commit: 341fc672209c42ba191d94431740c3c39ed4a730 Author: Martin Mokrejš <mmokrejs <AT> gmail <DOT> com> AuthorDate: Thu Jan 26 20:51:13 2017 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Fri Jan 27 22:11:02 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=341fc672
sys-libs/db: fix ebuilds for recent versions to respect EPREFIX (cherry picked from commit fdf6c8b0ace87100319face30463d38fa4daf637) Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> Fixes: https://github.com/gentoo/gentoo/pull/3671 sys-libs/db/db-5.3.28-r2.ebuild | 12 ++++++------ sys-libs/db/db-6.0.35.ebuild | 12 ++++++------ sys-libs/db/db-6.1.29.ebuild | 12 ++++++------ sys-libs/db/db-6.2.23.ebuild | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild index df351cf..61774e7 100644 --- 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 0ebd996..4ef04b9 100644 --- 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 412ab73..54e28f1 100644 --- 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 b0dfbe9..786c35b 100644 --- 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 }
