Cleanup

(Portage version: 2.1.9.45/cvs/Linux x86_64)

7 files changed, 7 insertions, 310 deletions

diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index b92527b68ca3..e628e5a5d30f 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/fwbuilder
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.99 2011/03/30 20:39:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.100 2011/03/30 20:52:15 dilfridge Exp $
+
+  30 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/4.0.1-secure-mktemp.patch, -fwbuilder-3.0.3.ebuild,
+  -fwbuilder-3.0.6.ebuild, -fwbuilder-4.0.1-r1.ebuild,
+  -fwbuilder-4.0.1.ebuild, -fwbuilder-4.1.1.ebuild:
+  Cleanup
 
   30 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org> metadata.xml:
   Adopted package
diff --git a/net-firewall/fwbuilder/files/4.0.1-secure-mktemp.patch b/net-firewall/fwbuilder/files/4.0.1-secure-mktemp.patch
deleted file mode 100644
index 952d40d53f06..000000000000
--- a/net-firewall/fwbuilder/files/4.0.1-secure-mktemp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naurp fwbuilder-4.0.1.orig//src/res/configlets/linux24/routing_functions fwbuilder-4.0.1//src/res/configlets/linux24/routing_functions
---- fwbuilder-4.0.1.orig//src/res/configlets/linux24/routing_functions	2009-12-17 23:12:01.000000000 -0500
-+++ fwbuilder-4.0.1//src/res/configlets/linux24/routing_functions	2010-06-05 14:04:15.735061939 -0400
-@@ -14,9 +14,9 @@
- 
- # ============== ROUTING RULES ============== 
- 
--TMPDIRNAME="/tmp/.fwbuilder.tempdir.$$"
-+TMPDIRNAME="$(umask 077 && mktemp --tmpdir=/tmp -d .fwbuilder.tempdir.XXXXXXXXXX)"
-+[ $? != 0 ] && exit 1
- TMPFILENAME="$TMPDIRNAME/.fwbuilder.out"
--(umask 077 && mkdir $TMPDIRNAME) || exit 1
- 
- #
- # This function stops stdout redirection
diff --git a/net-firewall/fwbuilder/fwbuilder-3.0.3.ebuild b/net-firewall/fwbuilder/fwbuilder-3.0.3.ebuild
deleted file mode 100644
index 900e043b5d5b..000000000000
--- a/net-firewall/fwbuilder/fwbuilder-3.0.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-3.0.3.ebuild,v 1.8 2010/09/13 06:28:01 kumba Exp $
-
-EAPI="2"
-
-inherit qt4-r2 multilib
-
-DESCRIPTION="A firewall GUI"
-HOMEPAGE="http://www.fwbuilder.org/"
-SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+pch"
-
-DEPEND="~net-libs/libfwbuilder-${PV}
-	>=dev-java/antlr-2.7.7:0[cxx]
-	x11-libs/qt-gui:4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	# Remove bundled antlr
-	rm -rf src/antlr
-
-	sed -i \
-		-e '/COPYING/d' \
-		doc/doc.pro || die "sed doc.pro failed"
-
-	# we'll use our eqmake instead of bundled script to process qmake files
-	sed -i \
-		-e 's:^. ./runqmake.sh$:echo:' \
-		configure || die "sed configure failed"
-
-	# prevent install script from automatically stripping binaries - let portage do that
-	sed -i \
-		-e 's/s) stripcmd="$stripprog"$/s)/' \
-		install.sh || die "sed install.sh failed"
-
-	if ! use pch; then
-		sed -i \
-				-e '/^PRECOMPILED_HEADER =/,/[^\\]$/d' \
-				-e '/^CONFIG += precompile_header/d' \
-				src/gui/gui.pro || die "sed for gui.pro failed"
-	fi
-}
-
-src_configure() {
-	econf \
-		--with-docdir=/usr/share/doc/${PF}
-
-	for pro_file in $(find "${S}" -name "*.pro"); do
-		eqmake4 "${pro_file}" -o "$(dirname ${pro_file})/Makefile"  || die "eqmake4 for ${pro_file} failed"
-	done
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-	cd doc
-	dodoc AUTHORS ChangeLog Credits README* \
-		FWBuilder-Routing-LICENSE.txt PatchAcceptancePolicy.txt
-	doman fwb*.1
-}
-
-pkg_postinst() {
-	validate_desktop_entries
-
-	elog "You need to emerge sys-apps/iproute2 on the machine"
-	elog "that will run the firewall script."
-}
diff --git a/net-firewall/fwbuilder/fwbuilder-3.0.6.ebuild b/net-firewall/fwbuilder/fwbuilder-3.0.6.ebuild
deleted file mode 100644
index 8ec5ffe930d6..000000000000
--- a/net-firewall/fwbuilder/fwbuilder-3.0.6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-3.0.6.ebuild,v 1.2 2010/09/13 06:28:01 kumba Exp $
-
-EAPI="2"
-
-inherit qt4-r2 multilib
-
-DESCRIPTION="A firewall GUI"
-HOMEPAGE="http://www.fwbuilder.org/"
-SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+pch"
-
-DEPEND="~net-libs/libfwbuilder-${PV}
-	>=dev-java/antlr-2.7.7:0[cxx]
-	x11-libs/qt-gui:4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	# Remove bundled antlr
-	rm -rf src/antlr
-
-	sed -i \
-		-e '/COPYING/d' \
-		doc/doc.pro || die "sed doc.pro failed"
-
-	# we'll use our eqmake instead of bundled script to process qmake files
-	sed -i \
-		-e 's:^. ./runqmake.sh$:echo:' \
-		configure || die "sed configure failed"
-
-	# prevent install script from automatically stripping binaries - let portage do that
-	sed -i \
-		-e 's/s) stripcmd="$stripprog"$/s)/' \
-		install.sh || die "sed install.sh failed"
-
-	if ! use pch; then
-		sed -i \
-				-e '/^PRECOMPILED_HEADER =/,/[^\\]$/d' \
-				-e '/^CONFIG += precompile_header/d' \
-				src/gui/gui.pro || die "sed for gui.pro failed"
-	fi
-}
-
-src_configure() {
-	econf \
-		--with-docdir=/usr/share/doc/${PF}
-
-	for pro_file in $(find "${S}" -name "*.pro"); do
-		eqmake4 "${pro_file}" -o "$(dirname ${pro_file})/Makefile" "CONFIG+=nostrip" || die "eqmake4 for ${pro_file} failed"
-	done
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-	cd doc
-	dodoc AUTHORS ChangeLog Credits README* \
-		FWBuilder-Routing-LICENSE.txt PatchAcceptancePolicy.txt
-	doman fwb*.1
-}
-
-pkg_postinst() {
-	validate_desktop_entries
-
-	elog "You need to emerge sys-apps/iproute2 on the machine"
-	elog "that will run the firewall script."
-}
diff --git a/net-firewall/fwbuilder/fwbuilder-4.0.1-r1.ebuild b/net-firewall/fwbuilder/fwbuilder-4.0.1-r1.ebuild
deleted file mode 100644
index 2987dac1fdda..000000000000
--- a/net-firewall/fwbuilder/fwbuilder-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.0.1-r1.ebuild,v 1.1 2010/09/13 06:28:01 kumba Exp $
-
-EAPI="2"
-
-inherit eutils qt4-r2 multilib autotools
-
-DESCRIPTION="A firewall GUI"
-HOMEPAGE="http://www.fwbuilder.org/"
-SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
-IUSE=""
-#IUSE="+pch"
-
-DEPEND="~net-libs/libfwbuilder-${PV}
-	>=x11-libs/qt-gui-4.3
-	dev-libs/openssl
-	dev-libs/elfutils
-	sys-devel/gnuconfig
-	"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt4-r2_src_prepare
-	epatch "${FILESDIR}/4.x-qmake-use-LDFLAGS.patch"
-	eautoreconf || die "eautoreconf failed"
-
-	# This package fundamentally changed its build system.  We have to
-	# manually copy config.{sub,guess} from /usr/share/gnuconfig/.
-	cp /usr/share/gnuconfig/config.{sub,guess} "${WORKDIR}/${P}/"	\
-		|| die "failed to copy config.{sub,guess}"
-}
-
-src_configure() {
-	econf || die "econf failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
-	validate_desktop_entries
-
-	elog "You need to emerge sys-apps/iproute2 on the machine"
-	elog "that will run the firewall script."
-}
diff --git a/net-firewall/fwbuilder/fwbuilder-4.0.1.ebuild b/net-firewall/fwbuilder/fwbuilder-4.0.1.ebuild
deleted file mode 100644
index 1a3805772478..000000000000
--- a/net-firewall/fwbuilder/fwbuilder-4.0.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.0.1.ebuild,v 1.2 2010/09/13 06:28:01 kumba Exp $
-
-EAPI="2"
-
-inherit eutils qt4-r2 multilib autotools
-
-DESCRIPTION="A firewall GUI"
-HOMEPAGE="http://www.fwbuilder.org/"
-SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
-IUSE=""
-#IUSE="+pch"
-
-DEPEND="~net-libs/libfwbuilder-${PV}
-	>=x11-libs/qt-gui-4.3
-	dev-libs/openssl
-	dev-libs/elfutils
-	sys-devel/gnuconfig
-	"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt4-r2_src_prepare
-	epatch "${FILESDIR}/${PV}-secure-mktemp.patch"
-	eautoreconf || die "eautoreconf failed"
-
-	# This package fundamentally changed its build system.  We have to
-	# manually copy config.{sub,guess} from /usr/share/gnuconfig/.
-	cp /usr/share/gnuconfig/config.{sub,guess} "${WORKDIR}/${P}/"	\
-		|| die "failed to copy config.{sub,guess}"
-}
-
-src_configure() {
-	econf || die "econf failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
-	validate_desktop_entries
-
-	elog "You need to emerge sys-apps/iproute2 on the machine"
-	elog "that will run the firewall script."
-}
diff --git a/net-firewall/fwbuilder/fwbuilder-4.1.1.ebuild b/net-firewall/fwbuilder/fwbuilder-4.1.1.ebuild
deleted file mode 100644
index 314c8bec6fa5..000000000000
--- a/net-firewall/fwbuilder/fwbuilder-4.1.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.1.1.ebuild,v 1.1 2010/09/13 06:28:01 kumba Exp $
-
-EAPI="2"
-
-inherit eutils qt4-r2 multilib autotools
-
-DESCRIPTION="A firewall GUI"
-HOMEPAGE="http://www.fwbuilder.org/"
-SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
-IUSE=""
-#IUSE="+pch"
-
-DEPEND="~net-libs/libfwbuilder-${PV}
-	>=x11-libs/qt-gui-4.3
-	dev-libs/openssl
-	dev-libs/elfutils
-	sys-devel/gnuconfig
-	"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt4-r2_src_prepare
-	epatch "${FILESDIR}/4.x-qmake-use-LDFLAGS.patch"
-	eautoreconf || die "eautoreconf failed"
-
-	# This package fundamentally changed its build system.  We have to
-	# manually copy config.{sub,guess} from /usr/share/gnuconfig/.
-	cp /usr/share/gnuconfig/config.{sub,guess} "${WORKDIR}/${P}/"	\
-		|| die "failed to copy config.{sub,guess}"
-}
-
-src_configure() {
-	econf || die "econf failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
-	validate_desktop_entries
-
-	elog "You need to emerge sys-apps/iproute2 on the machine"
-	elog "that will run the firewall script."
-}