dev-libs/libdbf: Avoid file name collision for endian.h

svn path=/sunrise/; revision=11402

diff --git a/dev-libs/libdbf/ChangeLog b/dev-libs/libdbf/ChangeLog
index f0ef2b84199027eaf437eda94be11f373e2ea29f..701e99f0d1c77c75a4261ee02c1c9bd836f19296 100644 (file)
--- a/dev-libs/libdbf/ChangeLog
+++ b/dev-libs/libdbf/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for dev-libs/libdbf
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Oct 2010; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>
+  libdbf-0.0.1.ebuild:
+  Avoid file name collision for endian.h
+
   08 Dec 2009; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>
   libdbf-0.0.1.ebuild:
   Added ~amd64 keyword

diff --git a/dev-libs/libdbf/Manifest b/dev-libs/libdbf/Manifest
index 26ffa2d1617a6a97db4715b3d67e445f54b301a5..bb54f6e35ba487a51395b309612c3a28203c764e 100644 (file)
--- a/dev-libs/libdbf/Manifest
+++ b/dev-libs/libdbf/Manifest
@@ -1,4 +1,4 @@
 DIST libdbf-0.0.1.src.zip 843956 RMD160 772380576ade79106ae0fcc2dbbe79e15b427947 SHA1 02914dd1647db60a7add7dc7dfc1b82e5c03ab6e SHA256 36e0dba4cef0af7b1e33637ea71fe1f03120b34e80e1b663c92fb35340197864
-EBUILD libdbf-0.0.1.ebuild 730 RMD160 f0f5acc816c0dd9a9bcd746be07dc32ddc9c02d0 SHA1 60b29f6d19eefdcdf58f099a6e01b029351f0808 SHA256 154fbce777c52d02c0aca3eb5daa15a49302a8c87723b7674753d8b2121a3b0d
-MISC ChangeLog 369 RMD160 4f0b1ddfe0969aa5dd87bf4c3d40a5e192b88074 SHA1 a16903416dc869870b6dd0d2b547c373f6f48876 SHA256 53af476b7e8df6b17bcbf36cbd0a0f163644f16e3f0ba4c1c403fee8f7c3af81
+EBUILD libdbf-0.0.1.ebuild 1010 RMD160 d13fecf379ad9c49c6fe09c204011f0f71bc8a16 SHA1 bb008c78b015ca84c58f66e73b733871059249af SHA256 4b82d7adfb1bac549b29f864943a3e9139cff264a716b052e32954940f8a9d6a
+MISC ChangeLog 498 RMD160 7db5c249875bf04c447d9343299b418722b3700e SHA1 351563172325c1fe2089819aa6f02e5f68a04498 SHA256 fea72e2cd692f5081179274d706358d80e78712693c2744c340929c32f1899bb
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f

diff --git a/dev-libs/libdbf/libdbf-0.0.1.ebuild b/dev-libs/libdbf/libdbf-0.0.1.ebuild
index 70a94df676011b928d6a30c80148356f5933f150..804a1a81711dc288440961ac18e554b4f00a2c0f 100644 (file)
--- a/dev-libs/libdbf/libdbf-0.0.1.ebuild
+++ b/dev-libs/libdbf/libdbf-0.0.1.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=3
+
 DESCRIPTION="Library to read the content of dBASE III, IV, and 5.0 files"
 HOMEPAGE="http://developer.berlios.de/projects/dbf/"
 SRC_URI="mirror://berlios/dbf/${P}.src.zip"
@@ -20,13 +22,21 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}
 
-src_compile() {
+src_prepare() {
+       # Avoid collisions with /usr/include/endian.h
+       # installed by e.g. sys-libs/glibc-2.12.1-r1
+       cd src || die "src dir missing"
+       mv endian.h dbf_endian.h || die "endian.h couldn't be renamed"
+       sed -i 's/endian\.h/dbf_endian.h/g' Makefile.in *.c *.h \
+               || die "error executing sed"
+}
+
+src_configure() {
        chmod u+x configure
        if use doc; then
                export DOC_TO_MAN=docbook2man
        fi
        econf
-       emake || die "emake failed"
 }
 
 src_install() {