Bug #126878, upstream seems to have changed the directory name inside the tarball. Also version bump that fixes a return code issue.

Package-Manager: portage-2.1_rc2

8 files changed, 116 insertions, 8 deletions

diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog
index 8c9fa148cba6..a415b2827616 100644
--- a/net-firewall/ipset/ChangeLog
+++ b/net-firewall/ipset/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/ipset
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.7 2006/01/27 01:46:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.8 2006/05/25 06:00:32 robbat2 Exp $
+
+*ipset-2.2.9.20060508 (25 May 2006)
+
+  25 May 2006; Robin H. Johnson <robbat2@gentoo.org>
+  ipset-2.2.8.20051203.ebuild, +ipset-2.2.9.20060508.ebuild:
+  Bug #126878, upstream seems to have changed the directory name inside the
+  tarball. Also version bump that fixes a return code issue.
 
   27 Jan 2006; Robin H. Johnson <robbat2@gentoo.org>
   ipset-2.2.8.20051203.ebuild:
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 5b56c9e9ca78..2527105d0a2a 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,8 +1,39 @@
-MD5 cac68ddef4982ee24052e0b3922d3d41 ChangeLog 1364
-MD5 eeb0a192ff8d4aa8efabfbae1e3ccf7c files/digest-ipset-2.1.0.20050119 72
-MD5 eeb0a192ff8d4aa8efabfbae1e3ccf7c files/digest-ipset-2.1.0.20050119-r1 72
-MD5 0990e81a95b5c9cc55cdbe3cb984d160 files/digest-ipset-2.2.8.20051203 72
+DIST ipset-2.1.0-20050119.tar.bz2 23821 RMD160 315f62e029237beb328dab54e28a0178f6b91ea0 SHA1 87c02d754d274d80c987021be4318924721c7641 SHA256 23cfac9c5f08453f3b3567adc4ed4c3d4055da6f25be56c251eb7785e81aa8a6
+DIST ipset-2.2.8-20051203.tar.bz2 27392 RMD160 dfccbfd3d20e142b7777d4b35bd7472362a7aea8 SHA1 d38c7a86c4d5731c0fa52dab4a838772684e75b0 SHA256 5396ac8b164b9a00511f68833a5e4f572dce972f881e6da13a6175ff49c33e63
+DIST ipset-2.2.9-20060508.tar.bz2 27530 RMD160 c300304303c5f52eeff156a1900cccf1c1b2f7e0 SHA1 053addb8595da7fc1c0953eece8d6921344ed5fa SHA256 09fe3e64e2715792dbd24f9e37b78cc0a66963ca226dc94f75f8b55dac5cb3d2
+EBUILD ipset-2.1.0.20050119-r1.ebuild 1608 RMD160 839b3367269ec00d5d7dfa12a337835e1c4fb361 SHA1 1de1c73ee077c41dc0d3890bcd4ad31e350d0c7d SHA256 f8ceb257ea4baba233dec0669e3a7ff09cf29a21db60ece251c5223df57f50f7
 MD5 81097c0394419fcc18c0d10d5e11bca7 ipset-2.1.0.20050119-r1.ebuild 1608
+RMD160 839b3367269ec00d5d7dfa12a337835e1c4fb361 ipset-2.1.0.20050119-r1.ebuild 1608
+SHA256 f8ceb257ea4baba233dec0669e3a7ff09cf29a21db60ece251c5223df57f50f7 ipset-2.1.0.20050119-r1.ebuild 1608
+EBUILD ipset-2.1.0.20050119.ebuild 1711 RMD160 f25758c0b1d25a0d5462337c0f9b531a7c0170aa SHA1 1f142914a3820fc59282fa2f734ed59c4bca5683 SHA256 8659184287976a6b8f61d4b862ad940a40299dfc5b754514230c796fc71a77fb
 MD5 8c5675e36f2f7d393dd634e387f538d6 ipset-2.1.0.20050119.ebuild 1711
-MD5 50b8996b7fab45d59ee13853bd7f74f5 ipset-2.2.8.20051203.ebuild 1616
+RMD160 f25758c0b1d25a0d5462337c0f9b531a7c0170aa ipset-2.1.0.20050119.ebuild 1711
+SHA256 8659184287976a6b8f61d4b862ad940a40299dfc5b754514230c796fc71a77fb ipset-2.1.0.20050119.ebuild 1711
+EBUILD ipset-2.2.8.20051203.ebuild 1625 RMD160 dad7f2cb4dafb3f026d5559e513da655af54ddfa SHA1 a723798fc4027f933c7e32739dd9372aed649195 SHA256 14f2b5ae09175d28caf606c93026448abf3976390a138a04d7f1acfff0eb2b6f
+MD5 4a447dbfebbf042633d9c4f9a17d4453 ipset-2.2.8.20051203.ebuild 1625
+RMD160 dad7f2cb4dafb3f026d5559e513da655af54ddfa ipset-2.2.8.20051203.ebuild 1625
+SHA256 14f2b5ae09175d28caf606c93026448abf3976390a138a04d7f1acfff0eb2b6f ipset-2.2.8.20051203.ebuild 1625
+EBUILD ipset-2.2.9.20060508.ebuild 1625 RMD160 a9a8e6b79ceea4cd4c16b24b0c52e09192cf562f SHA1 4fd90afefc88d0b2566c7e18532b6b24fe73b878 SHA256 07b94e6583f45fd5a40fb3a8d93feed769b6e417cc914aa2f2be6cd0b41116bb
+MD5 7aae0c9d76bfe5b96aca741c8f4a1bde ipset-2.2.9.20060508.ebuild 1625
+RMD160 a9a8e6b79ceea4cd4c16b24b0c52e09192cf562f ipset-2.2.9.20060508.ebuild 1625
+SHA256 07b94e6583f45fd5a40fb3a8d93feed769b6e417cc914aa2f2be6cd0b41116bb ipset-2.2.9.20060508.ebuild 1625
+MISC ChangeLog 1653 RMD160 37fe7f2c5d0535d7485dcb2303fe8546bce585d5 SHA1 1fbc9ce66caeec94b486c850e2c3bb4b1b0fb452 SHA256 3744686b2418ce10676ad7831b2f7572da94ab69704dca7c50cad69177b8869b
+MD5 cc089c2aabd325e1e80065110dc0c926 ChangeLog 1653
+RMD160 37fe7f2c5d0535d7485dcb2303fe8546bce585d5 ChangeLog 1653
+SHA256 3744686b2418ce10676ad7831b2f7572da94ab69704dca7c50cad69177b8869b ChangeLog 1653
+MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
 MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
+RMD160 ffa99612cf27469c417944deed0e0c9155e64331 metadata.xml 223
+SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44 metadata.xml 223
+MD5 30f2b541893fab9277557175a8e43c7a files/digest-ipset-2.1.0.20050119 262
+RMD160 416753938043f7fdc05f788426279e0fdbf018e9 files/digest-ipset-2.1.0.20050119 262
+SHA256 e437a5e451004627651ac3c44adad37ac3deb662c74c5e781ebaa03d17fb92a5 files/digest-ipset-2.1.0.20050119 262
+MD5 30f2b541893fab9277557175a8e43c7a files/digest-ipset-2.1.0.20050119-r1 262
+RMD160 416753938043f7fdc05f788426279e0fdbf018e9 files/digest-ipset-2.1.0.20050119-r1 262
+SHA256 e437a5e451004627651ac3c44adad37ac3deb662c74c5e781ebaa03d17fb92a5 files/digest-ipset-2.1.0.20050119-r1 262
+MD5 611cd5ddc633f2f0bd813606465f2124 files/digest-ipset-2.2.8.20051203 262
+RMD160 9113a6045e9901826f541c023067014d8191a29b files/digest-ipset-2.2.8.20051203 262
+SHA256 d044355d3cac452599f833aa395257096bca99d3176363fe6663be030300e5e6 files/digest-ipset-2.2.8.20051203 262
+MD5 00bc9e2fce1e1218097071b42968c53c files/digest-ipset-2.2.9.20060508 262
+RMD160 17f16c5a04c2f3e0b9a05a3d7bb3f624da782a09 files/digest-ipset-2.2.9.20060508 262
+SHA256 28db3f51d561e02a1289f4173e16482bf3164d1351f5b3f697fae44d229e5976 files/digest-ipset-2.2.9.20060508 262
diff --git a/net-firewall/ipset/files/digest-ipset-2.1.0.20050119 b/net-firewall/ipset/files/digest-ipset-2.1.0.20050119
index 68db10cd589a..c9954fa559f2 100644
--- a/net-firewall/ipset/files/digest-ipset-2.1.0.20050119
+++ b/net-firewall/ipset/files/digest-ipset-2.1.0.20050119
@@ -1 +1,3 @@
 MD5 9f1b9c36d37eb8371c83b5610362d16d ipset-2.1.0-20050119.tar.bz2 23821
+RMD160 315f62e029237beb328dab54e28a0178f6b91ea0 ipset-2.1.0-20050119.tar.bz2 23821
+SHA256 23cfac9c5f08453f3b3567adc4ed4c3d4055da6f25be56c251eb7785e81aa8a6 ipset-2.1.0-20050119.tar.bz2 23821
diff --git a/net-firewall/ipset/files/digest-ipset-2.1.0.20050119-r1 b/net-firewall/ipset/files/digest-ipset-2.1.0.20050119-r1
index 68db10cd589a..c9954fa559f2 100644
--- a/net-firewall/ipset/files/digest-ipset-2.1.0.20050119-r1
+++ b/net-firewall/ipset/files/digest-ipset-2.1.0.20050119-r1
@@ -1 +1,3 @@
 MD5 9f1b9c36d37eb8371c83b5610362d16d ipset-2.1.0-20050119.tar.bz2 23821
+RMD160 315f62e029237beb328dab54e28a0178f6b91ea0 ipset-2.1.0-20050119.tar.bz2 23821
+SHA256 23cfac9c5f08453f3b3567adc4ed4c3d4055da6f25be56c251eb7785e81aa8a6 ipset-2.1.0-20050119.tar.bz2 23821
diff --git a/net-firewall/ipset/files/digest-ipset-2.2.8.20051203 b/net-firewall/ipset/files/digest-ipset-2.2.8.20051203
index 67287591f8dc..d42d99a18e5d 100644
--- a/net-firewall/ipset/files/digest-ipset-2.2.8.20051203
+++ b/net-firewall/ipset/files/digest-ipset-2.2.8.20051203
@@ -1 +1,3 @@
 MD5 a638af2788ce9e41e07dbe89311c0914 ipset-2.2.8-20051203.tar.bz2 27392
+RMD160 dfccbfd3d20e142b7777d4b35bd7472362a7aea8 ipset-2.2.8-20051203.tar.bz2 27392
+SHA256 5396ac8b164b9a00511f68833a5e4f572dce972f881e6da13a6175ff49c33e63 ipset-2.2.8-20051203.tar.bz2 27392
diff --git a/net-firewall/ipset/files/digest-ipset-2.2.9.20060508 b/net-firewall/ipset/files/digest-ipset-2.2.9.20060508
new file mode 100644
index 000000000000..47749f91289d
--- /dev/null
+++ b/net-firewall/ipset/files/digest-ipset-2.2.9.20060508
@@ -0,0 +1,3 @@
+MD5 b86efac9457e992d2633e9b4176f8ca9 ipset-2.2.9-20060508.tar.bz2 27530
+RMD160 c300304303c5f52eeff156a1900cccf1c1b2f7e0 ipset-2.2.9-20060508.tar.bz2 27530
+SHA256 09fe3e64e2715792dbd24f9e37b78cc0a66963ca226dc94f75f8b55dac5cb3d2 ipset-2.2.9-20060508.tar.bz2 27530
diff --git a/net-firewall/ipset/ipset-2.2.8.20051203.ebuild b/net-firewall/ipset/ipset-2.2.8.20051203.ebuild
index 1e76218bfa16..0f8f9580ae4e 100644
--- a/net-firewall/ipset/ipset-2.2.8.20051203.ebuild
+++ b/net-firewall/ipset/ipset-2.2.8.20051203.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.2.8.20051203.ebuild,v 1.2 2006/01/27 01:46:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.2.8.20051203.ebuild,v 1.3 2006/05/25 06:00:32 robbat2 Exp $
 
 inherit eutils flag-o-matic versionator linux-info
 
@@ -16,7 +16,7 @@ IUSE=""
 RDEPEND=">=net-firewall/iptables-1.3"
 DEPEND="${RDEPEND}
 		virtual/linux-sources"
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}/${PN}-${PV%.*}"
 CONFIG_CHECK="IP_NF_SET"
 
 pkg_setup() {
diff --git a/net-firewall/ipset/ipset-2.2.9.20060508.ebuild b/net-firewall/ipset/ipset-2.2.9.20060508.ebuild
new file mode 100644
index 000000000000..6a7bf9a68e2e
--- /dev/null
+++ b/net-firewall/ipset/ipset-2.2.9.20060508.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.2.9.20060508.ebuild,v 1.1 2006/05/25 06:00:32 robbat2 Exp $
+
+inherit eutils flag-o-matic versionator linux-info
+
+MY_PV="$(replace_version_separator 3 '-' )"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="IPset userspace tool for iptables, successor to ippool."
+HOMEPAGE="http://people.netfilter.org/kadlec/ipset/"
+SRC_URI="${HOMEPAGE}/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+RDEPEND=">=net-firewall/iptables-1.3"
+DEPEND="${RDEPEND}
+		virtual/linux-sources"
+S="${WORKDIR}/${PN}-${PV%.*}"
+CONFIG_CHECK="IP_NF_SET"
+
+pkg_setup() {
+	ewarn "If your kernel sources do not contain the IPset functionality,"
+	ewarn "this package may fail to compile."
+	linux-info_pkg_setup
+}
+
+src_defs() {
+	# these are used in both of src_compile and src_install
+	myconf="${myconf} PREFIX="
+	myconf="${myconf} LIBDIR=/lib"
+	myconf="${myconf} BINDIR=/sbin"
+	myconf="${myconf} MANDIR=/usr/share/man"
+	myconf="${myconf} INCDIR=/usr/include"
+	export myconf
+}
+
+src_compile() {
+	src_defs
+
+	# for some reason, it doesn't behave right if this is skipped
+	replace-flags -O0 -O2
+	if [ -z `get-flag O` ]; then
+		append-flags -O2
+	fi
+
+	# see iptables ebuild, as this code links against it
+	filter-flags "-fstack-protector"
+
+	# now build it
+	emake COPT_FLAGS="${CFLAGS}" ${myconf} \
+		KERNEL_DIR="${KERNEL_DIR}" \
+		|| die "failed to build"
+}
+
+src_install() {
+	src_defs
+	emake DESTDIR="${D}" ${myconf} \
+		KERNEL_DIR="${KERNEL_DIR}" \
+		install || die "failed to package"
+}