Upstream respun the 4.4.20 tarballs with an entire subdir dropped and some stuff dual-licensed.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 23 insertions, 13 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 1890ef670f9a..900b11929bf5 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.306 2010/05/14 10:56:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.307 2010/05/27 01:08:56 robbat2 Exp $
+
+  27 May 2010; Robin H. Johnson <robbat2@gentoo.org> db-4.4.20_p4.ebuild,
+  db-4.4.20_p4-r1.ebuild:
+  Upstream respun the 4.4.20 tarballs with an entire subdir dropped and some
+  stuff dual-licensed.
 
   14 May 2010; Robin H. Johnson <robbat2@gentoo.org> db-5.0.21-r1.ebuild:
   Bug #319667: Disable the multi_repmgr tests in a different way.
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 23e72ea69e22..a18dc737b45f 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -31,7 +31,8 @@ DIST db-1.85-r3.1.patch.bz2 14641 RMD160 463c9d6cf013b28ff2c364d3f2ced378b334fea
 DIST db-3.2.9.tar.gz 2085238 RMD160 c2c5cdb3ec0e99e5687c0861dfbf76b8878f27cb SHA1 1adcc34b6a56e51e4019e80bc56b509ac28e1035 SHA256 3eccaec87bca4ca0f5728cf4579650da9d12e331187f1e98321e5c9e9e04b108
 DIST db-4.2.52.tar.gz 4073147 RMD160 d9095bce12b519695f3d1ff708dc0d1babd7a4b2 SHA1 12d21a58efd7b5fd35b56815a8fb1ac2cbab2e5c SHA256 72f581d8b91da900434629886d1d1c6ea8b9d2a9329368c3b875e7cd556b6a0e
 DIST db-4.3.29.tar.gz 6103264 RMD160 fac910828a74087124e9cc3cad99c6a6dc88c14b SHA1 7ddac51fcbd5945aed154be2ee1fe166b3acd628 SHA256 db3e762d819f9a31bc4ebf5ecada53e9787aeb26fc92fa6064b2ba57df806af4
-DIST db-4.4.20.tar.gz 8112163 RMD160 1e62a7583c8064f1e8533e188db4644d6d047f66 SHA1 1931c0774c3e2fc45741ba9b7c4187a12801184c SHA256 56442966cf51a6eb81272f4ab4cec929dcb695a5081b187215afdc7cf7629a57
+DIST db-4.4.20-20060110-rpc_server-java.tar.gz 158976 RMD160 e29a0899b59e5c52c75485050160dab58c5e8d2e SHA1 6baa89305a59bbeea5c380caa2837b73adeb0453 SHA256 a1bbc35c4ac3ce1c13de695dd2870cf8bd0f5030a19d4531c1fbf9c95e5fcc78
+DIST db-4.4.20.tar.gz 7952742 RMD160 5940d9244b4df4897f66f1b67d3c967081c18b85 SHA1 bb4c68a4afc14712eb2954b7991f5dc9fe93bf7b SHA256 298ab78801f7502016aa2db033b65fab46f323533bdc08610d3dabd910d63b79
 DIST db-4.5.20.tar.gz 9281894 RMD160 5fc492efcddce6f446c5977128f5526f73763e01 SHA1 0e5a6c152c5d7089899481d9de689d1f7e77bde1 SHA256 f52cd5cea899823dd200d56556f70b33c55e48a33bb7b65ee128968dc10ca82d
 DIST db-4.6.21.tar.gz 11881885 RMD160 ccf9a4b85cc0464b2f3c2f2da29d99328fd4978e SHA1 5be3beb82e42a78ff671a3f5a4c30e5652972119 SHA256 53ea9c9f03746a0aa415e6706e9c6da18ca18148f20ad1465b182411a7985e21
 DIST db-4.7.25.tar.gz 13124129 RMD160 9a5d8149d61452906c3f1c36f2859a2033c8bc3b SHA1 957c10358df1211e1dc37ea997aadef42117d6a5 SHA256 f14fd96dd38915a1d63dcb94a63fbb8092334ceba6b5060760427096f631263e
@@ -71,8 +72,8 @@ EBUILD db-4.2.52_p5.ebuild 3634 RMD160 271b1a67cb7421a446366b690a612137a597cc96
 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.4.20_p4-r1.ebuild 4810 RMD160 ad4e315751b6fa78a81d65775d3469d5ca3cd3f5 SHA1 869d3eb18f238ef3ddd92c6f820278390fefd5ff SHA256 0314a42e233a5b69b7afdfc2566ffef8755a8bc0a03901f648afb3416d9fb703
+EBUILD db-4.4.20_p4.ebuild 3830 RMD160 3b61abe33fd9ecb6eec95c7363d46df2b6988447 SHA1 b9a50091ed2b204e93bc399f97b7cd2ada24f213 SHA256 a6291143bb6fbe45181b66cc98f5b07cb4c66fc1c0ceb659c4193cd0dce855a7
 EBUILD db-4.5.20_p2-r1.ebuild 5092 RMD160 99ad7d8a79557e94233f424843801adc74f3bad5 SHA1 3b6ce62889cf7b3ff95263f2a3d7cfbd31a5d551 SHA256 245668fb060f6ad4fd016cf8b1c355f384e6984d866f215203bfe8b1b4980219
 EBUILD db-4.5.20_p2.ebuild 3971 RMD160 e1b40740d6dd5606637f19085180192eb3c1ef34 SHA1 fadb3c00f2b25ad8f95749b72349c49a470afc21 SHA256 aa8e24fcdffcc13de62adc1d7abae6a4a8ff9c85dac1bcb14a5e0e170e53dfa1
 EBUILD db-4.6.21_p4.ebuild 4818 RMD160 0777c54632c7c6ebb967ec2a7b15ae69f11d911a SHA1 2af001ec07a7d24407455d0c7a39a9ebb6731e31 SHA256 73232ce6539cc21b45a22f0b3d24e015325b0a9e231f7b10f7785088dc4d5ff7
@@ -82,5 +83,5 @@ EBUILD db-4.8.24.ebuild 4431 RMD160 3ed6aa7cd48f9824bdf8b2cb4f44b5fc48fe887c SHA
 EBUILD db-4.8.26.ebuild 4431 RMD160 b5ada7784ee0ff0ecff7bcbd10a72a64abb6271c SHA1 c884f625ead196b4e1afaf428cf394b8008ef4a4 SHA256 ba81971dc4090bc318cdfa6ec02e5dad68693b038a5fa03827f83e677089e5fd
 EBUILD db-4.8.30.ebuild 4431 RMD160 79ad467c23dd37c895542fd4d1cb1839d1dd16dc SHA1 f6e4a3314c118c72aa1da277e1a8c3382c53dbab SHA256 2265aba0c86de5423f17b2b0db0998d14fdcb65a045e9da968b3ecd9840965d2
 EBUILD db-5.0.21-r1.ebuild 5366 RMD160 473e53358830d7cb37391c98549144df8cd56078 SHA1 89d7a01c4de83e3d14fa08ed81fc714dcd5c37a9 SHA256 6f6e8371ba59d3593592f468e66d83b6e1b737eac1a624445f1c3cba8eb0072a
-MISC ChangeLog 48075 RMD160 fe1f120b6cc4fbe22ed6f98e2eb0da7230a5649a SHA1 4cf1c900da34e48ba9d2057152a09d880cda47f4 SHA256 9e63bc2b5a93c52e710e5901c0ded4ff344f374f3940e4a57326e97f88a1a79c
+MISC ChangeLog 48276 RMD160 0f090d67411002a50144764977166c7a324967fe SHA1 d2803840644544425ad14c4a5d1259ea713d5974 SHA256 8f86b3bf33949335687c32e1929e11cbff668b40e703add9600add802331b0d1
 MISC metadata.xml 1657 RMD160 f474f2ae4512bb017c5f6d344d5d2d1b03dc6b47 SHA1 f24d5b8ab267859ddc9c1ddb0c10992d31809ec9 SHA256 cb82ec7afe1d3df3b38835aa74a6d467f5b31f98a783df9a01396a546acdf044
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 84cd8870bc0a..ee9e06ca7157 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
+# Copyright 1999-2010 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.6 2009/09/20 19:52:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.4.20_p4-r1.ebuild,v 1.7 2010/05/27 01:08:57 robbat2 Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
 
@@ -19,12 +19,13 @@ fi
 S="${WORKDIR}/${MY_P}/build_unix"
 DESCRIPTION="Oracle Berkeley DB"
 HOMEPAGE="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
-SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
+SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz
+		 mirror://gentoo/${MY_P}-20060110-rpc_server-java.tar.gz"
 for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
 	export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
 done
 
-LICENSE="OracleDB"
+LICENSE="OracleDB BSD"
 SLOT="4.4"
 KEYWORDS="~amd64 ~arm ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="tcl java doc nocxx"
@@ -37,6 +38,7 @@ RDEPEND="tcl? ( dev-lang/tcl )
 
 src_unpack() {
 	unpack "${MY_P}".tar.gz
+	unpack "${MY_P}-20060110-rpc_server-java".tar.gz
 	cd "${WORKDIR}"/"${MY_P}"
 	for (( i=1 ; i<=${PATCHNO} ; i++ ))
 	do
diff --git a/sys-libs/db/db-4.4.20_p4.ebuild b/sys-libs/db/db-4.4.20_p4.ebuild
index ff2231a643ce..0676eaa42609 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
+# Copyright 1999-2010 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.9 2009/09/20 19:52:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.4.20_p4.ebuild,v 1.10 2010/05/27 01:08:57 robbat2 Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2
 
@@ -19,12 +19,13 @@ fi
 S="${WORKDIR}/${MY_P}/build_unix"
 DESCRIPTION="Oracle Berkeley DB"
 HOMEPAGE="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
-SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
+SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz
+		 mirror://gentoo/${MY_P}-20060110-rpc_server-java.tar.gz"
 for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
 	export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
 done
 
-LICENSE="OracleDB"
+LICENSE="OracleDB BSD"
 SLOT="4.4"
 KEYWORDS="~amd64 ~arm ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="tcl java doc nocxx"
@@ -37,6 +38,7 @@ RDEPEND="tcl? ( dev-lang/tcl )
 
 src_unpack() {
 	unpack "${MY_P}".tar.gz
+	unpack "${MY_P}-20060110-rpc_server-java".tar.gz
 	cd "${WORKDIR}"/"${MY_P}"
 	for (( i=1 ; i<=${PATCHNO} ; i++ ))
 	do