Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net-firewall/firewalld/ChangeLog8
-rw-r--r--net-firewall/firewalld/firewalld-0.2.9-r1.ebuild90
-rw-r--r--net-firewall/firewalld/firewalld-0.3.14.2.ebuild (renamed from net-firewall/firewalld/firewalld-0.2.12.ebuild)59
3 files changed, 40 insertions, 117 deletions
diff --git a/net-firewall/firewalld/ChangeLog b/net-firewall/firewalld/ChangeLog
index b434928c4496..86799ee33af0 100644
--- a/net-firewall/firewalld/ChangeLog
+++ b/net-firewall/firewalld/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-firewall/firewalld
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/ChangeLog,v 1.19 2015/05/27 11:15:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/ChangeLog,v 1.20 2015/06/23 09:32:25 tamiko Exp $
+
+*firewalld-0.3.14.2 (23 Jun 2015)
+
+ 23 Jun 2015; Matthias Maier <tamiko@gentoo.org> +firewalld-0.3.14.2.ebuild,
+ -firewalld-0.2.12.ebuild, -firewalld-0.2.9-r1.ebuild:
+ cleanup; version bump, thanks to Denis Schridde, bug #552832
27 May 2015; Agostino Sarubbo <ago@gentoo.org> firewalld-0.3.10.ebuild:
Stable for x86, wrt bug #549270
diff --git a/net-firewall/firewalld/firewalld-0.2.9-r1.ebuild b/net-firewall/firewalld/firewalld-0.2.9-r1.ebuild
deleted file mode 100644
index 6bd7e17772ec..000000000000
--- a/net-firewall/firewalld/firewalld-0.2.9-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/firewalld-0.2.9-r1.ebuild,v 1.5 2015/04/08 18:16:34 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-BACKPORTS=190680ba
-
-inherit autotools eutils gnome2-utils python-r1 systemd multilib
-
-DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
-HOMEPAGE="http://fedorahosted.org/firewalld"
-SRC_URI="https://fedorahosted.org/released/firewalld/${P}.tar.bz2
- ${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gui"
-
-RDEPEND="${PYTHON_DEPS}
- dev-python/dbus-python
- dev-python/decorator
- >=dev-python/python-slip-0.2.7[dbus]
- dev-python/pygobject:3
- net-firewall/ebtables
- net-firewall/iptables[ipv6]
- || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
- gui? (
- dev-python/pygtk:2
- >=x11-libs/gtk+-2.6:2
- x11-libs/gtk+:3
- )"
-DEPEND="${RDEPEND}
- dev-libs/glib:2
- >=dev-util/intltool-0.35
- sys-devel/gettext"
-
-src_prepare() {
- [[ -n ${BACKPORTS} ]] && \
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
- epatch
-
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- python_export_best
-
- econf \
- --enable-systemd
- "$(systemd_with_unitdir 'systemd-unitdir')"
-}
-
-src_install() {
- python_foreach_impl \
- emake DESTDIR="${ED}" pythondir="$(python_get_sitedir)" install
-
- # Get rid of junk
- rm -f "${ED}/etc/rc.d/init.d/firewalld"
- rm -f "${ED}/etc/sysconfig/firewalld"
- rm -rf "${ED}/etc/rc.d/"
- rm -rf "${ED}/etc/sysconfig/"
-
- # For non-gui installs we need to remove GUI bits
- if ! use gui; then
- rm -f "${ED}/usr/bin/firewall-applet"
- rm -f "${ED}/usr/bin/firewall-config"
- rm -rf "${ED}/usr/share/icons"
- rm -rf "${ED}/usr/share/applications"
- fi
-
- newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- gnome2_schemas_update
-}
diff --git a/net-firewall/firewalld/firewalld-0.2.12.ebuild b/net-firewall/firewalld/firewalld-0.3.14.2.ebuild
index a6724080514f..cc78f2c221b6 100644
--- a/net-firewall/firewalld/firewalld-0.2.12.ebuild
+++ b/net-firewall/firewalld/firewalld-0.3.14.2.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/firewalld-0.2.12.ebuild,v 1.2 2015/04/08 18:16:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/firewalld-0.3.14.2.ebuild,v 1.1 2015/06/23 09:32:25 tamiko Exp $
EAPI=5
-PYTHON_COMPAT=( python2_7 )
-#BACKPORTS=190680ba
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+#BACKPORTS=
-inherit autotools eutils gnome2-utils python-r1 systemd multilib
+inherit autotools eutils gnome2-utils python-r1 systemd multilib bash-completion-r1
DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
HOMEPAGE="http://fedorahosted.org/firewalld"
@@ -19,18 +19,14 @@ KEYWORDS="~amd64 ~x86"
IUSE="gui"
RDEPEND="${PYTHON_DEPS}
- dev-python/dbus-python
- dev-python/decorator
- >=dev-python/python-slip-0.2.7[dbus]
- dev-python/pygobject:3
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/decorator[${PYTHON_USEDEP}]
+ >=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
net-firewall/ebtables
net-firewall/iptables[ipv6]
|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
- gui? (
- dev-python/pygtk:2
- >=x11-libs/gtk+-2.6:2
- x11-libs/gtk+:3
- )"
+ gui? ( x11-libs/gtk+:3 )"
DEPEND="${RDEPEND}
dev-libs/glib:2
>=dev-util/intltool-0.35
@@ -46,29 +42,40 @@ src_prepare() {
}
src_configure() {
- python_export_best
+ python_setup
econf \
- --enable-systemd
- "$(systemd_with_unitdir 'systemd-unitdir')"
+ --enable-systemd \
+ "$(systemd_with_unitdir 'systemd-unitdir')" \
+ --with-bashcompletiondir="$(get_bashcompdir)"
}
src_install() {
- python_foreach_impl \
- emake DESTDIR="${ED}" pythondir="$(python_get_sitedir)" install
+ # manually split up the installation to avoid "file already exists" errors
+ emake -C config DESTDIR="${D}" install
+ emake -C po DESTDIR="${D}" install
+ emake -C shell-completion DESTDIR="${D}" install
+ emake -C doc DESTDIR="${D}" install
+
+ install_python() {
+ emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
+ python_optimize
+ }
+ python_foreach_impl install_python
+
+ python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
+ python_replicate_script "${D}/usr/sbin/firewalld"
# Get rid of junk
- rm -f "${ED}/etc/rc.d/init.d/firewalld"
- rm -f "${ED}/etc/sysconfig/firewalld"
- rm -rf "${ED}/etc/rc.d/"
- rm -rf "${ED}/etc/sysconfig/"
+ rm -rf "${D}/etc/rc.d/"
+ rm -rf "${D}/etc/sysconfig/"
# For non-gui installs we need to remove GUI bits
if ! use gui; then
- rm -f "${ED}/usr/bin/firewall-applet"
- rm -f "${ED}/usr/bin/firewall-config"
- rm -rf "${ED}/usr/share/icons"
- rm -rf "${ED}/usr/share/applications"
+ rm -f "${D}/usr/bin/firewall-applet"
+ rm -f "${D}/usr/bin/firewall-config"
+ rm -rf "${D}/usr/share/icons"
+ rm -rf "${D}/usr/share/applications"
fi
newinitd "${FILESDIR}"/firewalld.init firewalld