version bump; mark 1.10.23 x86

Package-Manager: portage-2.0.51-r15

7 files changed, 43 insertions, 15 deletions

diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index 87c05c67f0e0..f5b549ec7fb5 100644
--- a/app-arch/dpkg/ChangeLog
+++ b/app-arch/dpkg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/dpkg
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.23 2005/01/01 11:43:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.24 2005/01/27 13:57:19 lanius Exp $
+
+*dpkg-1.10.26 (27 Jan 2005)
+
+  27 Jan 2005; lanius@gentoo.org +files/dpkg-1.10.26.patch,
+  -dpkg-1.10.18.1.ebuild, dpkg-1.10.23.ebuild, +dpkg-1.10.26.ebuild:
+  version bump; mark 1.10.23 x86
 
   18 Dec 2004; Simon Stelling <blubb@gentoo.org> dpkg-1.10.23.ebuild:
   was testing for a long time, marking stable on amd64
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 764d1106752f..340097eb5bed 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -1,10 +1,11 @@
-MD5 d15c1b629308b20b36cc9a23ba29cb22 ChangeLog 2584
-MD5 5934bcb0636cc7e7f4fad11fe94aa2df dpkg-1.10.18.1.ebuild 984
-MD5 e745c598101f73b3b6f4fe0266ca18e0 dpkg-1.10.23.ebuild 916
+MD5 390d6c36b4d0054bcce56c10678c4fea dpkg-1.10.23.ebuild 911
 MD5 d5a28a5f630757e5553eeda7a6c5a6bc dpkg-1.10.20.ebuild 922
+MD5 f4fcdc01687dd52184cee4ad1342c920 ChangeLog 2772
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
+MD5 44ecb52c91ae0f612eb7d0817e2aafeb dpkg-1.10.26.ebuild 913
+MD5 feb5a11111cc715877cc527c979ef699 files/dpkg-1.10.26.patch 840
+MD5 e25e466552059c545baaa686f75f8c9d files/digest-dpkg-1.10.20 65
 MD5 6ce73296206ff0316cc07546b042f0bb files/digest-dpkg-1.10.23 65
+MD5 3a89ac1e794696a143c8c6665b00cc1d files/digest-dpkg-1.10.26 65
 MD5 10b6a5c819cf7e8e0170991382ec48fe files/dpkg-1.10.23.patch 2435
-MD5 9a3f70c7e5883631fbce58014a7fcb4b files/digest-dpkg-1.10.18.1 67
-MD5 e25e466552059c545baaa686f75f8c9d files/digest-dpkg-1.10.20 65
 MD5 ad43abcbe5b91df05112cee2fc95c8f4 files/dpkg-1.10.18.patch 2429
diff --git a/app-arch/dpkg/dpkg-1.10.23.ebuild b/app-arch/dpkg/dpkg-1.10.23.ebuild
index 39376ae425b7..51f3158046ce 100644
--- a/app-arch/dpkg/dpkg-1.10.23.ebuild
+++ b/app-arch/dpkg/dpkg-1.10.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.10.23.ebuild,v 1.3 2005/01/01 11:43:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.10.23.ebuild,v 1.4 2005/01/27 13:57:19 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 amd64"
+KEYWORDS="x86 ~ppc ~sparc ~arm amd64"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.6.0
diff --git a/app-arch/dpkg/dpkg-1.10.18.1.ebuild b/app-arch/dpkg/dpkg-1.10.26.ebuild
index 0f3bbaaf6f5a..8e9124c34917 100644
--- a/app-arch/dpkg/dpkg-1.10.18.1.ebuild
+++ b/app-arch/dpkg/dpkg-1.10.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.1.ebuild,v 1.8 2005/01/01 11:43:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.10.26.ebuild,v 1.1 2005/01/27 13:57:19 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 ~amd64"
+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.18.patch
+	epatch ${FILESDIR}/${P}.patch
 	./configure || die
 	make || die
 }
@@ -32,8 +32,6 @@ src_install() {
 	make DESTDIR=${D} install || die
 	rm -f ${D}/usr/sbin/install-info
 	rm -f ${D}/usr/bin/md5sum
-	dodir /etc/alternatives
-	insinto /etc/alternatives
-	doins scripts/README.alternatives
+	mv ${D}/usr/etc ${D}/
 	dodoc ChangeLog INSTALL THANKS TODO
 }
diff --git a/app-arch/dpkg/files/digest-dpkg-1.10.18.1 b/app-arch/dpkg/files/digest-dpkg-1.10.18.1
deleted file mode 100644
index ea0286168cbd..000000000000
--- a/app-arch/dpkg/files/digest-dpkg-1.10.18.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d74d6e25611a0f999c12ba5f49a05a69 dpkg_1.10.18.1.tar.gz 1610337
diff --git a/app-arch/dpkg/files/digest-dpkg-1.10.26 b/app-arch/dpkg/files/digest-dpkg-1.10.26
new file mode 100644
index 000000000000..a12a58ce7ce8
--- /dev/null
+++ b/app-arch/dpkg/files/digest-dpkg-1.10.26
@@ -0,0 +1 @@
+MD5 76c7987cbaef738ebc8c101d5a46c3d6 dpkg_1.10.26.tar.gz 2026331
diff --git a/app-arch/dpkg/files/dpkg-1.10.26.patch b/app-arch/dpkg/files/dpkg-1.10.26.patch
new file mode 100644
index 000000000000..a847dfd41932
--- /dev/null
+++ b/app-arch/dpkg/files/dpkg-1.10.26.patch
@@ -0,0 +1,23 @@
+diff -Naur dpkg-1.10.25.orig/archtable dpkg-1.10.25/archtable
+--- dpkg-1.10.25.orig/archtable	2004-12-17 19:37:46.975709560 -0200
++++ dpkg-1.10.25/archtable	2004-12-17 19:38:07.895529264 -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
+diff -Naur dpkg-1.10.25.orig/Makefile.in dpkg-1.10.25/Makefile.in
+--- dpkg-1.10.25.orig/Makefile.in	2004-12-17 19:37:46.979708952 -0200
++++ dpkg-1.10.25/Makefile.in	2004-12-17 19:38:21.609444432 -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
+