commit: b7bb930838f049041c51e3763bb4a9fc7f5be0be Author: Martin Mokrejš <mmokrejs <AT> gmail <DOT> com> AuthorDate: Fri Jan 27 10:33:30 2017 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Fri Jan 27 22:11:13 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7bb9308
sys-libs/db: respect EPREFIX, fixes bug #587520 (cherry picked from commit 6eab44c650e8134e1b3025a197cb77057d2925d5) Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> Fixes: https://github.com/gentoo/gentoo/pull/3671 sys-libs/db/db-1.85-r3.ebuild | 2 +- sys-libs/db/db-3.2.9_p2.ebuild | 20 ++++++++++---------- sys-libs/db/db-4.2.52_p5-r1.ebuild | 26 +++++++++++++------------- sys-libs/db/db-4.3.29_p1-r1.ebuild | 26 +++++++++++++------------- sys-libs/db/db-4.4.20_p4-r1.ebuild | 26 +++++++++++++------------- sys-libs/db/db-4.5.20_p2-r1.ebuild | 26 +++++++++++++------------- sys-libs/db/db-4.6.21_p4.ebuild | 26 +++++++++++++------------- sys-libs/db/db-4.7.25_p4.ebuild | 10 +++++----- sys-libs/db/db-4.8.30-r2.ebuild | 12 ++++++------ sys-libs/db/db-5.1.29-r1.ebuild | 10 +++++----- 10 files changed, 92 insertions(+), 92 deletions(-) diff --git a/sys-libs/db/db-1.85-r3.ebuild b/sys-libs/db/db-1.85-r3.ebuild index df57100..6630970 100644 --- a/sys-libs/db/db-1.85-r3.ebuild +++ b/sys-libs/db/db-1.85-r3.ebuild @@ -36,7 +36,7 @@ src_compile() { } src_install() { - make -C PORT/linux install DESTDIR="${D}" || die + make -C PORT/linux install DESTDIR="${ED}" || die # binary compat symlink dosym libdb1.so.2 /usr/$(get_libdir)/libdb.so.2 || die diff --git a/sys-libs/db/db-3.2.9_p2.ebuild b/sys-libs/db/db-3.2.9_p2.ebuild index 454fecc..adf8063 100644 --- a/sys-libs/db/db-3.2.9_p2.ebuild +++ b/sys-libs/db/db-3.2.9_p2.ebuild @@ -84,7 +84,7 @@ src_compile() { --enable-cxx \ --enable-compat185 \ --enable-dump185 \ - --prefix=/usr" + --prefix=${EPREFIX}/usr" # --enable-rpc DOES NOT BUILD # Robin H. Johnson <[email protected]> (18 Oct 2003) @@ -107,17 +107,17 @@ src_compile() { strip=/bin/true \ ECONF_SOURCE="${S}"/dist econf \ ${conf} ${conf_static} \ - --libdir=/usr/$(get_libdir) \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ --disable-shared \ --enable-static || die einfo "Configuring ${P} (shared)..." mkdir -p "${S}"/build-shared cd "${S}"/build-shared - strip=/bin/true \ + strip="${ED}"/bin/true \ ECONF_SOURCE="${S}"/dist econf \ ${conf} ${conf_shared} \ - --libdir=/usr/$(get_libdir) \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ --disable-static \ --enable-shared || die @@ -125,19 +125,19 @@ src_compile() { MAKEOPTS="${MAKEOPTS} -j1" einfo "Building ${P} (static)..." cd "${S}"/build-static - emake strip=/bin/true || die "Static build failed" + emake strip="${EPREFIX}"/bin/true || die "Static build failed" einfo "Building ${P} (shared)..." cd "${S}"/build-shared - emake strip=/bin/true || die "Shared build failed" + emake strip="${EPREFIX}"/bin/true || die "Shared build failed" } src_install () { cd "${S}"/build-shared make libdb=libdb-3.2.a \ libcxx=libcxx_3.2.a \ - prefix="${D}"/usr \ - libdir="${D}"/usr/$(get_libdir) \ - strip=/bin/true \ + prefix="${EPREFIX}"/usr \ + libdir="${EPREFIX}"/usr/$(get_libdir) \ + strip="${EPREFIX}"/bin/true \ install || die cd "${S}"/build-static @@ -153,7 +153,7 @@ src_install () { # For some reason, db.so's are *not* readable by group or others, # resulting in no one but root being able to use them!!! # This fixes it -- DR 15 Jun 2001 - cd "${D}"/usr/$(get_libdir) + cd "${ED}"/usr/$(get_libdir) chmod go+rx *.so # The .la's aren't readable either chmod go+r *.la diff --git a/sys-libs/db/db-4.2.52_p5-r1.ebuild b/sys-libs/db/db-4.2.52_p5-r1.ebuild index c0b98c7..3571d83 100644 --- a/sys-libs/db/db-4.2.52_p5-r1.ebuild +++ b/sys-libs/db/db-4.2.52_p5-r1.ebuild @@ -113,13 +113,13 @@ src_compile() { fi cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --datadir=/usr/share \ - --sysconfdir=/etc \ - --localstatedir=/var/lib \ - --libdir=/usr/"$(get_libdir)" \ + --prefix="${EPREFIX}"/usr \ + --mandir="${EPREFIX}"/usr/share/man \ + --infodir="${EPREFIX}"/usr/share/info \ + --datadir="${EPREFIX}"/usr/share \ + --sysconfdir="${EPREFIX}"/etc \ + --localstatedir="${EPREFIX}"/var/lib \ + --libdir="${EPREFIX}"/usr/"$(get_libdir)" \ --enable-compat185 \ --with-uniquename \ $(use_enable rpc) \ @@ -135,7 +135,7 @@ src_compile() { } src_install() { - einstall libdir="${D}/usr/$(get_libdir)" strip="${D}/bin/strip" || die + einstall libdir="${ED}/usr/$(get_libdir)" strip="${ED}/bin/strip" || die db_src_install_usrbinslot @@ -147,13 +147,13 @@ src_install() { dodir /usr/sbin # This file is not always built, and no longer exists as of db-4.8 - [[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \ - mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc + [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \ + mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc if 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 } diff --git a/sys-libs/db/db-4.3.29_p1-r1.ebuild b/sys-libs/db/db-4.3.29_p1-r1.ebuild index 5aa0eb8..85fda3c 100644 --- a/sys-libs/db/db-4.3.29_p1-r1.ebuild +++ b/sys-libs/db/db-4.3.29_p1-r1.ebuild @@ -120,13 +120,13 @@ src_compile() { fi cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --datadir=/usr/share \ - --sysconfdir=/etc \ - --localstatedir=/var/lib \ - --libdir=/usr/"$(get_libdir)" \ + --prefix="${EPREFIX}"/usr \ + --mandir="${EPREFIX}"/usr/share/man \ + --infodir="${EPREFIX}"/usr/share/info \ + --datadir="${EPREFIX}"/usr/share \ + --sysconfdir="${EPREFIX}"/etc \ + --localstatedir="${EPREFIX}"/var/lib \ + --libdir="${EPREFIX}"/usr/"$(get_libdir)" \ --enable-compat185 \ --enable-o_direct \ --without-uniquename \ @@ -138,7 +138,7 @@ src_compile() { } src_install() { - einstall libdir="${D}/usr/$(get_libdir)" strip="${D}/bin/strip" || die + einstall libdir="${ED}/usr/$(get_libdir)" strip="${ED}/bin/strip" || die db_src_install_usrbinslot @@ -150,13 +150,13 @@ src_install() { dodir /usr/sbin # This file is not always built, and no longer exists as of db-4.8 - [[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \ - mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc + [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \ + mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc if 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 } diff --git a/sys-libs/db/db-4.4.20_p4-r1.ebuild b/sys-libs/db/db-4.4.20_p4-r1.ebuild index 16d94fe..34b7a9a 100644 --- a/sys-libs/db/db-4.4.20_p4-r1.ebuild +++ b/sys-libs/db/db-4.4.20_p4-r1.ebuild @@ -114,13 +114,13 @@ src_compile() { fi cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --datadir=/usr/share \ - --sysconfdir=/etc \ - --localstatedir=/var/lib \ - --libdir=/usr/"$(get_libdir)" \ + --prefix="${EPREFIX}"/usr \ + --mandir="${EPREFIX}"/usr/share/man \ + --infodir="${EPREFIX}"/usr/share/info \ + --datadir="${EPREFIX}"/usr/share \ + --sysconfdir="${EPREFIX}"/etc \ + --localstatedir="${EPREFIX}"/var/lib \ + --libdir="${EPREFIX}"/usr/"$(get_libdir)" \ --enable-compat185 \ --enable-o_direct \ --without-uniquename \ @@ -132,7 +132,7 @@ src_compile() { } src_install() { - einstall libdir="${D}/usr/$(get_libdir)" strip="${D}/bin/strip" || die + einstall libdir="${ED}/usr/$(get_libdir)" strip="${ED}/bin/strip" || die db_src_install_usrbinslot @@ -144,13 +144,13 @@ src_install() { dodir /usr/sbin # This file is not always built, and no longer exists as of db-4.8 - [[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \ - mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc + [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \ + mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc if 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 } diff --git a/sys-libs/db/db-4.5.20_p2-r1.ebuild b/sys-libs/db/db-4.5.20_p2-r1.ebuild index 2395c41..8cbd68b 100644 --- a/sys-libs/db/db-4.5.20_p2-r1.ebuild +++ b/sys-libs/db/db-4.5.20_p2-r1.ebuild @@ -124,13 +124,13 @@ src_compile() { fi cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --datadir=/usr/share \ - --sysconfdir=/etc \ - --localstatedir=/var/lib \ - --libdir=/usr/"$(get_libdir)" \ + --prefix="${EPREFIX}"/usr \ + --mandir="${EPREFIX}"/usr/share/man \ + --infodir="${EPREFIX}"/usr/share/info \ + --datadir="${EPREFIX}"/usr/share \ + --sysconfdir="${EPREFIX}"/etc \ + --localstatedir="${EPREFIX}"/var/lib \ + --libdir="${EPREFIX}"/usr/"$(get_libdir)" \ --enable-compat185 \ --enable-o_direct \ --without-uniquename \ @@ -145,7 +145,7 @@ src_compile() { } src_install() { - einstall libdir="${D}/usr/$(get_libdir)" STRIP="true" || die + einstall libdir="${ED}/usr/$(get_libdir)" STRIP="true" || die db_src_install_usrbinslot @@ -157,13 +157,13 @@ src_install() { dodir /usr/sbin # This file is not always built, and no longer exists as of db-4.8 - [[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \ - mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc + [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \ + mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc if 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 } diff --git a/sys-libs/db/db-4.6.21_p4.ebuild b/sys-libs/db/db-4.6.21_p4.ebuild index 04423a1..225fc78 100644 --- a/sys-libs/db/db-4.6.21_p4.ebuild +++ b/sys-libs/db/db-4.6.21_p4.ebuild @@ -117,13 +117,13 @@ src_compile() { fi cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --datadir=/usr/share \ - --sysconfdir=/etc \ - --localstatedir=/var/lib \ - --libdir=/usr/"$(get_libdir)" \ + --prefix="${EPREFIX}"/usr \ + --mandir="${EPREFIX}"/usr/share/man \ + --infodir="${EPREFIX}"/usr/share/info \ + --datadir="${EPREFIX}"/usr/share \ + --sysconfdir="${EPREFIX}"/etc \ + --localstatedir="${EPREFIX}"/var/lib \ + --libdir="${EPREFIX}"/usr/"$(get_libdir)" \ --enable-compat185 \ --enable-o_direct \ --without-uniquename \ @@ -138,7 +138,7 @@ src_compile() { } src_install() { - einstall libdir="${D}/usr/$(get_libdir)" STRIP="true" || die + einstall libdir="${ED}/usr/$(get_libdir)" STRIP="true" || die db_src_install_usrbinslot @@ -150,13 +150,13 @@ src_install() { dodir /usr/sbin # This file is not always built, and no longer exists as of db-4.8 - [[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \ - mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc + [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \ + mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc if 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 } diff --git a/sys-libs/db/db-4.7.25_p4.ebuild b/sys-libs/db/db-4.7.25_p4.ebuild index 153588f..d696d2f 100644 --- a/sys-libs/db/db-4.7.25_p4.ebuild +++ b/sys-libs/db/db-4.7.25_p4.ebuild @@ -141,13 +141,13 @@ src_install() { dodir /usr/sbin # This file is not always built, and no longer exists as of db-4.8 - [[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \ - mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc + [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \ + mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc if 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 } diff --git a/sys-libs/db/db-4.8.30-r2.ebuild b/sys-libs/db/db-4.8.30-r2.ebuild index 93cbd4b..8f1969e 100644 --- a/sys-libs/db/db-4.8.30-r2.ebuild +++ b/sys-libs/db/db-4.8.30-r2.ebuild @@ -153,9 +153,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 } @@ -166,9 +166,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-5.1.29-r1.ebuild b/sys-libs/db/db-5.1.29-r1.ebuild index d178026..f3aa99b 100644 --- a/sys-libs/db/db-5.1.29-r1.ebuild +++ b/sys-libs/db/db-5.1.29-r1.ebuild @@ -170,13 +170,13 @@ src_install() { dodir /usr/sbin # This file is not always built, and no longer exists as of db-4.8 - [[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \ - mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc + [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \ + mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc if 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 }
