Bug #160192: Trim old gnuconfig_update versions.

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

6 files changed, 6 insertions, 563 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 169a74bb1f61..659ac03fa2c5 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.310 2010/08/01 21:47:48 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.311 2010/09/12 08:48:18 robbat2 Exp $
+
+  12 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> -db-3.2.9-r11.ebuild,
+  -db-4.2.52_p4-r2.ebuild, -db-4.3.29-r2.ebuild, -files/patch.3.2.9.1,
+  -files/patch.3.2.9.2:
+  Bug #160192: Trim old gnuconfig_update versions.
 
   01 Aug 2010; Markos Chandras <hwoarang@gentoo.org> db-4.8.30.ebuild:
   Stable on amd64 wrt bug #328609
diff --git a/sys-libs/db/db-3.2.9-r11.ebuild b/sys-libs/db/db-3.2.9-r11.ebuild
deleted file mode 100644
index 5bf7ee08c1dc..000000000000
--- a/sys-libs/db/db-3.2.9-r11.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r11.ebuild,v 1.19 2009/10/13 13:53:47 ssuominen Exp $
-
-inherit gnuconfig libtool eutils db
-
-DESCRIPTION="Berkeley DB for transaction support in MySQL"
-HOMEPAGE="http://www.sleepycat.com/"
-SRC_URI="ftp://ftp.sleepycat.com/releases/${P}.tar.gz"
-
-LICENSE="DB"
-SLOT="3"
-# This ebuild is to be the compatibility ebuild for when db4 is put
-# in the tree.
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc"
-
-DEPEND="${RDEPEND}
-	=sys-libs/db-1.85*
-	sys-devel/libtool
-	sys-devel/m4"
-# We need m4 too else build fails without config.guess
-
-# This doesn't build without exceptions
-export CXXFLAGS="${CXXFLAGS/-fno-exceptions/-fexceptions}"
-
-src_unpack() {
-	unpack ${A}
-
-	chmod -R ug+w *
-
-	cd "${WORKDIR}"/${P}
-	epatch "${FILESDIR}"/patch.3.2.9.1
-	epatch "${FILESDIR}"/patch.3.2.9.2
-
-	# Get db to link libdb* to correct dependencies ... for example if we use
-	# NPTL or NGPT, db detects usable mutexes, and should link against
-	# libpthread, but does not do so ...
-	# <azarah@gentoo.org> (23 Feb 2003)
-	epatch "${FILESDIR}"/${P}-fix-dep-link.patch
-
-	# We should get dump185 to link against system db1 ..
-	# <azarah@gentoo.org> (23 Feb 2003)
-	mv "${S}"/dist/Makefile.in "${S}"/dist/Makefile.in.orig
-	sed -e 's:DB185INC=:DB185INC= -I/usr/include/db1:' \
-		-e 's:DB185LIB=:DB185LIB= -ldb1:' \
-		"${S}"/dist/Makefile.in.orig > "${S}"/dist/Makefile.in || die "Failed to sed"
-
-	# Fix invalid .la files
-	cd "${WORKDIR}"/${P}/dist
-	rm -f ltversion.sh
-	# remove config.guess else we have problems with gcc-3.2
-	rm -f config.guess
-	sed -i "s,\(-D_GNU_SOURCE\),\1 ${CFLAGS}," configure
-
-	cd "${S}"
-	gnuconfig_update
-}
-
-src_compile() {
-	local conf=
-	local conf_shared=
-	local conf_static=
-
-	conf="${conf}
-		--host=${CHOST} \
-		--build=${CHOST} \
-		--enable-cxx \
-		--enable-compat185 \
-		--enable-dump185 \
-		--prefix=/usr"
-
-	# --enable-rpc DOES NOT BUILD
-	# Robin H. Johnson <robbat2@gentoo.org> (18 Oct 2003)
-
-	conf_shared="${conf_shared}
-		--enable-dynamic"
-
-	# TCL support is also broken
-	# Robin H. Johnson <robbat2@gentoo.org> (18 Oct 2003)
-	# conf_shared="${conf_shared}
-	#	`use_enable tcl tcl`
-	#	`use_with tcl tcl /usr/$(get_libdir)`"
-
-	# NOTE: we should not build both shared and static versions
-	#       of the libraries in the same build root!
-
-	einfo "Configuring ${P} (static)..."
-	mkdir -p "${S}"/build-static
-	cd "${S}"/build-static
-	strip=/bin/true \
-	../dist/configure ${conf} ${conf_static} \
-		--libdir=/usr/$(get_libdir) \
-		--enable-static || die
-
-	einfo "Configuring ${P} (shared)..."
-	mkdir -p "${S}"/build-shared
-	cd "${S}"/build-shared
-	strip=/bin/true \
-	../dist/configure ${conf} ${conf_shared} \
-		--libdir=/usr/$(get_libdir) \
-		--enable-shared || die
-
-	# Parallel make does not work
-	MAKEOPTS="${MAKEOPTS} -j1"
-	einfo "Building ${P} (static)..."
-	cd "${S}"/build-static
-	emake strip=/bin/true || die "Static build failed"
-	einfo "Building ${P} (shared)..."
-	cd "${S}"/build-shared
-	emake strip=/bin/true || die "Shared build failed"
-}
-
-src_install () {
-	cd "${S}"/build-shared
-	make libdb=libdb-3.2.a \
-		libcxx=libcxx_3.2.a \
-		prefix="${D}"/usr \
-		libdir="${D}"/usr/$(get_libdir) \
-		strip=/bin/true \
-		install || die
-
-	cd "${S}"/build-static
-	newlib.a libdb.a libdb-3.2.a || die "failed to package static libraries!"
-	newlib.a libdb_cxx.a libdb_cxx-3.2.a || die "failed to package static libraries!"
-
-	db_src_install_headerslot || die "db_src_install_headerslot failed!"
-
-	# this is now done in the db eclass, function db_fix_so and db_src_install_usrlibcleanup
-	#cd "${D}"/usr/lib
-	#ln -s libdb-3.2.so libdb.so.3
-
-	# For some reason, db.so's are *not* readable by group or others,
-	# resulting in no one but root being able to use them!!!
-	# This fixes it -- DR 15 Jun 2001
-	cd "${D}"/usr/$(get_libdir)
-	chmod go+rx *.so
-	# The .la's aren't readable either
-	chmod go+r *.la
-
-	cd "${S}"
-	dodoc README
-
-	db_src_install_doc || die "db_src_install_doc failed!"
-
-	db_src_install_usrbinslot || die "db_src_install_usrbinslot failed!"
-
-	db_src_install_usrlibcleanup || die "db_src_install_usrlibcleanup failed!"
-}
-
-pkg_postinst () {
-	db_fix_so
-}
-
-pkg_postrm () {
-	db_fix_so
-}
-
-src_test() {
-	if use test; then
-		eerror "We'd love to be able to test, but the testsuite is broken in the 3.2.9 series"
-	fi
-}
diff --git a/sys-libs/db/db-4.2.52_p4-r2.ebuild b/sys-libs/db/db-4.2.52_p4-r2.ebuild
deleted file mode 100644
index d1d8211c0e5f..000000000000
--- a/sys-libs/db/db-4.2.52_p4-r2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p4-r2.ebuild,v 1.18 2009/09/20 19:52:44 robbat2 Exp $
-
-inherit eutils gnuconfig db 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="Berkeley DB"
-HOMEPAGE="http://www.sleepycat.com/"
-SRC_URI="mirror://gentoo/${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.2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="tcl java doc nocxx"
-
-DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
-	java? ( >=virtual/jdk-1.4 )"
-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
-	epatch "${FILESDIR}"/"${PN}"-4.0.14-fix-dep-link.patch
-	epatch "${FILESDIR}"/"${PN}"-4.2.52_p2-TXN.patch
-
-	# use the includes from the prefix
-	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
-	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-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"
-
-	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 && use test; then
-		myconf="${myconf} --enable-test"
-	else
-		myconf="${myconf} --disable-test"
-	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
-	# This file is not always built, and no longer exists as of db-4.8
-	[[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \
-	mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db42_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/db-4.3.29-r2.ebuild b/sys-libs/db/db-4.3.29-r2.ebuild
deleted file mode 100644
index 508577d649c4..000000000000
--- a/sys-libs/db/db-4.3.29-r2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29-r2.ebuild,v 1.22 2009/09/20 19:52:44 robbat2 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="Berkeley DB"
-HOMEPAGE="http://www.sleepycat.com/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-#SRC_URI="ftp://ftp.sleepycat.com/releases/${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.3"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="tcl java doc nocxx"
-
-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
-
-	epatch "${FILESDIR}"/"${PN}"-4.3.27-fix-dep-link.patch
-
-	# use the includes from the prefix
-	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
-	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-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"
-
-	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 && use test ; 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 \
-		--without-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
-	# This file is not always built, and no longer exists as of db-4.8
-	[[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \
-	mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db43_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/patch.3.2.9.1 b/sys-libs/db/files/patch.3.2.9.1
deleted file mode 100644
index 8d70c6e51917..000000000000
--- a/sys-libs/db/files/patch.3.2.9.1
+++ /dev/null
@@ -1,104 +0,0 @@
-*** include/log.h.orig	2001/01/25 18:22:51	11.20
---- include/log.h	2001/02/06 05:02:28	11.21
-***************
-*** 198,203 ****
---- 198,204 ----
-   */
-  typedef enum {
-  	DB_LV_INCOMPLETE,
-+ 	DB_LV_NONEXISTENT,
-  	DB_LV_NORMAL,
-  	DB_LV_OLD_READABLE,
-  	DB_LV_OLD_UNREADABLE
-*** log/log.c.orig	2001/01/25 18:22:55	11.43
---- log/log.c	2001/02/06 05:02:28	11.44
-***************
-*** 309,321 ****
-  	int find_first, *valp;
-  	logfile_validity *statusp;
-  {
-! 	logfile_validity clv_status, status;
-  	u_int32_t clv, logval;
-  	int cnt, fcnt, ret;
-  	const char *dir;
-  	char **names, *p, *q, savech;
-  
-! 	clv_status = status = DB_LV_NORMAL;
-  
-  	/* Return a value of 0 as the log file number on failure. */
-  	*valp = 0;
---- 309,321 ----
-  	int find_first, *valp;
-  	logfile_validity *statusp;
-  {
-! 	logfile_validity logval_status, status;
-  	u_int32_t clv, logval;
-  	int cnt, fcnt, ret;
-  	const char *dir;
-  	char **names, *p, *q, savech;
-  
-! 	logval_status = status = DB_LV_NONEXISTENT;
-  
-  	/* Return a value of 0 as the log file number on failure. */
-  	*valp = 0;
-***************
-*** 385,394 ****
-  			 * as a valid log file.
-  			 */
-  			break;
-  		case DB_LV_NORMAL:
-  		case DB_LV_OLD_READABLE:
-  			logval = clv;
-! 			clv_status = status;
-  			break;
-  		case DB_LV_OLD_UNREADABLE:
-  			/*
---- 385,398 ----
-  			 * as a valid log file.
-  			 */
-  			break;
-+ 		case DB_LV_NONEXISTENT:
-+ 			/* Should never happen. */
-+ 			DB_ASSERT(0);
-+ 			break;
-  		case DB_LV_NORMAL:
-  		case DB_LV_OLD_READABLE:
-  			logval = clv;
-! 			logval_status = status;
-  			break;
-  		case DB_LV_OLD_UNREADABLE:
-  			/*
-***************
-*** 410,416 ****
-  			 */
-  			if (!find_first) {
-  				logval = clv;
-! 				clv_status = status;
-  			}
-  			break;
-  		}
---- 414,420 ----
-  			 */
-  			if (!find_first) {
-  				logval = clv;
-! 				logval_status = status;
-  			}
-  			break;
-  		}
-***************
-*** 420,426 ****
-  
-  err:	__os_dirfree(names, fcnt);
-  	__os_freestr(p);
-! 	*statusp = clv_status;
-  
-  	return (ret);
-  }
---- 424,430 ----
-  
-  err:	__os_dirfree(names, fcnt);
-  	__os_freestr(p);
-! 	*statusp = logval_status;
-  
-  	return (ret);
-  }
diff --git a/sys-libs/db/files/patch.3.2.9.2 b/sys-libs/db/files/patch.3.2.9.2
deleted file mode 100644
index 4092cda52eac..000000000000
--- a/sys-libs/db/files/patch.3.2.9.2
+++ /dev/null
@@ -1,21 +0,0 @@
-*** log/log_rec.c.orig	2001/01/25 18:22:56	11.49
---- log/log_rec.c	2001/02/07 22:17:46
-***************
-*** 404,410 ****
-  				TAILQ_INIT(&logp->dbentry[i].dblist);
-  			else
-  				TAILQ_REINSERT_HEAD(
-! 				    &logp->dbentry[i].dblist, dbp, links);
-  		}
-  
-  		/* Initialize the new entries. */
---- 404,410 ----
-  				TAILQ_INIT(&logp->dbentry[i].dblist);
-  			else
-  				TAILQ_REINSERT_HEAD(
-! 				    &logp->dbentry[i].dblist, dbtmp, links);
-  		}
-  
-  		/* Initialize the new entries. */
-
-