| 1 |
commit: 341fc672209c42ba191d94431740c3c39ed4a730 |
| 2 |
Author: Martin Mokrejš <mmokrejs <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Jan 26 20:51:13 2017 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 27 22:11:02 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=341fc672 |
| 7 |
|
| 8 |
sys-libs/db: fix ebuilds for recent versions to respect EPREFIX |
| 9 |
|
| 10 |
(cherry picked from commit fdf6c8b0ace87100319face30463d38fa4daf637) |
| 11 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 12 |
Fixes: https://github.com/gentoo/gentoo/pull/3671 |
| 13 |
|
| 14 |
sys-libs/db/db-5.3.28-r2.ebuild | 12 ++++++------ |
| 15 |
sys-libs/db/db-6.0.35.ebuild | 12 ++++++------ |
| 16 |
sys-libs/db/db-6.1.29.ebuild | 12 ++++++------ |
| 17 |
sys-libs/db/db-6.2.23.ebuild | 12 ++++++------ |
| 18 |
4 files changed, 24 insertions(+), 24 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild |
| 21 |
index df351cf..61774e7 100644 |
| 22 |
--- a/sys-libs/db/db-5.3.28-r2.ebuild |
| 23 |
+++ b/sys-libs/db/db-5.3.28-r2.ebuild |
| 24 |
@@ -171,9 +171,9 @@ multilib_src_install() { |
| 25 |
db_src_install_usrlibcleanup |
| 26 |
|
| 27 |
if multilib_is_native_abi && use java; then |
| 28 |
- java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so |
| 29 |
- java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar |
| 30 |
- rm -f "${D}"/usr/"$(get_libdir)"/*.jar |
| 31 |
+ java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so |
| 32 |
+ java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar |
| 33 |
+ rm -f "${ED}"/usr/"$(get_libdir)"/*.jar |
| 34 |
fi |
| 35 |
} |
| 36 |
|
| 37 |
@@ -184,9 +184,9 @@ multilib_src_install_all() { |
| 38 |
|
| 39 |
dodir /usr/sbin |
| 40 |
# This file is not always built, and no longer exists as of db-4.8 |
| 41 |
- if [[ -f "${D}"/usr/bin/berkeley_db_svc ]] ; then |
| 42 |
- mv "${D}"/usr/bin/berkeley_db_svc \ |
| 43 |
- "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die |
| 44 |
+ if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then |
| 45 |
+ mv "${ED}"/usr/bin/berkeley_db_svc \ |
| 46 |
+ "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die |
| 47 |
fi |
| 48 |
} |
| 49 |
|
| 50 |
|
| 51 |
diff --git a/sys-libs/db/db-6.0.35.ebuild b/sys-libs/db/db-6.0.35.ebuild |
| 52 |
index 0ebd996..4ef04b9 100644 |
| 53 |
--- a/sys-libs/db/db-6.0.35.ebuild |
| 54 |
+++ b/sys-libs/db/db-6.0.35.ebuild |
| 55 |
@@ -169,9 +169,9 @@ multilib_src_install() { |
| 56 |
db_src_install_usrlibcleanup |
| 57 |
|
| 58 |
if multilib_is_native_abi && use java; then |
| 59 |
- java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so |
| 60 |
- java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar |
| 61 |
- rm -f "${D}"/usr/"$(get_libdir)"/*.jar |
| 62 |
+ java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so |
| 63 |
+ java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar |
| 64 |
+ rm -f "${ED}"/usr/"$(get_libdir)"/*.jar |
| 65 |
fi |
| 66 |
} |
| 67 |
|
| 68 |
@@ -182,9 +182,9 @@ multilib_src_install_all() { |
| 69 |
|
| 70 |
dodir /usr/sbin |
| 71 |
# This file is not always built, and no longer exists as of db-4.8 |
| 72 |
- if [[ -f "${D}"/usr/bin/berkeley_db_svc ]] ; then |
| 73 |
- mv "${D}"/usr/bin/berkeley_db_svc \ |
| 74 |
- "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die |
| 75 |
+ if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then |
| 76 |
+ mv "${ED}"/usr/bin/berkeley_db_svc \ |
| 77 |
+ "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die |
| 78 |
fi |
| 79 |
} |
| 80 |
|
| 81 |
|
| 82 |
diff --git a/sys-libs/db/db-6.1.29.ebuild b/sys-libs/db/db-6.1.29.ebuild |
| 83 |
index 412ab73..54e28f1 100644 |
| 84 |
--- a/sys-libs/db/db-6.1.29.ebuild |
| 85 |
+++ b/sys-libs/db/db-6.1.29.ebuild |
| 86 |
@@ -169,9 +169,9 @@ multilib_src_install() { |
| 87 |
db_src_install_usrlibcleanup |
| 88 |
|
| 89 |
if multilib_is_native_abi && use java; then |
| 90 |
- java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so |
| 91 |
- java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar |
| 92 |
- rm -f "${D}"/usr/"$(get_libdir)"/*.jar |
| 93 |
+ java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so |
| 94 |
+ java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar |
| 95 |
+ rm -f "${ED}"/usr/"$(get_libdir)"/*.jar |
| 96 |
fi |
| 97 |
} |
| 98 |
|
| 99 |
@@ -182,9 +182,9 @@ multilib_src_install_all() { |
| 100 |
|
| 101 |
dodir /usr/sbin |
| 102 |
# This file is not always built, and no longer exists as of db-4.8 |
| 103 |
- if [[ -f "${D}"/usr/bin/berkeley_db_svc ]] ; then |
| 104 |
- mv "${D}"/usr/bin/berkeley_db_svc \ |
| 105 |
- "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die |
| 106 |
+ if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then |
| 107 |
+ mv "${ED}"/usr/bin/berkeley_db_svc \ |
| 108 |
+ "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die |
| 109 |
fi |
| 110 |
} |
| 111 |
|
| 112 |
|
| 113 |
diff --git a/sys-libs/db/db-6.2.23.ebuild b/sys-libs/db/db-6.2.23.ebuild |
| 114 |
index b0dfbe9..786c35b 100644 |
| 115 |
--- a/sys-libs/db/db-6.2.23.ebuild |
| 116 |
+++ b/sys-libs/db/db-6.2.23.ebuild |
| 117 |
@@ -174,9 +174,9 @@ multilib_src_install() { |
| 118 |
db_src_install_usrlibcleanup |
| 119 |
|
| 120 |
if multilib_is_native_abi && use java; then |
| 121 |
- java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so |
| 122 |
- java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar |
| 123 |
- rm -f "${D}"/usr/"$(get_libdir)"/*.jar |
| 124 |
+ java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so |
| 125 |
+ java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar |
| 126 |
+ rm -f "${ED}"/usr/"$(get_libdir)"/*.jar |
| 127 |
fi |
| 128 |
} |
| 129 |
|
| 130 |
@@ -187,9 +187,9 @@ multilib_src_install_all() { |
| 131 |
|
| 132 |
dodir /usr/sbin |
| 133 |
# This file is not always built, and no longer exists as of db-4.8 |
| 134 |
- if [[ -f "${D}"/usr/bin/berkeley_db_svc ]] ; then |
| 135 |
- mv "${D}"/usr/bin/berkeley_db_svc \ |
| 136 |
- "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die |
| 137 |
+ if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then |
| 138 |
+ mv "${ED}"/usr/bin/berkeley_db_svc \ |
| 139 |
+ "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die |
| 140 |
fi |
| 141 |
} |
Archives