8 files changed, 18 insertions, 130 deletions
diff --git a/net-firewall/ipp2p/ChangeLog b/net-firewall/ipp2p/ChangeLog
index eae10de5794b..cfe520d6d47a 100644
--- a/net-firewall/ipp2p/ChangeLog
+++ b/net-firewall/ipp2p/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/ipp2p
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ChangeLog,v 1.6 2005/03/02 23:36:44 eradicator Exp $
+
+*ipp2p-0.7.1-r1 (02 Mar 2005)
+
+  02 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -ipp2p-0.6-r1.ebuild, +ipp2p-0.7.1-r1.ebuild, -ipp2p-0.7.1.ebuild,
+  -ipp2p-0.7.ebuild:
+  Revbump since it was incompatible with a change in linux-mod. See bug
+  #80499. Stable amd64, x86.
 
 *ipp2p-0.7.1 (11 Jan 2005)
 
diff --git a/net-firewall/ipp2p/Manifest b/net-firewall/ipp2p/Manifest
index 74591309486c..dbdd81c156aa 100644
--- a/net-firewall/ipp2p/Manifest
+++ b/net-firewall/ipp2p/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 affc51d7cde558793de84889c2750c55 ChangeLog 1343
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
-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 3189d79995aa9e51c7b68f9279b851e8 ipp2p-0.7.1-r1.ebuild 1134
+MD5 09c45d9dd51a824d5f46627efc141020 files/digest-ipp2p-0.7.1-r1 62
 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.4.0 (GNU/Linux)
 
-iD8DBQFB46zvArHZZzCEUG0RAiHzAJ42mH8yPr2Rj2YqKYabN2N7Akz9/wCaAjp8
-QpI0MzB8vONNFXTeIHddV+I=
-=7ia1
+iD8DBQFCJk4XArHZZzCEUG0RAmkOAJ9G7hJpk8dnG9H+gRdm4EfcBFlKugCeN+Cd
+XKVMIU5KQzweiqaUKMwVAXk=
+=w/mM
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipp2p/files/digest-ipp2p-0.6-r1 b/net-firewall/ipp2p/files/digest-ipp2p-0.6-r1
deleted file mode 100644
index bf369b132197..000000000000
--- a/net-firewall/ipp2p/files/digest-ipp2p-0.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9ac3ab4f48755500dbb0020292088efe ipp2p.06.tar.gz 6752
diff --git a/net-firewall/ipp2p/files/digest-ipp2p-0.7 b/net-firewall/ipp2p/files/digest-ipp2p-0.7
deleted file mode 100644
index 9aa18cd30a46..000000000000
--- a/net-firewall/ipp2p/files/digest-ipp2p-0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ba11c907dce9841b7d659eb0e962a5ff ipp2p-0.7.tar.gz 16428
diff --git a/net-firewall/ipp2p/files/digest-ipp2p-0.7.1 b/net-firewall/ipp2p/files/digest-ipp2p-0.7.1-r1
index 8f7899ab5d3a..8f7899ab5d3a 100644
--- a/net-firewall/ipp2p/files/digest-ipp2p-0.7.1
+++ b/net-firewall/ipp2p/files/digest-ipp2p-0.7.1-r1
diff --git a/net-firewall/ipp2p/ipp2p-0.6-r1.ebuild b/net-firewall/ipp2p/ipp2p-0.6-r1.ebuild
deleted file mode 100644
index 4b34e0a6aa24..000000000000
--- a/net-firewall/ipp2p/ipp2p-0.6-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.3 2005/01/11 10:39:33 eradicator Exp $
-
-IUSE=""
-
-inherit linux-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"
-
-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}/${P}-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.1.ebuild b/net-firewall/ipp2p/ipp2p-0.7.1-r1.ebuild
index 9b1cd11f208b..2b95e9a2c5b8 100644
--- a/net-firewall/ipp2p/ipp2p-0.7.1.ebuild
+++ b/net-firewall/ipp2p/ipp2p-0.7.1-r1.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/net-firewall/ipp2p/ipp2p-0.7.1.ebuild,v 1.1 2005/01/11 10:39:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ipp2p-0.7.1-r1.ebuild,v 1.1 2005/03/02 23:36:44 eradicator Exp $
 
 IUSE=""
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.ipp2p.org/downloads/${P}.tar.gz"
 
 SLOT="${KV}"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~sparc x86"
 
 RDEPEND="virtual/modutils"
 
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	CONFIG_CHECK="NETFILTER"
 	NETFILTER_ERROR="Your kernel is not configured to support Netfilter."
-	MODULE_NAMES="ipt_ipp2p"
+	MODULE_NAMES="ipt_ipp2p(${PN}:${S}:${S})"
 
 	linux-mod_pkg_setup
 }
diff --git a/net-firewall/ipp2p/ipp2p-0.7.ebuild b/net-firewall/ipp2p/ipp2p-0.7.ebuild
deleted file mode 100644
index 19de23f939c5..000000000000
--- a/net-firewall/ipp2p/ipp2p-0.7.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.2 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}/${P}-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
-}