mark 1.10.20 stable, add 1.10.23

9 files changed, 34 insertions, 59 deletions

diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index f99eeca9ed74..d459063e7570 100644
--- a/app-arch/dpkg/ChangeLog
+++ b/app-arch/dpkg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/dpkg
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.19 2004/06/24 21:29:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.20 2004/08/24 10:54:11 lanius Exp $
+
+*dpkg-1.10.23 (24 Aug 2004)
+
+  24 Aug 2004; Heinrich Wendel <lanius@gentoo.org> -files/dpkg-1.10.10.patch,
+  +files/dpkg-1.10.23.patch, -dpkg-1.10.15.ebuild, -dpkg-1.10.18.ebuild,
+  dpkg-1.10.20.ebuild, +dpkg-1.10.23.ebuild:
+  mark 1.10.20 stable, add 1.10.23
 
   02 May 2004; Mike Frysinger <vapier@gentoo.org> :
   Make sure we don't install files into /usr/etc.
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 048260989bee..b41828080e96 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -1,12 +1,10 @@
-MD5 57514e4466715b954e18d19ab8f50113 dpkg-1.10.20.ebuild 913
+MD5 22cd7440b7680c82858d5966d1326bcb dpkg-1.10.23.ebuild 913
+MD5 cfb454084a7cdeb1eaf649ceb95b8348 dpkg-1.10.20.ebuild 918
 MD5 3e8e34e51da3f68d5a3065a787d67953 dpkg-1.10.18.1.ebuild 983
-MD5 1ec647ce142bc9e83878c7093ef660e1 dpkg-1.10.18.ebuild 945
-MD5 02a922281e943e9239373dd4f744bc00 dpkg-1.10.15.ebuild 940
-MD5 0b50d08bb7a0ba3664cb30315d7cbf7a ChangeLog 2064
+MD5 ae02fea7830632106478d5151455b387 ChangeLog 2323
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
-MD5 aa710d7725ed75e2b0ffb003300c5e11 files/digest-dpkg-1.10.15 65
-MD5 9931fb5397739e360052b5bad267c8d6 files/digest-dpkg-1.10.18 65
 MD5 e25e466552059c545baaa686f75f8c9d files/digest-dpkg-1.10.20 65
+MD5 6ce73296206ff0316cc07546b042f0bb files/digest-dpkg-1.10.23 65
 MD5 9a3f70c7e5883631fbce58014a7fcb4b files/digest-dpkg-1.10.18.1 67
-MD5 982d82b477842d92e5184b3856a63d74 files/dpkg-1.10.10.patch 2112
+MD5 10b6a5c819cf7e8e0170991382ec48fe files/dpkg-1.10.23.patch 2435
 MD5 ad43abcbe5b91df05112cee2fc95c8f4 files/dpkg-1.10.18.patch 2429
diff --git a/app-arch/dpkg/dpkg-1.10.18.ebuild b/app-arch/dpkg/dpkg-1.10.18.ebuild
deleted file mode 100644
index b83c92f3a31a..000000000000
--- a/app-arch/dpkg/dpkg-1.10.18.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.10.18.ebuild,v 1.5 2004/06/24 21:29:52 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="Package maintenance system for Debian"
-HOMEPAGE="http://packages.qa.debian.org/dpkg"
-SRC_URI="mirror://debian/pool/main/d/dpkg/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.6.0
-	>=sys-libs/ncurses-5.2-r7
-	>=sys-libs/zlib-1.1.4" #app-text/sgmltools-lite?
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.11.5"
-
-src_compile() {
-	cd main
-	ln -s ../archtable
-	cd ..
-	epatch ${FILESDIR}/${PN}-${PV}.patch
-	./configure || die
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	rm -f ${D}/usr/sbin/install-info
-	dodir /etc/alternatives
-	insinto /etc/alternatives
-	doins scripts/README.alternatives
-	dodoc ChangeLog INSTALL THANKS TODO
-}
diff --git a/app-arch/dpkg/dpkg-1.10.20.ebuild b/app-arch/dpkg/dpkg-1.10.20.ebuild
index fae8be6ea542..ab7168061cb1 100644
--- a/app-arch/dpkg/dpkg-1.10.20.ebuild
+++ b/app-arch/dpkg/dpkg-1.10.20.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/dpkg/dpkg-1.10.20.ebuild,v 1.4 2004/06/24 21:29:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.10.20.ebuild,v 1.5 2004/08/24 10:54: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 sparc arm"
+KEYWORDS="x86 ppc sparc arm ~amd64"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.6.0
diff --git a/app-arch/dpkg/dpkg-1.10.15.ebuild b/app-arch/dpkg/dpkg-1.10.23.ebuild
index 28c97a6a35aa..1d6e1aeeff32 100644
--- a/app-arch/dpkg/dpkg-1.10.15.ebuild
+++ b/app-arch/dpkg/dpkg-1.10.23.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/dpkg/dpkg-1.10.15.ebuild,v 1.4 2004/06/24 21:29:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.10.23.ebuild,v 1.1 2004/08/24 10:54: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 ~sparc ~arm ~amd64"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.6.0
@@ -23,7 +23,7 @@ src_compile() {
 	cd main
 	ln -s ../archtable
 	cd ..
-	epatch ${FILESDIR}/${PN}-1.10.10.patch
+	epatch ${FILESDIR}/${P}.patch
 	./configure || die
 	make || die
 }
@@ -31,8 +31,7 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 	rm -f ${D}/usr/sbin/install-info
-	dodir /etc/alternatives
-	insinto /etc/alternatives
-	doins scripts/README.alternatives
+	rm -f ${D}/usr/bin/md5sum
+	mv ${D}/usr/etc ${D}/
 	dodoc ChangeLog INSTALL THANKS TODO
 }
diff --git a/app-arch/dpkg/files/digest-dpkg-1.10.15 b/app-arch/dpkg/files/digest-dpkg-1.10.15
deleted file mode 100644
index b508304e99a7..000000000000
--- a/app-arch/dpkg/files/digest-dpkg-1.10.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 557870fdeaf717d48bf8ce430e65c927 dpkg_1.10.15.tar.gz 1551492
diff --git a/app-arch/dpkg/files/digest-dpkg-1.10.18 b/app-arch/dpkg/files/digest-dpkg-1.10.18
deleted file mode 100644
index eafafef419ae..000000000000
--- a/app-arch/dpkg/files/digest-dpkg-1.10.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e300ecc7d0088264ee8a8a22be2d6cbd dpkg_1.10.18.tar.gz 1602833
diff --git a/app-arch/dpkg/files/digest-dpkg-1.10.23 b/app-arch/dpkg/files/digest-dpkg-1.10.23
new file mode 100644
index 000000000000..ff60c77e9ba3
--- /dev/null
+++ b/app-arch/dpkg/files/digest-dpkg-1.10.23
@@ -0,0 +1 @@
+MD5 94a845ab0e14deb196d43e03c48a16b9 dpkg_1.10.23.tar.gz 1763248
diff --git a/app-arch/dpkg/files/dpkg-1.10.10.patch b/app-arch/dpkg/files/dpkg-1.10.23.patch
index dfc1751b23b9..00f169ba4f56 100644
--- a/app-arch/dpkg/files/dpkg-1.10.10.patch
+++ b/app-arch/dpkg/files/dpkg-1.10.23.patch
@@ -10,8 +10,8 @@
  include ../Makefile.conf
 +top_srcdir	= @top_srcdir@
  
- CXX_SOURCES	= basecmds.cc baselist.cc basetop.cc bindings.cc curkeys.cc \
- 		  main.cc methkeys.cc methlist.cc method.cc methparse.cc \
+ 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 @@
@@ -66,7 +66,7 @@
  srcdir		= @srcdir@
 -top_srcdir	= @top_srcdir@
  
- SUBDIRS		= de en fr ja pt_BR ru sv
+ SUBDIRS		= de en es fr ja pt_BR ru sv
  
  default: all
  include ../Makefile.conf
@@ -74,3 +74,13 @@
  
  clean: clean-recursive
  
+--- archtable	2004-07-19 20:56:49.000000000 +0200
++++ archtable.new	2004-08-24 12:45:37.877058458 +0200
+@@ -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