Remove old 1.85 ebuild, plus clean up 1.85 for downloading from Oracle.

(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64)

3 files changed, 12 insertions, 64 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 7b9fda13ad65..cf967e28fe31 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.245 2008/08/16 03:32:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.246 2008/08/16 03:46:59 robbat2 Exp $
+
+  16 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> -db-1.85-r1.ebuild,
+  db-1.85-r3.ebuild:
+  Remove old 1.85 ebuild, plus clean up 1.85 for downloading from Oracle.
 
   16 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> db-4.4.20_p4.ebuild,
   db-4.5.20_p2.ebuild:
diff --git a/sys-libs/db/db-1.85-r1.ebuild b/sys-libs/db/db-1.85-r1.ebuild
deleted file mode 100644
index 87612a137fe9..000000000000
--- a/sys-libs/db/db-1.85-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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-1.85-r1.ebuild,v 1.34 2007/10/24 07:07:55 wltjr Exp $
-
-inherit eutils
-
-DESCRIPTION="db 1.85 -- required for RPM 4.0 to compile; that's about it."
-HOMEPAGE="http://www.sleepycat.com/"
-SRC_URI="ftp://ftp.sleepycat.com/releases/db.${PV}.tar.gz
-	 mirror://gentoo/db.1.85.patch"
-
-LICENSE="DB"
-SLOT="1"
-KEYWORDS="mips"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-S=${WORKDIR}/db.${PV}
-
-src_unpack() {
-	unpack db.${PV}.tar.gz
-	cd "${S}"
-	epatch ${DISTDIR}/db.${PV}.patch
-}
-
-src_compile() {
-	cd "${S}"/PORT/linux
-	make ${MAKEOPTS} OORG="${CFLAGS} -fomit-frame-pointer" prefix=/usr || die
-}
-
-src_install () {
-	cd "${S}"/PORT/linux
-
-	newlib.a libdb.a libdb1.a || die "newlib.a failed"
-	newlib.so libdb.so.2 libdb1.so.2 || die "newlib.so failed"
-	dosym libdb1.so.2 /usr/$(get_libdir)/libdb1.so
-	dosym libdb1.so.2 /usr/$(get_libdir)/libdb.so.2
-	dosym libdb1.so.2 /usr/$(get_libdir)/libndbm.so
-	dosym libdb1.a /usr/$(get_libdir)/libndbm.a
-
-	dodir /usr/include/db1
-	insinto /usr/include/db1
-	doins include/db.h include/mpool.h
-
-	insinto /usr/include/db1
-	doins include/ndbm.h
-	dosed "s:<db.h>:<db1/db.h>:" /usr/include/db1/ndbm.h
-	dosym db1/ndbm.h /usr/include/ndbm.h
-	newbin db_dump185 db1_dump185
-
-	cd "${S}"
-	dodoc changelog README
-	docinto ps
-	dodoc docs/*.ps
-	docinto hash
-	dodoc hash/README
-}
diff --git a/sys-libs/db/db-1.85-r3.ebuild b/sys-libs/db/db-1.85-r3.ebuild
index f553efdcebce..e666b34e778c 100644
--- a/sys-libs/db/db-1.85-r3.ebuild
+++ b/sys-libs/db/db-1.85-r3.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.13 2007/11/19 06:48:19 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85-r3.ebuild,v 1.14 2008/08/16 03:46:59 robbat2 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}.1.patch.bz2"
+HOMEPAGE="http://www.oracle.com/technology/software/products/berkeley-db/db/index.html"
+SRC_URI="http://download.oracle.com/berkeley-db/db.${PV}.tar.gz
+		 mirror://gentoo/${PF}.1.patch.bz2"
+# The patch used by Gentoo is from Fedora, and includes all 5 patches found on
+# the Oracle page, plus others.
 
 LICENSE="DB"
 SLOT="1"