version bump; add i686-pc-linux architecture; remove old version

5 files changed, 94 insertions, 9 deletions

diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index c3ef553cdabf..ce1e05a1348f 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -1,9 +1,8 @@
-MD5 455029ffe4bb1fcc6cb3c59fed5b5a0e dpkg-1.10.10-r1.ebuild 949
-MD5 99996349299f8fcf159910978b5e5692 dpkg-1.10.18.ebuild 957
+MD5 c5704a9b057b42ac5a1abe4f4a6efe60 dpkg-1.10.18.ebuild 957
 MD5 99996349299f8fcf159910978b5e5692 dpkg-1.10.15.ebuild 957
-MD5 58045f69d17c717e798b84b97c1e3c6a ChangeLog 1053
+MD5 fe8c566ca52c1420e5b3f262e311a878 ChangeLog 1274
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 aa710d7725ed75e2b0ffb003300c5e11 files/digest-dpkg-1.10.15 65
 MD5 9931fb5397739e360052b5bad267c8d6 files/digest-dpkg-1.10.18 65
 MD5 982d82b477842d92e5184b3856a63d74 files/dpkg-1.10.10.patch 2112
-MD5 0c6bf832b2ed2a0c94a7879c3427c6a1 files/digest-dpkg-1.10.10-r1 65
+MD5 ad43abcbe5b91df05112cee2fc95c8f4 files/dpkg-1.10.18.patch 2429
diff --git a/app-arch/dpkg/dpkg-1.10.10-r1.ebuild b/app-arch/dpkg/dpkg-1.10.18.ebuild
index d7ea5315edd8..d6096ba5a840 100644
--- a/app-arch/dpkg/dpkg-1.10.10-r1.ebuild
+++ b/app-arch/dpkg/dpkg-1.10.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.10.10-r1.ebuild,v 1.2 2003/09/20 20:33:54 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.10.18.ebuild,v 1.1 2004/01/23 19:07:11 lanius Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/dpkg/${P/-/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="~x86 ~ppc"
 
 RDEPEND=">=dev-lang/perl-5.6.0
 	>=sys-libs/ncurses-5.2-r7
@@ -22,7 +22,7 @@ src_compile() {
 	cd main
 	ln -s ../archtable
 	cd ..
-	epatch ${FILESDIR}/${P}.patch
+	epatch ${FILESDIR}/${PN}-${PV}.patch
 	./configure || die
 	make || die
 }
diff --git a/app-arch/dpkg/files/digest-dpkg-1.10.10-r1 b/app-arch/dpkg/files/digest-dpkg-1.10.10-r1
deleted file mode 100644
index 3bbc3b04f22b..000000000000
--- a/app-arch/dpkg/files/digest-dpkg-1.10.10-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e5cdb9e0f4de30fa9d5a8a0f97d23b0f dpkg_1.10.10.tar.gz 1547158
diff --git a/app-arch/dpkg/files/digest-dpkg-1.10.18 b/app-arch/dpkg/files/digest-dpkg-1.10.18
new file mode 100644
index 000000000000..eafafef419ae
--- /dev/null
+++ b/app-arch/dpkg/files/digest-dpkg-1.10.18
@@ -0,0 +1 @@
+MD5 e300ecc7d0088264ee8a8a22be2d6cbd dpkg_1.10.18.tar.gz 1602833
diff --git a/app-arch/dpkg/files/dpkg-1.10.18.patch b/app-arch/dpkg/files/dpkg-1.10.18.patch
new file mode 100644
index 000000000000..cae43e1623ab
--- /dev/null
+++ b/app-arch/dpkg/files/dpkg-1.10.18.patch
@@ -0,0 +1,86 @@
+--- main/Makefile.in	2003-05-11 18:23:18.000000000 +0200
++++ main.new/Makefile.in	2003-05-11 18:23:42.000000000 +0200
+@@ -1,10 +1,10 @@
+ VPATH		= @srcdir@
+ srcdir		= @srcdir@
+-top_srcdir	= @top_srcdir@
+ top_builddir	= ..
+ 
+ default: all
+ include ../Makefile.conf
++top_srcdir	= @top_srcdir@
+ 
+ SOURCES	= main.c enquiry.c filesdb.c archives.c processarc.c \
+ 		 cleanup.c select.c packages.c configure.c remove.c \
+--- dselect/curkeys.cc	2003-05-11 18:44:26.000000000 +0200
++++ dselect/curkeys.cc.1	2003-05-11 18:43:57.000000000 +0200
+@@ -19,6 +19,8 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
++#define NCURSES_WGETCH_EVENTS
++
+ extern "C" {
+ #include <config.h>
+ #include <dpkg.h>
+--- doc/Makefile.in	2003-05-11 18:47:18.000000000 +0200
++++ doc.new/Makefile.in	2003-05-11 18:47:31.000000000 +0200
+@@ -1,10 +1,10 @@
+ VPATH		= @srcdir@
+ srcdir		= @srcdir@
+-top_srcdir	= @top_srcdir@
+ 
+ default: all
+ 
+ include ../Makefile.conf
++top_srcdir	= @top_srcdir@
+ 
+ ifeq (@USE_SGML_DOC@, true)
+ all: internals.html/index.html
+--- Makefile.in	2003-05-11 19:00:49.000000000 +0200
++++ Makefile.in.new	2003-05-11 19:00:40.000000000 +0200
+@@ -10,7 +10,7 @@
+ include Makefile.conf
+ 
+ SUBDIRS		= include optlib lib dpkg-deb split scripts utils main \
+-		  @DSELECTDIR@ po methods man doc
++		  @DSELECTDIR@ po methods man
+ 
+ all: version.h all-recursive
+ 
+--- Makefile.conf.in	2003-05-11 19:06:03.000000000 +0200
++++ Makefile.conf.in.new	2003-05-11 19:06:29.000000000 +0200
+@@ -43,7 +43,7 @@
+ subdir = $(patsubst $(top_srcdir)/%,%,$(srcdir))/
+ endif
+ PERL			= @PERL@
+-mkinstalldirs		= $(SHELL) $(top_srcdir)/mkinstalldirs
++mkinstalldirs		= /usr/share/automake-1.5/mkinstalldirs
+ LN			= @LN_S@
+ INSTALL			= @INSTALL@
+ INSTALL_PROGRAM		= @INSTALL_PROGRAM@
+--- man/Makefile.in	2003-05-11 19:11:06.000000000 +0200
++++ man.new/Makefile.in	2003-05-11 19:11:18.000000000 +0200
+@@ -1,11 +1,11 @@
+ VPATH		= @srcdir@
+ srcdir		= @srcdir@
+-top_srcdir	= @top_srcdir@
+ 
+ SUBDIRS		= de en fr ja pt_BR ru sv es
+ 
+ default: all
+ include ../Makefile.conf
++top_srcdir	= @top_srcdir@
+ 
+ clean: clean-recursive
+ 
+--- archtable.org	2004-01-23 19:36:04.905552663 +0100
++++ archtable	2004-01-23 19:36:29.183688202 +0100
+@@ -11,6 +11,7 @@
+ i486-linux-gnu		i386		i486
+ i586-linux-gnu		i386		i486
+ i686-linux-gnu		i386		i486
++i686-pc-linux-gnu		i386		i486
+ pentium-linux-gnu	i386		i486
+ sparc-linux-gnu		sparc		sparc
+ sparc64-linux-gnu	sparc		sparc