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

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 18 insertions, 9 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/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