added IUSE=uclibc support for building portage with uclibc support

5 files changed, 184 insertions, 22 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index ce1f313f0f13..171e0bf30f2b 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/db
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.91 2004/05/06 19:16:50 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.92 2004/06/20 02:56:56 solar Exp $
+
+*db-4.1.25_p1-r4 (19 Jun 2004)
+
+  19 Jun 2004; <solar@gentoo.org> db-4.1.25_p1-r4.ebuild,
+  files/db-4.1.25-uclibc.patch:
+  added IUSE=uclibc support for building portage with uclibc support
 
   06 May 2004; Ferris McCormick <fmccor@gentoo.org> db-4.2.52_p2.ebuild:
   Add ~sparc keyword at user request (bug 50272)
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 9aae2badd14d..d922cb66a8f3 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,31 +1,34 @@
-MD5 9bf5c84109d1b9b73918d0e28769c818 ChangeLog 14647
-MD5 427f3b55cddcac23c2d39f1438523bf7 db-1.85-r1.ebuild 1410
-MD5 78ba1cba72701cee3ff4cec93aefb02f db-4.2.52_p1.ebuild 2764
-MD5 7544a30d24ed53f6d41aa26df4351976 db-3.2.9-r7.ebuild 4362
+MD5 8b4e4250e9f833966522cf108fd5af5c db-3.3.11.ebuild 2407
+MD5 62cc8dd8c76df7c9bf606482e663701a db-4.0.14-r3.ebuild 2378
+MD5 f9252ee5daf4fb001097b9c5ff765cfb db-4.1.25_p1-r4.ebuild 2769
+MD5 15f4c3c84dd55edd2e793bf63c64955f db-3.2.9-r10.ebuild 4165
+MD5 f31aa3825097ccd2873d359d8db23372 db-1.85-r1.ebuild 1409
+MD5 663b2fc89eef87d0edd2679fa994dc64 db-4.0.14-r2.ebuild 2131
 MD5 4d197bc2e02ff64b734f0f8d66e59302 db-4.2.52_p2.ebuild 2759
+MD5 e29ba3e1e39ce8ca0bb5d7cfd5b260b7 db-4.1.25_p1-r3.ebuild 2645
+MD5 7544a30d24ed53f6d41aa26df4351976 db-3.2.9-r7.ebuild 4362
 MD5 af40eeed979d50c5ea3c7264a85f5208 db-3.2.9-r9.ebuild 3495
-MD5 a4882f7506a0f084e1c71cb8a7b3fcdd db-3.3.11.ebuild 2408
-MD5 15f4c3c84dd55edd2e793bf63c64955f db-3.2.9-r10.ebuild 4165
-MD5 d23bb9a64830aa173a4f7f8bc8687a9a db-4.0.14-r2.ebuild 2132
-MD5 ce0e75e9646a539b758d77ef13b88c47 db-4.0.14-r3.ebuild 2379
+MD5 566b22eb6ecb1b58a0352fe0a53e68d4 ChangeLog 14646
 MD5 5c921197970cd970a8fbb4cad2d7df7b metadata.xml 1457
-MD5 7a766fee5d7e9dd71ebeeca12cdb7cac db-4.1.25_p1-r3.ebuild 2646
-MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
+MD5 78ba1cba72701cee3ff4cec93aefb02f db-4.2.52_p1.ebuild 2764
+MD5 6eb8be5f7803acaa5bcfd4ed5ffabf83 files/db-3.2.9-jarlocation.patch 492
+MD5 2bb2a5dbe8d16f858d177e1193639b70 files/db-4.1.25_p1-jarlocation.patch 626
+MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r10 61
+MD5 0101200dac8a9299fc1578081ac72b71 files/db-4.0.14-jarlocation.patch 565
 MD5 eb9b0f2c1d8440c6c49fc1d916c2dc0e files/db-4.0.14-fix-dep-link.patch 1119
-MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
-MD5 3057fcc117c33a02bd4c092586a58e49 files/digest-db-1.85-r1 59
-MD5 35fa694f3db327e4fb015728aca6a082 files/digest-db-4.2.52_p1 118
-MD5 68a677d9846ad3fc623f173581ff9aa5 files/digest-db-4.2.52_p2 175
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r7 61
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r9 61
-MD5 214b855f6996d3dca754f6606beff672 files/digest-db-3.3.11 62
+MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r3 118
+MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r4 118
+MD5 3057fcc117c33a02bd4c092586a58e49 files/digest-db-1.85-r1 59
 MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r2 62
+MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r3 62
+MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
+MD5 214b855f6996d3dca754f6606beff672 files/digest-db-3.3.11 62
+MD5 75ba5de97737693cfdfe85908b5adfbd files/db-4.1.25-uclibc.patch 731
+MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
+MD5 35fa694f3db327e4fb015728aca6a082 files/digest-db-4.2.52_p1 118
+MD5 68a677d9846ad3fc623f173581ff9aa5 files/digest-db-4.2.52_p2 175
 MD5 9cf113248f29b1e319ae73b266df4986 files/patch.3.2.9.1 2139
 MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
-MD5 6eb8be5f7803acaa5bcfd4ed5ffabf83 files/db-3.2.9-jarlocation.patch 492
-MD5 0101200dac8a9299fc1578081ac72b71 files/db-4.0.14-jarlocation.patch 565
-MD5 2bb2a5dbe8d16f858d177e1193639b70 files/db-4.1.25_p1-jarlocation.patch 626
-MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r10 61
-MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r3 62
-MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r3 118
 MD5 3c47ce6ed92e948fbde232c1e3571f16 files/db-4.2-jarlocation.patch 599
diff --git a/sys-libs/db/db-4.1.25_p1-r4.ebuild b/sys-libs/db/db-4.1.25_p1-r4.ebuild
new file mode 100644
index 000000000000..d74bd14d78ea
--- /dev/null
+++ b/sys-libs/db/db-4.1.25_p1-r4.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r4.ebuild,v 1.1 2004/06/20 02:56:56 solar Exp $
+
+inherit eutils gnuconfig db
+
+#Number of official patches
+PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
+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="http://www.sleepycat.com/update/snapshot/${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.1"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+IUSE="tcltk java doc uclibc"
+
+DEPEND="tcltk? ( dev-lang/tcl )
+	java? ( virtual/jdk )"
+
+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
+		patch -p0 <${DISTDIR}/patch.${MY_PV}.${i}
+	done
+	epatch ${FILESDIR}/${P}-jarlocation.patch
+
+	epatch ${FILESDIR}/${PN}-4.0.14-fix-dep-link.patch
+	epatch ${FILESDIR}/${PN}-4.1.25-uclibc.patch
+}
+
+src_compile() {
+	addwrite /proc/self/maps
+
+	# Mips needs a gnuconfig update so obscure things like mips64 are known
+	# db-4.1.25_p1 extracts to ${WORKDIR}/db-4.1.25, so we need to strip the _p1
+	if ( use mips || uclibc ) ; then
+		einfo "Updating config.{guess,sub} for mips"
+		local OLDS="${S}"
+		S="${S}/../dist"
+		gnuconfig_update
+		S="${OLDS}"
+	fi
+
+
+	use uclibc && local myconf="--disable-rpc" || local myconf="--enable-rpc"
+
+	use amd64 &&  myconf="${myconf} --with-mutex=x86/gcc-assembly"
+
+	use java \
+		&& myconf="${myconf} --enable-java" \
+		|| myconf="${myconf} --disable-java"
+
+	use tcltk \
+		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/lib" \
+		|| myconf="${myconf} --disable-tcl"
+
+	if use java && [ -n "${JAVAC}" ]; then
+		export PATH=`dirname ${JAVAC}`:${PATH}
+		export JAVAC=`basename ${JAVAC}`
+	fi
+
+	[ -n "${CBUILD}" ] && myconf="${myconf} --build=${CBUILD}"
+
+	../dist/configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--datadir=/usr/share \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		--enable-compat185 \
+		--enable-cxx \
+		--with-uniquename \
+		--host=${CHOST} \
+		${myconf} || die
+
+	emake || make || die
+}
+
+src_install () {
+
+	einstall || 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_db41_svc
+}
+
+pkg_postinst () {
+	db_fix_so
+}
+
+pkg_postrm () {
+	db_fix_so
+}
diff --git a/sys-libs/db/files/db-4.1.25-uclibc.patch b/sys-libs/db/files/db-4.1.25-uclibc.patch
new file mode 100644
index 000000000000..91f3216003d5
--- /dev/null
+++ b/sys-libs/db/files/db-4.1.25-uclibc.patch
@@ -0,0 +1,29 @@
+--- dist/configure.mps	2004-03-03 18:35:23.000000000 +0100
++++ dist/configure	2004-03-03 18:35:57.000000000 +0100
+@@ -5065,7 +5065,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-gnu*|linux-uclibc*)
+   case $host_cpu in
+   alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
+     lt_cv_deplibs_check_method=pass_all ;;
+@@ -6331,7 +6331,7 @@
+ 
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
+-linux-gnu*) ;;
++linux-gnu*|linux-uclibc*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+ 
+@@ -7953,7 +7953,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-gnu*|linux-uclibc*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
diff --git a/sys-libs/db/files/digest-db-4.1.25_p1-r4 b/sys-libs/db/files/digest-db-4.1.25_p1-r4
new file mode 100644
index 000000000000..4f81c12b1c1e
--- /dev/null
+++ b/sys-libs/db/files/digest-db-4.1.25_p1-r4
@@ -0,0 +1,2 @@
+MD5 df71961002b552c0e72c6e4e358f27e1 db-4.1.25.tar.gz 3080234
+MD5 1e073d12cd89f9345e281ca07368f74b patch.4.1.25.1 610