Version bump closes bug #77457. Moving 0.6-r1 to stable.

8 files changed, 78 insertions, 66 deletions

diff --git a/net-firewall/ipp2p/ChangeLog b/net-firewall/ipp2p/ChangeLog
index bc97b8883765..eae10de5794b 100644
--- a/net-firewall/ipp2p/ChangeLog
+++ b/net-firewall/ipp2p/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/ipp2p
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ChangeLog,v 1.4 2004/12/26 19:54:42 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ChangeLog,v 1.5 2005/01/11 10:39:33 eradicator Exp $
+
+*ipp2p-0.7.1 (11 Jan 2005)
+
+  11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  ipp2p-0.6-r1.ebuild, -ipp2p-0.6.ebuild, +ipp2p-0.7.1.ebuild:
+  Version bump closes bug #77457.  Moving 0.6-r1 to stable.
 
 *ipp2p-0.7 (26 Dec 2004)
 
diff --git a/net-firewall/ipp2p/Manifest b/net-firewall/ipp2p/Manifest
index 8c32043d17bc..74591309486c 100644
--- a/net-firewall/ipp2p/Manifest
+++ b/net-firewall/ipp2p/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3ee568b63d3eb9028fa9214414c94986 ipp2p-0.6.ebuild 1019
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
-MD5 838cf9ab0243cc8d93fde7c2b4b82495 ipp2p-0.7.ebuild 1102
-MD5 06515efeb52bbc7810f2f0966fc41318 ChangeLog 854
-MD5 67c58e94b5aec13e9b6dca903a9d5782 ipp2p-0.6-r1.ebuild 1167
-MD5 7dde11c31f867f3b9c624ac8dcb944a4 files/digest-ipp2p-0.6 58
+MD5 01c5c194e8c3f281aedc9ede83c58f13 ipp2p-0.7.ebuild 1102
+MD5 6634717b9f4ae61ef52a91b975579902 ChangeLog 1063
+MD5 1dc3022936a4d96933083d70ea01bc84 ipp2p-0.6-r1.ebuild 1165
+MD5 43feea974b6a7c2ac687bde766a25a07 ipp2p-0.7.1.ebuild 1109
 MD5 210b099d966d09350c8cfc0d81ec56ce files/ipp2p-0.6-Makefile.patch 996
 MD5 7dde11c31f867f3b9c624ac8dcb944a4 files/digest-ipp2p-0.6-r1 58
 MD5 3493a751f553b880c087ad0e71ac242a files/digest-ipp2p-0.7 60
 MD5 ab7e8116b2ec2c738835b5facdfbf3d3 files/ipp2p-0.7-Makefile.patch 1069
+MD5 09c45d9dd51a824d5f46627efc141020 files/digest-ipp2p-0.7.1 62
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBzxcMArHZZzCEUG0RAvyVAKCE6KKrT915LdBugLl+LKYAZyTj/gCeIXP4
-6X6HYH12T36O+f4e6jOVojg=
-=OsHj
+iD8DBQFB46zvArHZZzCEUG0RAiHzAJ42mH8yPr2Rj2YqKYabN2N7Akz9/wCaAjp8
+QpI0MzB8vONNFXTeIHddV+I=
+=7ia1
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipp2p/files/digest-ipp2p-0.6 b/net-firewall/ipp2p/files/digest-ipp2p-0.6
deleted file mode 100644
index bf369b132197..000000000000
--- a/net-firewall/ipp2p/files/digest-ipp2p-0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9ac3ab4f48755500dbb0020292088efe ipp2p.06.tar.gz 6752
diff --git a/net-firewall/ipp2p/files/digest-ipp2p-0.7.1 b/net-firewall/ipp2p/files/digest-ipp2p-0.7.1
new file mode 100644
index 000000000000..8f7899ab5d3a
--- /dev/null
+++ b/net-firewall/ipp2p/files/digest-ipp2p-0.7.1
@@ -0,0 +1 @@
+MD5 0b9b1dc9910a81743bea4b252d7f7ead ipp2p-0.7.1.tar.gz 16491
diff --git a/net-firewall/ipp2p/ipp2p-0.6-r1.ebuild b/net-firewall/ipp2p/ipp2p-0.6-r1.ebuild
index a40eb4fb1674..4b34e0a6aa24 100644
--- a/net-firewall/ipp2p/ipp2p-0.6-r1.ebuild
+++ b/net-firewall/ipp2p/ipp2p-0.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ipp2p-0.6-r1.ebuild,v 1.2 2004/12/08 00:06:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ipp2p-0.6-r1.ebuild,v 1.3 2005/01/11 10:39:33 eradicator Exp $
 
 IUSE=""
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.ipp2p.org/downloads/${MY_P}.tar.gz"
 
 SLOT="${KV}"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="virtual/modutils"
 
diff --git a/net-firewall/ipp2p/ipp2p-0.6.ebuild b/net-firewall/ipp2p/ipp2p-0.6.ebuild
deleted file mode 100644
index 84aee1db7682..000000000000
--- a/net-firewall/ipp2p/ipp2p-0.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ipp2p-0.6.ebuild,v 1.2 2004/12/06 20:31:38 eradicator Exp $
-
-IUSE=""
-
-inherit kernel-mod eutils
-
-MY_PV=${PV/./}
-MY_P="${PN}.${MY_PV}"
-S="${WORKDIR}/${PN}"
-
-DESCRIPTION="Netfilter module for dealing with P2P Applications."
-HOMEPAGE="http://www.ipp2p.org/index_en.html"
-SRC_URI="http://www.ipp2p.org/downloads/${MY_P}.tar.gz"
-
-SLOT="${KV}"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-RDEPEND="virtual/modutils"
-
-DEPEND="${RDEPEND}
-	>=net-firewall/iptables-1.2.11
-	virtual/linux-sources"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-Makefile.patch
-}
-
-src_compile() {
-	unset ARCH
-	emake KERNEL_SRC=${KERNEL_DIR} || die "Parallel Make Failed"
-}
-
-
-src_install() {
-	exeinto /$(get_libdir)/iptables
-	doexe libipt_ipp2p.so
-
-	kernel-mod_getversion
-	insinto /lib/modules/${KV_MK_VERSION_FULL}/kernel/net/ipv4/netfilter
-	doins ipt_ipp2p.ko
-
-	dodoc README
-}
diff --git a/net-firewall/ipp2p/ipp2p-0.7.1.ebuild b/net-firewall/ipp2p/ipp2p-0.7.1.ebuild
new file mode 100644
index 000000000000..9b1cd11f208b
--- /dev/null
+++ b/net-firewall/ipp2p/ipp2p-0.7.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ipp2p-0.7.1.ebuild,v 1.1 2005/01/11 10:39:33 eradicator Exp $
+
+IUSE=""
+
+inherit linux-mod eutils
+
+DESCRIPTION="Netfilter module for dealing with P2P Applications."
+HOMEPAGE="http://www.ipp2p.org/index_en.html"
+SRC_URI="http://www.ipp2p.org/downloads/${P}.tar.gz"
+
+SLOT="${KV}"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="virtual/modutils"
+
+DEPEND="${RDEPEND}
+	>=net-firewall/iptables-1.2.11
+	virtual/linux-sources"
+
+pkg_setup() {
+	CONFIG_CHECK="NETFILTER"
+	NETFILTER_ERROR="Your kernel is not configured to support Netfilter."
+	MODULE_NAMES="ipt_ipp2p"
+
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-0.7-Makefile.patch
+}
+
+src_compile() {
+	xarch="${ARCH}"
+	unset ARCH
+	emake KERNEL_SRC=${KV_DIR} || die "Parallel Make Failed"
+	ARCH="${xarch}"
+}
+
+src_install() {
+	exeinto /$(get_libdir)/iptables
+	doexe libipt_ipp2p.so
+
+	dodoc README
+	linux-mod_src_install
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+}
diff --git a/net-firewall/ipp2p/ipp2p-0.7.ebuild b/net-firewall/ipp2p/ipp2p-0.7.ebuild
index d081d0b1f7d5..19de23f939c5 100644
--- a/net-firewall/ipp2p/ipp2p-0.7.ebuild
+++ b/net-firewall/ipp2p/ipp2p-0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ipp2p-0.7.ebuild,v 1.1 2004/12/26 19:54:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ipp2p-0.7.ebuild,v 1.2 2005/01/11 10:39:33 eradicator Exp $
 
 IUSE=""