summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2009-09-20 19:52:44 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2009-09-20 19:52:44 +0000
commit06000a735f3e6fef416f2ffddf5f15fe2a71b58a (patch)
treeea81cb9890dd64d470a2b07d2677bf7d4f464da3 /sys-libs/db
parentadd ~arm, bug #283953 (diff)
downloadhistorical-06000a735f3e6fef416f2ffddf5f15fe2a71b58a.tar.gz
historical-06000a735f3e6fef416f2ffddf5f15fe2a71b58a.tar.bz2
historical-06000a735f3e6fef416f2ffddf5f15fe2a71b58a.zip
berkeley_db_svc is not always built, and might be going away permanently in db-4.8 series, but I suspect it might come back too, so just don't try to rename it if it doesn't exist. Thanks to Sebastian Luettich <selu@mediman.org>.
Package-Manager: portage-2.2_rc40/cvs/Linux x86_64
Diffstat (limited to 'sys-libs/db')
-rw-r--r--sys-libs/db/ChangeLog13
-rw-r--r--sys-libs/db/Manifest30
-rw-r--r--sys-libs/db/db-4.2.52_p4-r2.ebuild4
-rw-r--r--sys-libs/db/db-4.2.52_p5-r1.ebuild4
-rw-r--r--sys-libs/db/db-4.2.52_p5.ebuild4
-rw-r--r--sys-libs/db/db-4.3.29-r2.ebuild4
-rw-r--r--sys-libs/db/db-4.3.29_p1-r1.ebuild4
-rw-r--r--sys-libs/db/db-4.3.29_p1.ebuild4
-rw-r--r--sys-libs/db/db-4.4.20_p4-r1.ebuild4
-rw-r--r--sys-libs/db/db-4.4.20_p4.ebuild4
-rw-r--r--sys-libs/db/db-4.5.20_p2-r1.ebuild4
-rw-r--r--sys-libs/db/db-4.5.20_p2.ebuild4
-rw-r--r--sys-libs/db/db-4.6.21_p4.ebuild4
-rw-r--r--sys-libs/db/db-4.7.25_p3.ebuild4
-rw-r--r--sys-libs/db/db-4.7.25_p4.ebuild4
-rw-r--r--sys-libs/db/db-4.8.24.ebuild4
16 files changed, 69 insertions, 30 deletions
diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 39afb904051b..0f0470a7f041 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,17 @@
# ChangeLog for sys-libs/db
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.291 2009/09/19 23:48:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.292 2009/09/20 19:52:44 robbat2 Exp $
+
+ 20 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> db-4.2.52_p4-r2.ebuild,
+ db-4.2.52_p5.ebuild, db-4.2.52_p5-r1.ebuild, db-4.3.29-r2.ebuild,
+ db-4.3.29_p1.ebuild, db-4.3.29_p1-r1.ebuild, db-4.4.20_p4.ebuild,
+ db-4.4.20_p4-r1.ebuild, db-4.5.20_p2.ebuild, db-4.5.20_p2-r1.ebuild,
+ db-4.6.21_p4.ebuild, db-4.7.25_p3.ebuild, db-4.7.25_p4.ebuild,
+ db-4.8.24.ebuild:
+ berkeley_db_svc is not always built, and might be going away permanently
+ in db-4.8 series, but I suspect it might come back too, so just don't try
+ to rename it if it doesn't exist. Thanks to Sebastian Luettich
+ <selu@mediman.org>.
19 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> db-4.8.24.ebuild,
+files/db-4.8.24-java-manifest-location.patch:
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index c72c9bea437b..a171138ab909 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -61,19 +61,19 @@ DIST patch.4.7.25.4 5500 RMD160 614765c392e3a5854736df2034f8ae041d31034c SHA1 0e
EBUILD db-1.85-r3.ebuild 1380 RMD160 5f83a60a3e196d9988af40a0e1a5c1b4781f81ca SHA1 07998d65f70d2ff4703f7f87cb73f6b35f545b19 SHA256 2547f9e976def8144f3ce8ab21c396b6555bc98193bef3ab54656e2b829ab994
EBUILD db-3.2.9-r11.ebuild 4414 RMD160 2ac3a91548b6d8d783e4d546501750fa570eb337 SHA1 105ab8fea6c91f62f251053823d9a3a04c0c9055 SHA256 e9db34f342f3bbae3aa90cb4aeb093a6bb14d7a22a11d9bf212f9e099b0ebcc6
EBUILD db-3.2.9_p2.ebuild 4917 RMD160 75ddd6c2dd9a96a9b26624dbba2956ace3fdf9d3 SHA1 819d16049c401c07659e36a55b0fd63f7677ba6e SHA256 393eb303c48c757df6ddd80aaefee10c4d08c0cbe4dfaa969b1f4118af0c1da9
-EBUILD db-4.2.52_p4-r2.ebuild 3406 RMD160 7004e87ae505928cc7d8b3cc0eb3cb953603c58e SHA1 a89f6e563b238c1f2696a2ee4367faaac555868f SHA256 4f30931637ce2a8574c22e3c2a4dbd543f32bbdce749078beca362d936340855
-EBUILD db-4.2.52_p5-r1.ebuild 4854 RMD160 07eacecf2d9bff7a1e2bab68d7424997be33de91 SHA1 c3a6f221c833cf86d1e981abe490991029e13589 SHA256 19aceb475b0f2367d8cab53079a632fed27fc6351ef223339abe8dbf9d9f229e
-EBUILD db-4.2.52_p5.ebuild 3519 RMD160 de557f27ae2a706c79f1e4f7ab8649571bc39b02 SHA1 5cb914942ddd055194dd112eceb0b1b038173cbd SHA256 cc2c60676c4e6ab431538c99eef4361934d276004a6f7f195e6ab2e1f1ff4d78
-EBUILD db-4.3.29-r2.ebuild 3632 RMD160 f4f81677c7849473470cc0eeed83b9fee686fb67 SHA1 07ca54713319100f3f59b19c79bc9ee5b14e81cb SHA256 27301b0602b81641998d27941514e0927c6e19385e5c4f892e92da1158f6b234
-EBUILD db-4.3.29_p1-r1.ebuild 4813 RMD160 ed9d5d87fd272410197df83c56ae07714dee9601 SHA1 c080f13be3172b46635854709bb8f5299c293efe SHA256 3ccd487b763d19fe9cba0fd7ce43bfea2e315ec0e150070387b2578089e1fa0b
-EBUILD db-4.3.29_p1.ebuild 3689 RMD160 a83cbbe70cb61919ae943c862c58925bb928cb53 SHA1 a7fff686047d4865c566aec2bf2ad61e724dbdc0 SHA256 0b208c777fe40f2247c35cd2394c739e1785937468a50cb2d00649b2ba65c347
-EBUILD db-4.4.20_p4-r1.ebuild 4584 RMD160 e4a443515d1a2d31e127276e46c0374c09a5894c SHA1 cc4a5229073c74204c2f2f5850faab7c592a223d SHA256 098cdeb5f763859c15c0ba2d7679086ed13e7fc614a20de55e1f08c7a9b1dd87
-EBUILD db-4.4.20_p4.ebuild 3601 RMD160 57ceb3c247733c2bc2d82ed6d3cf3cb96ca1b913 SHA1 ec721d8af4be80503bcfb2863d0373c062f02c80 SHA256 6de9b905e5821505eb90230b16d40bb6261af00a805b68ceca34733d95e0bb1d
-EBUILD db-4.5.20_p2-r1.ebuild 4979 RMD160 128bb759423c6aa27637f938c0302b5fc615f515 SHA1 ddaec7d540cb0d4565b8a2665fc56331336b46f4 SHA256 b61f63af5ab910ebc1ed41de8dbcd9fc123863129587b925a275685367e7d52f
-EBUILD db-4.5.20_p2.ebuild 3856 RMD160 18891b5909302bd17785a8ccfac724057da12822 SHA1 36dc963b96e1617e93cc284fcc1b8dc82ce1913c SHA256 d7814200a9278707edf8acdf114b6e85e51669ade804cceca6bb9d4b6ebe32e1
-EBUILD db-4.6.21_p4.ebuild 4704 RMD160 18faff8d70da50a909b21359716e5c6fc29a35ee SHA1 6159dd1d5f53046239cd75a66b9f7a78e4f3d536 SHA256 08f0d4428c33dfd7003e93bf92adb5094a8a07f086b8aa252767df6b44930834
-EBUILD db-4.7.25_p3.ebuild 3969 RMD160 09ea8ff35bd50a1e13b5fbca45ee1321018a528f SHA1 3097b15d1807a684d20dc9c1fbd9b0f414b88ddd SHA256 7cffd88df1cdfb5108dd1b32b0ac986665b68538ee10fe00d85fce0840e5a5fb
-EBUILD db-4.7.25_p4.ebuild 4251 RMD160 188a55fbeb47340451651b8336da7607cf48ced8 SHA1 6e74480f4793e8e67a6a77b74bcacbcde5266fec SHA256 53cdf906e604d2a866127628f0dab1809c870aede7dd30984bb2e2440156f1f1
-EBUILD db-4.8.24.ebuild 4317 RMD160 320afbaa7a2142262710a817a8dc90bf613fa12b SHA1 52b48d1dd5069c0e6be5f0458c16e7c3cc0fe6db SHA256 656986e66e83d2a1a8ef9268231fc400b737b41cb4e07cb6e032789e695a3fca
-MISC ChangeLog 45583 RMD160 400daa32d838bdadb2110d1ba76e6ca21cd3525d SHA1 25b1598e50667c5b33417ad5c6eadfee58419906 SHA256 1a05217ac4ace7ac0dcd819842e6449da6c7987890028ccde99f385c9c6ffdc9
+EBUILD db-4.2.52_p4-r2.ebuild 3521 RMD160 77ad9588ffd789749991d256007905b81beb89f0 SHA1 50a335a481f4c1460e3fc5588c718cdccbde3d01 SHA256 2ab0cdb42945b201159166b42f6f43f985372c3fa5c58a8d2c698d864b45d7bf
+EBUILD db-4.2.52_p5-r1.ebuild 4967 RMD160 965f1c0634d6283a89ba387636321096e010fe82 SHA1 f6538f9dc37bb9f6c07350f99c78bd096339a32d SHA256 2a52dbfde95da704237caeee30ee622ae7084be0144cc3faa161718c304030a4
+EBUILD db-4.2.52_p5.ebuild 3634 RMD160 271b1a67cb7421a446366b690a612137a597cc96 SHA1 958ad6327ceb8dcbeea155a6080286d590ab72a7 SHA256 96ff59badf4f54513430383f7611d9cdf564f3e7170e178227673b5eb6ed5059
+EBUILD db-4.3.29-r2.ebuild 3747 RMD160 2d0a38bf4dd571b4c40e2045e5145e170bf3f95e SHA1 597d8fab390df03152fc5cf04b08ec829bab0083 SHA256 06ba8c4284bdf1415ca5315c561eb2822e498bc362c6e9de75407720c3394ede
+EBUILD db-4.3.29_p1-r1.ebuild 4926 RMD160 39a85a8d06d197542d15c2fc7e1b8f0746cd645e SHA1 30a4c224b2e760d517c40e60d210f63511a81c0a SHA256 84c2159bbf0968f72ebc2aedfb7044aa71c51938bf31de9ba06ecf5688435d44
+EBUILD db-4.3.29_p1.ebuild 3804 RMD160 2b171030d3158631018d3275104ae6f703633ff8 SHA1 270b4136936e7c524cf474926e20aa9c823b6204 SHA256 f8073fb1f2d95be50d035aad0b4858297e668c7d23f1fbacdc1e156345861a2a
+EBUILD db-4.4.20_p4-r1.ebuild 4697 RMD160 8239958186e0b41c5d8368a5a3cec20be1585c20 SHA1 ad639052c97c5e302773e4e3543ac73620e55b6c SHA256 68934f4f491b4753a12f9eab1cb04559e98361c9af16227d379c6a6525ad50f8
+EBUILD db-4.4.20_p4.ebuild 3716 RMD160 552a9494af7a661dbf2a30225f45d1fef16b7819 SHA1 a729eb93008120026f946a6c4929af5998f512f0 SHA256 c65e185e912b08a09e7b61b6c45c728800e35ffa9e769e9cfa021ae324cc0d8b
+EBUILD db-4.5.20_p2-r1.ebuild 5092 RMD160 584ca254f4224d083649332d1a893d1b804ea022 SHA1 a0412757a31bd7090bb3ed400b9795647c8e5564 SHA256 2cf45cf178f6239483c872cae6228771a199783e35172f31c5b4e0cc0f69aa6e
+EBUILD db-4.5.20_p2.ebuild 3971 RMD160 2acedc9f05f22779c34d1b6b7f521b7b14083916 SHA1 9898dd2b87bd38eea915494a0336f5f87e487f85 SHA256 117133ef28477686affa222aeeee95958fa338114dc2e6e8843b8d7eb03fb27b
+EBUILD db-4.6.21_p4.ebuild 4818 RMD160 3f98f8a04f1dc0b4a787a92d458e1d30dd52299f SHA1 9b2623cc59292a5afc552457e397b7e7ee54bb15 SHA256 df3165009982842c8394b876411df74642be3e9eda37308a0dc3d5534a8b634a
+EBUILD db-4.7.25_p3.ebuild 4085 RMD160 d286c79e84bd1002718aaa185d4589d22673e35b SHA1 aa4314ffbd7359b2326b754586c4ad91b8566093 SHA256 4a22799ba6f7362b88eecebaad0ba79a449f4ee3737c5ac9fd92b0b054b40647
+EBUILD db-4.7.25_p4.ebuild 4364 RMD160 2db242f53208b58e6ad3fa862700e69d508b5a0d SHA1 1aee029cde11d02115db1bdaba7ecbff5c1efbfc SHA256 c6ae8359b1c08a2d90d48a862124fe6f9c772530738e48bd270919db4f736a84
+EBUILD db-4.8.24.ebuild 4431 RMD160 3ed6aa7cd48f9824bdf8b2cb4f44b5fc48fe887c SHA1 968afb91b4c4eef1fc1ee5745a044d38776d0a2e SHA256 ef5d888687d88dab2aac25234df1c6376343aee7d68b9277254d678f043706e5
+MISC ChangeLog 46191 RMD160 a28c59a19fb5a4b96f759759e6e0ffa4a3013cc0 SHA1 a6b047fb612445b8c14d860271d1a2484c28022c SHA256 a80c7a701c8cc59cb4ac079fd07a1b1a666a378362b9a7c53ab8868fb9806f52
MISC metadata.xml 1657 RMD160 f474f2ae4512bb017c5f6d344d5d2d1b03dc6b47 SHA1 f24d5b8ab267859ddc9c1ddb0c10992d31809ec9 SHA256 cb82ec7afe1d3df3b38835aa74a6d467f5b31f98a783df9a01396a546acdf044
diff --git a/sys-libs/db/db-4.2.52_p4-r2.ebuild b/sys-libs/db/db-4.2.52_p4-r2.ebuild
index c4e280bed688..d1d8211c0e5f 100644
--- a/sys-libs/db/db-4.2.52_p4-r2.ebuild
+++ b/sys-libs/db/db-4.2.52_p4-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p4-r2.ebuild,v 1.17 2009/07/30 11:01:33 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p4-r2.ebuild,v 1.18 2009/09/20 19:52:44 robbat2 Exp $
inherit eutils gnuconfig db java-pkg-opt-2
@@ -113,6 +113,8 @@ src_install() {
db_src_install_usrlibcleanup
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_db42_svc
if use java; then
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 04c8849f785b..cb533fdd215a 100644
--- a/sys-libs/db/db-4.2.52_p5-r1.ebuild
+++ b/sys-libs/db/db-4.2.52_p5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p5-r1.ebuild,v 1.11 2009/09/15 18:51:30 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p5-r1.ebuild,v 1.12 2009/09/20 19:52:44 robbat2 Exp $
inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
@@ -146,6 +146,8 @@ src_install() {
db_src_install_usrlibcleanup
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
if use java; then
diff --git a/sys-libs/db/db-4.2.52_p5.ebuild b/sys-libs/db/db-4.2.52_p5.ebuild
index 4db03631929f..6c6c3682acb5 100644
--- a/sys-libs/db/db-4.2.52_p5.ebuild
+++ b/sys-libs/db/db-4.2.52_p5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p5.ebuild,v 1.4 2009/07/30 11:01:33 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p5.ebuild,v 1.5 2009/09/20 19:52:44 robbat2 Exp $
inherit eutils db java-pkg-opt-2
@@ -111,6 +111,8 @@ src_install() {
db_src_install_usrlibcleanup
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
if use java; then
diff --git a/sys-libs/db/db-4.3.29-r2.ebuild b/sys-libs/db/db-4.3.29-r2.ebuild
index 63e7190a936f..508577d649c4 100644
--- a/sys-libs/db/db-4.3.29-r2.ebuild
+++ b/sys-libs/db/db-4.3.29-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29-r2.ebuild,v 1.21 2009/07/30 11:01:33 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29-r2.ebuild,v 1.22 2009/09/20 19:52:44 robbat2 Exp $
inherit eutils gnuconfig db flag-o-matic java-pkg-opt-2
@@ -121,6 +121,8 @@ src_install() {
db_src_install_usrlibcleanup
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_db43_svc
if use java; then
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 b2d23bdb49f8..c59c53fa54c5 100644
--- a/sys-libs/db/db-4.3.29_p1-r1.ebuild
+++ b/sys-libs/db/db-4.3.29_p1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29_p1-r1.ebuild,v 1.13 2009/09/15 18:51:30 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29_p1-r1.ebuild,v 1.14 2009/09/20 19:52:44 robbat2 Exp $
inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
@@ -149,6 +149,8 @@ src_install() {
db_src_install_usrlibcleanup
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
if use java; then
diff --git a/sys-libs/db/db-4.3.29_p1.ebuild b/sys-libs/db/db-4.3.29_p1.ebuild
index da57892055f5..fcf2e67297e6 100644
--- a/sys-libs/db/db-4.3.29_p1.ebuild
+++ b/sys-libs/db/db-4.3.29_p1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29_p1.ebuild,v 1.4 2009/07/30 11:01:33 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29_p1.ebuild,v 1.5 2009/09/20 19:52:44 robbat2 Exp $
inherit eutils db flag-o-matic java-pkg-opt-2
@@ -118,6 +118,8 @@ src_install() {
db_src_install_usrlibcleanup
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
if use java; then
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 919bfda7a6b1..84cd8870bc0a 100644
--- a/sys-libs/db/db-4.4.20_p4-r1.ebuild
+++ b/sys-libs/db/db-4.4.20_p4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.4.20_p4-r1.ebuild,v 1.5 2009/09/15 18:51:30 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.4.20_p4-r1.ebuild,v 1.6 2009/09/20 19:52:44 robbat2 Exp $
inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
@@ -141,6 +141,8 @@ src_install() {
db_src_install_usrlibcleanup
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
if use java; then
diff --git a/sys-libs/db/db-4.4.20_p4.ebuild b/sys-libs/db/db-4.4.20_p4.ebuild
index a7830883771d..ff2231a643ce 100644
--- a/sys-libs/db/db-4.4.20_p4.ebuild
+++ b/sys-libs/db/db-4.4.20_p4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.4.20_p4.ebuild,v 1.8 2009/07/30 11:01:33 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.4.20_p4.ebuild,v 1.9 2009/09/20 19:52:44 robbat2 Exp $
inherit eutils db flag-o-matic java-pkg-opt-2
@@ -116,6 +116,8 @@ src_install() {
db_src_install_usrlibcleanup
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
if use java; then
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 07c5d34ebe06..f8a6568d9b99 100644
--- a/sys-libs/db/db-4.5.20_p2-r1.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2-r1.ebuild,v 1.13 2009/09/15 18:51:30 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2-r1.ebuild,v 1.14 2009/09/20 19:52:44 robbat2 Exp $
inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
@@ -156,6 +156,8 @@ src_install() {
db_src_install_usrlibcleanup
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
if use java; then
diff --git a/sys-libs/db/db-4.5.20_p2.ebuild b/sys-libs/db/db-4.5.20_p2.ebuild
index fabfceeb219d..0b5d522b6716 100644
--- a/sys-libs/db/db-4.5.20_p2.ebuild
+++ b/sys-libs/db/db-4.5.20_p2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2.ebuild,v 1.28 2009/07/30 11:01:33 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2.ebuild,v 1.29 2009/09/20 19:52:44 robbat2 Exp $
inherit eutils db flag-o-matic java-pkg-opt-2
@@ -125,6 +125,8 @@ src_install() {
db_src_install_usrlibcleanup
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
if use java; then
diff --git a/sys-libs/db/db-4.6.21_p4.ebuild b/sys-libs/db/db-4.6.21_p4.ebuild
index 61f6dc8ab103..c3db7784511e 100644
--- a/sys-libs/db/db-4.6.21_p4.ebuild
+++ b/sys-libs/db/db-4.6.21_p4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.6.21_p4.ebuild,v 1.9 2009/09/15 18:51:30 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.6.21_p4.ebuild,v 1.10 2009/09/20 19:52:44 robbat2 Exp $
inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
@@ -149,6 +149,8 @@ src_install() {
db_src_install_usrlibcleanup
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
if use java; then
diff --git a/sys-libs/db/db-4.7.25_p3.ebuild b/sys-libs/db/db-4.7.25_p3.ebuild
index 86fdc4f82011..f3e5be932b52 100644
--- a/sys-libs/db/db-4.7.25_p3.ebuild
+++ b/sys-libs/db/db-4.7.25_p3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.7.25_p3.ebuild,v 1.1 2009/03/21 12:23:59 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.7.25_p3.ebuild,v 1.2 2009/09/20 19:52:44 robbat2 Exp $
inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
@@ -128,6 +128,8 @@ src_install() {
db_src_install_usrlibcleanup
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
if use java; then
diff --git a/sys-libs/db/db-4.7.25_p4.ebuild b/sys-libs/db/db-4.7.25_p4.ebuild
index cae47dc291d7..cdea2dbd0961 100644
--- a/sys-libs/db/db-4.7.25_p4.ebuild
+++ b/sys-libs/db/db-4.7.25_p4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.7.25_p4.ebuild,v 1.5 2009/09/15 18:51:30 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.7.25_p4.ebuild,v 1.6 2009/09/20 19:52:44 robbat2 Exp $
inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
@@ -140,6 +140,8 @@ src_install() {
db_src_install_usrlibcleanup
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
if use java; then
diff --git a/sys-libs/db/db-4.8.24.ebuild b/sys-libs/db/db-4.8.24.ebuild
index 77e3888f2d7d..bd112c89ff4e 100644
--- a/sys-libs/db/db-4.8.24.ebuild
+++ b/sys-libs/db/db-4.8.24.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.8.24.ebuild,v 1.2 2009/09/19 23:48:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.8.24.ebuild,v 1.3 2009/09/20 19:52:44 robbat2 Exp $
inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
@@ -141,6 +141,8 @@ src_install() {
db_src_install_usrlibcleanup
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
if use java; then