net-misc/anytun: New Version 0.3.2. ebuild changes to reflect improvements in anytun build sys. thanks to #gentoo-sunrise people for their patience

svn path=/sunrise/; revision=9651

4 files changed, 84 insertions, 85 deletions

diff --git a/net-misc/anytun/ChangeLog b/net-misc/anytun/ChangeLog
index 9d04db32c..f59bcda57 100644
--- a/net-misc/anytun/ChangeLog
+++ b/net-misc/anytun/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v3
 # $Header: $
 
+  05 Dec 2009; Bernhard Tittelbach (xro) <xro@gmx.net> -anytun-0.3.1.ebuild,
+  +anytun-0.3.2.ebuild:
+  New Version 0.3.2. ebuild changes to reflect improvements in anytun build
+  sys. thanks to #gentoo-sunrise people for their patience
+
   25 Nov 2009; Bernhard Tittelbach (xro) <xro@gmx.net>
   files/anytun-0.3.1.init:
   changed indentation to tabs on request.
diff --git a/net-misc/anytun/Manifest b/net-misc/anytun/Manifest
index 1828c0279..7316e5897 100644
--- a/net-misc/anytun/Manifest
+++ b/net-misc/anytun/Manifest
@@ -1,5 +1,5 @@
 AUX anytun-0.3.1.init 4132 RMD160 e913cee56b91b12cdd37cfc026b589ec7f3f23bc SHA1 c8bf76fd5486351d72934165c16e22b8903a4e36 SHA256 5aa33087d9d2b5496bb42cd6841087a275d4bfa2b4817931fd01f72e51e908be
-DIST anytun-0.3.1.tar.gz 133451 RMD160 0750f681887dcfc527fbf92f525e16b8ab5bfa47 SHA1 7489ebff5b5cefe909e7f187feae783b874ab614 SHA256 e696b2b6767753234df21dbfce8d994d4a9bbb75e9f3f360081d25ece5eb80c6
-EBUILD anytun-0.3.1.ebuild 2973 RMD160 357415b3781b6177927cb57ba5111bc5b6a11b56 SHA1 600fbcdc2037a31f3be022a365b87b2e7e0297fc SHA256 74b0f0db27c154daf75cf7f99d8388120e37821ef14a72f152a73888c3cfd451
-MISC ChangeLog 1001 RMD160 e56f8211f94dcda2e221e1961d57cad7daa88631 SHA1 8e9553fa7b6dc3d78826c9425a0492c816553044 SHA256 bb217aca1c4e654aed78c1a84c59552cf5fd82087ddf1418fd73b12f030f7bd8
+DIST anytun-0.3.2.tar.gz 135773 RMD160 47f4c43f3ddb5fcb13bc8205054326bf138df1bf SHA1 b7700f3f9a3718adcf1f952f37857ad9426ab6a0 SHA256 f13eea22d0ff509f24ff89e4298d3ac4be4c71f2fb9aa610dfb4d968c11bc2c2
+EBUILD anytun-0.3.2.ebuild 2546 RMD160 86aef3773b7fea80a391f441d2ee421d5f302d1e SHA1 0b13e69179b82e395042c560ea7c567c3ad65127 SHA256 2111b3bdbf72d7af114ffe5515adbebfd80f1388eb877a7b85f8133bb9f86d36
+MISC ChangeLog 1238 RMD160 551427de4d4ea349d724c8bada59c97cd9b51ba6 SHA1 0c7e212a395130aa6a0495c82368e9a0fc9ff2a5 SHA256 29be42a38fd349b0ac98ea4f4615a70b58e0a70542093c31be1f62ce2484b93f
 MISC metadata.xml 676 RMD160 076aacf8fa6c9063e3e6cff368e8f5c45980ede3 SHA1 0a0af1b5f03b28a698c8cd3f22e62cdfa7418481 SHA256 2f185c8e9c5cbcf72c2e344d17923dfb4745a87d28860e45824d67412afc4e1b
diff --git a/net-misc/anytun/anytun-0.3.1.ebuild b/net-misc/anytun/anytun-0.3.1.ebuild
deleted file mode 100644
index 5277c411a..000000000
--- a/net-misc/anytun/anytun-0.3.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="VPN daemon using Secure Anycast Tunneling"
-HOMEPAGE="http://anytun.org/"
-SRC_URI="http://anytun.org/~equinox/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples gcrypt"
-
-RDEPEND=">=dev-libs/boost-1.35
-	<dev-libs/boost-1.40
-	gcrypt? ( dev-libs/libgcrypt )
-	!gcrypt? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	<app-text/asciidoc-8.5.0" # asciidoc a2x >= 8.5.0 requires an -L switch not	present in lower versions
-
-S=${S}/src
-
-src_compile() {
-	local myconf=""
-	use gcrypt || myconf="--use-ssl-crypto"
-	# anytun's configure right now only takes 1! option (no --prefix etc), so econf would be too
-	# much for your little script and the build would fail
-	#econf ${myconf}
-	./configure ${myconf} || die "configure failed"
-
-	emake || die "make failed"
-
-	einfo "Building manpages"
-	emake manpage || die "failed building manpages"
-}
-
-src_install() {
-	dosbin anytun || die "failed to copy/install an executable"
-	dobin anytun-config anytun-controld anytun-showtables anytun-nosync || die "failed to copy/install an executable"
-	newinitd "${FILESDIR}/${PN}-0.3.1.init" anytun || die "failed to copy/install initrd script"
-	keepdir /var/run/anytun || die "failed to mkdir"
-	keepdir /var/run/anytun-controld || die "failed to mkdir"
-
-	cd man/
-	doman anyrtpproxy.8 anytun-config.8 anytun-controld.8 anytun-showtables.8 anytun.8 || die "failed to install manpages"
-
-	cd ../../
-	insinto /usr/share/${P}/wireshark-lua/
-	doins wireshark-lua/* || die "failed to install wireshark-lua contrib script"
-
-	dodoc AUTHORS ChangeLog README || die "failed to install docs"
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/etc-anytun-examples/
-		doins -r etc/anytun/* || die "failed to install examples"
-	fi
-}
-
-pkg_config() {
-	[ -e "${ROOT}"/etc/anytun ] && die "${ROOT}/etc/anytun/ already present, rm -R it first"
-	[ ! -d "${ROOT}"/usr/share/doc/${PF}/etc-anytun-examples/ ] && \
-		die "can't copy example configs since examples were not installed (reemerge with USE=\"examples\")"
-	mkdir -p "${ROOT}"/etc/anytun/ || die "couldn't mkdir ${ROOT}/etc/anytun/"
-	cp -r "${ROOT}"/usr/share/doc/${PF}/etc-anytun-examples/* "${ROOT}"/etc/anytun/ || die "failed to copy examples"
-}
-
-pkg_postinst() {
-	enewgroup anytun
-	enewuser anytun -1 -1 /var/run/anytun anytun
-	einfo "Note that each VPN gets its own directory under /etc/anytun/"
-	einfo " (see examples provided with the package)"
-	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 "# ln -s /etc/init.d/anytun /etc/init.d/anytun.client1"
-	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/net-misc/anytun/anytun-0.3.2.ebuild b/net-misc/anytun/anytun-0.3.2.ebuild
new file mode 100644
index 000000000..34f3b0581
--- /dev/null
+++ b/net-misc/anytun/anytun-0.3.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+DESCRIPTION="VPN daemon using Secure Anycast Tunneling"
+HOMEPAGE="http://anytun.org/"
+SRC_URI="http://anytun.org/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples gcrypt"
+
+RDEPEND=">=dev-libs/boost-1.35
+	gcrypt? ( dev-libs/libgcrypt )
+	!gcrypt? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	app-text/asciidoc"
+
+S=${S}/src
+
+src_compile() {
+	local myconf
+	use gcrypt || myconf="--use-ssl-crypto"
+	use examples\
+		&& myconf="${myconf} --examplesdir=/usr/share/doc/${PF}/examples/etc" \
+		|| myconf="${myconf} --no-examples"
+	econf --ebuild-compat ${myconf}
+
+	einfo "Building executables"
+	emake || die "make failed"
+
+	einfo "Building manpages"
+	emake manpage || die "failed building manpages"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	rm -Rf "${D}"/etc/init.d
+	#as long as README just contains path to examples, only install it with examples
+	use examples || rm -f "${D}"/etc/${PN}/README
+	keepdir /var/run/anytun || die "failed to mkdir"
+	keepdir /var/run/anytun-controld || die "failed to mkdir"
+
+	newinitd "${FILESDIR}/${PN}-0.3.1.init" ${PN} || die "failed to copy/install initrd script"
+
+	cd ../
+	dodoc AUTHORS ChangeLog README || die "failed to install docs"
+
+	insinto /usr/share/${P}/wireshark-lua/
+	doins wireshark-lua/satp.lua || die "failed to install wireshark-lua contrib script"
+}
+
+pkg_config() {
+	[ ! -d "${ROOT}"/usr/share/doc/${PF}/examples/etc/${PN} ] && \
+		die "can't copy example configs since examples were not installed (reemerge with USE='examples')"
+	for example in autostart server client1 client2 client3 p2p-a p2p-b; do
+		[ -e "${ROOT}"/etc/${PN}/${example} ] && die "${ROOT}/etc/${PN}/${example} already present, rm -R it first"
+	done
+	cp -rv "${ROOT}"/usr/share/doc/${PF}/examples/etc/${PN} "${ROOT}"/etc/ || die "failed to copy examples"
+}
+
+pkg_postinst() {
+	enewgroup anytun
+	enewuser anytun -1 -1 /var/run/anytun anytun
+	elog "Please refer to the README file regarding the syntax of the /etc/${PN}/"
+	elog "configuration files or see examples provided with the package"
+	elog "You can use gentoo-style ${PN}.{VPN} initrd scripts to start "
+	elog "VPNs separately. Just symlink to the initscript, e.g.:"
+	elog "# ln -s /etc/init.d/${PN} /etc/init.d/${PN}.client1"
+	elog
+	elog "You can disect anytun traffic using wireshark by plugging the script"
+	elog " /usr/share/${P}/wireshark-lua/satp.lua into wireshark"
+}