net-firewall/firewall-mv: Version bump. Provide wrapper

5 files changed, 10 insertions, 30 deletions

diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index db10864c..80844009 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -87,7 +87,7 @@ net-dialup/martian-modem 20100123-r2: ltmodem alternative driver providing suppo
 net-dialup/wvdial 1.61: Excellent program to automatically configure PPP sessions
 net-dns/host 20070128-r1: A powerful command-line DNS query and test tool
 net-dns/noip-updater 2.1.9-r4: no-ip.com dynamic DNS updater
-net-firewall/firewall-mv 11.0: Initialize iptables and net-related sysctl variables
+net-firewall/firewall-mv 12.0: Initialize iptables and net-related sysctl variables
 net-libs/wvstreams 4.6.1-r3: A network programming library in C++
 net-misc/openrdate 1.2: use TCP or UDP to retrieve the current time of another machine
 net-misc/sshstart 3.00: Start ssh-agent/ssh-add only if you really use ssh or friends
diff --git a/net-firewall/firewall-mv/Manifest b/net-firewall/firewall-mv/Manifest
index cc70acf5..3fed1bc2 100644
--- a/net-firewall/firewall-mv/Manifest
+++ b/net-firewall/firewall-mv/Manifest
@@ -1 +1 @@
-DIST firewall-mv-11.0.tar.gz 16449 SHA256 e956db60b4732f7ae83827fde773b48e6d3af01c46ab4761c0a53925e5a540ec
+DIST firewall-mv-12.0.tar.gz 16865 SHA256 af75082235165a93baeffe3831fc234399367fd880b3a43729d9007f051dccac
diff --git a/net-firewall/firewall-mv/firewall-mv-11.0.ebuild b/net-firewall/firewall-mv/firewall-mv-12.0.ebuild
index 54ec3ea7..8666268e 100644
--- a/net-firewall/firewall-mv/firewall-mv-11.0.ebuild
+++ b/net-firewall/firewall-mv/firewall-mv-12.0.ebuild
@@ -12,11 +12,8 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="old-openrc"
-RDEPEND="!<sys-apps/openrc-0.13
-	!old-openrc? ( !<sys-apps/openrc-0.21.7 )
-	old-openrc? ( !>=sys-apps/openrc-0.21.7 )
-	>=app-shells/push-2.0-r2"
+IUSE=""
+RDEPEND=">=app-shells/push-2.0-r2"
 DEPEND=""
 
 src_prepare() {
@@ -29,23 +26,14 @@ src_prepare() {
 			-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
 			-- sbin/* || die
 	fi
-	eapply_user
+	default
+}
+
+src_compile() {
+	emake "SYSTEMUNITDIR=$(systemd_get_systemunitdir)"
 }
 
 src_install() {
-	into /
-	dosbin sbin/*
-	insinto /etc
-	doins -r etc/firewall.d
-	insinto /usr/lib/modules-load.d
-	doins modules-load.d/*
-	insinto /lib/firewall
-	doins etc/firewall.config
-	insinto /usr/share/zsh/site-functions
-	doins zsh/*
-	doconfd openrc/conf.d/fire*
-	! use old-openrc || doconfd openrc/conf.d/modules
-	doinitd openrc/init.d/*
 	dodoc README
-	systemd_dounit systemd/*
+	emake DESTDIR="${ED}" "SYSTEMUNITDIR=$(systemd_get_systemunitdir)" install
 }
diff --git a/net-firewall/firewall-mv/metadata.xml b/net-firewall/firewall-mv/metadata.xml
index c858f194..62185dea 100644
--- a/net-firewall/firewall-mv/metadata.xml
+++ b/net-firewall/firewall-mv/metadata.xml
@@ -13,11 +13,4 @@
 		<bugs-to>mailto:martin@mvath.de</bugs-to>
 		<remote-id type="github">vaeth/firewall-mv</remote-id>
 	</upstream>
-	<use>
-		<flag name="old-openrc">Install rudimentary support for
-/etc/modules.load.d for sys-apps/openrc-0.21.5 or older. This is a temporary
-hack of /etc/conf.d/modules which should not be used with more recent versions
-of sys-apps/openrc. Therefore, newer or older versions of openrc are blocked
-depending on this flag, respectively.</flag>
-	</use>
 </pkgmetadata>
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 2515d5ea..896cb475 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -205,7 +205,6 @@ media-tv/sundtek-tv:ld-preload-file - Install /etc/ld.so.preload
 media-tv/sundtek-tv:pax_kernel - Mark package which is necessary if you use a PAX kernel
 media-video/avidemux:nvenc - Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.
 net-dns/noip-updater:ezipupd - Use user/group ezipupd instead of nobody: Useful if you restrict outgoing network traffic for user nobody
-net-firewall/firewall-mv:old-openrc - Install rudimentary support for /etc/modules.load.d for sys-apps/openrc-0.21.5 or older. This is a temporary hack of /etc/conf.d/modules which should not be used with more recent versions of sys-apps/openrc. Therefore, newer or older versions of openrc are blocked depending on this flag, respectively.
 net-libs/wvstreams:boost - Use dev-libs/boost to provide TR1-compatible functional interface. This USE flag is only needed with GCC earlier than version 4.1, or with other compilares not providing said interface.
 net-misc/sshstart:keychain - Pull in keychain as dependency. Not required, but recommended for smoother operation.
 net-print/foo2zjs:foo2zjs_devices_hp1000 - HP LJ 1000 firmware