Clean out old for repoman happy, stable on x86 to preserve keywording

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 7 insertions, 114 deletions

diff --git a/net-firewall/nufw/ChangeLog b/net-firewall/nufw/ChangeLog
index 419e60f3e882..47333f4f34e4 100644
--- a/net-firewall/nufw/ChangeLog
+++ b/net-firewall/nufw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/nufw
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/ChangeLog,v 1.43 2014/11/03 13:33:58 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/ChangeLog,v 1.44 2014/11/04 04:06:59 patrick Exp $
+
+  04 Nov 2014; Patrick Lauer <patrick@gentoo.org> -nufw-2.2.21.ebuild,
+  nufw-2.2.22-r1.ebuild:
+  Clean out old for repoman happy, stable on x86 to preserve keywording
 
   03 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org> nufw-2.2.21.ebuild,
   nufw-2.2.22-r1.ebuild:
diff --git a/net-firewall/nufw/nufw-2.2.21.ebuild b/net-firewall/nufw/nufw-2.2.21.ebuild
deleted file mode 100644
index be87f02bb348..000000000000
--- a/net-firewall/nufw/nufw-2.2.21.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/nufw-2.2.21.ebuild,v 1.5 2014/11/03 13:33:58 titanofold Exp $
-
-EAPI=2
-
-inherit autotools ssl-cert eutils pam
-
-DESCRIPTION="An enterprise grade authenticating firewall based on netfilter"
-HOMEPAGE="http://www.nufw.org/"
-SRC_URI="http://www.nufw.org/download/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="debug ldap mysql pam pam_nuauth plaintext postgres prelude \
-unicode nfqueue nfconntrack static syslog test"
-
-DEPEND=">=dev-libs/glib-2
-	dev-libs/libgcrypt:0
-	>=dev-libs/cyrus-sasl-2
-	net-firewall/iptables
-	>=net-libs/gnutls-1.1
-	ldap? ( >=net-nds/openldap-2 )
-	mysql? ( virtual/mysql )
-	pam? ( sys-libs/pam )
-	pam_nuauth? ( sys-libs/pam )
-	postgres? ( virtual/postgresql[server] )
-	nfqueue? ( net-libs/libnfnetlink
-		net-libs/libnetfilter_queue )
-	nfconntrack? ( net-libs/libnetfilter_conntrack )
-	prelude? ( dev-libs/libprelude )
-	dev-python/ipy"
-RDEPEND=${DEPEND}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e 's:^#\(nuauth_tls_key="/etc/nufw/\)nuauth-key.pem:\1nuauth.key:' \
-		-e 's:^#\(nuauth_tls_cert="/etc/nufw/\)nuauth-cert.pem:\1nuauth.pem:' \
-		conf/nuauth.conf || die "sed failed"
-
-	epatch "${FILESDIR}/${P}-fix-gnutls.patch"
-
-	# This tests require inl_tests to be installed. We don't have it now in our
-	# tree so we disable them for now... for more information see tests/README
-	use test && sed -i "s:\(^TESTS=test_all.py\):#\1:" tests/Makefile.am
-
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		--with-shared \
-		$(use_enable static) \
-		$(use_enable pam_nuauth pam-nufw) \
-		$(use_with prelude prelude-log) \
-		$(use_with mysql mysql-log) \
-		$(use_with mysql mysql-auth) \
-		$(use_with postgres pgsql-log) \
-		$(use_with syslog syslog-log) \
-		$(use_with plaintext plaintext-auth) \
-		--with-mark-group \
-		$(use_with pam system-auth) \
-		$(use_with ldap) \
-		$(use_with nfqueue) \
-		$(use_with nfconntrack) \
-		$(use_with unicode utf8) \
-		$(use_enable debug) \
-		--with-user-mark \
-		--sysconfdir="/etc/nufw" \
-		--localstatedir="/var" \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_test() {
-	ewarn "Some tests are skiped! If you wish to run them read tests/README and"
-	ewarn "do that manually."
-	ebeep 5
-	make check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/nufw-init.d nufw
-	newconfd "${FILESDIR}"/nufw-conf.d nufw
-
-	newinitd "${FILESDIR}"/nuauth-init.d nuauth
-	newconfd "${FILESDIR}"/nuauth-conf.d nuauth
-
-	insinto /etc/nufw
-	doins conf/nuauth.conf
-	keepdir /var/run/nuauth
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	docinto scripts
-	dodoc scripts/{clean_conntrack.pl,nuaclgen,nutop,README,ulog_rotate_daily.sh,ulog_rotate_weekly.sh}
-	docinto conf
-	dodoc conf/*.{nufw,schema,conf,dump,xml}
-
-	if use pam; then
-		pamd_mimic system-auth nufw auth account password session
-	fi
-}
-
-pkg_postinst() {
-	install_cert /etc/nufw/{nufw,nuauth}
-}
diff --git a/net-firewall/nufw/nufw-2.2.22-r1.ebuild b/net-firewall/nufw/nufw-2.2.22-r1.ebuild
index 4b6c6c7d6a76..9f0e987ba77e 100644
--- a/net-firewall/nufw/nufw-2.2.22-r1.ebuild
+++ b/net-firewall/nufw/nufw-2.2.22-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/nufw-2.2.22-r1.ebuild,v 1.2 2014/11/03 13:33:58 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/nufw-2.2.22-r1.ebuild,v 1.3 2014/11/04 04:06:59 patrick Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.nufw.org/attachments/download/39/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="debug ldap mysql pam pam_nuauth plaintext postgres prelude unicode nfqueue nfconntrack static syslog test"
 
 REQUIRED_USE="pam_nuauth? ( plaintext )"