chaosvpn: Bump to 2.12, update live ebuild

(Portage version: 2.2.0_alpha120/git/Linux x86_64, signed Manifest commit with key 84F20B43)

4 files changed, 25 insertions, 66 deletions

diff --git a/net-misc/chaosvpn/Manifest b/net-misc/chaosvpn/Manifest
index 690af5f..13d64bf 100644
--- a/net-misc/chaosvpn/Manifest
+++ b/net-misc/chaosvpn/Manifest
@@ -1,7 +1,15 @@
-AUX chaosvpn.init 580 RMD160 d57bb636085467a0f91598422ffb860194e93aa0 SHA1 2ce1d74472c3e48108b7f120f1a35008c149a542 SHA256 7adb2e24f5f1063dcf6693928f7e27b3466f40bdaf4b7046b8b4ae70edb02623
-DIST chaosvpn-2.05.tar.gz 62457 RMD160 4ba0cdfe32b9cc51a4a32011abe5d96619acd090 SHA1 b33709b7b354e96c6cc12dff552664326184e994 SHA256 528724f7d6162b1b0d4509c9456d9d00248e5371f09b92a966f457cd14de964f
-DIST chaosvpn-2.10.tar.gz 72595 RMD160 f4671db6a4c2d56880a2b99aac06f75b0e26c39e SHA1 303228f4881e04d0d675d0ee05191b6856adeedc SHA256 70f8315d870e44bacd7cdb0b10225a0296ce8d8721ced7da7f70a6be0dff9fc8
-EBUILD chaosvpn-2.05.ebuild 911 RMD160 067aac5df1c7887a2e432f3dfe8bb18159490d9e SHA1 9a7521684faae933911cb6e98aeed3bb1c889056 SHA256 c53a1b13821470501838fd4b7f4511312261e2e287f7c50488233a4b02210edc
-EBUILD chaosvpn-2.10.ebuild 911 RMD160 b758284150593b783fbe30b718e908d42e0de61e SHA1 ccfe0986e98ae705e6345c5711fc6e18c97efa79 SHA256 8df6e1f22b1d474d39cecee56608371ba908241bb443b5701c62bf224b1b494e
-EBUILD chaosvpn-9999.ebuild 856 RMD160 744fa911139d41c361dadab07a7af446547fa8cf SHA1 6c8f24d84288706005b4de5ac8eef69e6f3b7b1d SHA256 d25382a5fa226d02391f136ccdde0ac42f3c88e1d9a1420fca9ddaad95eb0307
-MISC metadata.xml 140 RMD160 580e775b5b49d7303a7053e405f8db311400197a SHA1 b70c9d212cdfe358e63058de175f1122833a6579 SHA256 46e94927a74c45d5fd3e380fdc946886e83bc28a0a51b4f57b0a360428a5cf4b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX chaosvpn.init 580 SHA256 7adb2e24f5f1063dcf6693928f7e27b3466f40bdaf4b7046b8b4ae70edb02623 SHA512 2eaee5808a9322c6960fa0b32621a9c8dd8f7c7b7b2b0ce8a3382f9b89a7cd19aeba532050adea2b8acc14f7fcae66d8c151df60dffd215b206982f5cbd55aa9 WHIRLPOOL cc22f418c5ec75b7dbc39cbd6a6b71631911f957a2fe21224f826f3b79522649a1822395db2441ca02ebf8ee55b9d3c6233157cc4ccc915f6c0697e869de61d8
+DIST chaosvpn-2.12.tar.gz 73251 SHA256 68659625a22ab54bf0a85e4b055e83d4ae5a25b1e200bbd2e1992a17fe70e1bb SHA512 46e031456faf9024d8c16e856e75300a76a5f3191870bd0c36b82f50d80b0afecbc7e33fa0357e3e303e887bb7da7ca98f4500ab4a7b8ef37152d62f77ef25b0 WHIRLPOOL 8d1c78e3413f4871659b3712cc8cf2bc8dea27bb6340a9867b04c49d04bcb45d542d44f56c5adea98754553933dd219e1fcdee9be0f69ffec5fd466da3fd0f2f
+EBUILD chaosvpn-2.12.ebuild 867 SHA256 f22967a1b5265ef6647456c4c3afa3b45e7f5dfb1b35c38d179de9ef73120673 SHA512 1f6bf7e29bf63697a51ba26f1ebf8312773c9af674ab4fde050e1f24a2f001ef13a503d1054dd1be468b398b5c2e157e65c3737b1acce00c2b59ed95c64c0912 WHIRLPOOL 022f85652282e3ff59e7465b37f157bf65693cb7340d4158273e5ed885ec03d867ab336d2e70bbe745813b979887082416e2d521842bfc940452e013242c9781
+EBUILD chaosvpn-9999.ebuild 842 SHA256 7d045fd21308fc93eb239bff2e8155362562edcb8a838b192deaa8a7d7fad2a0 SHA512 7ea52e2e4ca3eb8f3bb4f75424951a42fa9d6e1b86ad9b9ea97f770244435ef887e7af55f57d7162502cf73b3188eb2bec37ea91dc9be2e029517999a98a2cee WHIRLPOOL e3eb778e6828e341272e2046408b188b8b4f9dc71f6cb8796b0044f1347566c4eb4c6c454c60aa759f30901ad70af0b6664170c40cfdef5e9353921fc8152363
+MISC metadata.xml 140 SHA256 46e94927a74c45d5fd3e380fdc946886e83bc28a0a51b4f57b0a360428a5cf4b SHA512 fea2d8570514bac76535850a58a9fb50946a315efd0448cbb3fb0d543acc203541fb3431bd4c3ca82e057f2bd4fcd763da81d07dccfd4a788aedc9aa825d6296 WHIRLPOOL 78baff9ed584f9e1f978667c5b19ba0a66fe2793cacd56c2afbb9fd22fad28d6d012c3d976e8ad30aa4ddd63614cc990bb3a89a2052b3271e4cfd77003d5158e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlAJLdAACgkQmWq1bYTyC0P5UAEAuDzS9i/I9TR7ZrD2XjqlS9TZ
+x89tJtAEAHIadzDAUVMA/3Mu2a74gLuy6ht8Yf/rQD5WW2uVdLxgDdEgS80pZPiM
+=61Y6
+-----END PGP SIGNATURE-----
diff --git a/net-misc/chaosvpn/chaosvpn-2.10.ebuild b/net-misc/chaosvpn/chaosvpn-2.10.ebuild
deleted file mode 100644
index 669c28c..0000000
--- a/net-misc/chaosvpn/chaosvpn-2.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="ChaosVPN client"
-HOMEPAGE="http://wiki.hamburg.ccc.de/index.php/ChaosVPN"
-SRC_URI="https://github.com/ryd/${PN}/tarball/${PV} -> ${P}.tar.gz"
-REV=f3feb82
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=net-misc/tinc-1.0.13"
-
-S=${WORKDIR}/ryd-${PN}-${REV}
-
-pkg_setup() {
-	enewuser chaosvpn "" "" /etc/tinc/chaos/
-}
-
-src_prepare() {
-	sed -i -e "/strip/d" Makefile || die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	diropts -m0700 -o chaosvpn -g chaosvpn
-	dodir /etc/tinc/chaos/
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-}
-
-pkg_postinst() {
-	elog "Don't forget to run"
-	elog "	# tincd -n chaos --generate-keys=2048"
-	elog "if this is your first install."
-}
diff --git a/net-misc/chaosvpn/chaosvpn-2.05.ebuild b/net-misc/chaosvpn/chaosvpn-2.12.ebuild
index b58bd39..cfe9d6a 100644
--- a/net-misc/chaosvpn/chaosvpn-2.05.ebuild
+++ b/net-misc/chaosvpn/chaosvpn-2.12.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=4
-inherit eutils toolchain-funcs
+inherit toolchain-funcs user vcs-snapshot
 
 DESCRIPTION="ChaosVPN client"
 HOMEPAGE="http://wiki.hamburg.ccc.de/index.php/ChaosVPN"
 SRC_URI="https://github.com/ryd/${PN}/tarball/${PV} -> ${P}.tar.gz"
-REV=f1b4b62
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -16,9 +15,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND=">=net-misc/tinc-1.0.13"
-
-S=${WORKDIR}/ryd-${PN}-${REV}
+RDEPEND="dev-libs/openssl
+	net-misc/tinc"
 
 pkg_setup() {
 	enewuser chaosvpn "" "" /etc/tinc/chaos/
@@ -33,7 +31,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	diropts -m0700 -o chaosvpn -g chaosvpn
 	dodir /etc/tinc/chaos/
diff --git a/net-misc/chaosvpn/chaosvpn-9999.ebuild b/net-misc/chaosvpn/chaosvpn-9999.ebuild
index f22d25f..fa6cb33 100644
--- a/net-misc/chaosvpn/chaosvpn-9999.ebuild
+++ b/net-misc/chaosvpn/chaosvpn-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=4
-inherit eutils git-2 toolchain-funcs
+inherit toolchain-funcs user git-2
 
 DESCRIPTION="ChaosVPN client"
 HOMEPAGE="http://wiki.hamburg.ccc.de/index.php/ChaosVPN"
@@ -15,7 +15,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND=">=net-misc/tinc-1.0.13"
+RDEPEND="dev-libs/openssl
+	net-misc/tinc"
 
 pkg_setup() {
 	enewuser chaosvpn "" "" /etc/tinc/chaos/
@@ -30,7 +31,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	diropts -m0700 -o chaosvpn -g chaosvpn
 	dodir /etc/tinc/chaos/