diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2015-04-18 06:22:41 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2015-04-18 06:22:41 +0000 |
commit | 595e797751b35126870a87004a339c3a8a460cd2 (patch) | |
tree | ecabbd50b540b1de982aaefc1823bb7443ef56a8 /net-firewall/fwbuilder | |
parent | Add missing test dependency on app-admin/puppet. (diff) | |
download | gentoo-2-595e797751b35126870a87004a339c3a8a460cd2.tar.gz gentoo-2-595e797751b35126870a87004a339c3a8a460cd2.tar.bz2 gentoo-2-595e797751b35126870a87004a339c3a8a460cd2.zip |
old
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'net-firewall/fwbuilder')
4 files changed, 7 insertions, 115 deletions
diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog index ff21661ed652..00de1afe1f0e 100644 --- a/net-firewall/fwbuilder/ChangeLog +++ b/net-firewall/fwbuilder/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-firewall/fwbuilder -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.124 2013/03/02 22:49:59 hwoarang Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.125 2015/04/18 06:22:41 mr_bones_ Exp $ + + 18 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org> + -files/fwbuilder-4.2.2.3541-ccache.patch, + -files/fwbuilder-4.2.2.3541-flags.patch, -fwbuilder-4.2.2.3541.ebuild: + old 02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> fwbuilder-4.2.2.3541.ebuild, fwbuilder-5.0.1.3592-r1.ebuild, diff --git a/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-ccache.patch b/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-ccache.patch deleted file mode 100644 index 807d9ac488fa..000000000000 --- a/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-ccache.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ruN fwbuilder-4.2.2.3541.orig/configure.in fwbuilder-4.2.2.3541/configure.in ---- fwbuilder-4.2.2.3541.orig/configure.in 2011-05-11 23:02:03.000000000 +0200 -+++ fwbuilder-4.2.2.3541/configure.in 2011-05-29 18:53:06.624998022 +0200 -@@ -638,12 +638,27 @@ - AC_SUBST(MANDIR) - AC_SUBST(ICONSDIR) - --AC_PATH_PROG(CCACHE, ccache, , ) --AC_SUBST(CCACHE) -+AC_ARG_WITH(ccache,[ --with-ccache=yes Use ccache to speed up repeated compilation]) - --if test -n "$CCACHE" --then -+if test -n "$with_ccache"; then -+ if test "x$with_ccache" != "xno"; then -+ AC_PATH_PROG(CCACHE, ccache, , ) -+ AC_SUBST(CCACHE) -+ if test -n "$CCACHE" -+ then -+ ccache -s -+ fi -+ else -+ CCACHE="" -+ AC_SUBST(CCACHE) -+ fi -+else -+ AC_PATH_PROG(CCACHE, ccache, , ) -+ AC_SUBST(CCACHE) -+ if test -n "$CCACHE" -+ then - ccache -s -+ fi - fi - - AC_ARG_WITH(distcc,[ --with-distcc=N Use distcc with N parallel make count]) diff --git a/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-flags.patch b/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-flags.patch deleted file mode 100644 index 4da909b7c54f..000000000000 --- a/net-firewall/fwbuilder/files/fwbuilder-4.2.2.3541-flags.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ruN fwbuilder-4.2.2.3541.orig/qmake.inc.in fwbuilder-4.2.2.3541/qmake.inc.in ---- fwbuilder-4.2.2.3541.orig/qmake.inc.in 2011-05-11 23:02:03.000000000 +0200 -+++ fwbuilder-4.2.2.3541/qmake.inc.in 2011-08-21 11:22:11.550158618 +0200 -@@ -16,8 +16,8 @@ - CPPUNIT_LIBS = @CPPUNIT_LIBS@ - - # CONFIG -= nostrip --# CONFIG += release --CONFIG += debug -+CONFIG += release nostrip -+# CONFIG += debug - - unix { - PREFIX = @PREFIX@ -@@ -36,9 +36,10 @@ - OBJECTS_DIR = .obj - - QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter -- QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter -+ QMAKE_CFLAGS_RELEASE += @CFLAGS@ -Wno-unused-parameter - QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter -- QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter -+ QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ -Wno-unused-parameter -+ QMAKE_LFLAGS = @LDFLAGS@ - - !macx { - diff --git a/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild b/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild deleted file mode 100644 index 82c4cff5829b..000000000000 --- a/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild,v 1.9 2013/03/02 22:49:59 hwoarang Exp $ - -EAPI=4 - -inherit eutils base 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 ppc ppc64 x86" -IUSE="" - -DEPEND=">=dev-qt/qtgui-4.3:4 - dev-libs/openssl - dev-libs/elfutils - sys-devel/gnuconfig" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-flags.patch" - "${FILESDIR}/${P}-ccache.patch" -) - -src_prepare() { - qt4-r2_src_prepare - eautoreconf - - # 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 --with-ccache=no --with-distcc=no -} - -src_install() { - emake INSTALL_ROOT="${D}" install -} - -pkg_postinst() { - validate_desktop_entries - - elog "You need to emerge sys-apps/iproute2 on the machine" - elog "that will run the firewall script." -} |