Closing #58794

10 files changed, 45 insertions, 194 deletions

diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index 86b1f97afefe..c20547d95c8c 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/fwbuilder
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.26 2004/06/24 22:39:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.27 2004/08/02 16:53:52 aliz Exp $
+
+  02 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump, ebuild contributed by Carsten Lohrke <carlo@gentoo.org> in
+  #58794.
+
+*fwbuilder-2.0.0 (02 Aug 2004)
 
   09 Jun 2004; Aron Griffis <agriffis@gentoo.org> fwbuilder-1.0.11.ebuild,
   fwbuilder-1.1.1-r1.ebuild, fwbuilder-1.1.1.ebuild:
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index cb784d02df93..db404ff0d912 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,11 +1,7 @@
-MD5 93123c4bd85f096133b7af20ba953d16 fwbuilder-1.0.11.ebuild 1490
-MD5 631bbc5e5c5dd9dfbaf69ceb1f9f1e25 fwbuilder-1.1.1-r1.ebuild 1489
 MD5 81dfc240bfb7e2b0e3daf67cfea20c8e fwbuilder-1.1.2.ebuild 1393
-MD5 f61def00edd5a4f50bcde774ce8d8f4e fwbuilder-1.1.1.ebuild 1459
-MD5 deb7b90b8f20d3450a227b285022e40e ChangeLog 5583
+MD5 0c05111d214db57cb60a6fc7ebbeb72f ChangeLog 5747
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+MD5 2f095d37f139b03ad01a82b2b2fc2f89 fwbuilder-2.0.0.ebuild 842
 MD5 b7ecd1d8440ad584eead03ccddd2a800 files/fwbuilder-1.1.2-nls_fix.patch 382
-MD5 c61d4dd60ad312374a1b44d79c9b4fb1 files/digest-fwbuilder-1.0.11 69
-MD5 c77b261f76d99627b79e0ba37f4049e3 files/digest-fwbuilder-1.1.1-r1 68
-MD5 c77b261f76d99627b79e0ba37f4049e3 files/digest-fwbuilder-1.1.1 68
 MD5 c1a7d072ddaa87c67e47e135f6cbd1cf files/digest-fwbuilder-1.1.2 68
+MD5 c1fa80e0d8e4fecdab2f4954a4331849 files/digest-fwbuilder-2.0.0 67
diff --git a/net-firewall/fwbuilder/files/digest-fwbuilder-1.0.11 b/net-firewall/fwbuilder/files/digest-fwbuilder-1.0.11
deleted file mode 100644
index f073453a3914..000000000000
--- a/net-firewall/fwbuilder/files/digest-fwbuilder-1.0.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 03f013f0f02472c91845e3d6fd50720a fwbuilder-1.0.11.tar.gz 1385279
diff --git a/net-firewall/fwbuilder/files/digest-fwbuilder-1.1.1 b/net-firewall/fwbuilder/files/digest-fwbuilder-1.1.1
deleted file mode 100644
index 0fa1cb9d1f8b..000000000000
--- a/net-firewall/fwbuilder/files/digest-fwbuilder-1.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c0c86c5d0a2f6eeff388c66d49c63463 fwbuilder-1.1.1.tar.gz 1440033
diff --git a/net-firewall/fwbuilder/files/digest-fwbuilder-1.1.1-r1 b/net-firewall/fwbuilder/files/digest-fwbuilder-1.1.1-r1
deleted file mode 100644
index 0fa1cb9d1f8b..000000000000
--- a/net-firewall/fwbuilder/files/digest-fwbuilder-1.1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c0c86c5d0a2f6eeff388c66d49c63463 fwbuilder-1.1.1.tar.gz 1440033
diff --git a/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.0 b/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.0
new file mode 100644
index 000000000000..bdd07de8122a
--- /dev/null
+++ b/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.0
@@ -0,0 +1 @@
+MD5 167ba3ce4b2cacf3018f799b9cee5743 fwbuilder-2.0.0.tar.gz 890982
diff --git a/net-firewall/fwbuilder/fwbuilder-1.0.11.ebuild b/net-firewall/fwbuilder/fwbuilder-1.0.11.ebuild
deleted file mode 100644
index 07b2f973d6ab..000000000000
--- a/net-firewall/fwbuilder/fwbuilder-1.0.11.ebuild
+++ /dev/null
@@ -1,61 +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/fwbuilder/fwbuilder-1.0.11.ebuild,v 1.10 2004/07/14 23:42:20 agriffis Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="A firewall GUI"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.fwbuilder.org/"
-RESTRICT="nomirror"
-
-KEYWORDS="x86 sparc"
-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.1"
-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"
-
-	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.1-r1.ebuild b/net-firewall/fwbuilder/fwbuilder-1.1.1-r1.ebuild
deleted file mode 100644
index ba238f3db82d..000000000000
--- a/net-firewall/fwbuilder/fwbuilder-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,62 +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/fwbuilder/fwbuilder-1.1.1-r1.ebuild,v 1.7 2004/07/14 23:42:20 agriffis Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="A firewall GUI"
-SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
-HOMEPAGE="http://www.fwbuilder.org/"
-
-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="sys-apps/iproute2"
-
-# 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"
-
-	cd ${S}
-
-	env WANT_AUTOCONF_2_5=1 ./autogen.sh \
-		--prefix=/usr \
-		--host=${CHOST}	|| die "./autogen.sh 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
deleted file mode 100644
index b6e22935a1f0..000000000000
--- a/net-firewall/fwbuilder/fwbuilder-1.1.1.ebuild
+++ /dev/null
@@ -1,60 +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/fwbuilder/fwbuilder-1.1.1.ebuild,v 1.8 2004/07/14 23:42:20 agriffis Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="A firewall GUI"
-SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
-HOMEPAGE="http://www.fwbuilder.org/"
-RESTRICT="nomirror"
-
-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-2.0.0.ebuild b/net-firewall/fwbuilder/fwbuilder-2.0.0.ebuild
new file mode 100644
index 000000000000..926a68a3be2a
--- /dev/null
+++ b/net-firewall/fwbuilder/fwbuilder-2.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-2.0.0.ebuild,v 1.1 2004/08/02 16:53:52 aliz Exp $
+
+DESCRIPTION="A firewall GUI"
+HOMEPAGE="http://www.fwbuilder.org/"
+SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="nls"
+
+DEPEND="~net-libs/libfwbuilder-2.0.0
+	nls? ( >=sys-devel/gettext-0.11.4 )"
+RDEPEND=${DEPEND}
+
+src_compile() {
+	econf `use_enable nls` || die "./configure failed"
+
+	addwrite "${QTDIR}/etc/settings"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DDIR=${D} install || die "emake install failed"
+}
+
+pkg_postinst() {
+	echo ""
+	einfo "You need to emerge iproute2 on the machine that"
+	einfo "will run the firewall script."
+	echo ""
+}