Further cleanup the patch from Redhat, add a SONAME fix for alpha #48616, and tweak how we build/install.

Package-Manager: portage-2.0.53_rc7

5 files changed, 120 insertions, 32 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 4d8760e5a6f4..169151a006ef 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/db
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.135 2005/08/23 20:46:39 agriffis Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.136 2005/11/08 02:40:54 vapier Exp $
+
+*db-1.85-r3 (08 Nov 2005)
+
+  08 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/db-1.85-gentoo-paths.patch, +db-1.85-r3.ebuild:
+  Further cleanup the patch from Redhat, add a SONAME fix for alpha #48616,
+  and tweak how we build/install.
 
   23 Aug 2005; Aron Griffis <agriffis@gentoo.org> db-4.2.52_p2.ebuild:
   stable on ia64
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 007cf9f58947..04cd9db22b93 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,50 +1,53 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 73ccb0c04661223f8a54651fa23d1a5c db-3.2.9-r10.ebuild 4299
-MD5 3316d306f09820f7daaeed2a6b179eef db-4.2.52_p1.ebuild 2836
-MD5 e1753ef0eb3e9614fadff321ecd1b082 metadata.xml 1460
+MD5 1a523236426073bc2819265261173ea8 ChangeLog 21618
 MD5 15e26e1303761aa1b814d1d46f930d74 db-1.85-r1.ebuild 1435
-MD5 08193a44b9ff7ab8193fd7874bca288e db-4.1.25_p1-r3.ebuild 2550
-MD5 74f280853789512d578b7cb488c28733 db-4.3.27.ebuild 2917
-MD5 9d8f11ca7cc13982009b7e2786291ef4 ChangeLog 21375
+MD5 a0435de0fd1dacc747f315502eda91bc db-1.85-r2.ebuild 1467
+MD5 acf165d206ae3e99d4a903ab7f3f5086 db-1.85-r3.ebuild 1209
+MD5 73ccb0c04661223f8a54651fa23d1a5c db-3.2.9-r10.ebuild 4299
 MD5 3095611cc9de038f5dab190381574a17 db-3.2.9-r7.ebuild 4416
-MD5 b3cb97191214b2260603ee79ee1cc8e0 db-4.0.14-r3.ebuild 2480
-MD5 fa0e2188b8f14d47bc85775d74115c76 db-4.2.52_p2.ebuild 2958
 MD5 6f9b8f054235426e239efa7ad5269ab3 db-4.0.14-r2.ebuild 2227
+MD5 b3cb97191214b2260603ee79ee1cc8e0 db-4.0.14-r3.ebuild 2480
+MD5 08193a44b9ff7ab8193fd7874bca288e db-4.1.25_p1-r3.ebuild 2550
 MD5 2b53b92447c5f06991103d07b2443168 db-4.1.25_p1-r4.ebuild 2706
-MD5 a0435de0fd1dacc747f315502eda91bc db-1.85-r2.ebuild 1467
-MD5 4f68188f3bc051f50a85c5b72bab85c7 files/db-4.2-libtool.patch 665
-MD5 68a677d9846ad3fc623f173581ff9aa5 files/digest-db-4.2.52_p2 175
+MD5 3316d306f09820f7daaeed2a6b179eef db-4.2.52_p1.ebuild 2836
+MD5 fa0e2188b8f14d47bc85775d74115c76 db-4.2.52_p2.ebuild 2958
+MD5 74f280853789512d578b7cb488c28733 db-4.3.27.ebuild 2917
+MD5 86aca9a49a082dc56e4103ec8112f344 files/db-1.85-gentoo-paths.patch 684
+MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
+MD5 6eb8be5f7803acaa5bcfd4ed5ffabf83 files/db-3.2.9-jarlocation.patch 492
 MD5 fa494e61698001c02f2b6a192acfaf99 files/db-3.2.9-java15.patch 598
-MD5 72688c24d0217c7e214b816417d8ef97 files/db-4.3.27-fix-dep-link.patch 1179
+MD5 eb9b0f2c1d8440c6c49fc1d916c2dc0e files/db-4.0.14-fix-dep-link.patch 1119
+MD5 0101200dac8a9299fc1578081ac72b71 files/db-4.0.14-jarlocation.patch 565
 MD5 395933484399c22681916b0e86db3258 files/db-4.1.25-java.patch 721
-MD5 3057fcc117c33a02bd4c092586a58e49 files/digest-db-1.85-r1 59
 MD5 75ba5de97737693cfdfe85908b5adfbd files/db-4.1.25-uclibc.patch 731
 MD5 2bb2a5dbe8d16f858d177e1193639b70 files/db-4.1.25_p1-jarlocation.patch 626
+MD5 3c47ce6ed92e948fbde232c1e3571f16 files/db-4.2-jarlocation.patch 599
+MD5 4f68188f3bc051f50a85c5b72bab85c7 files/db-4.2-libtool.patch 665
+MD5 b1df069d8d9a974fe864e681dc165cfc files/db-4.3-jarlocation.patch 599
 MD5 fee87f3b3eb96ac9a15f44aa5ff1c08c files/db-4.3-libtool.patch 2161
-MD5 0101200dac8a9299fc1578081ac72b71 files/db-4.0.14-jarlocation.patch 565
-MD5 6eb8be5f7803acaa5bcfd4ed5ffabf83 files/db-3.2.9-jarlocation.patch 492
-MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r7 61
-MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r3 118
-MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
-MD5 9cf113248f29b1e319ae73b266df4986 files/patch.3.2.9.1 2139
-MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r4 118
-MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
-MD5 eb9b0f2c1d8440c6c49fc1d916c2dc0e files/db-4.0.14-fix-dep-link.patch 1119
-MD5 35fa694f3db327e4fb015728aca6a082 files/digest-db-4.2.52_p1 118
+MD5 72688c24d0217c7e214b816417d8ef97 files/db-4.3.27-fix-dep-link.patch 1179
 MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
+MD5 3057fcc117c33a02bd4c092586a58e49 files/digest-db-1.85-r1 59
 MD5 69bde9765bf0a2d6c55a253eb0e53190 files/digest-db-1.85-r2 120
-MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r2 62
-MD5 3c47ce6ed92e948fbde232c1e3571f16 files/db-4.2-jarlocation.patch 599
+MD5 964290ad12dc08fdbaa640a38faff81e files/digest-db-1.85-r3 123
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r10 61
-MD5 b1df069d8d9a974fe864e681dc165cfc files/db-4.3-jarlocation.patch 599
+MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r7 61
+MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r2 62
 MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r3 62
+MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r3 118
+MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r4 118
+MD5 35fa694f3db327e4fb015728aca6a082 files/digest-db-4.2.52_p1 118
+MD5 68a677d9846ad3fc623f173581ff9aa5 files/digest-db-4.2.52_p2 175
 MD5 e54996f4a19633179add94a051ebf900 files/digest-db-4.3.27 62
+MD5 9cf113248f29b1e319ae73b266df4986 files/patch.3.2.9.1 2139
+MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
+MD5 e1753ef0eb3e9614fadff321ecd1b082 metadata.xml 1460
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDC4uWBXaUFmZvwyMRAi8UAKCvs2ZOKduIgHfrR6jw2oNZTmGx/ACeK4xT
-ypxFjSCcEvu8KaHpCoZXOjc=
-=lXtg
+iD8DBQFDcBBggIKl8Uu19MoRAiFZAJ4plc6jekKP36UbesB3r/32kKuFaQCfWTf0
+o9qPQ+JZ8J2euXg9icDwujg=
+=ElhW
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/db/db-1.85-r3.ebuild b/sys-libs/db/db-1.85-r3.ebuild
new file mode 100644
index 000000000000..c523954b9f24
--- /dev/null
+++ b/sys-libs/db/db-1.85-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85-r3.ebuild,v 1.1 2005/11/08 02:40:54 vapier Exp $
+
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="old berk db kept around for really old packages"
+HOMEPAGE="http://www.sleepycat.com/"
+SRC_URI="ftp://ftp.sleepycat.com/releases/db.${PV}.tar.gz
+	mirror://gentoo/${PF}.patch.bz2"
+
+LICENSE="DB"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+
+S=${WORKDIR}/db.${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/${PF}.patch
+	epatch "${FILESDIR}"/${P}-gentoo-paths.patch
+	sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):" PORT/linux/Makefile || die
+}
+
+src_compile() {
+	tc-export CC AR RANLIB
+	emake -C PORT/linux OORG="${CFLAGS}" || die
+}
+
+src_install() {
+	make -C PORT/linux install DESTDIR="${D}" || die
+
+	# binary compat symlink
+	dosym libdb1.so.2 /usr/$(get_libdir)/libdb.so.2 || die
+
+	dosed "s:<db.h>:<db1/db.h>:" /usr/include/db1/ndbm.h
+	dosym db1/ndbm.h /usr/include/ndbm.h
+
+	dodoc changelog README
+	newdoc hash/README README.hash
+	docinto ps
+	dodoc docs/*.ps
+}
diff --git a/sys-libs/db/files/db-1.85-gentoo-paths.patch b/sys-libs/db/files/db-1.85-gentoo-paths.patch
new file mode 100644
index 000000000000..4a65106bdc70
--- /dev/null
+++ b/sys-libs/db/files/db-1.85-gentoo-paths.patch
@@ -0,0 +1,29 @@
+--- PORT/linux/Makefile
++++ PORT/linux/Makefile
+@@ -1,12 +1,12 @@
+ #	@(#)Makefile	8.9 (Berkeley) 7/14/94
+ 
+-LIBDB=	libdb.a
+-LIBDBSO=libdb.so
++LIBDB=	libdb1.a
++LIBDBSO=libdb1.so
+ SOVER=2
+ SONAME=$(LIBDBSO).$(SOVER)
+ LIBNDBM=libndbm.a
+ LIBNDBMSO=libndbm.so
+-PROG=	db_dump185
++PROG=	db1_dump185
+ OBJ1=	hash.o hash_bigkey.o hash_buf.o hash_func.o hash_log2.o hash_page.o \
+ 	ndbm.o
+ OBJ2=	bt_close.o bt_conv.o bt_debug.o bt_delete.o bt_get.o bt_open.o \
+@@ -27,8 +27,8 @@
+ DESTDIR =
+ prefix = /usr
+ bindir = $(prefix)/bin
+-libdir = $(prefix)/lib
+-includedir = $(prefix)/include
++libdir = $(prefix)/@GENTOO_LIBDIR@
++includedir = $(prefix)/include/db1
+ 
+ all: $(LIBDB) $(LIBDBSO) $(PROG)
+ 
diff --git a/sys-libs/db/files/digest-db-1.85-r3 b/sys-libs/db/files/digest-db-1.85-r3
new file mode 100644
index 000000000000..9991746913e0
--- /dev/null
+++ b/sys-libs/db/files/digest-db-1.85-r3
@@ -0,0 +1,2 @@
+MD5 befeaaece9f5e8214194fdf4129537fa db-1.85-r3.patch.bz2 14629
+MD5 42cc6c1e1e25818bd3e3f91328edb0f1 db.1.85.tar.gz 270953