lib updates

10 files changed, 16 insertions, 10 deletions

diff --git a/app-arch/rpm/files/rpm-3.0.3-compile.patch.bz2 b/app-arch/rpm/files/rpm-3.0.3-compile.patch.bz2
new file mode 100644
index 000000000000..883abd95214d
--- /dev/null
+++ b/app-arch/rpm/files/rpm-3.0.3-compile.patch.bz2
diff --git a/app-arch/rpm/files/rpm-3.0.3-fakeroot.patch.bz2 b/app-arch/rpm/files/rpm-3.0.3-fakeroot.patch.bz2
new file mode 100644
index 000000000000..25bc11b6bb30
--- /dev/null
+++ b/app-arch/rpm/files/rpm-3.0.3-fakeroot.patch.bz2
diff --git a/app-arch/rpm/files/rpm-3.0.5-objdump-shutup.patch.bz2 b/app-arch/rpm/files/rpm-3.0.5-objdump-shutup.patch.bz2
new file mode 100644
index 000000000000..af105f2c29f8
--- /dev/null
+++ b/app-arch/rpm/files/rpm-3.0.5-objdump-shutup.patch.bz2
diff --git a/app-arch/rpm/files/rpm-4.0-bashort.patch.bz2 b/app-arch/rpm/files/rpm-4.0-bashort.patch.bz2
new file mode 100644
index 000000000000..96cd524c312c
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.0-bashort.patch.bz2
diff --git a/app-arch/rpm/files/rpm-4.0-rpmgettext.patch.bz2 b/app-arch/rpm/files/rpm-4.0-rpmgettext.patch.bz2
new file mode 100644
index 000000000000..2a42db007c10
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.0-rpmgettext.patch.bz2
diff --git a/app-arch/rpm/files/rpm-4.0.1-install-ugid-h.patch.bz2 b/app-arch/rpm/files/rpm-4.0.1-install-ugid-h.patch.bz2
new file mode 100644
index 000000000000..9fe69fe22846
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.0.1-install-ugid-h.patch.bz2
diff --git a/app-arch/rpm/files/rpm-rpmlibsucks.patch.bz2 b/app-arch/rpm/files/rpm-rpmlibsucks.patch.bz2
new file mode 100644
index 000000000000..0fab4d755a43
--- /dev/null
+++ b/app-arch/rpm/files/rpm-rpmlibsucks.patch.bz2
diff --git a/app-arch/rpm/files/rpm-skipmntpoints.patch.bz2 b/app-arch/rpm/files/rpm-skipmntpoints.patch.bz2
new file mode 100644
index 000000000000..b4ebd74f893e
--- /dev/null
+++ b/app-arch/rpm/files/rpm-skipmntpoints.patch.bz2
diff --git a/app-arch/rpm/files/rpm-wait-for-lock.patch.bz2 b/app-arch/rpm/files/rpm-wait-for-lock.patch.bz2
new file mode 100644
index 000000000000..4cb67a316bf2
--- /dev/null
+++ b/app-arch/rpm/files/rpm-wait-for-lock.patch.bz2
diff --git a/app-arch/rpm/rpm-4.0.ebuild b/app-arch/rpm/rpm-4.0.ebuild
index 02c3f3258baa..7d995663f16f 100644
--- a/app-arch/rpm/rpm-4.0.ebuild
+++ b/app-arch/rpm/rpm-4.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.0.ebuild,v 1.1 2000/11/16 16:19:03 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.0.ebuild,v 1.2 2000/11/17 01:50:35 drobbins Exp $
 
 A="${P}.tar.gz"
 S=${WORKDIR}/${P}
-DESCRIPTION="Red Hat Package Management Utils"
-SRC_URI="ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/${A}"
+DESCRIPTION="RedHat Package Management Utils"
+SRC_URI="ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/${A}"
 HOMEPAGE="http://www.rpm.org/"
 
 DEPEND=">=sys-apps/bash-2.04
@@ -16,16 +16,22 @@ DEPEND=">=sys-apps/bash-2.04
 	>=dev-db/db-3.1.17"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp configure.in configure.in.orig
-	sed -e '33,71d' -e 's:db-3.1:db:g' -e 's:-ldb-3.1:-ldb:g' configure.in.orig > configure.in
-	autoconf
+        unpack ${A}
+        cd ${S}
+        cat ${FILESDIR}/rpm-4.0-rpmgettext.patch.bz2 | bzip2 -d | patch -p0
+        cat ${FILESDIR}/rpm-rpmlibsucks.patch.bz2 | bzip2 -d | patch -p1
+        cat ${FILESDIR}/rpm-4.0-bashort.patch.bz2 | bzip2 -d | patch -p0
+        cat ${FILESDIR}/rpm-3.0.3-compile.patch.bz2 | bzip2 -d | patch -p0
+        cat ${FILESDIR}/rpm-3.0.3-fakeroot.patch.bz2 | bzip2 -d | patch -p0
+        cat ${FILESDIR}/rpm-skipmntpoints.patch.bz2 | bzip2 -d | patch -p1
+        cat ${FILESDIR}/rpm-3.0.5-objdump-shutup.patch.bz2 | bzip2 -d | patch -p1
+        cat ${FILESDIR}/rpm-wait-for-lock.patch.bz2 | bzip2 -d | patch -p0
+        cat ${FILESDIR}/rpm-4.0.1-install-ugid-h.patch.bz2 | bzip2 -d | patch -p1
 }
 
 src_compile() {
     cd ${S}
-    try ./configure --prefix=/usr --disable-static
+    try ./configure --prefix=/usr
     try make
 }
 
@@ -38,7 +44,7 @@ src_install() {
 }
 
 pkg_postinst() {
-  ${ROOT}/usr/bin/rpm --initdb --root=${ROOT}
+	${ROOT}usr/bin/rpm --initdb --root=${ROOT}
 }