config file handling

3 files changed, 33 insertions, 17 deletions

diff --git a/gentoo-linux/net-misc/anytun/Manifest b/gentoo-linux/net-misc/anytun/Manifest
index c9525e5..252e455 100644
--- a/gentoo-linux/net-misc/anytun/Manifest
+++ b/gentoo-linux/net-misc/anytun/Manifest
@@ -1,5 +1,6 @@
 AUX anytun-0.3.1-boost-mt.patch 880 RMD160 ef4b35b7c2d976de3e970c6b5f9937e771654a21 SHA1 e03371a06741eee48e14bb3af3c5347fb0d19999 SHA256 27fed2ddf30da748ca96676c47e54c24172a67c2789b3bde7769919b76e86a58
 AUX anytun-0.3.1.init 4790 RMD160 cbf8157bceca641c600067e824d742b642bedd9e SHA1 bca46549390acc1bfb248144b95b5a4b63e06165 SHA256 9aa762ad1b375f50460560fe4597049d1808b97fe539c8dcaa4dea1634b13c9d
 DIST anytun-0.3.1.tar.gz 133451 RMD160 0750f681887dcfc527fbf92f525e16b8ab5bfa47 SHA1 7489ebff5b5cefe909e7f187feae783b874ab614 SHA256 e696b2b6767753234df21dbfce8d994d4a9bbb75e9f3f360081d25ece5eb80c6
-EBUILD anytun-0.3.1.ebuild 2784 RMD160 bab42b95753f8fbf3cbd955d227933f661f9b6d2 SHA1 69f7806126f11d4ffaac93e0aa8ed3de41136e52 SHA256 1bd463246bcd83a05f7c4abe5b8557dbe3fceb3d45af4f6977de3056f7aea051
-MISC metadata.xml 621 RMD160 9716c412c6848b0d6ace6783580d4990b06dacce SHA1 8bb0fe8adce8a4754fdc7c18b80ed4fc4223704f SHA256 fdd3e94a62d86efc9504fc7c5933ec19d91119a607310a20ded5638e171de9bf
+EBUILD anytun-0.3.1.ebuild 3147 RMD160 99d630c5371f7a82df258e8b37e0566aae7f298c SHA1 5b8e35c99ba0960ae96d55895656b18716dd7a63 SHA256 a2c42223a07373020dff307abb8700e2ed8049ec5f1682eee2f65b6b616e220a
+MISC Changelog 483 RMD160 1341ab375ee45382aa223f9a5c8e59507c499d9b SHA1 8fd4ec5559e8854c5dda0cc741cc6c687da2f88f SHA256 03b0705950884ca162b27041e4d5ed168fb30a43d62c3714e9ea006c9fcb398f
+MISC metadata.xml 710 RMD160 a39bb81b9d65a852ae5c5e78f3f3fc54bd8baa89 SHA1 81d76cb978239c12b4ce8ea39aedac0e1d514174 SHA256 ac3bbc9561c412dc9300e865fe48c6ed85c501fbff4c17b80f20297cff813644
diff --git a/gentoo-linux/net-misc/anytun/anytun-0.3.1.ebuild b/gentoo-linux/net-misc/anytun/anytun-0.3.1.ebuild
index 2e84f15..7f03a48 100644
--- a/gentoo-linux/net-misc/anytun/anytun-0.3.1.ebuild
+++ b/gentoo-linux/net-misc/anytun/anytun-0.3.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://anytun.org/"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="gcrypt doc"
+IUSE="gcrypt doc examples"
 
 DEPEND=">=dev-libs/boost-1.35
 	gcrypt? ( dev-libs/libgcrypt )
@@ -54,7 +54,6 @@ src_compile() {
 src_install() {
 	cd "${S}/src"
 	dosbin anytun 
-	use static && dosbin anytun-static
 	dobin anytun-config anytun-controld anytun-showtables anytun-nosync
 	
 	newinitd "${FILESDIR}/${PN}-0.3.1.init" anytun
@@ -62,9 +61,6 @@ src_install() {
 	#insinto /etc/default/
 	#doins ${S}/etc/default/*
 
-	cd ${S}/etc/anytun/
-	find -type f -exec install -dm644 {} ${D}/etc/anytun/{}
-	
 	insinto /usr/share/${P}/wireshark-lua/
 	doins ${S}/wireshark-lua/*
 
@@ -73,6 +69,10 @@ src_install() {
 	dodir /var/run/anytun-controld
 	keepdir /var/run/anytun-controld
 	
+	if use examples; then
+		insinto /usr/share/doc/${PF}/etc-anytun-examples/
+		doins -r ${S}/etc/anytun/*
+	fi
 	if use doc; then
 		cd ${S}
 		dodoc AUTHORS ChangeLog LICENSE README
@@ -80,24 +80,37 @@ src_install() {
 		doman anyrtpproxy.8 anytun-config.8 anytun-controld.8 anytun-showtables.8 anytun.8
 		prepalldocs
 	fi
+
+}
+
+pkg_config() {
+	mkdir -p ${ROOT}/etc/anytun/
+	tar xv --strip-components 3 -f ${DISTDIR}/${P}.tar.gz -C ${ROOT}/etc/anytun/ ${P}/etc/anytun
 }
 
 pkg_postinst() {
 	enewgroup anytun
 	enewuser anytun -1 -1 /var/run/anytun anytun
-	
-	einfo "Example configuration files have been installed in /etc/anytun"
-	einfo "tunnels get their own directory in /etc/anytun and should then"
-	einfo "be added to the /etc/anytun/autostart file"
+
+	if use examples; then	
+		einfo "Example configuration files have been installed in"
+		einfo " /usr/share/doc/${PF}/etc-anytun-examples/"
+		einfo ""
+	fi
+	einfo "To install inital config files for anytun use"
+	einfo "> emerge --config anytun"
 	einfo ""
-	einfo "Alternatively you can forget the autostart file and create"
-	einfo "gentoostyle anytun.{VPN} initrd scripts for each VPN"
-	einfo " ex: ln -s /etc/init.d/anytun /etc/init.d/anytun.client1"
+	einfo "Note that each VPN gets it's own directory under /etc/anytun/"
+	einfo "You can either add tunnels to /etc/anytun/autostart and"
+	einfo "start them using /etc/init.d/anytun"
+	einfo "Or you can forget the autostart file and create"
+	einfo "gentoo-style anytun.{VPN} initrd scripts for each VPN"
+	einfo "e.g.> ln -s /etc/init.d/anytun /etc/init.d/anytun.client1"
 	einfo ""
 	einfo "Don't forget to "
-	einfo " rc-update add anytun default"
+	einfo "> rc-update add anytun default"
 	einfo "or"
-	einfo " rc-update add anytun.client1 default"
+	einfo "> rc-update add anytun.client1 default"
 	einfo ""
 	einfo "You can disect anytun traffic using wireshark by plugging the script"
 	einfo "/usr/share/${P}/wireshark-lua/satp.lua into wireshark"
diff --git a/gentoo-linux/net-misc/anytun/metadata.xml b/gentoo-linux/net-misc/anytun/metadata.xml
index 06d4e99..56c3806 100644
--- a/gentoo-linux/net-misc/anytun/metadata.xml
+++ b/gentoo-linux/net-misc/anytun/metadata.xml
@@ -6,6 +6,8 @@
 <use>
   <flag name='doc'>Build and install manpages (depend on asciidoc)</flag>
   <flag name='gcrypt'>Prefer <pkg>dev-libs/libgcrypt</pkg> over
-  <pkg>dev-libs/openssl</pkg> for encryption</flag>
+	  <pkg>dev-libs/openssl</pkg> for encryption
+  </flag>
+  <flag name='examples'>Install example configuration into /usr/share/doc/...</flag>
 </use>
 </pkgmetadata>