Make ebuild Prefix aware

Package-Manager: portage-2.2.00.15842-prefix/cvs/Darwin powerpc

diff --git a/dev-libs/dbxml/ChangeLog b/dev-libs/dbxml/ChangeLog
index 288cfcab52353f6b3290e0ff30e40035ce4d8cbb..2754a1cb4b2e0875e3d96f91e649b9e0feddcc7c 100644 (file)
--- a/dev-libs/dbxml/ChangeLog
+++ b/dev-libs/dbxml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/dbxml
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/ChangeLog,v 1.9 2010/06/01 21:25:54 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/ChangeLog,v 1.10 2010/06/03 06:07:41 grobian Exp $
+
+  02 Jun 2010; Fabian Groffen <grobian@gentoo.org> dbxml-2.5.16-r1.ebuild:
+  Make ebuild Prefix aware
 
 *dbxml-2.5.16-r1 (01 Jun 2010)
 

diff --git a/dev-libs/dbxml/Manifest b/dev-libs/dbxml/Manifest
index a97a0b14f25a832d9bacbec1d7dfd680904777d8..a6640e6e56d61317252cdfe8d07d2c88ee0f3976 100644 (file)
--- a/dev-libs/dbxml/Manifest
+++ b/dev-libs/dbxml/Manifest
@@ -1,5 +1,5 @@
 DIST dbxml-2.5.16.tar.gz 52819154 RMD160 fdb4c85271cb84a8e31931d8fb287ad17fafff9c SHA1 46f0e6b301e556c2502e4da0cd96a599acc53837 SHA256 f2423be3805811a9cca71d6877c0b1bdc1941cd76c3f26d6eb011a5724a3edd2
-EBUILD dbxml-2.5.16-r1.ebuild 4678 RMD160 bad1e2a938835a8892fab40dc4eae9d732a0c10a SHA1 90ec23d16a301c97d8c6444542f11d6462b5c214 SHA256 bf00afe7fa05f5122ff25a8c981ab00a464b366db459a02bfaee6ba0964a468e
+EBUILD dbxml-2.5.16-r1.ebuild 4739 RMD160 f3df2436b990b9e54da5490585081c313510ff90 SHA1 8446441e9a68227f62c2acde4d28dfb023c4a813 SHA256 3117fd41ed91114cde2882bae0153396c9c375e6a31f0c609cc0a9942bc75b16
 EBUILD dbxml-2.5.16.ebuild 4888 RMD160 ad48755d31f5e6e39405549d0367256feab26122 SHA1 259d133ca655dcf7571955c6c4177bcae810a3c5 SHA256 2d390dd680277810397ec67575487c8bdabee5e42945187bfe408ba9073a56f3
-MISC ChangeLog 2399 RMD160 79ef964c1a4c7e7140d0d1c3da842165538396a7 SHA1 ea6fff85f6663602bbc01393af9cfb2c91e745c7 SHA256 457b3fe83dd33cc646a432eab3c8811222e578cc7d20bf00a21fe7dbe33cadf8
+MISC ChangeLog 2502 RMD160 21d4360a775b7cc6596c11dc414dc0321a0b5aad SHA1 8125d329e5f41cb465cd5230d112e8fdf16bd8a0 SHA256 482e70439de6ccd4a3ac5866bc43fd85b6a466133ac8a1f5edcbd8d8ad3bfff6
 MISC metadata.xml 255 RMD160 ffab53e6c250ea6880036224ec7944b5f25a2ff5 SHA1 fe663297149bc1158616da920b78c01b929398b9 SHA256 fce233aa3c475563b0dde3e7115a5f61f6da338070a7f995e9a9ba146468e935

diff --git a/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild b/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild
index 4d34481dd4751f18b4aa6b4d2e810d9677b91528..c5500e24996f22b3a91ed62e865af5d1bc5ba348 100644 (file)
--- a/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild
+++ b/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild,v 1.1 2010/06/01 21:25:54 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild,v 1.2 2010/06/03 06:07:41 grobian Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -103,21 +103,21 @@ src_configure() {
        cd "${S}/build_unix"
 
        #Needed despite db_version stuff above
-       append-flags -I/usr/include/db${DB_VER}
+       append-flags -I"${EPREFIX}"/usr/include/db${DB_VER}
 
        local myconf=""
 
        # use_enable doesn't work here due to a different syntax
        use java && myconf="${myconf} --enable-java"
-       use tcl && myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)"
+       use tcl && myconf="${myconf} --enable-tcl --with-tcl=${EPREFIX}/usr/$(get_libdir)"
 
        export ac_cv_prog_path_strip="missing_strip"
        ECONF_SOURCE="../" \
        JAVAPREFIX="${JAVA_HOME}" \
                econf \
-                       --with-berkeleydb=/usr \
-                       --with-xqilla=/usr \
-                       --with-xerces=/usr \
+                       --with-berkeleydb="${EPREFIX}"/usr \
+                       --with-xqilla="${EPREFIX}"/usr \
+                       --with-xerces="${EPREFIX}"/usr \
                        ${myconf}
 }
 
@@ -147,12 +147,12 @@ src_install() {
        # somewhat broken build system
        emake DESTDIR="${D}" install || die "emake install failed"
 
-       use doc && dohtml -A pdf -r "${D}"/usr/docs/*
-       rm -rf "${D}/usr/docs"
+       use doc && dohtml -A pdf -r "${ED}"/usr/docs/*
+       rm -rf "${ED}/usr/docs"
 
        if use java ; then
-               java-pkg_dojar "${D}/usr/$(get_libdir)/dbxml.jar"
-               rm "${D}/usr/$(get_libdir)/dbxml.jar"
+               java-pkg_dojar "${ED}/usr/$(get_libdir)/dbxml.jar"
+               rm "${ED}/usr/$(get_libdir)/dbxml.jar"
        fi
 
        if use python ; then