Unmasks and ebuild cleanups

6 files changed, 4 insertions, 122 deletions

diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index d6f3b3065b26..ccfef2b69ff5 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,10 +1,6 @@
 MD5 be0c8451ba4cbbe4417c974630a05543 fwbuilder-1.0.11.ebuild 1500
-MD5 71db7c7fb278027bd2b7c145aae20303 fwbuilder-1.1.0.ebuild 1471
-MD5 71db68eeccdff5082ca2885c15e7eec3 fwbuilder-1.0.6.ebuild 1329
-MD5 2c492745d967a13c3a21863c3a97a862 fwbuilder-1.1.1.ebuild 1471
+MD5 3f3ed2631227552a89219ed9ba84318b fwbuilder-1.1.1.ebuild 1469
 MD5 bc091322584ec480b88f053b6fb05030 ChangeLog 4275
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
 MD5 c61d4dd60ad312374a1b44d79c9b4fb1 files/digest-fwbuilder-1.0.11 69
-MD5 ff88c9bc83f87f89dbab85052a8685f2 files/digest-fwbuilder-1.0.6 68
-MD5 531420274a01f8c31def77233127dc7c files/digest-fwbuilder-1.1.0 68
 MD5 c77b261f76d99627b79e0ba37f4049e3 files/digest-fwbuilder-1.1.1 68
diff --git a/net-firewall/fwbuilder/files/digest-fwbuilder-1.0.6 b/net-firewall/fwbuilder/files/digest-fwbuilder-1.0.6
deleted file mode 100644
index 4daa0f9f9063..000000000000
--- a/net-firewall/fwbuilder/files/digest-fwbuilder-1.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fc09b20c22f84b6bd19a08320555534a fwbuilder-1.0.6.tar.gz 1154386
diff --git a/net-firewall/fwbuilder/files/digest-fwbuilder-1.1.0 b/net-firewall/fwbuilder/files/digest-fwbuilder-1.1.0
deleted file mode 100644
index 05e1ffc1746e..000000000000
--- a/net-firewall/fwbuilder/files/digest-fwbuilder-1.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 98191b8b22cf71167d90fcd654137429 fwbuilder-1.1.0.tar.gz 1438661
diff --git a/net-firewall/fwbuilder/fwbuilder-1.0.6.ebuild b/net-firewall/fwbuilder/fwbuilder-1.0.6.ebuild
deleted file mode 100644
index 499960e77caf..000000000000
--- a/net-firewall/fwbuilder/fwbuilder-1.0.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-1.0.6.ebuild,v 1.6 2003/10/21 16:02:03 mholzer Exp $
-
-DESCRIPTION="A firewall GUI"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://fwbuilder.sourceforge.net/"
-RESTRICT="nomirror"
-S=${WORKDIR}/${P}
-
-KEYWORDS="x86 sparc "
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static nls"
-
-DEPEND="=dev-cpp/gtkmm-1.2*
-	>=dev-libs/libxslt-1.0.7
-	=net-libs/libfwbuilder-0.10.10
-	media-libs/gdk-pixbuf
-	dev-libs/libxml2
-	=dev-libs/libsigc++-1.0*"
-RDEPEND="sys-apps/iproute"
-
-src_compile() {
-	local myconf
-	myconf="--with-gnu-ld"
-	use static	&&	myconf="${myconf} --enable-shared=no --enable-static=yes"
-	use nls		||	myconf="${myconf} --disable-nls"
-
-	./autogen.sh \
-		--prefix=/usr \
-		--host=${CHOST}	|| die "./configure failed"
-
-	cp config.h config.h.orig
-	sed -e "s:#define HAVE_XMLSAVEFORMATFILE 1://:" config.h.orig > config.h
-
-	if [ "`use static`" ]
-	then
-		emake LDFLAGS="-static" || die "emake LDFLAGS failed"
-	else
-		emake || die "emake failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "emake install failed"
-}
-
-pkg_postinst() {
-	einfo "You may have to install iproute on the machine that"
-	einfo "will run the firewall script."
-}
diff --git a/net-firewall/fwbuilder/fwbuilder-1.1.0.ebuild b/net-firewall/fwbuilder/fwbuilder-1.1.0.ebuild
deleted file mode 100644
index 0383bcc97d97..000000000000
--- a/net-firewall/fwbuilder/fwbuilder-1.1.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-1.1.0.ebuild,v 1.1 2003/11/26 11:09:42 aliz Exp $
-
-DESCRIPTION="A firewall GUI"
-SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
-HOMEPAGE="http://www.fwbuilder.org/"
-RESTRICT="nomirror"
-S=${WORKDIR}/${P}
-
-KEYWORDS="~x86 ~sparc ~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static nls"
-
-DEPEND="sys-devel/autoconf
-	=x11-libs/gtk+-1.2*
-	>=media-libs/gdk-pixbuf-0.16.0
-	=dev-cpp/gtkmm-1.2*
-	=dev-libs/libsigc++-1.0*
-	nls? ( >=sys-devel/gettext-0.11 )
-	~net-libs/libfwbuilder-1.0.2"
-RDEPEND="$DEPEND"
-
-# Added by Jason Wever <weeve@gentoo.org>
-# Fix for bug #30256.
-if [ "${ARCH}" = "sparc" ]; then
-	inherit flag-o-matic
-	replace-flags "-O3" "-O2"
-fi
-
-src_compile() {
-	local myconf
-	myconf="--with-gnu-ld"
-	use static	&&	myconf="${myconf} --enable-shared=no --enable-static=yes"
-	use nls		||	myconf="${myconf} --disable-nls"
-
-	./autogen.sh \
-		--prefix=/usr \
-		--host=${CHOST}	|| die "./configure failed"
-
-	sed -i -e "s:#define HAVE_XMLSAVEFORMATFILE 1://:" config.h
-
-	if [ "`use static`" ]
-	then
-		emake LDFLAGS="-static" || die "emake LDFLAGS failed"
-	else
-		emake || die "emake failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "emake install failed"
-}
-
-pkg_postinst() {
-	einfo "You may have to install iproute on the machine that"
-	einfo "will run the firewall script."
-}
-
diff --git a/net-firewall/fwbuilder/fwbuilder-1.1.1.ebuild b/net-firewall/fwbuilder/fwbuilder-1.1.1.ebuild
index fc8a2ed54a90..71bda0cd6f30 100644
--- a/net-firewall/fwbuilder/fwbuilder-1.1.1.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-1.1.1.ebuild,v 1.1 2003/12/12 22:49:05 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-1.1.1.ebuild,v 1.2 2004/01/13 13:46:38 aliz Exp $
 
 DESCRIPTION="A firewall GUI"
 SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.fwbuilder.org/"
 RESTRICT="nomirror"
 S=${WORKDIR}/${P}
 
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="x86 ~sparc amd64"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="static nls"