diff options
| author |   Martin Mokrejš <mmokrejs@gmail.com> | 2017-01-26 21:51:13 +0100 |
|---|---|---|
| committer |   Robin H. Johnson <robbat2@gentoo.org> | 2017-01-27 14:11:02 -0800 |
| commit | 341fc672209c42ba191d94431740c3c39ed4a730 (patch) | |
| tree | 055d6144e62d45da1a4709a7e31e8d9417997ada /sys-libs | |
| parent | net-nds/openldap: remove unused init file (diff) | |
| download | gentoo-341fc672209c42ba191d94431740c3c39ed4a730.tar.gz gentoo-341fc672209c42ba191d94431740c3c39ed4a730.tar.bz2 gentoo-341fc672209c42ba191d94431740c3c39ed4a730.zip | |
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
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/db/db-5.3.28-r2.ebuild | 12 | ||||
| -rw-r--r-- | sys-libs/db/db-6.0.35.ebuild | 12 | ||||
| -rw-r--r-- | sys-libs/db/db-6.1.29.ebuild | 12 | ||||
| -rw-r--r-- | 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 df351cf46820..61774e797b79 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 0ebd996d2cfb..4ef04b95326e 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 412ab73af23c..54e28f14bb8e 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 b0dfbe963d9f..786c35b6231a 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 } |