From d116958b66b03dba2f6c65e702354541fd9de55f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Sat, 23 Sep 2017 18:03:52 +0200
Subject: multiconfig v0.1.1

---
 sys-apps/multiconfig/Manifest                    |  2 +-
 sys-apps/multiconfig/multiconfig-0.1-r2.ebuild   | 38 -----------------
 sys-apps/multiconfig/multiconfig-0.1.1-r2.ebuild | 53 ++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 39 deletions(-)
 delete mode 100644 sys-apps/multiconfig/multiconfig-0.1-r2.ebuild
 create mode 100644 sys-apps/multiconfig/multiconfig-0.1.1-r2.ebuild

diff --git a/sys-apps/multiconfig/Manifest b/sys-apps/multiconfig/Manifest
index 9303bdc..6805916 100644
--- a/sys-apps/multiconfig/Manifest
+++ b/sys-apps/multiconfig/Manifest
@@ -1 +1 @@
-DIST multiconfig-0.1.tar.gz 1726 SHA256 9299ee9d0cc2e73576d54ea3d577c70a8593af65125fe9178fb9dd39e4cb5ae3 SHA512 0b2ccf0503b27de643622689262e5e7a752acfbb620325f9888a3c66742aaebc633525d1460761830ea343db1507e1b47d573d481b95f991d3882023201ab8ff WHIRLPOOL a4d66d852a7ecf49be5d0fd42bdc1f1172ab01f1f1328a478f055f11428b7632c370aecd06eedeb69519f07bdbab4a451470f07531da370184e6344948b9b023
+DIST multiconfig-0.1.1.tar.gz 1719 SHA256 1a7c6f702db4c0952a344671902ceb3e6b1a4bf30d0381223f6a13158498af9b SHA512 e87bc1d2b1d521d738ee5645187ad2c1954af4c018c5a6a38498f2c7d361ec382fc892ed299d52cfafe180008ef6b071d14d78e45b45819a51bf137fac9a8e9b WHIRLPOOL 7ebe9f525470f5c0dfdbae6cd35a9ca06326403670e6f557045845bcfc1fa58b62723ec3d6df6485bc69308798f8e9c44f9c1803b920ec996ca44d9dd8512c43
diff --git a/sys-apps/multiconfig/multiconfig-0.1-r2.ebuild b/sys-apps/multiconfig/multiconfig-0.1-r2.ebuild
deleted file mode 100644
index 677c12f..0000000
--- a/sys-apps/multiconfig/multiconfig-0.1-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VER="${PV%-r*}"
-
-DESCRIPTION="Multiple configuration system"
-HOMEPAGE="http://git.cynerd.cz/multiconfig/"
-SRC_URI="http://git.cynerd.cz/multiconfig/snapshot/multiconfig-${VER}.tar.gz  -> ${P}.tar.gz"
-S="${WORKDIR}/multiconfig-${VER}"
-
-LICENSE="GPL-3.0+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bridge firewall openvpn"
-
-DEPEND="bridge? ( net-misc/dhcp )"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dodir /usr/sbin
-	exeinto /usr/sbin
-	doexe "${S}/multiconfig.sh"
-
-	if use bridge; then
-		doinitd "${S}/bridge/init/bridge"
-		doinitd "${S}/bridge/init/bridge-dhcp"
-
-		dodir /etc/dhcp
-		insinto /etc/dhcp
-		newins "${S}/bridge/dhcpd.conf" "bridge_dhcpd.conf"
-
-		dodir /etc/sysctl.d
-		insinto /etc/sysctl.d
-		newins "${S}/bridge/sysctl.conf" "bridge.conf"
-	fi
-}
diff --git a/sys-apps/multiconfig/multiconfig-0.1.1-r2.ebuild b/sys-apps/multiconfig/multiconfig-0.1.1-r2.ebuild
new file mode 100644
index 0000000..d10c35b
--- /dev/null
+++ b/sys-apps/multiconfig/multiconfig-0.1.1-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VER="${PV%-r*}"
+
+DESCRIPTION="Multiple configuration system"
+HOMEPAGE="http://git.cynerd.cz/multiconfig/"
+SRC_URI="http://git.cynerd.cz/multiconfig/snapshot/multiconfig-${VER}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/multiconfig-${VER}"
+
+LICENSE="GPL-3.0+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="bridge firewall openvpn"
+
+DEPEND="bridge? ( net-misc/dhcp )
+        firewall? ( net-firewall/iptables )
+        openvpn? ( net-vpn/openvpn )
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dodir /usr/sbin
+	exeinto /usr/sbin
+	doexe "${S}/multiconfig.sh"
+	dodir /usr/lib/multiconfig
+	touch "${D}"/usr/lib/multiconfig/.keep
+	# TODO cron
+
+	if use bridge; then
+		doinitd "${S}/bridge/init/bridge"
+		doinitd "${S}/bridge/init/bridge-dhcp"
+
+		dodir /etc/dhcp
+		insinto /etc/dhcp
+		newins "${S}/bridge/dhcpd.conf" "bridge_dhcpd.conf"
+
+		dodir /etc/sysctl.d
+		insinto /etc/sysctl.d
+		newins "${S}/bridge/sysctl.conf" "bridge.conf"
+	fi
+
+	if use firewall; then
+		cp "${S}/firewall/multiconfig.sh" "${D}/usr/lib/multiconfig/firewall.sh"
+	fi
+
+	if use openvpn; then
+		cp "${S}/openvpn/multiconfig.sh" "${D}/usr/lib/multiconfig/openvpn.sh"
+		# TODO
+	fi
+}
-- 
cgit v1.2.3