Bump to 4.5. See comments in changelog for details

(Portage version: 2.1.2-r12)

6 files changed, 224 insertions, 4 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index ad5082827f91..6390f622fafe 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.193 2007/02/17 22:42:11 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.194 2007/02/27 20:18:37 caleb Exp $
+
+*db-4.5.20_p2 (27 Feb 2007)
+
+  27 Feb 2007; Caleb Tennis <caleb@gentoo.org>
+  files/db-4.4-jarlocation.patch, +files/db-4.5-jarlocation.patch,
+  +files/db-4.5-libtool.patch, +db-4.5.20_p2.ebuild:
+  Bump to 4.5. SRC_URI and LICENSE have changed because Oracle bought
+  Sleepycat. I also revered back to --with-uniquename as it's supported again
+  with C++,Java, and RPC (was not in 4.2-4.4 series). >=4.4 is currently
+  masked, so this is currently in for testing
 
   17 Feb 2007; Fabian Groffen <grobian@gentoo.org> db-4.2.52_p2.ebuild,
   db-4.2.52_p2-r1.ebuild, db-4.2.52_p4.ebuild, db-4.2.52_p4-r2.ebuild:
diff --git a/sys-libs/db/db-4.5.20_p2.ebuild b/sys-libs/db/db-4.5.20_p2.ebuild
new file mode 100644
index 000000000000..55678ac12633
--- /dev/null
+++ b/sys-libs/db/db-4.5.20_p2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2007 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.1 2007/02/27 20:18:37 caleb Exp $
+
+inherit eutils gnuconfig db flag-o-matic java-pkg-opt-2
+
+#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="Oracle Berkeley DB"
+HOMEPAGE="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
+SRC_URI="http://download-west.oracle.com/berkeley-db/${MY_P}.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"
+SLOT="4.5"
+KEYWORDS="~amd64 ~arm ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="tcl java doc nocxx bootstrap"
+
+DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
+	java? ( >=virtual/jdk-1.4 )
+	>=sys-devel/binutils-2.16.1"
+RDEPEND="tcl? ( dev-lang/tcl )
+	java? ( >=virtual/jre-1.4 )"
+
+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}"-libtool.patch
+
+	# use the includes from the prefix
+	epatch "${FILESDIR}"/"${PN}"-4.3-jni-check-prefix-first.patch
+	epatch "${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.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() {
+	local myconf=""
+
+	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
+
+	use bootstrap \
+		&& myconf="${myconf} --disable-cxx" \
+		|| myconf="${myconf} $(use_enable !nocxx cxx)"
+
+	use tcl \
+		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
+		|| myconf="${myconf} --disable-tcl"
+
+	myconf="${myconf} $(use_enable java)"
+	if use java; then
+		myconf="${myconf} --with-java-prefix=${JAVA_HOME}"
+		# Can't get this working any other way, since it returns spaces, and
+		# bash doesn't seem to want to pass correctly in any way i try
+		local javaconf="-with-javac-flags=$(java-pkg_javac-args)"
+	fi
+
+	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
+
+	# the entire testsuite needs the TCL functionality
+	if use tcl && 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 \
+		--with-uniquename \
+		--enable-rpc \
+		--host="${CHOST}" \
+		${myconf}  "${javaconf}" || 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
+		java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
+		java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
+		rm -f "${D}"/usr/"$(get_libdir)"/*.jar
+	fi
+}
+
+pkg_postinst() {
+	db_fix_so
+}
+
+pkg_postrm() {
+	db_fix_so
+}
diff --git a/sys-libs/db/files/db-4.4-jarlocation.patch b/sys-libs/db/files/db-4.4-jarlocation.patch
index c0d689f43691..2d4bd4e46032 100644
--- a/sys-libs/db/files/db-4.4-jarlocation.patch
+++ b/sys-libs/db/files/db-4.4-jarlocation.patch
@@ -8,9 +8,9 @@ diff -ur db-4.1.25.old/dist/Makefile.in db-4.1.25/dist/Makefile.in
 -libj_jarfile=	db.jar
 -libj_exjarfile=	dbexamples.jar
 -rpc_jarfile=	dbsvc.jar
-+libj_jarfile=	db-4.4.jar
-+libj_exjarfile=	dbexamples-4.4.jar
-+rpc_jarfile=	dbsvc-4.4.jar
++libj_jarfile=	db-4.5.jar
++libj_exjarfile=	dbexamples-4.5.jar
++rpc_jarfile=	dbsvc-4.5.jar
  libjso_base=	libdb_java
  libjso=		$(libjso_base)-$(SOVERSION).@JMODSUFFIX@
  libjso_static=	$(libjso_base)-$(SOVERSION).a
diff --git a/sys-libs/db/files/db-4.5-jarlocation.patch b/sys-libs/db/files/db-4.5-jarlocation.patch
new file mode 100644
index 000000000000..c0d689f43691
--- /dev/null
+++ b/sys-libs/db/files/db-4.5-jarlocation.patch
@@ -0,0 +1,16 @@
+diff -ur db-4.1.25.old/dist/Makefile.in db-4.1.25/dist/Makefile.in
+--- db-4.1.25.old/dist/Makefile.in	2003-10-18 02:15:45.000000000 -0700
++++ db-4.1.25/dist/Makefile.in	2003-10-18 02:13:47.000000000 -0700
+@@ -107,9 +107,9 @@
+ JAVA_EXDIR=	$(JAVA_SRCDIR)/$(JAVA_EXREL)
+ JAVA_RPCDIR=	$(srcdir)/rpc_server/java
+ 
+-libj_jarfile=	db.jar
+-libj_exjarfile=	dbexamples.jar
+-rpc_jarfile=	dbsvc.jar
++libj_jarfile=	db-4.4.jar
++libj_exjarfile=	dbexamples-4.4.jar
++rpc_jarfile=	dbsvc-4.4.jar
+ libjso_base=	libdb_java
+ libjso=		$(libjso_base)-$(SOVERSION).@JMODSUFFIX@
+ libjso_static=	$(libjso_base)-$(SOVERSION).a
diff --git a/sys-libs/db/files/db-4.5-libtool.patch b/sys-libs/db/files/db-4.5-libtool.patch
new file mode 100644
index 000000000000..3d86b88f86b3
--- /dev/null
+++ b/sys-libs/db/files/db-4.5-libtool.patch
@@ -0,0 +1,47 @@
+--- dist/configure.orig	2006-01-31 10:23:58.000000000 +0100
++++ dist/configure	2006-01-31 10:26:43.000000000 +0100
+@@ -5765,7 +5765,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   # I'd rather use --version here, but apparently some GNU lds only accept -v.
+-case `$LD -v 2>&1 </dev/null` in
++case `"$LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+   ;;
+@@ -8753,7 +8753,7 @@
+   	whole_archive_flag_spec=
+     fi
+     supports_anon_versioning=no
+-    case `$LD -v 2>/dev/null` in
++    case `"$LD" -v 2>/dev/null` in
+       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -11855,7 +11855,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   # I'd rather use --version here, but apparently some GNU lds only accept -v.
+-case `$LD -v 2>&1 </dev/null` in
++case `"$LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+   ;;
+@@ -15842,7 +15842,7 @@
+   	whole_archive_flag_spec_F77=
+     fi
+     supports_anon_versioning=no
+-    case `$LD -v 2>/dev/null` in
++    case `"$LD" -v 2>/dev/null` in
+       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -18300,7 +18300,7 @@
+   	whole_archive_flag_spec_GCJ=
+     fi
+     supports_anon_versioning=no
+-    case `$LD -v 2>/dev/null` in
++    case `"$LD" -v 2>/dev/null` in
+       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
diff --git a/sys-libs/db/files/digest-db-4.5.20_p2 b/sys-libs/db/files/digest-db-4.5.20_p2
new file mode 100644
index 000000000000..857345e1cf79
--- /dev/null
+++ b/sys-libs/db/files/digest-db-4.5.20_p2
@@ -0,0 +1,9 @@
+MD5 b0f1c777708cb8e9d37fb47e7ed3312d db-4.5.20.tar.gz 9281894
+RMD160 5fc492efcddce6f446c5977128f5526f73763e01 db-4.5.20.tar.gz 9281894
+SHA256 f52cd5cea899823dd200d56556f70b33c55e48a33bb7b65ee128968dc10ca82d db-4.5.20.tar.gz 9281894
+MD5 a571e239b9041d7990df287cbc59ad6f patch.4.5.20.1 984
+RMD160 52093e6c3d952cb8193db35e45aa4462ba0772be patch.4.5.20.1 984
+SHA256 f0749a6780cd260fed20b6e961a0d354889ffe84505129d5c81925a4a4dcf6cb patch.4.5.20.1 984
+MD5 b7a7086a067ba116f5a8464362c9a9a7 patch.4.5.20.2 1752
+RMD160 d35069e8267f02e64e6f1be046d6cb9e75e9e720 patch.4.5.20.2 1752
+SHA256 232a93565ab1bf34db10f7513b612867bb61e0c012def7f63715800a05d07e6a patch.4.5.20.2 1752