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

svn path=/sunrise/; revision=9650

4 files changed, 79 insertions, 69 deletions

diff --git a/net-misc/uanytun/ChangeLog b/net-misc/uanytun/ChangeLog
index 8d27550bf..996dbe25a 100644
--- a/net-misc/uanytun/ChangeLog
+++ b/net-misc/uanytun/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Dec 2009; Bernhard Tittelbach (xro) <xro@gmx.net>
+  -uanytun-0.3.1.ebuild, +uanytun-0.3.2.ebuild:
+  New Version 0.3.2. ebuild changes to reflect improvements in uanytun build
+  system. thanks to gentoo-sunrise people for their patience
+
   25 Nov 2009; Bernhard Tittelbach (xro) <xro@gmx.net>
   files/uanytun-0.3.1.init:
   changed indentation to tabs on request.
diff --git a/net-misc/uanytun/Manifest b/net-misc/uanytun/Manifest
index 8859e69b9..64c8259f7 100644
--- a/net-misc/uanytun/Manifest
+++ b/net-misc/uanytun/Manifest
@@ -1,5 +1,5 @@
 AUX uanytun-0.3.1.init 2170 RMD160 1d4aad8bae5a2c79254b5cee8a24a8dcf2f0b1c5 SHA1 19ee5866715aebb6c6e2c953dabf73ae5ba2dcf1 SHA256 da89c087a08cdd402aad9699449b8bfef79bea005b44e05a01cb51d16b63613a
-DIST uanytun-0.3.1.tar.gz 49131 RMD160 478f582dc8a8328a8a024641c6fdd3eb7c7825ff SHA1 2bfe9e26413a53fdef69c7a0f1f43d94f9926542 SHA256 c5d692b0c51cbbc2535a4358b0b5bbc9a8c48e76f0f983081d53dbd4b9f6476c
-EBUILD uanytun-0.3.1.ebuild 2177 RMD160 b7af9ee3a09fa7935ef356b7ddb5587237f86e74 SHA1 c93e371804aa2ba17bf0b2557fdc1c65c7c0bf76 SHA256 ab964c7a2b71ebd66ddaa5ee441c7985762dd1b737daed0648e480d01e032ff6
-MISC ChangeLog 767 RMD160 d71711ca42a5f438d98f5a31d4aea00aeb706b49 SHA1 8fba04f88ed99a6ff75ecea888830eb6f845f43c SHA256 0df0a69bad8df2382de1af39dd3982740a65ba6cba32d9e3de324e03551dfd09
+DIST uanytun-0.3.2.tar.gz 49802 RMD160 2a33909b53c326675a762e83becb59d2c0699b9e SHA1 2f16a69fed8433ed74cf439c00fa16ba27cc0234 SHA256 8f9236b1b7706545490664f52e3b324d75337a516d3e3d347130990ab067bc73
+EBUILD uanytun-0.3.2.ebuild 2269 RMD160 bfee9dbb4cc7fa79a742e54d0561010a22cef371 SHA1 1be931d9221d2685816d57bdc5a4b94e0fa9c084 SHA256 86a0adeb00e0bc89ad5aaef9c9c42f580cb01519e6ab7bc4f6a52e8f6f1acef8
+MISC ChangeLog 1009 RMD160 75799d2b139285b2d748db038b424c57539b67f5 SHA1 ec4ed788123342a3508db2d16475d6bfc80c77b2 SHA256 865924f3ee70a46dc8c10611ca527d4ea52c2d3717829edd1b88643aa096fa2a
 MISC metadata.xml 693 RMD160 c6e263e092a5077a618ab4991f61b0bb14808488 SHA1 a139e5f6f9dc0bd5c9c550469748f317a497167e SHA256 4c98a3a72abca98d4a1579357fb374a7a4681948e3a200831cdb515192a7bdcb
diff --git a/net-misc/uanytun/uanytun-0.3.1.ebuild b/net-misc/uanytun/uanytun-0.3.1.ebuild
deleted file mode 100644
index 6d62c6e41..000000000
--- a/net-misc/uanytun/uanytun-0.3.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="tiny 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="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"
-	#uanytun doesn't use autoconf and fails with options like --build --infodir	--host ...
-	./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc ${myconf} || die "configure failed"
-
-	emake || die "make failed"
-
-	einfo "Building manpages"
-	emake manpage || die "failed building manpages"
-}
-
-src_install() {
-	#make target install-bin is buggy
-	dosbin uanytun || die "failed to copy/install an executable"
-	newinitd "${FILESDIR}/${P}.init" uanytun || die "failed to copy/install initrd script"
-
-	emake install-man DESTDIR="${D}" || die "failed to install manpages"
-
-	cd ../
-	dodoc AUTHORS ChangeLog README || die "failed to install docs"
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples/etc/
-		doins -r etc/uanytun || die "failed to install examples"
-	fi
-}
-
-pkg_config() {
-	[ -e "${ROOT}"/etc/uanytun ] && die "${ROOT}/etc/uanytun/ already present, rm -R it first"
-	[ ! -d "${ROOT}"/usr/share/doc/${PF}/examples/etc/uanytun/ ] && \
-		die "can't copy example configs since examples were not installed (reemerge with USE=\"examples\")"
-	cp -vr "${ROOT}"/usr/share/doc/${PF}/examples/etc/uanytun "${ROOT}"/etc/ || die "failed to copy examples"
-}
-
-pkg_postinst() {
-	enewgroup uanytun
-	enewuser uanytun -1 -1 /var/run/ uanytun
-	einfo "Note that each VPN gets its own directory under /etc/uanytun/"
-	einfo " (see examples provided with the package)"
-	einfo "Use the following example to create gentoo-style"
-	einfo " uanytun.{VPN} initrd scripts for each VPN"
-	einfo "# ln -s /etc/init.d/uanytun /etc/init.d/uanytun.client1"
-}
diff --git a/net-misc/uanytun/uanytun-0.3.2.ebuild b/net-misc/uanytun/uanytun-0.3.2.ebuild
new file mode 100644
index 000000000..0d910cca3
--- /dev/null
+++ b/net-misc/uanytun/uanytun-0.3.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+DESCRIPTION="Tiny 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="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
+
+	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"
+
+	#patch any examples to use user "antun" instad of "uanytun"
+	find "${D}"/usr/share/doc/${PF}/examples/etc/ -name "config" \
+		-exec sed -i 's/\(username\|groupname\) uanytun$/\1 anytun/' {} \;
+}
+
+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 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
+	elog "Note that each VPN gets its own directory under /etc/${PN}/"
+	elog "(see examples provided with the package)"
+	elog "Use the following command to create gentoo-style"
+	elog "uanytun.{VPN} initrd scripts for each VPN"
+	elog "# ln -s /etc/init.d/${PN} /etc/init.d/${PN}.client1"
+}