version bump, desktop entry, clean up

(Portage version: 2.0.51.19)

16 files changed, 19 insertions, 235 deletions

diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index 63d368475e5a..62051ae0f186 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/fwbuilder
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.43 2005/04/17 03:31:04 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.44 2005/05/12 23:36:37 carlo Exp $
+
+*fwbuilder-2.0.7 (12 May 2005)
+
+  12 May 2005; Carsten Lohrke <carlo@gentoo.org>
+  -files/fwbuilder-2.0.3-errno.patch, -fwbuilder-2.0.0.ebuild,
+  -fwbuilder-2.0.1.ebuild, -fwbuilder-2.0.2.ebuild, -fwbuilder-2.0.3.ebuild,
+  -fwbuilder-2.0.4.ebuild, -fwbuilder-2.0.5.ebuild, +fwbuilder-2.0.7.ebuild:
+  version bump, desktop entry, clean up
 
   17 Apr 2005; Eric Shattow <jnc@gentoo.org> fwbuilder-2.0.6.ebuild:
   Stable on x86; Bug #85580
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index f5fe078e8008..929350c6fcf2 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,30 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 16c099a8c5bb2530376b520421872ffe ChangeLog 7541
+MD5 be63a7e6146a8fa29c6b9e08f572043d fwbuilder-2.0.7.ebuild 930
 MD5 11e6f232f520cdf75476e709f2b3bc7e fwbuilder-1.1.2.ebuild 1390
-MD5 3fa6fa9b1139da67bb478856fb0e5b4a fwbuilder-2.0.0.ebuild 834
-MD5 1155a6757dc0702e0fa6ddda4c095534 fwbuilder-2.0.1.ebuild 819
-MD5 4986eb03aa05e3480972643cdc42afa9 fwbuilder-2.0.2.ebuild 850
-MD5 76e4de6ec9b217c66c524497197dae75 fwbuilder-2.0.3.ebuild 945
-MD5 eb9856bc5402a9a226e2325d9192e453 fwbuilder-2.0.4.ebuild 866
-MD5 8719c7510feae1b658a046b360130d03 fwbuilder-2.0.5.ebuild 866
 MD5 f2365bdcbc631153ec65d2185083a46e fwbuilder-2.0.6.ebuild 866
+MD5 a2c7d4e97b3bc20b6a39ffda595a9833 ChangeLog 7880
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+MD5 b7ecd1d8440ad584eead03ccddd2a800 files/fwbuilder-1.1.2-nls_fix.patch 382
 MD5 c1a7d072ddaa87c67e47e135f6cbd1cf files/digest-fwbuilder-1.1.2 68
-MD5 c1fa80e0d8e4fecdab2f4954a4331849 files/digest-fwbuilder-2.0.0 67
-MD5 8e082dd18bf1a4f65177d623d336457c files/digest-fwbuilder-2.0.1 67
-MD5 ffe7fa3e450755fc36ccc950afcbd31b files/digest-fwbuilder-2.0.2 67
-MD5 c0a74a19faa5841b76a422ac2997a887 files/digest-fwbuilder-2.0.3 67
-MD5 53d2a461d760b41716b37876d0ef6d51 files/digest-fwbuilder-2.0.4 68
-MD5 9f20f25d4d825eab6d030825464b9c64 files/digest-fwbuilder-2.0.5 68
 MD5 70fea7193b1f73a34e3cf49a2ac9c9c7 files/digest-fwbuilder-2.0.6 68
-MD5 b7ecd1d8440ad584eead03ccddd2a800 files/fwbuilder-1.1.2-nls_fix.patch 382
-MD5 44b9d595271946adccdbfaa63eca4c5f files/fwbuilder-2.0.3-errno.patch 407
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCYdpm+uC/ViVka/0RAhXKAJ4tGrlKnR7Y7yzzx+u7Qug8IkMjdwCgsDgE
-Kd5fWXczriVw6KPkp9Ivh34=
-=qwD0
------END PGP SIGNATURE-----
+MD5 99c3ff5a964d751686899517a6b90485 files/digest-fwbuilder-2.0.7 68
diff --git a/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.0 b/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.0
deleted file mode 100644
index bdd07de8122a..000000000000
--- a/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 167ba3ce4b2cacf3018f799b9cee5743 fwbuilder-2.0.0.tar.gz 890982
diff --git a/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.1 b/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.1
deleted file mode 100644
index 8c8183744b8e..000000000000
--- a/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7e63c4c8c29a5fdd5cb7ed36dcb8bd38 fwbuilder-2.0.1.tar.gz 897411
diff --git a/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.2 b/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.2
deleted file mode 100644
index 29b72d78f153..000000000000
--- a/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1a31df4d7c6ddcbe9aa7ae861ea438d2 fwbuilder-2.0.2.tar.gz 928224
diff --git a/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.3 b/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.3
deleted file mode 100644
index 1952cc2a0f38..000000000000
--- a/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 407b8c14af1a2d7714ff6a90f0981bae fwbuilder-2.0.3.tar.gz 945727
diff --git a/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.4 b/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.4
deleted file mode 100644
index d0db10aa8444..000000000000
--- a/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a63df33d38f4845cc5721cee9a10640b fwbuilder-2.0.4.tar.gz 1064789
diff --git a/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.5 b/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.5
deleted file mode 100644
index 378221769d76..000000000000
--- a/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 03fe6aaa6f8c7728bd3015a4df187c70 fwbuilder-2.0.5.tar.gz 1154966
diff --git a/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.7 b/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.7
new file mode 100644
index 000000000000..9b6c0f0659dd
--- /dev/null
+++ b/net-firewall/fwbuilder/files/digest-fwbuilder-2.0.7
@@ -0,0 +1 @@
+MD5 e381567247165bb4a8a9a130d3abe446 fwbuilder-2.0.7.tar.gz 1222857
diff --git a/net-firewall/fwbuilder/files/fwbuilder-2.0.3-errno.patch b/net-firewall/fwbuilder/files/fwbuilder-2.0.3-errno.patch
deleted file mode 100644
index d39f3862332b..000000000000
--- a/net-firewall/fwbuilder/files/fwbuilder-2.0.3-errno.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ruN fwbuilder-2.0.3/src/gui/SSHPIX.cpp fwbuilder-2.0.3-new/src/gui/SSHPIX.cpp
---- fwbuilder-2.0.3/src/gui/SSHPIX.cpp	2004-09-29 08:31:52.000000000 +0200
-+++ fwbuilder-2.0.3-new/src/gui/SSHPIX.cpp	2004-10-03 22:55:51.801233872 +0200
-@@ -40,6 +40,11 @@
- 
- #include <iostream>
- 
-+#include <errno.h>
-+#ifndef errno
-+extern int errno;
-+#endif 
-+
- using namespace std;
- 
- SSHPIX::SSHPIX(const QString &_h,
-
diff --git a/net-firewall/fwbuilder/fwbuilder-2.0.0.ebuild b/net-firewall/fwbuilder/fwbuilder-2.0.0.ebuild
deleted file mode 100644
index ee6581528bf0..000000000000
--- a/net-firewall/fwbuilder/fwbuilder-2.0.0.ebuild
+++ /dev/null
@@ -1,33 +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/fwbuilder/fwbuilder-2.0.0.ebuild,v 1.6 2005/02/07 17:22:46 carlo 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 sparc ~ppc"
-IUSE="nls"
-
-DEPEND="~net-libs/libfwbuilder-${PV}
-	nls? ( >=sys-devel/gettext-0.11.4 )"
-
-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 ""
-}
diff --git a/net-firewall/fwbuilder/fwbuilder-2.0.1.ebuild b/net-firewall/fwbuilder/fwbuilder-2.0.1.ebuild
deleted file mode 100644
index a0f6c7750508..000000000000
--- a/net-firewall/fwbuilder/fwbuilder-2.0.1.ebuild
+++ /dev/null
@@ -1,34 +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/fwbuilder/fwbuilder-2.0.1.ebuild,v 1.3 2005/02/07 17:22:46 carlo 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 ~sparc ~ppc"
-IUSE="nls"
-
-DEPEND="~net-libs/libfwbuilder-${PV}
-	nls? ( >=sys-devel/gettext-0.11.4 )
-	>=dev-libs/libxslt-1.0.7"
-
-src_compile() {
-	econf `use_enable nls` || die
-
-	addwrite "${QTDIR}/etc/settings"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DDIR=${D} install || die
-}
-
-pkg_postinst() {
-	echo ""
-	einfo "You need to emerge iproute2 on the machine that"
-	einfo "will run the firewall script."
-	echo ""
-}
diff --git a/net-firewall/fwbuilder/fwbuilder-2.0.2.ebuild b/net-firewall/fwbuilder/fwbuilder-2.0.2.ebuild
deleted file mode 100644
index ff48251ef226..000000000000
--- a/net-firewall/fwbuilder/fwbuilder-2.0.2.ebuild
+++ /dev/null
@@ -1,36 +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/fwbuilder/fwbuilder-2.0.2.ebuild,v 1.3 2005/02/07 17:22:46 carlo 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 ~sparc ~ppc"
-IUSE="nls"
-
-DEPEND="~net-libs/libfwbuilder-${PV}
-	nls? ( >=sys-devel/gettext-0.11.4 )
-	>=dev-libs/libxslt-1.0.7"
-
-src_compile() {
-	export QMAKESPEC="linux-g++"
-
-	econf `use_enable nls` || die
-
-	addwrite "${QTDIR}/etc/settings"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DDIR=${D} install || die
-}
-
-pkg_postinst() {
-	echo ""
-	einfo "You need to emerge iproute2 on the machine that"
-	einfo "will run the firewall script."
-	echo ""
-}
diff --git a/net-firewall/fwbuilder/fwbuilder-2.0.3.ebuild b/net-firewall/fwbuilder/fwbuilder-2.0.3.ebuild
deleted file mode 100644
index de0e835eaa02..000000000000
--- a/net-firewall/fwbuilder/fwbuilder-2.0.3.ebuild
+++ /dev/null
@@ -1,44 +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/fwbuilder/fwbuilder-2.0.3.ebuild,v 1.2 2005/02/07 17:22:46 carlo Exp $
-
-inherit eutils
-
-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 ~sparc ~ppc"
-IUSE="nls"
-
-DEPEND="~net-libs/libfwbuilder-${PV}
-	nls? ( >=sys-devel/gettext-0.11.4 )
-	>=dev-libs/libxslt-1.0.7"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	epatch ${FILESDIR}/${P}-errno.patch
-}
-
-src_compile() {
-	export QMAKESPEC="linux-g++"
-
-	econf `use_enable nls` || die
-
-	addwrite "${QTDIR}/etc/settings"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DDIR=${D} install || die
-}
-
-pkg_postinst() {
-	echo ""
-	einfo "You need to emerge iproute2 on the machine that"
-	einfo "will run the firewall script."
-	echo ""
-}
diff --git a/net-firewall/fwbuilder/fwbuilder-2.0.5.ebuild b/net-firewall/fwbuilder/fwbuilder-2.0.5.ebuild
deleted file mode 100644
index 9ce46bc996ba..000000000000
--- a/net-firewall/fwbuilder/fwbuilder-2.0.5.ebuild
+++ /dev/null
@@ -1,38 +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/fwbuilder/fwbuilder-2.0.5.ebuild,v 1.1 2005/02/07 17:22:46 carlo Exp $
-
-inherit eutils
-
-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 ~sparc ~ppc"
-IUSE="nls"
-
-DEPEND="~net-libs/libfwbuilder-${PV}
-	nls? ( >=sys-devel/gettext-0.11.4 )
-	>=dev-libs/libxslt-1.0.7"
-
-src_compile() {
-	export QMAKESPEC="linux-g++"
-
-	econf `use_enable nls` || die
-
-	addwrite "${QTDIR}/etc/settings"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DDIR=${D} install || die
-}
-
-pkg_postinst() {
-	echo ""
-	einfo "You need to emerge iproute2 on the machine that"
-	einfo "will run the firewall script."
-	echo ""
-}
diff --git a/net-firewall/fwbuilder/fwbuilder-2.0.4.ebuild b/net-firewall/fwbuilder/fwbuilder-2.0.7.ebuild
index cb5e3ff5327a..2e1366ab8ec6 100644
--- a/net-firewall/fwbuilder/fwbuilder-2.0.4.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-2.0.7.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/fwbuilder/fwbuilder-2.0.4.ebuild,v 1.2 2005/02/07 17:22:46 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-2.0.7.ebuild,v 1.1 2005/05/12 23:36:37 carlo Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ppc64"
 IUSE="nls"
 
 DEPEND="~net-libs/libfwbuilder-${PV}
@@ -28,6 +28,9 @@ src_compile() {
 
 src_install() {
 	emake DDIR=${D} install || die
+	insinto /usr/share/pixmaps
+	doins src/gui/icons/firewall_64.png
+	make_desktop_entry fwbuilder "Firewall Builder" "/usr/share/pixmaps/firewall_64.png" "System;Qt"
 }
 
 pkg_postinst() {