fix bug #1893 - make rpm use the system libpopt

3 files changed, 588 insertions, 1 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 4c129343472f..9e17e99480e7 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/rpm
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.2 2002/04/23 13:16:34 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.3 2002/05/13 10:07:15 danarmak Exp $
+
+*rpm-4.0.4-r1 (13 May 2002)
+
+  13 May 2002; Dan Armak <danarmak@gentoo.org> changelog:
+  
+  Fix bug #1893 - make rpm use the system libpopt (dev-libs/popt) instead of
+  installing its own.
 
 *rpm-4.0.4 (23 April 2002)
 
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
new file mode 100644
index 000000000000..92e4878063a9
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.0.4-system-popt.diff
@@ -0,0 +1,521 @@
+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@
+ 
+ 
+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@
+Only in rpm-4.0.4.orig: popt
+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/rpm-4.0.4-r1.ebuild b/app-arch/rpm/rpm-4.0.4-r1.ebuild
new file mode 100644
index 000000000000..c0250271a99c
--- /dev/null
+++ b/app-arch/rpm/rpm-4.0.4-r1.ebuild
@@ -0,0 +1,59 @@
+# 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.4-r1.ebuild,v 1.1 2002/05/13 10:07:15 danarmak Exp $
+
+# note to self: check for java deps
+
+S=${WORKDIR}/${P}
+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/"
+
+RDEPEND="=sys-libs/db-3.2.3h-r4
+	>=sys-libs/zlib-1.1.3
+	>=sys-apps/bzip2-1.0.1
+	>=dev-libs/popt-1.6"
+
+DEPEND="$RDEPEND nls? ( sys-devel/gettext )"
+
+src_unpack() {
+
+  unpack ${A}
+  cd ${S}
+  patch -p1 < ${FILESDIR}/${P}-system-popt.diff
+  rm -rf ${S}/popt
+  # Suppress pointer warnings
+  cp configure configure.orig
+  sed -e "s:-Wpointer-arith::" configure.orig > configure
+
+}
+
+src_compile() {
+
+    local myconf
+    if [ -z "`use nls`" ]
+    then
+      myconf="--disable-nls"
+    fi
+    try ./configure --prefix=/usr --mandir=/usr/share/man ${myconf}
+    try make
+}
+
+src_install() {
+
+    try make DESTDIR=${D} install
+    mv ${D}/bin/rpm ${D}/usr/bin
+    rm -rf ${D}/bin
+
+    dodoc CHANGES COPYING CREDITS GROUPS README* RPM* TODO
+}
+
+pkg_postinst() {
+
+  ${ROOT}/usr/bin/rpm --initdb --root=${ROOT}
+
+}
+
+
+