sys-libs/db: fix ebuilds for recent versions to respect EPREFIX

(cherry picked from commit fdf6c8b0ace87100319face30463d38fa4daf637)
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Fixes: https://github.com/gentoo/gentoo/pull/3671

diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
index df351cf46820659a6984065b2023f16088667d20..61774e797b7912ec14b9433a2350ccc9c57853c0 100644 (file)
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -171,9 +171,9 @@ multilib_src_install() {
        db_src_install_usrlibcleanup
 
        if multilib_is_native_abi && use java; then
-               java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
-               java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
-               rm -f "${D}"/usr/"$(get_libdir)"/*.jar
+               java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
+               java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
+               rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
        fi
 }
 
@@ -184,9 +184,9 @@ multilib_src_install_all() {
 
        dodir /usr/sbin
        # This file is not always built, and no longer exists as of db-4.8
-       if [[ -f "${D}"/usr/bin/berkeley_db_svc ]] ; then
-               mv "${D}"/usr/bin/berkeley_db_svc \
-                       "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
+       if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then
+               mv "${ED}"/usr/bin/berkeley_db_svc \
+                       "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
        fi
 }
 

diff --git a/sys-libs/db/db-6.0.35.ebuild b/sys-libs/db/db-6.0.35.ebuild
index 0ebd996d2cfbc8d4d4307e937f537382681e584b..4ef04b95326e19552fc4a7435ad7ec4ac8015d07 100644 (file)
--- a/sys-libs/db/db-6.0.35.ebuild
+++ b/sys-libs/db/db-6.0.35.ebuild
@@ -169,9 +169,9 @@ multilib_src_install() {
        db_src_install_usrlibcleanup
 
        if multilib_is_native_abi && use java; then
-               java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
-               java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
-               rm -f "${D}"/usr/"$(get_libdir)"/*.jar
+               java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
+               java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
+               rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
        fi
 }
 
@@ -182,9 +182,9 @@ multilib_src_install_all() {
 
        dodir /usr/sbin
        # This file is not always built, and no longer exists as of db-4.8
-       if [[ -f "${D}"/usr/bin/berkeley_db_svc ]] ; then
-               mv "${D}"/usr/bin/berkeley_db_svc \
-                       "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
+       if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then
+               mv "${ED}"/usr/bin/berkeley_db_svc \
+                       "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
        fi
 }
 

diff --git a/sys-libs/db/db-6.1.29.ebuild b/sys-libs/db/db-6.1.29.ebuild
index 412ab73af23c5adf14c0ccac344088634d526449..54e28f14bb8e44f6afe951b4804520f4fcef8628 100644 (file)
--- a/sys-libs/db/db-6.1.29.ebuild
+++ b/sys-libs/db/db-6.1.29.ebuild
@@ -169,9 +169,9 @@ multilib_src_install() {
        db_src_install_usrlibcleanup
 
        if multilib_is_native_abi && use java; then
-               java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
-               java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
-               rm -f "${D}"/usr/"$(get_libdir)"/*.jar
+               java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
+               java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
+               rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
        fi
 }
 
@@ -182,9 +182,9 @@ multilib_src_install_all() {
 
        dodir /usr/sbin
        # This file is not always built, and no longer exists as of db-4.8
-       if [[ -f "${D}"/usr/bin/berkeley_db_svc ]] ; then
-               mv "${D}"/usr/bin/berkeley_db_svc \
-                       "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
+       if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then
+               mv "${ED}"/usr/bin/berkeley_db_svc \
+                       "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
        fi
 }
 

diff --git a/sys-libs/db/db-6.2.23.ebuild b/sys-libs/db/db-6.2.23.ebuild
index b0dfbe963d9fed1e92c964a9934576e90bcc5c37..786c35b6231a9a1dee5b1ef58d8d9a31857e795b 100644 (file)
--- a/sys-libs/db/db-6.2.23.ebuild
+++ b/sys-libs/db/db-6.2.23.ebuild
@@ -174,9 +174,9 @@ multilib_src_install() {
        db_src_install_usrlibcleanup
 
        if multilib_is_native_abi && use java; then
-               java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
-               java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
-               rm -f "${D}"/usr/"$(get_libdir)"/*.jar
+               java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
+               java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
+               rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
        fi
 }
 
@@ -187,9 +187,9 @@ multilib_src_install_all() {
 
        dodir /usr/sbin
        # This file is not always built, and no longer exists as of db-4.8
-       if [[ -f "${D}"/usr/bin/berkeley_db_svc ]] ; then
-               mv "${D}"/usr/bin/berkeley_db_svc \
-                       "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
+       if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then
+               mv "${ED}"/usr/bin/berkeley_db_svc \
+                       "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
        fi
 }