old

(Portage version: 2.1.2_pre2-r9)

15 files changed, 0 insertions, 1029 deletions

diff --git a/app-arch/rpm/files/digest-rpm-4.0.4-r5 b/app-arch/rpm/files/digest-rpm-4.0.4-r5
deleted file mode 100644
index 5775e40078f2..000000000000
--- a/app-arch/rpm/files/digest-rpm-4.0.4-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b0c3093d2f0d850760e59ac1db9bf152 rpm-4.0.4.tar.gz 5865692
-RMD160 be09ac0449901f413fe78d93feb56feb7747aad2 rpm-4.0.4.tar.gz 5865692
-SHA256 caf7ddc0b107d492d1af3d8706d263c825c09e5983f5b78342bb8f91c3f707ac rpm-4.0.4.tar.gz 5865692
diff --git a/app-arch/rpm/files/digest-rpm-4.2 b/app-arch/rpm/files/digest-rpm-4.2
deleted file mode 100644
index 2f801a10f074..000000000000
--- a/app-arch/rpm/files/digest-rpm-4.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b7610e5704dfc3e06ff7e2e84e0eb57c rpm-4.2.tar.gz 9742106
-RMD160 f7d0e8257d4e92bca358a30fa92fe99a62a13bb3 rpm-4.2.tar.gz 9742106
-SHA256 426d07a0aa841c83c7ae12cf3b1076a9153489fe535beef54cb0b21a02ac7e34 rpm-4.2.tar.gz 9742106
diff --git a/app-arch/rpm/files/digest-rpm-4.2-r1 b/app-arch/rpm/files/digest-rpm-4.2-r1
deleted file mode 100644
index 2f801a10f074..000000000000
--- a/app-arch/rpm/files/digest-rpm-4.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b7610e5704dfc3e06ff7e2e84e0eb57c rpm-4.2.tar.gz 9742106
-RMD160 f7d0e8257d4e92bca358a30fa92fe99a62a13bb3 rpm-4.2.tar.gz 9742106
-SHA256 426d07a0aa841c83c7ae12cf3b1076a9153489fe535beef54cb0b21a02ac7e34 rpm-4.2.tar.gz 9742106
diff --git a/app-arch/rpm/files/digest-rpm-4.2-r2 b/app-arch/rpm/files/digest-rpm-4.2-r2
deleted file mode 100644
index 2f801a10f074..000000000000
--- a/app-arch/rpm/files/digest-rpm-4.2-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b7610e5704dfc3e06ff7e2e84e0eb57c rpm-4.2.tar.gz 9742106
-RMD160 f7d0e8257d4e92bca358a30fa92fe99a62a13bb3 rpm-4.2.tar.gz 9742106
-SHA256 426d07a0aa841c83c7ae12cf3b1076a9153489fe535beef54cb0b21a02ac7e34 rpm-4.2.tar.gz 9742106
diff --git a/app-arch/rpm/files/digest-rpm-4.2.1 b/app-arch/rpm/files/digest-rpm-4.2.1
deleted file mode 100644
index c41c6e7f3c67..000000000000
--- a/app-arch/rpm/files/digest-rpm-4.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 136bf6e4b905f830fc6a7bdd76871c0a rpm-4.2.1.tar.gz 8449073
-RMD160 eefe0c53a7bbefaf5b8a164b9ca1fd75a4745f83 rpm-4.2.1.tar.gz 8449073
-SHA256 e22a796ddf18630d608108a4acd36e7b9cdd6a7b7a6a16ae7b84f2517c2b820f rpm-4.2.1.tar.gz 8449073
diff --git a/app-arch/rpm/files/digest-rpm-4.4.1 b/app-arch/rpm/files/digest-rpm-4.4.1
deleted file mode 100644
index 2013664b71ca..000000000000
--- a/app-arch/rpm/files/digest-rpm-4.4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 90ded9047b1b69d918c6c7c7b56fd7a9 rpm-4.4.1.tar.gz 11497447
-RMD160 b2b34d678c4707c1c1bf8e05e7b92a8956bb4226 rpm-4.4.1.tar.gz 11497447
-SHA256 4a5e2a5a64a47344b6447b54e046b8550ea7ee99344eee3e8d4c087cb148552b rpm-4.4.1.tar.gz 11497447
diff --git a/app-arch/rpm/files/digest-rpm-4.4.1-r1 b/app-arch/rpm/files/digest-rpm-4.4.1-r1
deleted file mode 100644
index 2013664b71ca..000000000000
--- a/app-arch/rpm/files/digest-rpm-4.4.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 90ded9047b1b69d918c6c7c7b56fd7a9 rpm-4.4.1.tar.gz 11497447
-RMD160 b2b34d678c4707c1c1bf8e05e7b92a8956bb4226 rpm-4.4.1.tar.gz 11497447
-SHA256 4a5e2a5a64a47344b6447b54e046b8550ea7ee99344eee3e8d4c087cb148552b rpm-4.4.1.tar.gz 11497447
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
deleted file mode 100644
index 8138fcdd7010..000000000000
--- a/app-arch/rpm/files/rpm-4.0.4-glibc2.3.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/rpm-4.0.4-system-popt.diff b/app-arch/rpm/files/rpm-4.0.4-system-popt.diff
deleted file mode 100644
index ce20ee7ccfac..000000000000
--- a/app-arch/rpm/files/rpm-4.0.4-system-popt.diff
+++ /dev/null
@@ -1,529 +0,0 @@
-diff -ur rpm-4.0.4.orig/Makefile.am rpm-4.0.4/Makefile.am
---- rpm-4.0.4.orig/Makefile.am	Mon Feb  4 21:12:44 2002
-+++ rpm-4.0.4/Makefile.am	Mon May 13 10:37:52 2002
-@@ -9,7 +9,7 @@
- 	Perl-RPM po/*.in po/*.po po/rpm.pot \
- 	rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
- 
--SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
-+SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_DB_SUBDIR@ beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
- 
- INCLUDES = \
- 	-I$(top_srcdir)/build \
-@@ -17,7 +17,6 @@
- 	-I$(top_srcdir)/rpmdb \
- 	-I$(top_srcdir)/rpmio \
- 	-I$(top_srcdir)/beecrypt \
--	-I$(top_srcdir)/popt \
- 	@WITH_ZLIB_INCLUDE@ \
- 	@INCPATH@
- 
-@@ -33,7 +32,7 @@
- 	$(top_builddir)/lib/librpm.la \
- 	$(top_builddir)/rpmdb/librpmdb.la \
- 	$(top_builddir)/rpmio/librpmio.la \
--	$(top_builddir)/popt/libpopt.la \
-+	/usr/lib/libpopt.la \
- 	@WITH_ZLIB_LIB@ \
- 	@INTLLIBS@ @LIBMISC@
- 
-@@ -108,8 +107,7 @@
- 		`make -s sources -C lib` \
- 		`make -s sources -C rpmdb` \
- 		`make -s sources -C rpmio` \
--		`make -s sources -C beecrypt` \
--		`make -s sources -C popt`
-+		`make -s sources -C beecrypt`
- 
- CVSTAG = r$(subst .,-,$(VERSION))
- 
-diff -ur rpm-4.0.4.orig/Makefile.in rpm-4.0.4/Makefile.in
---- rpm-4.0.4.orig/Makefile.in	Fri Feb 15 01:58:07 2002
-+++ rpm-4.0.4/Makefile.in	Mon May 13 10:38:00 2002
-@@ -195,7 +195,7 @@
- 	rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
- 
- 
--SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
-+SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_DB_SUBDIR@ beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
- 
- INCLUDES = \
- 	-I$(top_srcdir)/build \
-@@ -203,7 +203,6 @@
- 	-I$(top_srcdir)/rpmdb \
- 	-I$(top_srcdir)/rpmio \
- 	-I$(top_srcdir)/beecrypt \
--	-I$(top_srcdir)/popt \
- 	@WITH_ZLIB_INCLUDE@ \
- 	@INCPATH@
- 
-@@ -220,7 +219,7 @@
- 	$(top_builddir)/lib/librpm.la \
- 	$(top_builddir)/rpmdb/librpmdb.la \
- 	$(top_builddir)/rpmio/librpmio.la \
--	$(top_builddir)/popt/libpopt.la \
-+	/usr/lib/libpopt.la \
- 	@WITH_ZLIB_LIB@ \
- 	@INTLLIBS@ @LIBMISC@
- 
-@@ -294,31 +293,31 @@
- rpm2cpio_OBJECTS =  rpm2cpio.$(OBJEXT)
- rpm2cpio_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la /usr/lib/libpopt.la
- rpmb_OBJECTS =  build.$(OBJEXT)
- rpmb_DEPENDENCIES =  rpmb.o $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la /usr/lib/libpopt.la
- rpmd_OBJECTS = 
- rpmd_DEPENDENCIES =  rpmd.o $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la /usr/lib/libpopt.la
- rpmi_OBJECTS = 
- rpmi_DEPENDENCIES =  rpmi.o $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la /usr/lib/libpopt.la
- rpmk_OBJECTS = 
- rpmk_DEPENDENCIES =  rpmk.o $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la /usr/lib/libpopt.la
- rpmq_OBJECTS = 
- rpmq_DEPENDENCIES =  rpmq.o $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la /usr/lib/libpopt.la
- rpm_OBJECTS = 
- rpm_DEPENDENCIES =  rpm.o $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la /usr/lib/libpopt.la
- SCRIPTS =  $(bin_SCRIPTS) $(pkglib_SCRIPTS)
- 
- CFLAGS = @CFLAGS@
-@@ -887,8 +886,7 @@
- 		`make -s sources -C lib` \
- 		`make -s sources -C rpmdb` \
- 		`make -s sources -C rpmio` \
--		`make -s sources -C beecrypt` \
--		`make -s sources -C popt`
-+		`make -s sources -C beecrypt`
- 
- install-data-local:
- 	@$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm
-diff -ur rpm-4.0.4.orig/build/Makefile.am rpm-4.0.4/build/Makefile.am
---- rpm-4.0.4.orig/build/Makefile.am	Sun Jan 20 23:13:41 2002
-+++ rpm-4.0.4/build/Makefile.am	Mon May 13 10:36:06 2002
-@@ -8,7 +8,6 @@
- 	-I$(top_srcdir)/rpmdb \
- 	-I$(top_srcdir)/rpmio \
- 	-I$(top_srcdir)/beecrypt \
--	-I$(top_srcdir)/popt \
- 	@INCPATH@
-
- LIBS =
-diff -ur rpm-4.0.4.orig/build/Makefile.in rpm-4.0.4/build/Makefile.in
---- rpm-4.0.4.orig/build/Makefile.in	Fri Feb 15 01:58:40 2002
-+++ rpm-4.0.4/build/Makefile.in	Mon May 13 10:36:06 2002
-@@ -194,7 +194,6 @@
- 	-I$(top_srcdir)/rpmdb \
- 	-I$(top_srcdir)/rpmio \
- 	-I$(top_srcdir)/beecrypt \
--	-I$(top_srcdir)/popt \
- 	@INCPATH@
-
-
-@@ -394,7 +394,7 @@
- 	../beecrypt/mp32opt.h ../beecrypt/rsa.h ../beecrypt/rsakp.h \
- 	../beecrypt/rsapk.h rpmbuild.h ../lib/rpmcli.h ../lib/rpmlib.h \
- 	../rpmio/rpmmessages.h ../rpmio/rpmlog.h ../rpmio/rpmerr.h \
--	../lib/header.h ../lib/hdrinline.h ../popt/popt.h \
-+	../lib/header.h ../lib/hdrinline.h /usr/include/popt.h \
- 	../rpmio/rpmmacro.h ../lib/stringbuf.h ../lib/misc.h rpmspec.h \
- 	buildio.h ../lib/psm.h ../lib/fsm.h ../lib/cpio.h \
- 	../lib/depends.h myftw.h ../beecrypt/md5.h ../debug.h
-diff -ur rpm-4.0.4.orig/configure rpm-4.0.4/configure
---- rpm-4.0.4.orig/configure	Thu Feb 14 01:03:27 2002
-+++ rpm-4.0.4/configure	Mon May 13 10:36:06 2002
-@@ -1633,7 +1633,7 @@
- AS=${AS-as}
-
- if test "$ac_cv_prog_gcc" = yes; then
--    CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts"
-+    CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT -Wall  -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts"
- fi
- export CFLAGS
-
-@@ -13349,7 +13349,7 @@
- 
- 
- 
--subdirs="popt beecrypt zlib $WITH_DB_SUBDIR"
-+subdirs="beecrypt zlib $WITH_DB_SUBDIR"
- 
- 
- trap '' 1 2 15
-@@ -13889,7 +13889,6 @@
-           ;;
-         esac
-       done
--	echo timestamp > popt/stamp-h.in
- 	echo timestamp > beecrypt/stamp-h.in
- 	echo timestamp > stamp-h.in
-   
-@@ -13925,7 +13924,7 @@
-     esac
-   done
- 
--  for ac_config_dir in popt beecrypt zlib $WITH_DB_SUBDIR; do
-+  for ac_config_dir in beecrypt zlib $WITH_DB_SUBDIR; do
- 
-     # Do not complain, so a configure script can configure whichever
-     # parts of a large source tree are present.
-diff -ur rpm-4.0.4.orig/configure.in rpm-4.0.4/configure.in
---- rpm-4.0.4.orig/configure.in	Wed Feb 13 23:26:21 2002
-+++ rpm-4.0.4/configure.in	Mon May 13 10:36:06 2002
-@@ -1161,7 +1161,7 @@
- dnl # XXX Propagate -lucb to popt ...
- dnl export LIBS INCPATH CONFIG_SITE
- 
--AC_CONFIG_SUBDIRS(popt beecrypt zlib $WITH_DB_SUBDIR)
-+AC_CONFIG_SUBDIRS(beecrypt zlib $WITH_DB_SUBDIR)
- 
- AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
- 	rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
-@@ -1171,8 +1171,7 @@
- 	doc/Makefile doc/manual/Makefile
- 	doc/ja/Makefile doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
- 	python/Makefile ],
--  [	echo timestamp > popt/stamp-h.in
--	echo timestamp > beecrypt/stamp-h.in
-+  [	echo timestamp > beecrypt/stamp-h.in
- 	echo timestamp > stamp-h.in
-   ]
- )
-diff -ur rpm-4.0.4.orig/lib/Makefile.am rpm-4.0.4/lib/Makefile.am
---- rpm-4.0.4.orig/lib/Makefile.am	Tue Jan 22 18:08:30 2002
-+++ rpm-4.0.4/lib/Makefile.am	Mon May 13 10:36:06 2002
-@@ -8,7 +8,6 @@
- 	-I$(top_srcdir)/rpmdb \
- 	-I$(top_srcdir)/rpmio \
- 	-I$(top_srcdir)/beecrypt \
--	-I$(top_srcdir)/popt \
- 	@INCPATH@
- 
- EXTRA_DIST = getdate.y
-@@ -25,8 +24,7 @@
- mylibpaths = \
- 	-L$(top_builddir)/lib/.libs \
- 	-L$(top_builddir)/rpmdb/.libs \
--	-L$(top_builddir)/rpmio/.libs \
--	-L$(top_builddir)/popt/.libs
-+	-L$(top_builddir)/rpmio/.libs 
- 
- mylibs = -lrpm -lrpmdb -lrpmio -lpopt @LIBS@ @INTLLIBS@ @LIBMISC@
- LIBS =
-diff -ur rpm-4.0.4.orig/lib/Makefile.in rpm-4.0.4/lib/Makefile.in
---- rpm-4.0.4.orig/lib/Makefile.in	Fri Feb 15 01:58:39 2002
-+++ rpm-4.0.4/lib/Makefile.in	Mon May 13 10:36:06 2002
-@@ -194,7 +194,6 @@
- 	-I$(top_srcdir)/rpmdb \
- 	-I$(top_srcdir)/rpmio \
- 	-I$(top_srcdir)/beecrypt \
--	-I$(top_srcdir)/popt \
- 	@INCPATH@
- 
- 
-@@ -214,8 +213,7 @@
- mylibpaths = \
- 	-L$(top_builddir)/lib/.libs \
- 	-L$(top_builddir)/rpmdb/.libs \
--	-L$(top_builddir)/rpmio/.libs \
--	-L$(top_builddir)/popt/.libs
-+	-L$(top_builddir)/rpmio/.libs 
- 
- 
- mylibs = -lrpm -lrpmdb -lrpmio -lpopt @LIBS@ @INTLLIBS@ @LIBMISC@
-diff -ur rpm-4.0.4.orig/python/Makefile.am rpm-4.0.4/python/Makefile.am
---- rpm-4.0.4.orig/python/Makefile.am	Sat Jan 19 17:44:19 2002
-+++ rpm-4.0.4/python/Makefile.am	Mon May 13 10:38:04 2002
-@@ -10,7 +10,6 @@
- 	-I$(top_srcdir)/rpmdb \
- 	-I$(top_srcdir)/rpmio \
- 	-I$(top_srcdir)/beecrypt \
--	-I$(top_srcdir)/popt \
- 	-I/usr/include/python${PYVER} \
- 	@INCPATH@
- 
-@@ -19,7 +18,7 @@
- 	$(top_builddir)/lib/librpm.la \
- 	$(top_builddir)/rpmdb/librpmdb.la \
- 	$(top_builddir)/rpmio/librpmio.la \
--	$(top_builddir)/popt/libpopt.la
-+	/usr/lib/libpopt.la
- 
- LDADD =
- 
-diff -ur rpm-4.0.4.orig/python/Makefile.in rpm-4.0.4/python/Makefile.in
---- rpm-4.0.4.orig/python/Makefile.in	Fri Feb 15 01:58:41 2002
-+++ rpm-4.0.4/python/Makefile.in	Mon May 13 10:38:07 2002
-@@ -197,7 +197,6 @@
- 	-I$(top_srcdir)/rpmdb \
- 	-I$(top_srcdir)/rpmio \
- 	-I$(top_srcdir)/beecrypt \
--	-I$(top_srcdir)/popt \
- 	-I/usr/include/python${PYVER} \
- 	@INCPATH@
- 
-@@ -207,7 +206,7 @@
- 	$(top_builddir)/lib/librpm.la \
- 	$(top_builddir)/rpmdb/librpmdb.la \
- 	$(top_builddir)/rpmio/librpmio.la \
--	$(top_builddir)/popt/libpopt.la
-+	/usr/lib/libpopt.la
- 
- 
- LDADD = 
-diff -ur rpm-4.0.4.orig/rpmdb/Makefile.am rpm-4.0.4/rpmdb/Makefile.am
---- rpm-4.0.4.orig/rpmdb/Makefile.am	Sat Jan 19 17:42:35 2002
-+++ rpm-4.0.4/rpmdb/Makefile.am	Mon May 13 10:36:06 2002
-@@ -8,7 +8,6 @@
- 	-I$(top_srcdir)/lib \
- 	-I$(top_srcdir)/rpmio \
- 	-I$(top_srcdir)/beecrypt \
--	-I$(top_srcdir)/popt \
- 	@INCPATH@
- 
- EXTRA_DIST = db3.c db1.c falloc.c
-@@ -19,8 +18,7 @@
- 
- mylibpaths = \
- 	-L$(top_builddir)/lib/.libs \
--	-L$(top_builddir)/rpmio/.libs \
--	-L$(top_builddir)/popt/.libs
-+	-L$(top_builddir)/rpmio/.libs 
- 
- mylibs = -lrpm -lrpmio -lpopt @LIBS@ @INTLLIBS@ @LIBMISC@
- LIBS =
-diff -ur rpm-4.0.4.orig/rpmdb/Makefile.in rpm-4.0.4/rpmdb/Makefile.in
---- rpm-4.0.4.orig/rpmdb/Makefile.in	Fri Feb 15 01:58:38 2002
-+++ rpm-4.0.4/rpmdb/Makefile.in	Mon May 13 10:36:06 2002
-@@ -194,7 +194,6 @@
- 	-I$(top_srcdir)/lib \
- 	-I$(top_srcdir)/rpmio \
- 	-I$(top_srcdir)/beecrypt \
--	-I$(top_srcdir)/popt \
- 	@INCPATH@
- 
- 
-@@ -206,8 +205,7 @@
- 
- mylibpaths = \
- 	-L$(top_builddir)/lib/.libs \
--	-L$(top_builddir)/rpmio/.libs \
--	-L$(top_builddir)/popt/.libs
-+	-L$(top_builddir)/rpmio/.libs 
- 
- 
- mylibs = -lrpm -lrpmio -lpopt @LIBS@ @INTLLIBS@ @LIBMISC@
-diff -ur rpm-4.0.4.orig/rpmio/Makefile.am rpm-4.0.4/rpmio/Makefile.am
---- rpm-4.0.4.orig/rpmio/Makefile.am	Wed Jan 23 03:03:42 2002
-+++ rpm-4.0.4/rpmio/Makefile.am	Mon May 13 10:38:17 2002
-@@ -11,7 +11,6 @@
- 	-I$(top_srcdir)/build \
- 	-I$(top_srcdir)/lib \
- 	-I$(top_srcdir)/beecrypt \
--	-I$(top_srcdir)/popt \
- 	@WITH_ZLIB_INCLUDE@ \
- 	@INCPATH@
- 
-@@ -51,18 +50,18 @@
- 	rm -f $(BEECRYPTLOBJS) *.o .created
- 
- tdigest_SOURCES = tdigest.c
--tdigest_LDADD += librpmio.la $(top_builddir)/popt/libpopt.la
-+tdigest_LDADD += librpmio.la /usr/lib/libpopt.la
- 
- trpmio_SOURCES = trpmio.c
--trpmio_LDADD += librpmio.la $(top_builddir)/popt/libpopt.la
-+trpmio_LDADD += librpmio.la /usr/lib/libpopt.la
- 
- tkey_SOURCES = tkey.c
- tkey_LDFLAGS = -all-static
--tkey_LDADD += librpmio.la $(top_builddir)/popt/libpopt.la
-+tkey_LDADD += librpmio.la /usr/lib/libpopt.la
- 
- tring_SOURCES = tring.c
- tring_LDFLAGS = -all-static
--tring_LDADD += librpmio.la $(top_builddir)/popt/libpopt.la
-+tring_LDADD += librpmio.la /usr/lib/libpopt.la
- 
- dumpasn1_SOURCES = dumpasn1.c
- 
-diff -ur rpm-4.0.4.orig/rpmio/Makefile.in rpm-4.0.4/rpmio/Makefile.in
---- rpm-4.0.4.orig/rpmio/Makefile.in	Fri Feb 15 01:58:37 2002
-+++ rpm-4.0.4/rpmio/Makefile.in	Mon May 13 10:38:22 2002
-@@ -197,7 +197,6 @@
- 	-I$(top_srcdir)/build \
- 	-I$(top_srcdir)/lib \
- 	-I$(top_srcdir)/beecrypt \
--	-I$(top_srcdir)/popt \
- 	@WITH_ZLIB_INCLUDE@ \
- 	@INCPATH@
- 
-@@ -222,18 +221,18 @@
- librpmio_la_DEPENDENCIES = .created
- 
- tdigest_SOURCES = tdigest.c
--tdigest_LDADD =  librpmio.la $(top_builddir)/popt/libpopt.la
-+tdigest_LDADD =  librpmio.la /usr/lib/libpopt.la
- 
- trpmio_SOURCES = trpmio.c
--trpmio_LDADD =  librpmio.la $(top_builddir)/popt/libpopt.la
-+trpmio_LDADD =  librpmio.la /usr/lib/libpopt.la
- 
- tkey_SOURCES = tkey.c
- tkey_LDFLAGS = -all-static
--tkey_LDADD =  librpmio.la $(top_builddir)/popt/libpopt.la
-+tkey_LDADD =  librpmio.la /usr/lib/libpopt.la
- 
- tring_SOURCES = tring.c
- tring_LDFLAGS = -all-static
--tring_LDADD =  librpmio.la $(top_builddir)/popt/libpopt.la
-+tring_LDADD =  librpmio.la /usr/lib/libpopt.la
- 
- dumpasn1_SOURCES = dumpasn1.c
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -248,14 +247,14 @@
- librpmio_la_OBJECTS =  digest.lo macro.lo rpmio.lo rpmlog.lo \
- rpmmalloc.lo rpmpgp.lo rpmrpc.lo strcasecmp.lo stubs.lo url.lo ugid.lo
- tdigest_OBJECTS =  tdigest.$(OBJEXT)
--tdigest_DEPENDENCIES =  librpmio.la $(top_builddir)/popt/libpopt.la
-+tdigest_DEPENDENCIES =  librpmio.la /usr/lib/libpopt.la
- tdigest_LDFLAGS = 
- tkey_OBJECTS =  tkey.$(OBJEXT)
--tkey_DEPENDENCIES =  librpmio.la $(top_builddir)/popt/libpopt.la
-+tkey_DEPENDENCIES =  librpmio.la /usr/lib/libpopt.la
- tring_OBJECTS =  tring.$(OBJEXT)
--tring_DEPENDENCIES =  librpmio.la $(top_builddir)/popt/libpopt.la
-+tring_DEPENDENCIES =  librpmio.la /usr/lib/libpopt.la
- trpmio_OBJECTS =  trpmio.$(OBJEXT)
--trpmio_DEPENDENCIES =  librpmio.la $(top_builddir)/popt/libpopt.la
-+trpmio_DEPENDENCIES =  librpmio.la /usr/lib/libpopt.la
- trpmio_LDFLAGS = 
- dumpasn1_OBJECTS =  dumpasn1.$(OBJEXT)
- dumpasn1_LDADD = $(LDADD)
-diff -ur rpm-4.0.4.orig/tools/Makefile.am rpm-4.0.4/tools/Makefile.am
---- rpm-4.0.4.orig/tools/Makefile.am	Wed Jan 23 03:04:25 2002
-+++ rpm-4.0.4/tools/Makefile.am	Mon May 13 10:38:10 2002
-@@ -8,7 +8,6 @@
- 	-I$(top_srcdir)/lib \
- 	-I$(top_srcdir)/rpmdb \
- 	-I$(top_srcdir)/rpmio \
--	-I$(top_srcdir)/popt \
- 	@WITH_ZLIB_INCLUDE@ \
- 	@INCPATH@ \
- 	-I$(top_srcdir)/misc
-@@ -25,7 +24,7 @@
- 	$(top_builddir)/lib/librpm.la \
- 	$(top_builddir)/rpmdb/librpmdb.la \
- 	$(top_builddir)/rpmio/librpmio.la \
--	$(top_builddir)/popt/libpopt.la \
-+	/usr/lib/libpopt.la \
- 	@WITH_ZLIB_LIB@ \
- 	@INTLLIBS@
- 
-diff -ur rpm-4.0.4.orig/tools/Makefile.in rpm-4.0.4/tools/Makefile.in
---- rpm-4.0.4.orig/tools/Makefile.in	Fri Feb 15 01:58:42 2002
-+++ rpm-4.0.4/tools/Makefile.in	Mon May 13 10:38:13 2002
-@@ -194,7 +194,6 @@
- 	-I$(top_srcdir)/lib \
- 	-I$(top_srcdir)/rpmdb \
- 	-I$(top_srcdir)/rpmio \
--	-I$(top_srcdir)/popt \
- 	@WITH_ZLIB_INCLUDE@ \
- 	@INCPATH@ \
- 	-I$(top_srcdir)/misc
-@@ -212,7 +211,7 @@
- 	$(top_builddir)/lib/librpm.la \
- 	$(top_builddir)/rpmdb/librpmdb.la \
- 	$(top_builddir)/rpmio/librpmio.la \
--	$(top_builddir)/popt/libpopt.la \
-+	/usr/lib/libpopt.la \
- 	@WITH_ZLIB_LIB@ \
- 	@INTLLIBS@
- 
-@@ -249,60 +248,60 @@
- rpminject_LDADD = $(LDADD)
- rpminject_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la /usr/lib/libpopt.la
- rpminject_LDFLAGS = 
- rpmsort_OBJECTS =  rpmsort.$(OBJEXT)
- rpmsort_LDADD = $(LDADD)
- rpmsort_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la /usr/lib/libpopt.la
- dump_SOURCES = dump.c
- dump_OBJECTS =  dump.$(OBJEXT)
- dump_LDADD = $(LDADD)
- dump_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la /usr/lib/libpopt.la
- dump_LDFLAGS = 
- dumpdb_SOURCES = dumpdb.c
- dumpdb_OBJECTS =  dumpdb.$(OBJEXT)
- dumpdb_LDADD = $(LDADD)
- dumpdb_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la /usr/lib/libpopt.la
- dumpdb_LDFLAGS = 
- rpmarchive_SOURCES = rpmarchive.c
- rpmarchive_OBJECTS =  rpmarchive.$(OBJEXT)
- rpmarchive_LDADD = $(LDADD)
- rpmarchive_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la /usr/lib/libpopt.la
- rpmarchive_LDFLAGS = 
- rpmheader_SOURCES = rpmheader.c
- rpmheader_OBJECTS =  rpmheader.$(OBJEXT)
- rpmheader_LDADD = $(LDADD)
- rpmheader_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la /usr/lib/libpopt.la
- rpmheader_LDFLAGS = 
- rpmlead_SOURCES = rpmlead.c
- rpmlead_OBJECTS =  rpmlead.$(OBJEXT)
- rpmlead_LDADD = $(LDADD)
- rpmlead_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la /usr/lib/libpopt.la
- rpmlead_LDFLAGS = 
- rpmsignature_SOURCES = rpmsignature.c
- rpmsignature_OBJECTS =  rpmsignature.$(OBJEXT)
- rpmsignature_LDADD = $(LDADD)
- rpmsignature_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la /usr/lib/libpopt.la
- rpmsignature_LDFLAGS = 
- javadeps_OBJECTS =  javadeps.$(OBJEXT)
- javadeps_LDADD = $(LDADD)
- javadeps_DEPENDENCIES =  $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
--$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+$(top_builddir)/rpmio/librpmio.la /usr/lib/libpopt.la
- javadeps_LDFLAGS = 
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/app-arch/rpm/files/rpm-4.2-gcc4.patch b/app-arch/rpm/files/rpm-4.2-gcc4.patch
deleted file mode 100644
index e8b49994b2bc..000000000000
--- a/app-arch/rpm/files/rpm-4.2-gcc4.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- rpm-4.2-orig/python/header-py.c	2006-01-15 22:12:45.000000000 -0600
-+++ rpm-4.2/python/header-py.c	2006-01-15 22:13:44.000000000 -0600
-@@ -434,7 +434,7 @@
- 	while (extensions->name) {
- 	    if (extensions->type == HEADER_EXT_TAG
- 		&& !xstrcasecmp(extensions->name + 7, str)) {
--		(const struct headerSprintfExtension *) ext = extensions;
-+		ext = extensions;
- 	    }
- 	    extensions++;
- 	}
-diff -Naur rpm-4.2-orig/python/rpmmodule.c rpm-4.2/python/rpmmodule.c
---- rpm-4.2-orig/python/rpmmodule.c	2006-01-15 22:12:45.000000000 -0600
-+++ rpm-4.2/python/rpmmodule.c	2006-01-15 22:15:03.000000000 -0600
-@@ -263,7 +263,7 @@
- 
-     while (extensions->name) {
- 	if (extensions->type == HEADER_EXT_TAG) {
--            (const struct headerSprintfExtension *) ext = extensions;
-+            ext = extensions;
-             PyDict_SetItemString(d, (char *) extensions->name, o=PyCObject_FromVoidPtr(ext, NULL));
- 	    Py_DECREF(o);
-             PyDict_SetItem(dict, tag, o=PyString_FromString(ext->name + 7));
---- rpm-4.2-orig/python/rpmts-py.c	2006-01-15 22:39:42.000000000 -0600
-+++ rpm-4.2/python/rpmts-py.c	2006-01-15 22:46:02.000000000 -0600
-@@ -27,7 +27,7 @@
- 
- /*@unchecked@*/
- /*@-shadow@*/
--static int _rpmts_debug = 0;
-+extern int _rpmts_debug;
- /*@=shadow@*/
- 
- /*@access alKey @*/
-
diff --git a/app-arch/rpm/files/rpm-4.2-pic.patch b/app-arch/rpm/files/rpm-4.2-pic.patch
deleted file mode 100644
index 801775e8624c..000000000000
--- a/app-arch/rpm/files/rpm-4.2-pic.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- rpm-4.2/lib/rpmrc.c.jj	2004-11-05 12:14:16.961834816 -0800
-+++ rpm-4.2/lib/rpmrc.c	2004-11-05 12:17:43.567425992 -0800
-@@ -892,7 +892,7 @@
- #ifdef	__LCLINT__
-     *eax = *ebx = *ecx = *edx = 0;
- #endif
--#ifdef PIC
-+#ifdef __PIC__
- 	__asm__("pushl %%ebx; cpuid; movl %%ebx,%1; popl %%ebx"
- 		: "=a"(*eax), "=g"(*ebx), "=&c"(*ecx), "=&d"(*edx)
- 		: "a" (op));
-@@ -912,7 +912,7 @@
- {
- 	unsigned int val;
- 
--#ifdef PIC
-+#ifdef __PIC__
- 	__asm__("pushl %%ebx; cpuid; popl %%ebx"
- 		: "=a" (val) : "a" (op) : "ecx", "edx");
- #else
-@@ -927,7 +927,7 @@
- {
- 	unsigned int tmp, val;
- 
--#ifdef PIC
-+#ifdef __PIC__
- 	__asm__("pushl %%ebx; cpuid; movl %%ebx,%1; popl %%ebx"
- 		: "=a" (tmp), "=g" (val) : "a" (op) : "ecx", "edx");
- #else
-@@ -941,7 +941,7 @@
- 	/*@*/
- {
- 	unsigned int tmp, val;
--#ifdef PIC
-+#ifdef __PIC__
- 	__asm__("pushl %%ebx; cpuid; popl %%ebx"
- 		: "=a" (tmp), "=c" (val) : "a" (op) : "edx");
- #else
-@@ -956,7 +956,7 @@
- 	/*@*/
- {
- 	unsigned int tmp, val;
--#ifdef PIC
-+#ifdef __PIC__
- 	__asm__("pushl %%ebx; cpuid; popl %%ebx"
- 		: "=a" (tmp), "=d" (val) : "a" (op) : "ecx");
- #else
diff --git a/app-arch/rpm/files/rpm-4.2-python2.3.diff b/app-arch/rpm/files/rpm-4.2-python2.3.diff
deleted file mode 100644
index e2d1cbf2e1ba..000000000000
--- a/app-arch/rpm/files/rpm-4.2-python2.3.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-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@
- 
--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
-@@ -242,10 +243,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
-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@
- 
--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
- 
-Only in rpm-4.2.new/python/rpmdb: Makefile.in.orig
diff --git a/app-arch/rpm/files/rpm-4.2.1-lib64.patch b/app-arch/rpm/files/rpm-4.2.1-lib64.patch
deleted file mode 100644
index 27bd872cab05..000000000000
--- a/app-arch/rpm/files/rpm-4.2.1-lib64.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -uNr rpm-4.2.1.orig/configure rpm-4.2.1/configure
---- rpm-4.2.1.orig/configure	2005-04-03 11:36:20.000000000 -0500
-+++ rpm-4.2.1/configure	2005-04-03 17:45:48.000000000 -0500
-@@ -23477,9 +23477,9 @@
- fi
- 
- MARK64=
--case "${target_cpu}" in
--x86_64*|ppc64*|powerpc64*|sparc64*|s390x*)	MARK64=64 ;;
--esac
-+#case "${target_cpu}" in
-+#x86_64*|ppc64*|powerpc64*|sparc64*|s390x*)	MARK64=64 ;;
-+#esac
- 
- 
- autorelocate_path='%{nil}'
-@@ -23538,7 +23538,7 @@
- 
- LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
- 
--RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
-+RPMCONFIGDIR="`echo ${libdir}/rpm`"
- 
- cat >>confdefs.h <<_ACEOF
- #define RPMCONFIGDIR "$RPMCONFIGDIR"
-diff -uNr rpm-4.2.1.orig/file/Makefile.in rpm-4.2.1/file/Makefile.in
---- rpm-4.2.1.orig/file/Makefile.in	2003-07-16 12:05:23.000000000 -0500
-+++ rpm-4.2.1/file/Makefile.in	2005-04-03 18:34:54.000000000 -0500
-@@ -39,7 +39,7 @@
- 
- #MAGIC	 = @datadir@/magic
- #data_DATA = magic magic.mime magic.mgc magic.mime.mgc
--pkglibdir = @prefix@/lib/rpm
-+pkglibdir = ${libdir}/rpm
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-diff -uNr rpm-4.2.1.orig/file/configure rpm-4.2.1/file/configure
---- rpm-4.2.1.orig/file/configure	2005-04-03 11:36:20.000000000 -0500
-+++ rpm-4.2.1/file/configure	2005-04-03 13:57:28.000000000 -0500
-@@ -8005,9 +8005,9 @@
- export CFLAGS
- 
- MARK64=
--case "${target_cpu}" in
--x86_64*)	MARK64=64 ;;
--esac
-+#case "${target_cpu}" in
-+#x86_64*)	MARK64=64 ;;
-+#esac
- 
- 
- echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-diff -uNr rpm-4.2.1.orig/popt/configure rpm-4.2.1/popt/configure
---- rpm-4.2.1.orig/popt/configure	2005-04-03 11:36:20.000000000 -0500
-+++ rpm-4.2.1/popt/configure	2005-04-03 13:58:23.000000000 -0500
-@@ -9382,9 +9382,9 @@
- 
- 
- MARK64=
--case "${target_cpu}" in
--x86_64*|powerpc64*|ppc64*|sparc64*|s390x*)        MARK64=64 ;;
--esac
-+#case "${target_cpu}" in
-+#x86_64*|powerpc64*|ppc64*|sparc64*|s390x*)        MARK64=64 ;;
-+#esac
- 
- 
- 
-diff -uNr rpm-4.2.1.orig/scripts/Makefile.in rpm-4.2.1/scripts/Makefile.in
---- rpm-4.2.1.orig/scripts/Makefile.in	2003-07-16 12:05:49.000000000 -0500
-+++ rpm-4.2.1/scripts/Makefile.in	2005-04-03 18:11:06.000000000 -0500
-@@ -273,7 +273,7 @@
- 
- installprefix = $(DESTDIR)
- 
--configdir = ${prefix}/lib/rpm
-+configdir = ${libdir}/rpm
- config_SCRIPTS = \
- 	brp-compress brp-python-bytecompile brp-redhat \
- 	brp-strip brp-strip-comment-note \
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
deleted file mode 100644
index 6326c0d37832..000000000000
--- a/app-arch/rpm/files/rpm-4.2.1-python2.3.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-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/files/rpm-4.4.1-ubuntu-fixup.patch b/app-arch/rpm/files/rpm-4.4.1-ubuntu-fixup.patch
deleted file mode 100644
index 339f0b435024..000000000000
--- a/app-arch/rpm/files/rpm-4.4.1-ubuntu-fixup.patch
+++ /dev/null
@@ -1,215 +0,0 @@
---- rpm-4.4.1.orig/configure.ac
-+++ rpm-4.4.1/configure.ac
-@@ -1180,9 +1180,9 @@
- 
- dnl XXX Choose /usr/lib or /usr/lib64 for library installs.
- MARK64=
--case "${target_cpu}" in
--x86_64*|ppc64*|powerpc64*|sparc64*|s390x*)	MARK64=64 ;;
--esac
-+dnl case "${target_cpu}" in
-+dnl x86_64*|ppc64*|powerpc64*|sparc64*|s390x*)	MARK64=64 ;;
-+dnl esac
- AC_SUBST(MARK64)
- 
- dnl Determine the canonical arch-vendor-os for the build machine
---- rpm-4.4.1.orig/po/de.po
-+++ rpm-4.4.1/po/de.po
-@@ -190,7 +190,7 @@
- #: rpmqv.c:370
- msgid "one type of query/verify may be performed at a time"
- msgstr ""
--"Nur nur eine Art der Anfrage/Überprüfung kann pro Programmlauf durchgeführt "
-+"Nur eine Art der Anfrage/Überprüfung kann pro Programmlauf durchgeführt "
- "werden"
- 
- #: rpmqv.c:374
-@@ -4612,7 +4612,7 @@
- 
- # oder besser: "... verletzen" ?
- #~ msgid "removing these packages would break dependencies:\n"
--#~ msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n"
-+#~ msgstr "Das Entfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n"
- 
- #, fuzzy
- #~ msgid "package %s has unsatisfied Requires: %s\n"
-@@ -5520,7 +5520,7 @@
- 
- #, fuzzy
- #~ msgid "rename of %s to %s failed: %s\n"
--#~ msgstr "umbennen von %s nach %s fehlgeschlagen: %s"
-+#~ msgstr "umbenennen von %s nach %s fehlgeschlagen: %s"
- 
- #, fuzzy
- #~ msgid "removal of %s failed: %s\n"
---- rpm-4.4.1.orig/lib/depends.c
-+++ rpm-4.4.1/lib/depends.c
-@@ -1294,14 +1294,12 @@
- 	    switch (rpmteType(p)) {
- 	    case TR_REMOVED:
- 		/* Skip if not %preun/%postun requires or legacy prereq. */
--		if (isInstallPreReq(Flags)
--		 || !( isErasePreReq(Flags) || isLegacyPreReq(Flags) ) )
-+		if (!( isErasePreReq(Flags) || isLegacyPreReq(Flags) ) )
- 		    /*@innercontinue@*/ continue;
- 		/*@switchbreak@*/ break;
- 	    case TR_ADDED:
- 		/* Skip if not %pre/%post requires or legacy prereq. */
--		if (isErasePreReq(Flags)
--		 || !( isInstallPreReq(Flags) || isLegacyPreReq(Flags) ) )
-+		if (!( isInstallPreReq(Flags) || isLegacyPreReq(Flags) ) )
- 		    /*@innercontinue@*/ continue;
- 		/*@switchbreak@*/ break;
- 	    }
---- rpm-4.4.1.orig/python/header-py.c
-+++ rpm-4.4.1/python/header-py.c
-@@ -477,7 +477,7 @@
- 	while (extensions->name) {
- 	    if (extensions->type == HEADER_EXT_TAG
- 		&& !xstrcasecmp(extensions->name + 7, str)) {
--		(const struct headerSprintfExtension *) ext = extensions;
-+		ext = extensions;
- 	    }
- 	    extensions++;
- 	}
---- rpm-4.4.1.orig/lsb-rpm.1
-+++ rpm-4.4.1/lsb-rpm.1
-@@ -0,0 +1,16 @@
-+.TH LSB-RPM 1
-+.SH NAME
-+lsb-rpm \- build a LSB package 
-+.SH SYNOPSIS
-+.B lsb-rpm -b package.spec
-+.SH "DESCRIPTION"
-+This is a special version of rpm that can only be used to build RPM v3
-+format packages, for use as LSB packages. It cannot query or install
-+packages, just build them. See the BUILD OPTIONS section of
-+.BR rpm (8)
-+for the details.
-+.SH "SEE ALSO"
-+.BR rpm (8)
-+.SH AUTHOR
-+This manual page was written by Joey Hess,
-+for the Debian GNU/Linux system.
---- rpm-4.4.1.orig/macros.in
-+++ rpm-4.4.1/macros.in
-@@ -218,7 +218,7 @@
- %_tmppath		%{_var}/tmp
- 
- #	Path to top of build area.
--%_topdir		%{_usrsrc}/redhat
-+%_topdir		%{_usrsrc}/rpm
- 
- #	The path to the unzip executable (legacy, use %{__unzip} instead).
- %_unzipbin		%{__unzip}
-@@ -658,8 +658,8 @@
- 
- # Horowitz Key Protocol server configuration
- #
--%_hkp_keyserver         hkp://pgp.mit.edu
--%_hkp_keyserver_query   %{_hkp_keyserver}/pks/lookup?op=get&search=0x
-+#%_hkp_keyserver         hkp://pgp.mit.edu
-+#%_hkp_keyserver_query   %{_hkp_keyserver}/pks/lookup?op=get&search=0x
- 
- #==============================================================================
- # ---- Transaction macros.
-@@ -1058,15 +1058,15 @@
- %_sbindir		%{_exec_prefix}/sbin
- %_libexecdir		%{_exec_prefix}/libexec
- %_datadir		%{_prefix}/share
--%_sysconfdir		%{_prefix}/etc
-+%_sysconfdir		/etc
- %_sharedstatedir	%{_prefix}/com
--%_localstatedir		%{_prefix}/var
-+%_localstatedir		/var
- %_lib			lib
- %_libdir		%{_exec_prefix}/%{_lib}
- %_includedir		%{_prefix}/include
- %_oldincludedir		/usr/include
--%_infodir		%{_prefix}/info
--%_mandir		%{_prefix}/man
-+%_infodir		/usr/share/info
-+%_mandir		/usr/share/man
- 
- #==============================================================================
- # ---- config.guess platform macros.
---- rpm-4.4.1.orig/platform.in
-+++ rpm-4.4.1/platform.in
-@@ -28,7 +28,7 @@
- %_oldincludedir		@oldincludedir@
- %_infodir		@infodir@
- %_mandir		@mandir@
--%_initrddir		%{_sysconfdir}/rc.d/init.d
-+%_initrddir		%{_sysconfdir}/init.d
- 
- %_defaultdocdir		@DEFAULTDOCDIR@
- 
---- rpm-4.4.1.orig/lib/poptI.c
-+++ rpm-4.4.1/lib/poptI.c
-@@ -16,8 +16,7 @@
- /*@unchecked@*/
- struct rpmInstallArguments_s rpmIArgs = {
-     0,			/* transFlags */
--			/* probFilter */
--    (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
-+    0,			/* probFilter */
-     0,			/* installInterfaceFlags */
-     0,			/* eraseInterfaceFlags */
-     0,			/* qva_flags */
---- rpm-4.4.1.orig/lib/rpmal.c
-+++ rpm-4.4.1/lib/rpmal.c
-@@ -744,7 +744,7 @@
- 
-     /*@-branchstate@*/ /* FIX: ret is a problem */
-     for (found = 0, ret = NULL;
--	 die <= al->dirs + al->numDirs && dieCompare(die, dieNeedle) == 0;
-+	 die < al->dirs + al->numDirs && dieCompare(die, dieNeedle) == 0;
- 	 die++)
-     {
- 
---- rpm-4.4.1.orig/rpmio/rpmio.h
-+++ rpm-4.4.1/rpmio/rpmio.h
-@@ -637,7 +637,7 @@
- /*@unused@*/ int timedRead(FD_t fd, /*@out@*/ void * bufptr, int length)
- 	/*@globals fileSystem @*/
- 	/*@modifies fd, *bufptr, fileSystem @*/;
--#define	timedRead	ufdio->read
-+#define	timedRead	(ufdio->read)
- 
- /*@-exportlocal@*/
- /**
---- rpm-4.4.1.orig/lib/rpmlib.h
-+++ rpm-4.4.1/lib/rpmlib.h
-@@ -501,8 +501,7 @@
-     RPMSENSE_EQUAL	= (1 << 3),
-     RPMSENSE_PROVIDES	= (1 << 4), /* only used internally by builds */
-     RPMSENSE_CONFLICTS	= (1 << 5), /* only used internally by builds */
--	/* bit 6 used to be RPMSENSE_PREREQ */
--#define	RPMSENSE_PREREQ	RPMSENSE_ANY
-+    RPMSENSE_PREREQ     = (1 << 6),     /*!< @todo Legacy. */
-     RPMSENSE_OBSOLETES	= (1 << 7), /* only used internally by builds */
-     RPMSENSE_INTERP	= (1 << 8),	/*!< Interpreter used by scriptlet. */
-     RPMSENSE_SCRIPT_PRE	= ((1 << 9)|RPMSENSE_PREREQ), /*!< %pre dependency. */
---- rpm-4.4.1.orig/python/rpmmodule.c
-+++ rpm-4.4.1/python/rpmmodule.c
-@@ -293,7 +293,7 @@
- 
-     while (extensions->name) {
- 	if (extensions->type == HEADER_EXT_TAG) {
--            (const struct headerSprintfExtension *) ext = extensions;
-+            ext = extensions;
-             PyDict_SetItemString(d, (char *) extensions->name, o=PyCObject_FromVoidPtr(ext, NULL));
- 	    Py_DECREF(o);
-             PyDict_SetItem(dict, tag, o=PyString_FromString(ext->name + 7));
---- rpm-4.4.1.orig/lib/transaction.c
-+++ rpm-4.4.1/lib/transaction.c
-@@ -2285,7 +2285,7 @@
- 	p->fi = rpmfiFree(p->fi);
- 
- 	/* If no post-transaction script, then don't bother. */
--	if (haspostscript)
-+	if (!haspostscript)
- 	    continue;
- 
- 	p->fd = ts->notify(p->h, RPMCALLBACK_INST_OPEN_FILE, 0, 0,
-