Oh humz! downgrade rpm to 4.2 official version!

7 files changed, 165 insertions, 25 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index eac7cc6611f3..c961648e73c9 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/rpm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.38 2004/06/24 21:35:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.39 2004/10/24 01:53:43 cretin Exp $
+
+*rpm-4.2 (23 Oct 2004)
+
+  23 Oct 2004; Stefan Jones <cretin@gentoo.org> rpm-4.2.ebuild:
+  Use the rpm source code from rpm.org not some random RedHat snapshot.
+  Mark stable on x86 and mask 4.2.1 on x86 for proper testing!
 
   11 Apr 2004; Stefan Jones <cretin@gentoo.org> rpm-4.2.1.ebuild:
   Mark as stable for all archs
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index ecf023fea0e0..03b5d81b0009 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 80858c3183cb34417ebdce9fec4bc258 rpm-4.2.ebuild 2488
+MD5 c03c1811302d6a8ffdd82c377b5b7783 rpm-4.2.1.ebuild 2490
 MD5 c0b538f12c71979c6f8a1fb3832db476 ChangeLog 5612
 MD5 38980820a3828be6eaa1b830419ee070 rpm-4.0.4-r5.ebuild 1626
-MD5 c03c1811302d6a8ffdd82c377b5b7783 rpm-4.2.1.ebuild 2490
 MD5 e7ef0e369ef68d513461dd831eb1ef4f files/digest-rpm-4.0.4-r5 62
 MD5 dd838f7f21d8a9eed6fdf9a18e7ba0e4 files/digest-rpm-4.2.1 62
 MD5 806f307798e39d580d5286d99c44b965 files/rpm-4.0.4-glibc2.3.diff 495
-MD5 6b639232d435829fd97b09e10f58de81 files/rpm-4.0.4-system-popt.diff 18639
+MD5 25a887527d85208a2d3023df4e02a7a4 files/digest-rpm-4.2 60
 MD5 ec4886ca775cb1cb83aebcd42f20f59f files/rpm-4.2-python2.3.diff 1479
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBdp4JHTu7gpaalycRAqq7AJ4zYuJFlqAMa23Be8brwtArXL2crwCgxLVC
-3zFn5q9he0vmFmiuzsWLKQY=
-=Pk/V
------END PGP SIGNATURE-----
+MD5 6b639232d435829fd97b09e10f58de81 files/rpm-4.0.4-system-popt.diff 18639
diff --git a/app-arch/rpm/files/digest-rpm-4.2 b/app-arch/rpm/files/digest-rpm-4.2
new file mode 100644
index 000000000000..112ee0c363a5
--- /dev/null
+++ b/app-arch/rpm/files/digest-rpm-4.2
@@ -0,0 +1 @@
+MD5 b7610e5704dfc3e06ff7e2e84e0eb57c rpm-4.2.tar.gz 9742106
diff --git a/app-arch/rpm/files/rpm-4.2-python2.3.diff b/app-arch/rpm/files/rpm-4.2-python2.3.diff
index 6326c0d37832..e2d1cbf2e1ba 100644
--- a/app-arch/rpm/files/rpm-4.2-python2.3.diff
+++ b/app-arch/rpm/files/rpm-4.2-python2.3.diff
@@ -1,7 +1,7 @@
-diff -ru rpm-4.2.1/python/Makefile.in rpm-4.2.1.new/python/Makefile.in
---- rpm-4.2.1/python/Makefile.in	2003-07-16 19:05:47.000000000 +0200
-+++ rpm-4.2.1.new/python/Makefile.in	2004-01-24 21:38:59.000000000 +0100
-@@ -258,7 +258,8 @@
+diff -ur rpm-4.2/python/Makefile.in rpm-4.2.new/python/Makefile.in
+--- rpm-4.2/python/Makefile.in	2003-03-10 11:09:42.000000000 -0800
++++ rpm-4.2.new/python/Makefile.in	2004-10-23 18:16:25.802568264 -0700
+@@ -209,7 +209,8 @@
  
  PYVER = @WITH_PYTHON_VERSION@
  
@@ -11,7 +11,7 @@ diff -ru rpm-4.2.1/python/Makefile.in rpm-4.2.1.new/python/Makefile.in
  pyincdir = $(prefix)/include/python${PYVER}
  
  SUBDIRS = rpmdb test
-@@ -291,10 +292,9 @@
+@@ -242,10 +243,9 @@
  
  LDADD = 
  
@@ -23,10 +23,11 @@ diff -ru rpm-4.2.1/python/Makefile.in rpm-4.2.1.new/python/Makefile.in
  rpmdb_PROGRAMS = _rpmdb.so
  
  noinst_PROGRAMS = poptmodule.so
-diff -ru rpm-4.2.1/python/rpmdb/Makefile.in rpm-4.2.1.new/python/rpmdb/Makefile.in
---- rpm-4.2.1/python/rpmdb/Makefile.in	2003-07-16 19:05:47.000000000 +0200
-+++ rpm-4.2.1.new/python/rpmdb/Makefile.in	2004-01-24 22:06:07.000000000 +0100
-@@ -256,13 +256,13 @@
+Only in rpm-4.2.new/python: Makefile.in.orig
+diff -ur rpm-4.2/python/rpmdb/Makefile.in rpm-4.2.new/python/rpmdb/Makefile.in
+--- rpm-4.2/python/rpmdb/Makefile.in	2003-03-10 11:09:42.000000000 -0800
++++ rpm-4.2.new/python/rpmdb/Makefile.in	2004-10-23 18:16:25.803568112 -0700
+@@ -207,13 +207,13 @@
  
  PYVER = @WITH_PYTHON_VERSION@
  
@@ -42,3 +43,4 @@ diff -ru rpm-4.2.1/python/rpmdb/Makefile.in rpm-4.2.1.new/python/rpmdb/Makefile.
  rpmdb_SCRIPTS = \
  	__init__.py dbobj.py db.py dbrecio.py dbshelve.py dbtables.py dbutils.py
  
+Only in rpm-4.2.new/python/rpmdb: Makefile.in.orig
diff --git a/app-arch/rpm/files/rpm-4.2.1-python2.3.diff b/app-arch/rpm/files/rpm-4.2.1-python2.3.diff
new file mode 100644
index 000000000000..6326c0d37832
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.2.1-python2.3.diff
@@ -0,0 +1,44 @@
+diff -ru rpm-4.2.1/python/Makefile.in rpm-4.2.1.new/python/Makefile.in
+--- rpm-4.2.1/python/Makefile.in	2003-07-16 19:05:47.000000000 +0200
++++ rpm-4.2.1.new/python/Makefile.in	2004-01-24 21:38:59.000000000 +0100
+@@ -258,7 +258,8 @@
+ 
+ PYVER = @WITH_PYTHON_VERSION@
+ 
+-pylibdir = $(shell python -c 'import sys; print sys.path[1]')
++
++pythondir = $(shell python -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1,0)')
+ pyincdir = $(prefix)/include/python${PYVER}
+ 
+ SUBDIRS = rpmdb test
+@@ -291,10 +292,9 @@
+ 
+ LDADD = 
+ 
+-pythondir = $(pylibdir)/site-packages
+ python_PROGRAMS = rpmmodule.so
+ 
+-rpmdbdir = $(pylibdir)/site-packages/rpmdb
++rpmdbdir = $(pythondir)/rpmdb
+ rpmdb_PROGRAMS = _rpmdb.so
+ 
+ noinst_PROGRAMS = poptmodule.so
+diff -ru rpm-4.2.1/python/rpmdb/Makefile.in rpm-4.2.1.new/python/rpmdb/Makefile.in
+--- rpm-4.2.1/python/rpmdb/Makefile.in	2003-07-16 19:05:47.000000000 +0200
++++ rpm-4.2.1.new/python/rpmdb/Makefile.in	2004-01-24 22:06:07.000000000 +0100
+@@ -256,13 +256,13 @@
+ 
+ PYVER = @WITH_PYTHON_VERSION@
+ 
+-pylibdir = $(shell python -c 'import sys; print sys.path[1]')
++pythondir = $(shell python -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1,0)')
+ 
+ EXTRA_DIST = \
+ 	__init__.py dbobj.py db.py dbrecio.py dbshelve.py dbtables.py dbutils.py
+ 
+ 
+-rpmdbdir = $(pylibdir)/site-packages/rpmdb
++rpmdbdir = $(pythondir)/rpmdb
+ rpmdb_SCRIPTS = \
+ 	__init__.py dbobj.py db.py dbrecio.py dbshelve.py dbtables.py dbutils.py
+ 
diff --git a/app-arch/rpm/rpm-4.2.1.ebuild b/app-arch/rpm/rpm-4.2.1.ebuild
index abacd2c71796..67de91b9b292 100644
--- a/app-arch/rpm/rpm-4.2.1.ebuild
+++ b/app-arch/rpm/rpm-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2.1.ebuild,v 1.17 2004/10/19 18:00:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2.1.ebuild,v 1.18 2004/10/24 01:53:43 cretin Exp $
 
 inherit python flag-o-matic libtool eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/rpm-4.2.1.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sparc -x86"
 IUSE="nls python doc"
 
 RDEPEND="=sys-libs/db-3.2*
@@ -26,7 +26,7 @@ RDEPEND="=sys-libs/db-3.2*
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/rpm-4.2-python2.3.diff
+	epatch ${FILESDIR}/rpm-4.2.1-python2.3.diff
 }
 
 src_compile() {
diff --git a/app-arch/rpm/rpm-4.2.ebuild b/app-arch/rpm/rpm-4.2.ebuild
new file mode 100644
index 000000000000..f782fd1def7c
--- /dev/null
+++ b/app-arch/rpm/rpm-4.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2.ebuild,v 1.9 2004/10/24 01:53:43 cretin Exp $
+
+inherit python flag-o-matic libtool eutils
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="http://www.rpm.org/"
+SRC_URI="mirror://gentoo/rpm-4.2.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sparc x86"
+IUSE="nls python doc"
+
+RDEPEND="=sys-libs/db-3.2*
+	>=sys-libs/zlib-1.1.3
+	>=app-arch/bzip2-1.0.1
+	>=dev-libs/popt-1.7
+	>=app-crypt/gnupg-1.2
+	dev-libs/elfutils
+	>=dev-libs/beecrypt-3.1.0-r1
+	nls? ( sys-devel/gettext )
+	python? ( >=dev-lang/python-2.2 )
+	!ia64? ( doc? ( app-doc/doxygen ) )"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/rpm-4.2-python2.3.diff
+}
+
+src_compile() {
+	strip-flags
+	elibtoolize
+
+	unset LD_ASSUME_KERNEL
+	local myconf
+	myconf="--enable-posixmutexes --without-javaglue"
+
+	python_version
+	use python \
+		&& myconf="${myconf} --with-python=${PYVER}" \
+		|| myconf="${myconf} --without-python"
+
+	econf ${myconf} `use_enable nls` || die
+	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
+	# ------
+	# UPDATE for 4.1!
+	# There is a /usr/lib/rpm/rpmpopt-4.1 now
+	# the symlink is still created incorrectly. ???
+	rm -f ${D}/usr/lib/rpmpopt
+	rm -f ${D}/usr/lib/libpopt*
+	rm -f ${D}/usr/include/popt.h
+	use nls && rm -f  ${D}/usr/share/locale/*/LC_MESSAGES/popt.mo
+	rm -f ${D}/usr/share/man/man3/popt*
+
+	keepdir /var/lib/rpm
+	keepdir /usr/src/pc/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+	keepdir /usr/src/pc/RPMS/{noarch,i{3,4,5,6}86,athlon}
+	keepdir /usr/src/pc
+	dodoc CHANGES CREDITS GROUPS README* RPM* TODO
+
+	use nls || rm -rf ${D}/usr/share/man/{ko,ja,fr,pl,ru,sk}
+
+	# create /usr/src/redhat/ and co for rpmbuild
+	for d in /usr/src/redhat/{BUILD,RPMS,SOURCES,SPECS,SRPMS}; do
+		dodir "${d}"
+	done
+}
+
+pkg_postinst() {
+	if [ -f ${ROOT}/var/lib/rpm/Packages ]; 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
+
+	python_version
+	python_mod_optimize /usr/lib/python${PYVER}/site-packages/rpmdb
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup
+}