From 6a417adf33c288c67461373cc47050d5564f1fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Fri, 26 Jan 2018 15:35:23 +0100
Subject: Small cleanup in multiconfig

---
 sys-apps/multiconfig/multiconfig-0.1.2-r1.ebuild | 58 ------------------------
 sys-apps/multiconfig/multiconfig-0.1.2-r2.ebuild | 55 ++++++++++++++++++++++
 2 files changed, 55 insertions(+), 58 deletions(-)
 delete mode 100644 sys-apps/multiconfig/multiconfig-0.1.2-r1.ebuild
 create mode 100644 sys-apps/multiconfig/multiconfig-0.1.2-r2.ebuild

diff --git a/sys-apps/multiconfig/multiconfig-0.1.2-r1.ebuild b/sys-apps/multiconfig/multiconfig-0.1.2-r1.ebuild
deleted file mode 100644
index 3f98840..0000000
--- a/sys-apps/multiconfig/multiconfig-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-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"
-	fi
-
-	if use openvpn; then
-		cp "${S}/openvpn/multiconfig.sh" "${D}/usr/lib/multiconfig/openvpn"
-		# TODO
-	fi
-}
-
-pkg_postinst() {
-	# TODO run multiconfig
-	# TODO check if they are not activated
-	use bridge && einfo "Don't forget to activate bridge and bridge-dhcp services"
-	use firewall && einfo "Don't forget to activate iptables and ip6tables services"
-	use openvpn && einfo "Don't forget to activate myvpn service"
-}
diff --git a/sys-apps/multiconfig/multiconfig-0.1.2-r2.ebuild b/sys-apps/multiconfig/multiconfig-0.1.2-r2.ebuild
new file mode 100644
index 0000000..5618427
--- /dev/null
+++ b/sys-apps/multiconfig/multiconfig-0.1.2-r2.ebuild
@@ -0,0 +1,55 @@
+EAPI=6
+
+DESCRIPTION="Multiple configuration system"
+HOMEPAGE="https://git.cynerd.cz/multiconfig/"
+SRC_URI="https://git.cynerd.cz/multiconfig/snapshot/${P}.tar.gz -> ${P}.tar.gz"
+
+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"
+	fi
+
+	if use openvpn; then
+		cp "${S}/openvpn/multiconfig.sh" "${D}/usr/lib/multiconfig/openvpn"
+		# TODO
+	fi
+}
+
+pkg_postinst() {
+	# TODO run multiconfig
+	# TODO check if they are not activated
+	use bridge && einfo "Don't forget to activate bridge and bridge-dhcp services"
+	use firewall && einfo "Don't forget to activate iptables and ip6tables services"
+	use openvpn && einfo "Don't forget to activate myvpn service"
+}
-- 
cgit v1.2.3