Bug fix, 15621, plz test

3 files changed, 86 insertions, 1 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 8fa65c4d49e1..76d6c40e2083 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/rpm
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.15 2003/02/19 21:09:23 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.16 2003/02/28 09:50:58 cretin Exp $
+
+*rpm-4.0.4-r5 (28 Feb 2003)
+
+  28 Feb 2003; Stefan Jones <cretin@gentoo.org> rpm-4.0.4-r5.ebuild :
+  Fixed bug #15621 with homemade patch.
 
 *rpm-4.1 (19 Feb 2003)
 
diff --git a/app-arch/rpm/files/rpm-4.0.4-glibc2.3.diff b/app-arch/rpm/files/rpm-4.0.4-glibc2.3.diff
new file mode 100644
index 000000000000..8138fcdd7010
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.0.4-glibc2.3.diff
@@ -0,0 +1,11 @@
+--- rpm-4.0.4/rpmio/rpmio.h.jj	2003-02-28 09:32:38.000000000 +0000
++++ rpm-4.0.4/rpmio/rpmio.h	2003-02-28 09:35:04.000000000 +0000
+@@ -30,7 +30,7 @@
+  * API unchanged.
+  */
+ /*@{*/
+-#if !defined(__LCLINT__) && defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ == 2
++#if !defined(__LCLINT__) && defined(__GLIBC__) && ( __GLIBC__ > 2 || ( __GLIBC__ == 2 && __GLIBC_MINOR__ >= 2 ) )
+ #define USE_COOKIE_SEEK_POINTER 1
+ typedef _IO_off64_t 	_libio_off_t;
+ typedef _libio_off_t *	_libio_pos_t;
diff --git a/app-arch/rpm/rpm-4.0.4-r5.ebuild b/app-arch/rpm/rpm-4.0.4-r5.ebuild
new file mode 100644
index 000000000000..921a13f3fb65
--- /dev/null
+++ b/app-arch/rpm/rpm-4.0.4-r5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.0.4-r5.ebuild,v 1.1 2003/02/28 09:50:58 cretin Exp $
+
+inherit flag-o-matic
+
+# note to self: check for java deps
+DESCRIPTION="Red Hat Package Management Utils"
+SRC_URI="ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/${P}.tar.gz"
+HOMEPAGE="http://www.rpm.org/"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+IUSE="nls"
+
+RDEPEND="=sys-libs/db-3.2*
+	>=sys-libs/zlib-1.1.3
+	>=sys-apps/bzip2-1.0.1
+	>=dev-libs/popt-1.6.3"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+filter-flags -fPIC
+
+src_unpack() {
+	export WANT_AUTOCONF_2_1=1
+
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${P}-system-popt.diff || die
+	patch -p1 < ${FILESDIR}/${P}-glibc2.3.diff || die
+	rm -rf ${S}/popt
+	# Suppress pointer warnings
+	cp configure configure.orig
+	sed -e "s:-Wpointer-arith::" configure.orig > configure
+}
+
+src_compile() {
+	local myconf
+	use nls || myconf="--disable-nls"
+	econf ${myconf}
+	make || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	mv ${D}/bin/rpm ${D}/usr/bin
+	rm -rf ${D}/bin
+
+	# Fix for bug #8578 (app-arch/rpm create dead symlink)
+	# Local RH 7.3 install has no such symlink anywhere
+	rm -f ${D}/usr/lib/rpmpopt
+
+	keepdir /var/lib/rpm
+
+	dodoc CHANGES COPYING CREDITS GROUPS README* RPM* TODO
+}
+
+pkg_postinst() {
+	if [ -f ${ROOT}/var/lib/rpm/nameindex.rpm ]; then
+		einfo "RPM database found... Rebuilding database (may take a while)..."
+		${ROOT}/usr/bin/rpm --rebuilddb --root=${ROOT}
+	else
+		einfo "No RPM database found... Creating database..."
+		${ROOT}/usr/bin/rpm --initdb --root=${ROOT}
+	fi
+}