gentoo resync : 20.02.2019

4 files changed, 2 insertions, 75 deletions

diff --git a/net-firewall/ipkungfu/Manifest b/net-firewall/ipkungfu/Manifest
index 31b2f6e3ee42..2e6b5514e36b 100644
--- a/net-firewall/ipkungfu/Manifest
+++ b/net-firewall/ipkungfu/Manifest
@@ -1,8 +1,5 @@
 AUX ipkungfu.init 379 BLAKE2B b3e7dc8fbcea0487762852df3b11f1524b43ab57f3005dfb6d7f5e6a063009743c4f49751a0fb2d24dae8770d223f70f529563f08fe035235a3a723a93544de6 SHA512 612a42d7841e6ea72b4b9d4e77734cb38d65f38b0364c15234172fc5cc37d4382d51b4d35f08432e2badca6f8833c6d347c930f6a14295a373f0760226ce5c5d
 AUX ipkungfu_noiseless.patch 752 BLAKE2B c839038e90c8f420df7cff90cdc47a41263651aaa94ab2e53f15f9ec905629ce16f559f12e54274ed2c65baa1264870c54b551e6a52cb41d3ed684697f87ea12 SHA512 990dd6ef61e3e1645a8e09ee6ae43e90ad46a13c7855d97414dd942007a1a4de69c8c31d26973d7606a852b85e0322648ebe1713e7a51df76040f2df92c0c3b6
-AUX nat_ftp.patch 262 BLAKE2B 6f132a76990d7fc1b8a904ab793dc3dceb44bf8011953b2a48e3dd57e3712fa500a4c41dd0d92f05e30a7afee3ac214d02982cc27a7a025c44e4b5f5b6586c8a SHA512 4b8747bdd63fdd04d7fc3b3b9bd9437bbaae7b479aa3e1d5c3f9183c9f3228f9946bcb83e24871fad57557e439c752f458f8ad1496dfcc2f6a0ca3295ab62930
-DIST ipkungfu-0.5.2.tgz 35985 BLAKE2B de3bda12956ad97068f1ba00c98ca6d2f3fee5a3fb3f7ee914e5628e6f695fcb02c93141826b703ff46060d18bc1d42d865c3f54bda2a6629e18b28fd6cdbaf7 SHA512 9aaef341b85a0788d65dd6d341a94319cb8083a57f06645c5ad938dabccd53abbb590e8eddd3a9172f9b226780cc9e6e1f906da668f6a80c3a6fb0a9be081046
 DIST ipkungfu-0.6.1.tar.bz2 104516 BLAKE2B 94ff9942deb072a7dc372c89e4238fcfdbd29d69e3afe26b05b9d70cfd0058da731cfe8910b89a04ee4d765f24277b670fc8b932373b66b512b5237cc68582f1 SHA512 bc1df9894d36d40f5394cbaef6f7cc9f95a8eaaf45a03d1c3a809bc5a7a5ae685c8cf6a27363ab83f6f817a0d44277b28de8bd40230d29c5700dda1d52e231b7
-EBUILD ipkungfu-0.5.2-r2.ebuild 1330 BLAKE2B 0c91748e145b6118fea5e72dfb410f4c0598711eef37a9b61933d895428a912427cd4c7077d703ee9a705d83402d79a0c3dc7d48c211c4add6a00793666d2414 SHA512 befd332e1bf4b915cd86ebde052d813ba24d82068ee7e93a803d460a27978959c5116de453abee3ed830728b61e1ac5dfa9b853ede6982b9259d0a45259e74ef
-EBUILD ipkungfu-0.6.1-r1.ebuild 1159 BLAKE2B d84e2f33baec5c3fd1973448819a1e32f8d2f86d2e08ca9926f72fe549019ac68a18188f218dadcd19e5839d39351df0ea6bff4210a63f82c0bfbaa4d6b19434 SHA512 8797690ecef90b06a1f052e9ea14c1a5e665063e17873c0c1fdcbe2d6cef57436006c7084dc4ad9a2b5dee4ebd71f75371294f132e33ecbb21e46458875a441b
+EBUILD ipkungfu-0.6.1-r1.ebuild 1158 BLAKE2B 09b8f085116e81116a62d47c47d23b995480a34bd47c80679e444695973035f785a053b0f90b766df8d5a3fe18d793d8223de331454357ed6b5085d7dbe600b3 SHA512 d1bb71bba2c413f73bbe1422c2800609396622138597bad710e204b71d2ed85a3953dd8c663a6dfb23c31a115f3cb14e907a4c86fb66fed23d6833a3c034e978
 MISC metadata.xml 262 BLAKE2B c51f025557a4ff5cef478fafbeadae3fb45c30d70c8283683eefbba8e24ba997698ebc06f928d01e18f03585950c4f2366a8e446f0fa231df6324cf229604a77 SHA512 586abd31f3353b9225ef45186aa03c1fe24affc9937c796344c6025368e33ac62871ee003852e3272d39b2bf75fe2b8e4b9f56970f3c076268d19963bf71a6a0
diff --git a/net-firewall/ipkungfu/files/nat_ftp.patch b/net-firewall/ipkungfu/files/nat_ftp.patch
deleted file mode 100644
index db919c5565e1..000000000000
--- a/net-firewall/ipkungfu/files/nat_ftp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ipkungfu    2003-10-03 13:05:59.000000000 -0400
-+++ ipkungfu    2004-02-09 16:34:37.000000000 -0500
-@@ -138,7 +138,7 @@
-    if [ $INIT != 1 ] ; then
-     echo "Loading FTP NAT module..."
-    fi
--   $MODPROBE ip_nat_irc
-+   $MODPROBE ip_nat_ftp
-   fi
-  fi
- }
diff --git a/net-firewall/ipkungfu/ipkungfu-0.5.2-r2.ebuild b/net-firewall/ipkungfu/ipkungfu-0.5.2-r2.ebuild
deleted file mode 100644
index 1febf0b58fef..000000000000
--- a/net-firewall/ipkungfu/ipkungfu-0.5.2-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="A nice iptables firewall script"
-HOMEPAGE="http://www.linuxkungfu.org/"
-SRC_URI="http://www.linuxkungfu.org/ipkungfu/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND="net-firewall/iptables"
-RDEPEND="${DEPEND}
-	virtual/logger"
-
-src_unpack() {
-	unpack ${A}
-
-	# Patch ipkungfu to load the right module for ip_nat_ftp
-	# Fixes bug #42443.  Thanks to George L. Emigh <george@georgelemigh.com>
-	cd "${WORKDIR}"/${P} && epatch "${FILESDIR}"/nat_ftp.patch
-
-	# man page comes bzip2'd, so bunzip2 it.
-	cd "${WORKDIR}"/${P}/files
-	bunzip2 ipkungfu.8.bz2
-}
-
-src_install() {
-
-	# Package comes with a hard coded shell script, so here we
-	# replicate what they did, but so it's compatible with portage.
-
-	# Install shell script executable
-	dosbin ipkungfu
-
-	# Install Gentoo init script
-	newinitd "${FILESDIR}"/ipkungfu.init ipkungfu
-
-	# Install config files into /etc
-	dodir /etc/ipkungfu
-	insinto /etc/ipkungfu
-	doins files/*.conf
-
-	# Install man page
-	doman files/ipkungfu.8
-
-	# Install documentation
-	dodoc COPYRIGHT Changelog FAQ INSTALL README gpl.txt
-}
-
-pkg_postinst() {
-	einfo "Be sure to edit the config files"
-	einfo "in /etc/ipkungfu before running"
-}
diff --git a/net-firewall/ipkungfu/ipkungfu-0.6.1-r1.ebuild b/net-firewall/ipkungfu/ipkungfu-0.6.1-r1.ebuild
index c23eba995ec9..ded3ce2360a2 100644
--- a/net-firewall/ipkungfu/ipkungfu-0.6.1-r1.ebuild
+++ b/net-firewall/ipkungfu/ipkungfu-0.6.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.linuxkungfu.org/ipkungfu/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND="net-firewall/iptables"