| 1 |
commit: b7bb930838f049041c51e3763bb4a9fc7f5be0be |
| 2 |
Author: Martin Mokrejš <mmokrejs <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Jan 27 10:33:30 2017 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 27 22:11:13 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7bb9308 |
| 7 |
|
| 8 |
sys-libs/db: respect EPREFIX, fixes bug #587520 |
| 9 |
|
| 10 |
(cherry picked from commit 6eab44c650e8134e1b3025a197cb77057d2925d5) |
| 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-1.85-r3.ebuild | 2 +- |
| 15 |
sys-libs/db/db-3.2.9_p2.ebuild | 20 ++++++++++---------- |
| 16 |
sys-libs/db/db-4.2.52_p5-r1.ebuild | 26 +++++++++++++------------- |
| 17 |
sys-libs/db/db-4.3.29_p1-r1.ebuild | 26 +++++++++++++------------- |
| 18 |
sys-libs/db/db-4.4.20_p4-r1.ebuild | 26 +++++++++++++------------- |
| 19 |
sys-libs/db/db-4.5.20_p2-r1.ebuild | 26 +++++++++++++------------- |
| 20 |
sys-libs/db/db-4.6.21_p4.ebuild | 26 +++++++++++++------------- |
| 21 |
sys-libs/db/db-4.7.25_p4.ebuild | 10 +++++----- |
| 22 |
sys-libs/db/db-4.8.30-r2.ebuild | 12 ++++++------ |
| 23 |
sys-libs/db/db-5.1.29-r1.ebuild | 10 +++++----- |
| 24 |
10 files changed, 92 insertions(+), 92 deletions(-) |
| 25 |
|
| 26 |
diff --git a/sys-libs/db/db-1.85-r3.ebuild b/sys-libs/db/db-1.85-r3.ebuild |
| 27 |
index df57100..6630970 100644 |
| 28 |
--- a/sys-libs/db/db-1.85-r3.ebuild |
| 29 |
+++ b/sys-libs/db/db-1.85-r3.ebuild |
| 30 |
@@ -36,7 +36,7 @@ src_compile() { |
| 31 |
} |
| 32 |
|
| 33 |
src_install() { |
| 34 |
- make -C PORT/linux install DESTDIR="${D}" || die |
| 35 |
+ make -C PORT/linux install DESTDIR="${ED}" || die |
| 36 |
|
| 37 |
# binary compat symlink |
| 38 |
dosym libdb1.so.2 /usr/$(get_libdir)/libdb.so.2 || die |
| 39 |
|
| 40 |
diff --git a/sys-libs/db/db-3.2.9_p2.ebuild b/sys-libs/db/db-3.2.9_p2.ebuild |
| 41 |
index 454fecc..adf8063 100644 |
| 42 |
--- a/sys-libs/db/db-3.2.9_p2.ebuild |
| 43 |
+++ b/sys-libs/db/db-3.2.9_p2.ebuild |
| 44 |
@@ -84,7 +84,7 @@ src_compile() { |
| 45 |
--enable-cxx \ |
| 46 |
--enable-compat185 \ |
| 47 |
--enable-dump185 \ |
| 48 |
- --prefix=/usr" |
| 49 |
+ --prefix=${EPREFIX}/usr" |
| 50 |
|
| 51 |
# --enable-rpc DOES NOT BUILD |
| 52 |
# Robin H. Johnson <robbat2@g.o> (18 Oct 2003) |
| 53 |
@@ -107,17 +107,17 @@ src_compile() { |
| 54 |
strip=/bin/true \ |
| 55 |
ECONF_SOURCE="${S}"/dist econf \ |
| 56 |
${conf} ${conf_static} \ |
| 57 |
- --libdir=/usr/$(get_libdir) \ |
| 58 |
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \ |
| 59 |
--disable-shared \ |
| 60 |
--enable-static || die |
| 61 |
|
| 62 |
einfo "Configuring ${P} (shared)..." |
| 63 |
mkdir -p "${S}"/build-shared |
| 64 |
cd "${S}"/build-shared |
| 65 |
- strip=/bin/true \ |
| 66 |
+ strip="${ED}"/bin/true \ |
| 67 |
ECONF_SOURCE="${S}"/dist econf \ |
| 68 |
${conf} ${conf_shared} \ |
| 69 |
- --libdir=/usr/$(get_libdir) \ |
| 70 |
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \ |
| 71 |
--disable-static \ |
| 72 |
--enable-shared || die |
| 73 |
|
| 74 |
@@ -125,19 +125,19 @@ src_compile() { |
| 75 |
MAKEOPTS="${MAKEOPTS} -j1" |
| 76 |
einfo "Building ${P} (static)..." |
| 77 |
cd "${S}"/build-static |
| 78 |
- emake strip=/bin/true || die "Static build failed" |
| 79 |
+ emake strip="${EPREFIX}"/bin/true || die "Static build failed" |
| 80 |
einfo "Building ${P} (shared)..." |
| 81 |
cd "${S}"/build-shared |
| 82 |
- emake strip=/bin/true || die "Shared build failed" |
| 83 |
+ emake strip="${EPREFIX}"/bin/true || die "Shared build failed" |
| 84 |
} |
| 85 |
|
| 86 |
src_install () { |
| 87 |
cd "${S}"/build-shared |
| 88 |
make libdb=libdb-3.2.a \ |
| 89 |
libcxx=libcxx_3.2.a \ |
| 90 |
- prefix="${D}"/usr \ |
| 91 |
- libdir="${D}"/usr/$(get_libdir) \ |
| 92 |
- strip=/bin/true \ |
| 93 |
+ prefix="${EPREFIX}"/usr \ |
| 94 |
+ libdir="${EPREFIX}"/usr/$(get_libdir) \ |
| 95 |
+ strip="${EPREFIX}"/bin/true \ |
| 96 |
install || die |
| 97 |
|
| 98 |
cd "${S}"/build-static |
| 99 |
@@ -153,7 +153,7 @@ src_install () { |
| 100 |
# For some reason, db.so's are *not* readable by group or others, |
| 101 |
# resulting in no one but root being able to use them!!! |
| 102 |
# This fixes it -- DR 15 Jun 2001 |
| 103 |
- cd "${D}"/usr/$(get_libdir) |
| 104 |
+ cd "${ED}"/usr/$(get_libdir) |
| 105 |
chmod go+rx *.so |
| 106 |
# The .la's aren't readable either |
| 107 |
chmod go+r *.la |
| 108 |
|
| 109 |
diff --git a/sys-libs/db/db-4.2.52_p5-r1.ebuild b/sys-libs/db/db-4.2.52_p5-r1.ebuild |
| 110 |
index c0b98c7..3571d83 100644 |
| 111 |
--- a/sys-libs/db/db-4.2.52_p5-r1.ebuild |
| 112 |
+++ b/sys-libs/db/db-4.2.52_p5-r1.ebuild |
| 113 |
@@ -113,13 +113,13 @@ src_compile() { |
| 114 |
fi |
| 115 |
|
| 116 |
cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \ |
| 117 |
- --prefix=/usr \ |
| 118 |
- --mandir=/usr/share/man \ |
| 119 |
- --infodir=/usr/share/info \ |
| 120 |
- --datadir=/usr/share \ |
| 121 |
- --sysconfdir=/etc \ |
| 122 |
- --localstatedir=/var/lib \ |
| 123 |
- --libdir=/usr/"$(get_libdir)" \ |
| 124 |
+ --prefix="${EPREFIX}"/usr \ |
| 125 |
+ --mandir="${EPREFIX}"/usr/share/man \ |
| 126 |
+ --infodir="${EPREFIX}"/usr/share/info \ |
| 127 |
+ --datadir="${EPREFIX}"/usr/share \ |
| 128 |
+ --sysconfdir="${EPREFIX}"/etc \ |
| 129 |
+ --localstatedir="${EPREFIX}"/var/lib \ |
| 130 |
+ --libdir="${EPREFIX}"/usr/"$(get_libdir)" \ |
| 131 |
--enable-compat185 \ |
| 132 |
--with-uniquename \ |
| 133 |
$(use_enable rpc) \ |
| 134 |
@@ -135,7 +135,7 @@ src_compile() { |
| 135 |
} |
| 136 |
|
| 137 |
src_install() { |
| 138 |
- einstall libdir="${D}/usr/$(get_libdir)" strip="${D}/bin/strip" || die |
| 139 |
+ einstall libdir="${ED}/usr/$(get_libdir)" strip="${ED}/bin/strip" || die |
| 140 |
|
| 141 |
db_src_install_usrbinslot |
| 142 |
|
| 143 |
@@ -147,13 +147,13 @@ src_install() { |
| 144 |
|
| 145 |
dodir /usr/sbin |
| 146 |
# This file is not always built, and no longer exists as of db-4.8 |
| 147 |
- [[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \ |
| 148 |
- mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc |
| 149 |
+ [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \ |
| 150 |
+ mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc |
| 151 |
|
| 152 |
if use java; then |
| 153 |
- java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so |
| 154 |
- java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar |
| 155 |
- rm -f "${D}"/usr/"$(get_libdir)"/*.jar |
| 156 |
+ java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so |
| 157 |
+ java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar |
| 158 |
+ rm -f "${ED}"/usr/"$(get_libdir)"/*.jar |
| 159 |
fi |
| 160 |
} |
| 161 |
|
| 162 |
|
| 163 |
diff --git a/sys-libs/db/db-4.3.29_p1-r1.ebuild b/sys-libs/db/db-4.3.29_p1-r1.ebuild |
| 164 |
index 5aa0eb8..85fda3c 100644 |
| 165 |
--- a/sys-libs/db/db-4.3.29_p1-r1.ebuild |
| 166 |
+++ b/sys-libs/db/db-4.3.29_p1-r1.ebuild |
| 167 |
@@ -120,13 +120,13 @@ src_compile() { |
| 168 |
fi |
| 169 |
|
| 170 |
cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \ |
| 171 |
- --prefix=/usr \ |
| 172 |
- --mandir=/usr/share/man \ |
| 173 |
- --infodir=/usr/share/info \ |
| 174 |
- --datadir=/usr/share \ |
| 175 |
- --sysconfdir=/etc \ |
| 176 |
- --localstatedir=/var/lib \ |
| 177 |
- --libdir=/usr/"$(get_libdir)" \ |
| 178 |
+ --prefix="${EPREFIX}"/usr \ |
| 179 |
+ --mandir="${EPREFIX}"/usr/share/man \ |
| 180 |
+ --infodir="${EPREFIX}"/usr/share/info \ |
| 181 |
+ --datadir="${EPREFIX}"/usr/share \ |
| 182 |
+ --sysconfdir="${EPREFIX}"/etc \ |
| 183 |
+ --localstatedir="${EPREFIX}"/var/lib \ |
| 184 |
+ --libdir="${EPREFIX}"/usr/"$(get_libdir)" \ |
| 185 |
--enable-compat185 \ |
| 186 |
--enable-o_direct \ |
| 187 |
--without-uniquename \ |
| 188 |
@@ -138,7 +138,7 @@ src_compile() { |
| 189 |
} |
| 190 |
|
| 191 |
src_install() { |
| 192 |
- einstall libdir="${D}/usr/$(get_libdir)" strip="${D}/bin/strip" || die |
| 193 |
+ einstall libdir="${ED}/usr/$(get_libdir)" strip="${ED}/bin/strip" || die |
| 194 |
|
| 195 |
db_src_install_usrbinslot |
| 196 |
|
| 197 |
@@ -150,13 +150,13 @@ src_install() { |
| 198 |
|
| 199 |
dodir /usr/sbin |
| 200 |
# This file is not always built, and no longer exists as of db-4.8 |
| 201 |
- [[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \ |
| 202 |
- mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc |
| 203 |
+ [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \ |
| 204 |
+ mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc |
| 205 |
|
| 206 |
if use java; then |
| 207 |
- java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so |
| 208 |
- java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar |
| 209 |
- rm -f "${D}"/usr/"$(get_libdir)"/*.jar |
| 210 |
+ java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so |
| 211 |
+ java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar |
| 212 |
+ rm -f "${ED}"/usr/"$(get_libdir)"/*.jar |
| 213 |
fi |
| 214 |
} |
| 215 |
|
| 216 |
|
| 217 |
diff --git a/sys-libs/db/db-4.4.20_p4-r1.ebuild b/sys-libs/db/db-4.4.20_p4-r1.ebuild |
| 218 |
index 16d94fe..34b7a9a 100644 |
| 219 |
--- a/sys-libs/db/db-4.4.20_p4-r1.ebuild |
| 220 |
+++ b/sys-libs/db/db-4.4.20_p4-r1.ebuild |
| 221 |
@@ -114,13 +114,13 @@ src_compile() { |
| 222 |
fi |
| 223 |
|
| 224 |
cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \ |
| 225 |
- --prefix=/usr \ |
| 226 |
- --mandir=/usr/share/man \ |
| 227 |
- --infodir=/usr/share/info \ |
| 228 |
- --datadir=/usr/share \ |
| 229 |
- --sysconfdir=/etc \ |
| 230 |
- --localstatedir=/var/lib \ |
| 231 |
- --libdir=/usr/"$(get_libdir)" \ |
| 232 |
+ --prefix="${EPREFIX}"/usr \ |
| 233 |
+ --mandir="${EPREFIX}"/usr/share/man \ |
| 234 |
+ --infodir="${EPREFIX}"/usr/share/info \ |
| 235 |
+ --datadir="${EPREFIX}"/usr/share \ |
| 236 |
+ --sysconfdir="${EPREFIX}"/etc \ |
| 237 |
+ --localstatedir="${EPREFIX}"/var/lib \ |
| 238 |
+ --libdir="${EPREFIX}"/usr/"$(get_libdir)" \ |
| 239 |
--enable-compat185 \ |
| 240 |
--enable-o_direct \ |
| 241 |
--without-uniquename \ |
| 242 |
@@ -132,7 +132,7 @@ src_compile() { |
| 243 |
} |
| 244 |
|
| 245 |
src_install() { |
| 246 |
- einstall libdir="${D}/usr/$(get_libdir)" strip="${D}/bin/strip" || die |
| 247 |
+ einstall libdir="${ED}/usr/$(get_libdir)" strip="${ED}/bin/strip" || die |
| 248 |
|
| 249 |
db_src_install_usrbinslot |
| 250 |
|
| 251 |
@@ -144,13 +144,13 @@ src_install() { |
| 252 |
|
| 253 |
dodir /usr/sbin |
| 254 |
# This file is not always built, and no longer exists as of db-4.8 |
| 255 |
- [[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \ |
| 256 |
- mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc |
| 257 |
+ [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \ |
| 258 |
+ mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc |
| 259 |
|
| 260 |
if use java; then |
| 261 |
- java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so |
| 262 |
- java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar |
| 263 |
- rm -f "${D}"/usr/"$(get_libdir)"/*.jar |
| 264 |
+ java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so |
| 265 |
+ java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar |
| 266 |
+ rm -f "${ED}"/usr/"$(get_libdir)"/*.jar |
| 267 |
fi |
| 268 |
} |
| 269 |
|
| 270 |
|
| 271 |
diff --git a/sys-libs/db/db-4.5.20_p2-r1.ebuild b/sys-libs/db/db-4.5.20_p2-r1.ebuild |
| 272 |
index 2395c41..8cbd68b 100644 |
| 273 |
--- a/sys-libs/db/db-4.5.20_p2-r1.ebuild |
| 274 |
+++ b/sys-libs/db/db-4.5.20_p2-r1.ebuild |
| 275 |
@@ -124,13 +124,13 @@ src_compile() { |
| 276 |
fi |
| 277 |
|
| 278 |
cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \ |
| 279 |
- --prefix=/usr \ |
| 280 |
- --mandir=/usr/share/man \ |
| 281 |
- --infodir=/usr/share/info \ |
| 282 |
- --datadir=/usr/share \ |
| 283 |
- --sysconfdir=/etc \ |
| 284 |
- --localstatedir=/var/lib \ |
| 285 |
- --libdir=/usr/"$(get_libdir)" \ |
| 286 |
+ --prefix="${EPREFIX}"/usr \ |
| 287 |
+ --mandir="${EPREFIX}"/usr/share/man \ |
| 288 |
+ --infodir="${EPREFIX}"/usr/share/info \ |
| 289 |
+ --datadir="${EPREFIX}"/usr/share \ |
| 290 |
+ --sysconfdir="${EPREFIX}"/etc \ |
| 291 |
+ --localstatedir="${EPREFIX}"/var/lib \ |
| 292 |
+ --libdir="${EPREFIX}"/usr/"$(get_libdir)" \ |
| 293 |
--enable-compat185 \ |
| 294 |
--enable-o_direct \ |
| 295 |
--without-uniquename \ |
| 296 |
@@ -145,7 +145,7 @@ src_compile() { |
| 297 |
} |
| 298 |
|
| 299 |
src_install() { |
| 300 |
- einstall libdir="${D}/usr/$(get_libdir)" STRIP="true" || die |
| 301 |
+ einstall libdir="${ED}/usr/$(get_libdir)" STRIP="true" || die |
| 302 |
|
| 303 |
db_src_install_usrbinslot |
| 304 |
|
| 305 |
@@ -157,13 +157,13 @@ src_install() { |
| 306 |
|
| 307 |
dodir /usr/sbin |
| 308 |
# This file is not always built, and no longer exists as of db-4.8 |
| 309 |
- [[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \ |
| 310 |
- mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc |
| 311 |
+ [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \ |
| 312 |
+ mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc |
| 313 |
|
| 314 |
if use java; then |
| 315 |
- java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so |
| 316 |
- java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar |
| 317 |
- rm -f "${D}"/usr/"$(get_libdir)"/*.jar |
| 318 |
+ java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so |
| 319 |
+ java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar |
| 320 |
+ rm -f "${ED}"/usr/"$(get_libdir)"/*.jar |
| 321 |
fi |
| 322 |
} |
| 323 |
|
| 324 |
|
| 325 |
diff --git a/sys-libs/db/db-4.6.21_p4.ebuild b/sys-libs/db/db-4.6.21_p4.ebuild |
| 326 |
index 04423a1..225fc78 100644 |
| 327 |
--- a/sys-libs/db/db-4.6.21_p4.ebuild |
| 328 |
+++ b/sys-libs/db/db-4.6.21_p4.ebuild |
| 329 |
@@ -117,13 +117,13 @@ src_compile() { |
| 330 |
fi |
| 331 |
|
| 332 |
cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \ |
| 333 |
- --prefix=/usr \ |
| 334 |
- --mandir=/usr/share/man \ |
| 335 |
- --infodir=/usr/share/info \ |
| 336 |
- --datadir=/usr/share \ |
| 337 |
- --sysconfdir=/etc \ |
| 338 |
- --localstatedir=/var/lib \ |
| 339 |
- --libdir=/usr/"$(get_libdir)" \ |
| 340 |
+ --prefix="${EPREFIX}"/usr \ |
| 341 |
+ --mandir="${EPREFIX}"/usr/share/man \ |
| 342 |
+ --infodir="${EPREFIX}"/usr/share/info \ |
| 343 |
+ --datadir="${EPREFIX}"/usr/share \ |
| 344 |
+ --sysconfdir="${EPREFIX}"/etc \ |
| 345 |
+ --localstatedir="${EPREFIX}"/var/lib \ |
| 346 |
+ --libdir="${EPREFIX}"/usr/"$(get_libdir)" \ |
| 347 |
--enable-compat185 \ |
| 348 |
--enable-o_direct \ |
| 349 |
--without-uniquename \ |
| 350 |
@@ -138,7 +138,7 @@ src_compile() { |
| 351 |
} |
| 352 |
|
| 353 |
src_install() { |
| 354 |
- einstall libdir="${D}/usr/$(get_libdir)" STRIP="true" || die |
| 355 |
+ einstall libdir="${ED}/usr/$(get_libdir)" STRIP="true" || die |
| 356 |
|
| 357 |
db_src_install_usrbinslot |
| 358 |
|
| 359 |
@@ -150,13 +150,13 @@ src_install() { |
| 360 |
|
| 361 |
dodir /usr/sbin |
| 362 |
# This file is not always built, and no longer exists as of db-4.8 |
| 363 |
- [[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \ |
| 364 |
- mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc |
| 365 |
+ [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \ |
| 366 |
+ mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc |
| 367 |
|
| 368 |
if use java; then |
| 369 |
- java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so |
| 370 |
- java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar |
| 371 |
- rm -f "${D}"/usr/"$(get_libdir)"/*.jar |
| 372 |
+ java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so |
| 373 |
+ java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar |
| 374 |
+ rm -f "${ED}"/usr/"$(get_libdir)"/*.jar |
| 375 |
fi |
| 376 |
} |
| 377 |
|
| 378 |
|
| 379 |
diff --git a/sys-libs/db/db-4.7.25_p4.ebuild b/sys-libs/db/db-4.7.25_p4.ebuild |
| 380 |
index 153588f..d696d2f 100644 |
| 381 |
--- a/sys-libs/db/db-4.7.25_p4.ebuild |
| 382 |
+++ b/sys-libs/db/db-4.7.25_p4.ebuild |
| 383 |
@@ -141,13 +141,13 @@ src_install() { |
| 384 |
|
| 385 |
dodir /usr/sbin |
| 386 |
# This file is not always built, and no longer exists as of db-4.8 |
| 387 |
- [[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \ |
| 388 |
- mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc |
| 389 |
+ [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \ |
| 390 |
+ mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc |
| 391 |
|
| 392 |
if use java; then |
| 393 |
- java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so |
| 394 |
- java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar |
| 395 |
- rm -f "${D}"/usr/"$(get_libdir)"/*.jar |
| 396 |
+ java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so |
| 397 |
+ java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar |
| 398 |
+ rm -f "${ED}"/usr/"$(get_libdir)"/*.jar |
| 399 |
fi |
| 400 |
} |
| 401 |
|
| 402 |
|
| 403 |
diff --git a/sys-libs/db/db-4.8.30-r2.ebuild b/sys-libs/db/db-4.8.30-r2.ebuild |
| 404 |
index 93cbd4b..8f1969e 100644 |
| 405 |
--- a/sys-libs/db/db-4.8.30-r2.ebuild |
| 406 |
+++ b/sys-libs/db/db-4.8.30-r2.ebuild |
| 407 |
@@ -153,9 +153,9 @@ multilib_src_install() { |
| 408 |
db_src_install_usrlibcleanup |
| 409 |
|
| 410 |
if multilib_is_native_abi && use java; then |
| 411 |
- java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so |
| 412 |
- java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar |
| 413 |
- rm -f "${D}"/usr/"$(get_libdir)"/*.jar |
| 414 |
+ java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so |
| 415 |
+ java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar |
| 416 |
+ rm -f "${ED}"/usr/"$(get_libdir)"/*.jar |
| 417 |
fi |
| 418 |
} |
| 419 |
|
| 420 |
@@ -166,9 +166,9 @@ multilib_src_install_all() { |
| 421 |
|
| 422 |
dodir /usr/sbin |
| 423 |
# This file is not always built, and no longer exists as of db-4.8 |
| 424 |
- if [[ -f "${D}"/usr/bin/berkeley_db_svc ]] ; then |
| 425 |
- mv "${D}"/usr/bin/berkeley_db_svc \ |
| 426 |
- "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die |
| 427 |
+ if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then |
| 428 |
+ mv "${ED}"/usr/bin/berkeley_db_svc \ |
| 429 |
+ "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die |
| 430 |
fi |
| 431 |
} |
| 432 |
|
| 433 |
|
| 434 |
diff --git a/sys-libs/db/db-5.1.29-r1.ebuild b/sys-libs/db/db-5.1.29-r1.ebuild |
| 435 |
index d178026..f3aa99b 100644 |
| 436 |
--- a/sys-libs/db/db-5.1.29-r1.ebuild |
| 437 |
+++ b/sys-libs/db/db-5.1.29-r1.ebuild |
| 438 |
@@ -170,13 +170,13 @@ src_install() { |
| 439 |
|
| 440 |
dodir /usr/sbin |
| 441 |
# This file is not always built, and no longer exists as of db-4.8 |
| 442 |
- [[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \ |
| 443 |
- mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc |
| 444 |
+ [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \ |
| 445 |
+ mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc |
| 446 |
|
| 447 |
if use java; then |
| 448 |
- java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so |
| 449 |
- java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar |
| 450 |
- rm -f "${D}"/usr/"$(get_libdir)"/*.jar |
| 451 |
+ java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so |
| 452 |
+ java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar |
| 453 |
+ rm -f "${ED}"/usr/"$(get_libdir)"/*.jar |
| 454 |
fi |
| 455 |
} |
Archives