Upstream has 2 patches, so get a new version

(Portage version: 2.1_pre10-r2)
 (Unsigned Manifest commit)

3 files changed, 21 insertions, 172 deletions

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 32a26a6873ff..4d4b6470ad10 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -75,13 +75,13 @@ MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
 RMD160 c9982844d99e1c78efddcb7b7615c41f6225e6b9 files/patch.3.2.9.2 495
 SHA256 61db874796fe8789b0045f456285b27c5b8b7b8902a5e342a115456015716d0e files/patch.3.2.9.2 495
 DIST db-1.85-r3.1.patch.bz2 14641 size 14641
-DIST db-1.85.patch.bz2 15277 size 15277
+DIST db-1.85.patch.bz2 15277 RMD160 a1b024f5761a531d4f52a35b309242c4a4be38d1 SHA256 4339a08fb0b2c001ba819835e190996539e80f2cb6031ca4395f40f3363f8bc5 size 15277
 DIST db-3.2.9.tar.gz 2085238 size 2085238
 DIST db-4.0.14.tar.gz 2701799 size 2701799
 DIST db-4.1.25.tar.gz 3080234 size 3080234
 DIST db-4.2.52.tar.gz 4073147 RMD160 d9095bce12b519695f3d1ff708dc0d1babd7a4b2 SHA256 72f581d8b91da900434629886d1d1c6ea8b9d2a9329368c3b875e7cd556b6a0e size 4073147
 DIST db-4.3.27.tar.gz 5921872 RMD160 711129871c7edd840184bd5a87fb7bf93c8bb953 SHA256 6f09e04c5811ad72a2a5c99459340cb2c635e6553520af76fc9e717dd6207244 size 5921872
-DIST db-4.3.29.tar.gz 6103264 size 6103264
+DIST db-4.3.29.tar.gz 6103264 RMD160 fac910828a74087124e9cc3cad99c6a6dc88c14b SHA256 db3e762d819f9a31bc4ebf5ecada53e9787aeb26fc92fa6064b2ba57df806af4 size 6103264
 DIST db-4.4.20.tar.gz 8112163 RMD160 1e62a7583c8064f1e8533e188db4644d6d047f66 SHA256 56442966cf51a6eb81272f4ab4cec929dcb695a5081b187215afdc7cf7629a57 size 8112163
 DIST db.1.85.patch 55584 RMD160 e4433e45e13764b8d0cdf948909f6f5b8f9ed7ff SHA256 6df42acf6d7bec774b1bdc1629abadf7b006d622e2bbcf638aed7985eacdd48e size 55584
 DIST db.1.85.tar.gz 270953 RMD160 594253b7e80323cddc92cd7c89934217d403f58b SHA256 4220d4ddeb77fb57ba2f37c1aa105d561d3ef85a6fb89c79c3edd735d0e193c6 size 270953
@@ -91,6 +91,8 @@ DIST patch.4.2.52.1 988 RMD160 1ff7d93c4e6223b793ed3038070a4f0957dac44e SHA256 9
 DIST patch.4.2.52.2 1433 RMD160 880cd32f5bd1430463da0f4169e1d6e4a2b96b81 SHA256 c9b132bcc8f1c12e03baaf47abd3801f2adf24ffbd56f35a27617fec12654f32 size 1433
 DIST patch.4.2.52.3 8672 RMD160 443b5cb93346482166f407c8fb9522035d151f02 SHA256 ca5245d2e1c7a40df5ec57cbabee8bf0106292c69a37eb0ca275d1aa59061907 size 8672
 DIST patch.4.2.52.4 1311 RMD160 d6154a5e1203348d37e2f537300582fc06fc9def SHA256 c15c82071c02ce1a10024c572e2e9fd72006089007141a01fdd37b889411b973 size 1311
+DIST patch.4.4.20.1 867 RMD160 57ecff5ecb934e1eb771c49e4e67246d579702b2 SHA256 4eeb18450b88703282251c386405bf7c9efa053a42d1dda97603ee8039ee5869 size 867
+DIST patch.4.4.20.2 721 RMD160 e560b07cc20dbd6865d8aad91941515f8fb031c1 SHA256 45949e288482736bbc27bd62c854a99fad4b3e55103897eafd62bce1d5629bbc size 721
 EBUILD db-1.85-r1.ebuild 1477 RMD160 585f67421ea5d07737f0ef9ac24611548a9d8323 SHA1 e4a435e0981455499799f1d7722342c2d7eb1a0f SHA256 340f855bb89c3a080599df43f95ba8537d4f8820d6cf2190ab371ee87302d547 size 1477
 MD5 ce7bd16964612cce41bdf33b91001c49 db-1.85-r1.ebuild 1477
 RMD160 585f67421ea5d07737f0ef9ac24611548a9d8323 db-1.85-r1.ebuild 1477
@@ -147,14 +149,14 @@ EBUILD db-4.3.29.ebuild 3298 RMD160 8d2b0c8f11c33c1a4fe15d653131bc9cded331eb SHA
 MD5 46b97e2dd251d247258db00b6da8c56f db-4.3.29.ebuild 3298
 RMD160 8d2b0c8f11c33c1a4fe15d653131bc9cded331eb db-4.3.29.ebuild 3298
 SHA256 21b072276ea649b30e4ce527c68fc2fe190f8f0abf82d15d8e3a83e497b06fe3 db-4.3.29.ebuild 3298
-EBUILD db-4.4.20.ebuild 3272 RMD160 936f07ac7fe62d8ef6a99d70f06b9699c0c82fe0 SHA1 2b90ac5d5b862233706225ec43141fcc968501e7 SHA256 785bf862708c4855b811ec307c53047575f12a5f68a861ee6f319757b9554b65 size 3272
-MD5 30fd731d1ed6336902ee45aa5d8cec90 db-4.4.20.ebuild 3272
-RMD160 936f07ac7fe62d8ef6a99d70f06b9699c0c82fe0 db-4.4.20.ebuild 3272
-SHA256 785bf862708c4855b811ec307c53047575f12a5f68a861ee6f319757b9554b65 db-4.4.20.ebuild 3272
-MISC ChangeLog 24466 RMD160 ef9a007dec5aa4e0922a8636737a8c7040c6531f SHA1 0afb8ba749670bf716440e636699057c3a225b51 SHA256 0781b95c576fe59d28e9925acf4e32e3e7af7c3b76835a391a974d8a29c911cb size 24466
-MD5 8a985bf24af65b49e39c698157368c0b ChangeLog 24466
-RMD160 ef9a007dec5aa4e0922a8636737a8c7040c6531f ChangeLog 24466
-SHA256 0781b95c576fe59d28e9925acf4e32e3e7af7c3b76835a391a974d8a29c911cb ChangeLog 24466
+EBUILD db-4.4.20_p2.ebuild 3272 RMD160 1ddd87859a8cb9e72eb9386046a7316dc4b882cf SHA1 2e6d1247393a84a8411197b383ae52d4e8755860 SHA256 2b548999eba9306678d029597cd633b41809a02353710a1cb1327459d9c99c0e size 3272
+MD5 c58bc42340512ded6a73e07f18dcb95a db-4.4.20_p2.ebuild 3272
+RMD160 1ddd87859a8cb9e72eb9386046a7316dc4b882cf db-4.4.20_p2.ebuild 3272
+SHA256 2b548999eba9306678d029597cd633b41809a02353710a1cb1327459d9c99c0e db-4.4.20_p2.ebuild 3272
+MISC ChangeLog 24601 RMD160 854c374af4570bcda32ef36b7aca4aa0cb222219 SHA1 b665b4ef911b484a8a224b1832595feb4b7e9447 SHA256 9ea48f88b7c8e25585d7d660b0fc47c36ddf93ac1c5fd54421bc275693ba851b size 24601
+MD5 ba9eddc2035fbd0568a949761e63dee8 ChangeLog 24601
+RMD160 854c374af4570bcda32ef36b7aca4aa0cb222219 ChangeLog 24601
+SHA256 9ea48f88b7c8e25585d7d660b0fc47c36ddf93ac1c5fd54421bc275693ba851b ChangeLog 24601
 MISC metadata.xml 1460 RMD160 6f73dd6370c976b947d939633aa6f67d078e4fc7 SHA1 a29a6ed2d9dfbe3b686a9281a1909d9fc7bd61e9 SHA256 ad820b0fe2d8ec2aac1eb181f2e3e2769392e1ae6c5f6afb7e1603bdd0bb7405 size 1460
 MD5 e1753ef0eb3e9614fadff321ecd1b082 metadata.xml 1460
 RMD160 6f73dd6370c976b947d939633aa6f67d078e4fc7 metadata.xml 1460
@@ -162,60 +164,45 @@ SHA256 ad820b0fe2d8ec2aac1eb181f2e3e2769392e1ae6c5f6afb7e1603bdd0bb7405 metadata
 MD5 af69ed5a64631dd85c8c661ffe13fbb3 files/digest-db-1.85-r1 440
 RMD160 a39433dbd7e9920a4dd82e0d70e4e2d4a6286ad2 files/digest-db-1.85-r1 440
 SHA256 e1baf331d288a2846ebbe548b213350829b3459770b07becc689467cf901a010 files/digest-db-1.85-r1 440
-size 440 files/digest-db-1.85-r1 440
-MD5 5a72eec7a7994e4b53c533580a65095e files/digest-db-1.85-r2 284
-RMD160 58cb58a47f228411d200262de1c27cb3443c84ef files/digest-db-1.85-r2 284
-SHA256 42c33071379b4e25832da23a3abfda5fb248abaa224fea21a85a05516bdf9642 files/digest-db-1.85-r2 284
-size 284 files/digest-db-1.85-r2 284
+MD5 9750b5612581284a1a9f1b7c8916dd0e files/digest-db-1.85-r2 452
+RMD160 3638de99ee95d0a31998eb6e6d08234f262aa6ae files/digest-db-1.85-r2 452
+SHA256 7ecf6498f8927b448fc184f7cb6899101fd24351fdc2570839e3a659a3fb82e8 files/digest-db-1.85-r2 452
 MD5 252fa08d06e04fdfcba8b81e81128237 files/digest-db-1.85-r3 289
 RMD160 eff67c8d556e6d6ccb47b4ff59b5175b0c7b2141 files/digest-db-1.85-r3 289
 SHA256 b796123a8e18a6bdeed34fc6b6b639469da9572cd29ecb4399b83d518c263a5e files/digest-db-1.85-r3 289
-size 289 files/digest-db-1.85-r3 289
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r10 61
 RMD160 235d8ea4995dd6c34d14f6d8714f98ca251f83fa files/digest-db-3.2.9-r10 61
 SHA256 07454c39fb1836a1b44427b912a28bf9cb2c5467e589464b250d56c0aa09c532 files/digest-db-3.2.9-r10 61
-size 61 files/digest-db-3.2.9-r10 61
 MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r2 62
 RMD160 84f6ec075c1959e054011c1dcc095ca607cb6e0d files/digest-db-4.0.14-r2 62
 SHA256 42acc793140d5e93e255411bfb6fc162c2ec28733ea7ddde47da563bab7bd1ee files/digest-db-4.0.14-r2 62
-size 62 files/digest-db-4.0.14-r2 62
 MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r3 62
 RMD160 84f6ec075c1959e054011c1dcc095ca607cb6e0d files/digest-db-4.0.14-r3 62
 SHA256 42acc793140d5e93e255411bfb6fc162c2ec28733ea7ddde47da563bab7bd1ee files/digest-db-4.0.14-r3 62
-size 62 files/digest-db-4.0.14-r3 62
 MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r3 118
 RMD160 f2f3cbbf2357f42efef7b4b4a0c34a9660a8a88e files/digest-db-4.1.25_p1-r3 118
 SHA256 220db7218135f4d943b046a694ee79d33f0542eab265de9f61d8f79f78896500 files/digest-db-4.1.25_p1-r3 118
-size 118 files/digest-db-4.1.25_p1-r3 118
 MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r4 118
 RMD160 f2f3cbbf2357f42efef7b4b4a0c34a9660a8a88e files/digest-db-4.1.25_p1-r4 118
 SHA256 220db7218135f4d943b046a694ee79d33f0542eab265de9f61d8f79f78896500 files/digest-db-4.1.25_p1-r4 118
-size 118 files/digest-db-4.1.25_p1-r4 118
 MD5 0160bc21ad356ac2fbcf176f5d43ec17 files/digest-db-4.1.25_p2 176
 RMD160 6201a10e0d30c59d14f9ff44b24b392e242a3190 files/digest-db-4.1.25_p2 176
 SHA256 b260840fa592ecbdaec6e0f5b3e252704b3d817b7a7f9395fe9f285a86f6ca19 files/digest-db-4.1.25_p2 176
-size 176 files/digest-db-4.1.25_p2 176
 MD5 d13b4a7ed66c85bdb8ac0461e24a6bf4 files/digest-db-4.2.52_p2 663
 RMD160 a3a39cf7c2fa71931739657fbaecb29b2e01caaf files/digest-db-4.2.52_p2 663
 SHA256 e739ff2c7b811c40acda804c2c55022361bee9d70697ea5212ffadd0652c1aa6 files/digest-db-4.2.52_p2 663
-size 663 files/digest-db-4.2.52_p2 663
 MD5 d13b4a7ed66c85bdb8ac0461e24a6bf4 files/digest-db-4.2.52_p2-r1 663
 RMD160 a3a39cf7c2fa71931739657fbaecb29b2e01caaf files/digest-db-4.2.52_p2-r1 663
 SHA256 e739ff2c7b811c40acda804c2c55022361bee9d70697ea5212ffadd0652c1aa6 files/digest-db-4.2.52_p2-r1 663
-size 663 files/digest-db-4.2.52_p2-r1 663
 MD5 5b26ebc13339ba6b36378cca8d1731de files/digest-db-4.2.52_p4 1097
 RMD160 1facf4365533cb9dc8ddaccfa856936af15a37c4 files/digest-db-4.2.52_p4 1097
 SHA256 b43c4fbd39191f19fc0313e24ed0640fbbfbb3c8ef1b310dfebb81ef6960d7e8 files/digest-db-4.2.52_p4 1097
-size 1097 files/digest-db-4.2.52_p4 1097
 MD5 4ef4bc60989648f119a73c599713205a files/digest-db-4.3.27 232
 RMD160 d71ae7f43c1d3f28f334f211eb5ddbad2a8867ec files/digest-db-4.3.27 232
 SHA256 637d690af4a29579e25629be75bcbdd2ab4588753dce8d893aa5cee845a95b5b files/digest-db-4.3.27 232
-size 232 files/digest-db-4.3.27 232
-MD5 1ef24208f7a41603e6958e15c6278278 files/digest-db-4.3.29 62
-RMD160 73fe3d2d8fc9e5e119de7bcc65903c052fd52f73 files/digest-db-4.3.29 62
-SHA256 9aa09a9b4f1ad09f635fb0c4717f87f4ff69c8516927fdfd8802f78c77490d66 files/digest-db-4.3.29 62
-size 62 files/digest-db-4.3.29 62
-MD5 a1d438364867b5eee9e23acac2d5f76f files/digest-db-4.4.20 232
-RMD160 c5f6f009a109ce8f12c10b747238abe433dd813c files/digest-db-4.4.20 232
-SHA256 0166a0a89311fa638a7ee0a2fe60f673419e90dca438e6fd8b0df8f7ed7ad56d files/digest-db-4.4.20 232
-size 232 files/digest-db-4.4.20 232
+MD5 123d0f2ed8e43cfb592a0c5cdaf0df0b files/digest-db-4.3.29 232
+RMD160 7ae63d1ada88313b08eca576ddd037342f123cfa files/digest-db-4.3.29 232
+SHA256 43f814e2ff2cd9d7ca6f40f336a9eacefb8b3d2d0aa3fdd5046369a07aa00251 files/digest-db-4.3.29 232
+MD5 c36ac17ff6e664f9a8f5bd2fe3534dd5 files/digest-db-4.4.20_p2 660
+RMD160 fa3804c13649e3d5d0bc42c5a7822764be74a674 files/digest-db-4.4.20_p2 660
+SHA256 dcce09c08cdfddd585acc3b07685a92d1f78dad6ce7936b85728cf782b4c2096 files/digest-db-4.4.20_p2 660
diff --git a/sys-libs/db/db-4.4.20.ebuild b/sys-libs/db/db-4.4.20.ebuild
deleted file mode 100644
index cecc5a9f2e60..000000000000
--- a/sys-libs/db/db-4.4.20.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.7 2006/03/30 16:50:34 flameeyes Exp $
-
-inherit eutils gnuconfig db flag-o-matic
-
-#Number of official patches
-#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
-PATCHNO=${PV/*.*.*_p}
-if [ "${PATCHNO}" == "${PV}" ]; then
-	MY_PV=${PV}
-	MY_P=${P}
-	PATCHNO=0
-else
-	MY_PV=${PV/_p${PATCHNO}}
-	MY_P=${PN}-${MY_PV}
-fi
-
-S=${WORKDIR}/${MY_P}/build_unix
-DESCRIPTION="Berkeley DB"
-HOMEPAGE="http://www.sleepycat.com/"
-SRC_URI="ftp://ftp.sleepycat.com/releases/${MY_P}.tar.gz"
-for (( i=1 ; i<=$PATCHNO ; i++ )) ; do
-	export SRC_URI="${SRC_URI} http://www.sleepycat.com/update/${MY_PV}/patch.${MY_PV}.${i}"
-done
-
-LICENSE="DB"
-SLOT="4.4"
-KEYWORDS="~amd64 ~ia64 ~m68k ~ppc ~sparc ~x86"
-IUSE="tcltk java doc nocxx bootstrap"
-
-DEPEND="tcltk? ( >=dev-lang/tcl-8.4 )
-	java? ( virtual/jdk )
-	>=sys-devel/binutils-2.16.1"
-RDEPEND="tcltk? ( dev-lang/tcl )
-	java? ( virtual/jre )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	cd ${WORKDIR}/${MY_P}
-	for (( i=1 ; i<=$PATCHNO ; i++ ))
-	do
-		epatch ${DISTDIR}/patch.${MY_PV}.${i}
-	done
-	epatch ${FILESDIR}/${PN}-${SLOT}-jarlocation.patch
-	epatch ${FILESDIR}/${PN}-${SLOT}-libtool.patch
-
-	gnuconfig_update "${S}/../dist"
-
-	sed -i -e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" ${S}/../dist/configure
-}
-
-src_compile() {
-	addwrite /proc/self/maps
-
-	local myconf=""
-
-	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
-
-	use bootstrap \
-		&& myconf="${myconf} --disable-cxx" \
-		|| myconf="${myconf} $(use_enable !nocxx cxx)"
-
-	use tcltk \
-		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
-		|| myconf="${myconf} --disable-tcl"
-
-	myconf="${myconf} $(use_enable java)"
-	if use java && [[ -n ${JAVAC} ]] ; then
-		export PATH=`dirname ${JAVAC}`:${PATH}
-		export JAVAC=`basename ${JAVAC}`
-	fi
-
-	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
-
-	# the entire testsuite needs the TCL functionality
-	if use tcltk && has test $FEATURES ; then
-		myconf="${myconf} --enable-test"
-	else
-		myconf="${myconf} --disable-test"
-	fi
-
-	# Add linker versions to the symbols. Easier to do, and safer than header file
-	# mumbo jumbo.
-	if use userland_GNU; then
-		append-ldflags -Wl,--default-symver
-	fi
-
-	../dist/configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--datadir=/usr/share \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		--libdir=/usr/$(get_libdir) \
-		--enable-compat185 \
-		--without-uniquename \
-		--enable-rpc \
-		--host=${CHOST} \
-		${myconf} || die "configure failed"
-
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	einstall libdir="${D}/usr/$(get_libdir)" strip="${D}/bin/strip" || die
-
-	db_src_install_usrbinslot
-
-	db_src_install_headerslot
-
-	db_src_install_doc
-
-	db_src_install_usrlibcleanup
-
-	dodir /usr/sbin
-	mv ${D}/usr/bin/berkeley_db_svc ${D}/usr/sbin/berkeley_db44_svc
-
-	if use java; then
-		mkdir -p ${D}/usr/share/db
-		cat <<EOF >${D}/usr/share/db/package.env
-DESCRIPTION=The java bindings for berkeley db version ${MY_PV}
-CLASSPATH=:/usr/lib/db-${SLOT}.jar
-EOF
-	fi
-}
-
-pkg_postinst () {
-	db_fix_so
-}
-
-pkg_postrm () {
-	db_fix_so
-}
diff --git a/sys-libs/db/files/digest-db-4.4.20 b/sys-libs/db/files/digest-db-4.4.20
deleted file mode 100644
index 8f4cae68c49c..000000000000
--- a/sys-libs/db/files/digest-db-4.4.20
+++ /dev/null
@@ -1,3 +0,0 @@
-RMD160 1e62a7583c8064f1e8533e188db4644d6d047f66 db-4.4.20.tar.gz 8112163
-SHA256 56442966cf51a6eb81272f4ab4cec929dcb695a5081b187215afdc7cf7629a57 db-4.4.20.tar.gz 8112163
-MD5 33851f01b455cca48aa601956de93c6f db-4.4.20.tar.gz 8112163