From c51e285c6e3b6aa20d7ef7e4304fc612c70338e3 Mon Sep 17 00:00:00 2001
From: Martin Väth <martin@mvath.de>
Date: Sun, 20 Aug 2017 15:14:29 +0200
Subject: net-firewall/firewall-mv: Version bump. Provide wrapper

---
 net-firewall/firewall-mv/Manifest                |  2 +-
 net-firewall/firewall-mv/firewall-mv-11.0.ebuild | 51 ------------------------
 net-firewall/firewall-mv/firewall-mv-12.0.ebuild | 39 ++++++++++++++++++
 net-firewall/firewall-mv/metadata.xml            |  7 ----
 4 files changed, 40 insertions(+), 59 deletions(-)
 delete mode 100644 net-firewall/firewall-mv/firewall-mv-11.0.ebuild
 create mode 100644 net-firewall/firewall-mv/firewall-mv-12.0.ebuild

(limited to 'net-firewall/firewall-mv')

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-11.0.ebuild
deleted file mode 100644
index 54ec3ea7..00000000
--- a/net-firewall/firewall-mv/firewall-mv-11.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-RESTRICT="mirror"
-inherit systemd
-
-DESCRIPTION="Initialize iptables and net-related sysctl variables"
-HOMEPAGE="https://github.com/vaeth/firewall-mv/"
-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"
-DEPEND=""
-
-src_prepare() {
-	if use prefix
-	then	sed -i \
-			-e "s!/etc/!${EPREFIX}/etc/!g" \
-			-e "s!/usr/!${EPREFIX}/usr/!g" \
-			-- sbin/* etc/* systemd/* || die
-	else	sed -i \
-			-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
-			-- sbin/* || die
-	fi
-	eapply_user
-}
-
-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/*
-}
diff --git a/net-firewall/firewall-mv/firewall-mv-12.0.ebuild b/net-firewall/firewall-mv/firewall-mv-12.0.ebuild
new file mode 100644
index 00000000..8666268e
--- /dev/null
+++ b/net-firewall/firewall-mv/firewall-mv-12.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+RESTRICT="mirror"
+inherit systemd
+
+DESCRIPTION="Initialize iptables and net-related sysctl variables"
+HOMEPAGE="https://github.com/vaeth/firewall-mv/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND=">=app-shells/push-2.0-r2"
+DEPEND=""
+
+src_prepare() {
+	if use prefix
+	then	sed -i \
+			-e "s!/etc/!${EPREFIX}/etc/!g" \
+			-e "s!/usr/!${EPREFIX}/usr/!g" \
+			-- sbin/* etc/* systemd/* || die
+	else	sed -i \
+			-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+			-- sbin/* || die
+	fi
+	default
+}
+
+src_compile() {
+	emake "SYSTEMUNITDIR=$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	dodoc README
+	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>
-- 
cgit v1.2.3-65-gdbad