3 files changed, 32 insertions, 56 deletions
diff --git a/sys-apps/multiconfig/Manifest b/sys-apps/multiconfig/Manifest
index a53b60c..fbd6c11 100644
--- a/sys-apps/multiconfig/Manifest
+++ b/sys-apps/multiconfig/Manifest
@@ -1 +1 @@
-DIST multiconfig-0.1.2.tar.gz 2097 SHA256 45429e39f97312ece7dbb7bdfd2f858afd8a1d5bf56da0adce9c4f58acfd0b93 SHA512 12d6188a0088b1d2dc97017a43af9b4dedee9a9be8733617e2d5348e005cb0e05f2a4ce38a2c6bda973c13051cd6d7785469bf69ba1878b8f10564b19ad9452d WHIRLPOOL 548ec984fb95a2e311d953f283cdd29e868f69823dbe3ed6c130fc9ca2568969ead2ec89ad5f29a2844867e2b49b4c7880200f29fff0ebbde696e44a1f94c10d
+DIST multiconfig-0.2.tar.gz 7765 BLAKE2B f630c65a6aa14db41699e0b2e817a1dfbe52e5993b78b3f238dfb5f3f5bd21af7ce87362b4d30a66f9ef71ef969c65afc2384d1311ffbafab4699700433586a9 SHA512 6347d82bf9094d3a0d92383e5b6fa58f6b80c9d20c602e7da5dde45a5cf4c34043b2f5fc213c1475b12cb4f9c5afa4a3acb11bceee66791b37604283b6614822
diff --git a/sys-apps/multiconfig/multiconfig-0.1.2-r2.ebuild b/sys-apps/multiconfig/multiconfig-0.1.2-r2.ebuild
deleted file mode 100644
index 5618427..0000000
--- a/sys-apps/multiconfig/multiconfig-0.1.2-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-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"
-}
diff --git a/sys-apps/multiconfig/multiconfig-0.2-r1.ebuild b/sys-apps/multiconfig/multiconfig-0.2-r1.ebuild
new file mode 100644
index 0000000..92ece73
--- /dev/null
+++ b/sys-apps/multiconfig/multiconfig-0.2-r1.ebuild
@@ -0,0 +1,31 @@
+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="firewall hosts openvpn"
+
+DEPEND="
+	firewall? ( net-firewall/iptables )
+	openvpn? ( net-vpn/openvpn )"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dodir /usr/sbin
+	exeinto /usr/sbin
+	doexe "${S}/tools/multiconfig"
+
+	dodir /usr/lib/multiconfig
+	exeinto /usr/lib/multiconfig
+	doexe "${S}/multiconfig"
+
+	for MOD in $IUSE; do
+		if use $MOD; then
+			doexe "${S}/$MOD"
+		fi
+	done
+}