Version bump, bug #485174

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 97 insertions, 15 deletions

diff --git a/net-proxy/torsocks/ChangeLog b/net-proxy/torsocks/ChangeLog
index 371e82c0f9e5..7434565a1dd2 100644
--- a/net-proxy/torsocks/ChangeLog
+++ b/net-proxy/torsocks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/torsocks
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/torsocks/ChangeLog,v 1.11 2012/03/24 17:29:36 phajdan.jr Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/torsocks/ChangeLog,v 1.12 2013/09/17 18:22:23 blueness Exp $
+
+*torsocks-2.0.0_rc2 (17 Sep 2013)
+
+  17 Sep 2013; Anthony G. Basile <blueness@gentoo.org>
+  +files/fix-docdir-r2.patch, +torsocks-2.0.0_rc2.ebuild:
+  Version bump, bug #485174
 
   24 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> torsocks-1.2-r2.ebuild:
   x86 stable wrt bug #395215
@@ -46,4 +52,3 @@
   13 Sep 2011; Anthony G. Basile <blueness@gentoo.org> +torsocks-1.1a.ebuild,
   +metadata.xml:
   Initial commit
-
diff --git a/net-proxy/torsocks/Manifest b/net-proxy/torsocks/Manifest
index 33e525a04599..0bd6a9365e3f 100644
--- a/net-proxy/torsocks/Manifest
+++ b/net-proxy/torsocks/Manifest
@@ -1,17 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX fix-docdir.patch 1245 RMD160 e2b79f7a841a31504e49c89306a957a586831fec SHA1 1cb59c1e7f60983de5279f3b8b56d6da0d115ddf SHA256 0f5e2a84b1c77893902a35f2df5575087558822536bd64335c543f91d4bb70f0
-AUX suppress-warning-msgs.patch 657 RMD160 9420d95a6bbd35b97db8bea4b1aab637e52ad9e7 SHA1 cbcd7c1b5469e1c1384f488ce730ecc6ee069c95 SHA256 1700733259fae6b9e4915ec9ec4d678bff84fa50821e212f65d4bbe424c9f759
-DIST torsocks-1.2.tar.gz 456453 RMD160 eb4b16833c5f7a09424d7acb9993c6dd04f8a8d0 SHA1 b8afeb217db299892a628e28f2327a1d2697f9ad SHA256 bea57d3624d723724fd1e260f0e6b2a354c0da742c023aa994c7692270d111d4
-EBUILD torsocks-1.2-r2.ebuild 986 RMD160 376c8549ead133e3e497b8f2449f1fb6fd899ef8 SHA1 33a8fcb47c1e0ec451530ec21e2293f359cf39c3 SHA256 66b117b12c21e62522c19b0eb1d4c48ca2c52f41c86ccc1cd8167e9f4ccff15a
-EBUILD torsocks-1.2.ebuild 765 RMD160 e11bdbe7312184d4cebb5819eac36290db8b9d4a SHA1 ce348904f983364425d7d82abf5c3b4e359f2f9b SHA256 516e12861139063a948e720de4efcff760c66d97a53e306c3a5ca8affd1bd9ca
-MISC ChangeLog 1694 RMD160 bb645b1666f56bbe2ad45294db2a34bf9f5f4269 SHA1 de22e2161577cf0314839c1b2bc1eff6443ba17c SHA256 deea9198184407a395403999b0ab6a95ddd2d576e377c216a1f5f50b23d813af
-MISC metadata.xml 316 RMD160 fa591fded0d9f90f1b91f1bbf22eba2084a7752a SHA1 c5504c0a625f283db31d3c5640996be56294dd4d SHA256 4c32e171681ab5fdd7689307fe5fbca67e4b2c64d1ab5f60b17171ee08066234
+AUX fix-docdir-r2.patch 818 SHA256 119103f6c6e9a8891fe026ac0071b9b9b74197b3b92ff9328cc54bb6600c3564 SHA512 64468f0d4784e9c4b7009ed5e6ac1a1291f57c82a8226d1a35065435d790c8b9d99310998e7f0ac3a5a06634e7f5db13403dc08753ab3dcabb1660e9883372f7 WHIRLPOOL 5f7e68d05d14ed6cd1e2f195fa29272e58c92798ea80b1f65c6eb5b2a6c3d5c016d43f2c02a23b4507d0119d769b72ac75f16c5a6aaf3d890d4898532ff097eb
+AUX fix-docdir.patch 1245 SHA256 0f5e2a84b1c77893902a35f2df5575087558822536bd64335c543f91d4bb70f0 SHA512 ff137987df93ad9ff6eb9e82cd1b0bee06088d8ca87bf4a87c4bf4496d21cc0a65c8fb8fa8746bbd521aca6a97b1e4e79918435c61236d3a814c99e7da1c8999 WHIRLPOOL cbf0c8609d3247396d380542c769e61f625ac5ddf50a89c4f8b5ac6e9043b1e5c84c053e0bf0ab1a34e43de5cb322bdb61d7b8f07a52f83c06d8469c0ecff424
+AUX suppress-warning-msgs.patch 657 SHA256 1700733259fae6b9e4915ec9ec4d678bff84fa50821e212f65d4bbe424c9f759 SHA512 71472b0ea8ef99de58e2be415f7e90405b7f71c4dce26265dbfd4c2bdc2c037cfe2b7c6382f9128bfdc7d1cde850e20d411f9c5016e784840641d633cfa8482f WHIRLPOOL 90c90fb1a37c5f81008b0064be54302960f53886f90f854267502ebe523de1b02bac02b6549d52a5ba461192d395ff0a1b346b04c308a67f5cc1ac3ac50a4d9c
+DIST torsocks-1.2.tar.gz 456453 SHA256 bea57d3624d723724fd1e260f0e6b2a354c0da742c023aa994c7692270d111d4 SHA512 c48cf466c1d4f6204c90ccb5f741d14304b24651d18d080a73952b9a06bbe146e3f6e6c4343ed06ed7a73714d86561cde3eba369e17fc4e155f3553a8d0f3890 WHIRLPOOL af892c2a6f8070308f6867154c50ee8ce6fd20c761dbd6466ea1ae3b46730452ce0757e9de8bf698f8bd455649f3f76a4e9a0bd883408f464c619c1d41e937cf
+DIST torsocks-2.0.0-rc2.tar.gz 107022 SHA256 9467fc4e4d64b6d11dbbfc91196d7bd6fb08d7b4cc72d32a3850c9b78403908b SHA512 8b1d5870b70e20a3e3d5a4dc6344a41d5ff634293018ff721627a65325111b92444d0b715c61f111815d1d967fbd75a1f61815715895fb9ec5e4b6d7597b4409 WHIRLPOOL ac7f02fb4bcfab7a71bd0dc8ce730a2832ac220c6bc3605fe4c87532be3dcc773b0088824ecb9fef4ef24d93cbf16e637efe7858c8b9730705ab695c59f89716
+EBUILD torsocks-1.2-r2.ebuild 986 SHA256 66b117b12c21e62522c19b0eb1d4c48ca2c52f41c86ccc1cd8167e9f4ccff15a SHA512 577696c62d7056d1eaefcc0487cad1fb1bd091ea230b6a3df6cffd430c0622711871fbde79cfcf7203224a669fde87d3692764870d6b852e004036696f91c6fd WHIRLPOOL f89a2f18653cf19edfb7816d8c7daaa7d6f6151ace40261cca1d04d50963052db769ace2f9b0ab6ab0d9033b10b0e584bb15e2fca121610b067e2c2b3922ca72
+EBUILD torsocks-1.2.ebuild 765 SHA256 516e12861139063a948e720de4efcff760c66d97a53e306c3a5ca8affd1bd9ca SHA512 ece7864ec17800b46783776437e4b7083aafe8b9d15864ffd2231222acd95e0effbad8c176582558d758cc3ee8ae10e68543a7f651424d4ed5c973317235334d WHIRLPOOL d694995f08df2a351078186fb283e8d49a97b38cadae0efa1417df0337894dbfa3d2762461e8449876027cf1ed0756bdadca49eefaae108834ba569306c8542f
+EBUILD torsocks-2.0.0_rc2.ebuild 1066 SHA256 bc19e0eb6d36ba1ad665bd06dd617e6866dddacba4b2dd77b5fa32c28c7dc75b SHA512 8049c4a41ed0466fb3631ac4e4cc616eb085bfed293e39844c1b110aa7b0b1d2ee4f591159e2f8889c8fc7fbe75ae439dd325bae75bb9f19e883276b1bc9f79a WHIRLPOOL 8b2523280ae7fdf6f18c7d6dd242a0546c2d81f623963f5bc426ec9d33b258ca8776aca2dbe058d80494282aeddfada7077380074fd788d6aa755811d4d2edcd
+MISC ChangeLog 1868 SHA256 467b801b98b93701c34ef66e93a9ea5b42ac763cfc9a08761a5fa22913fd7542 SHA512 819fbc3736391a527aa19615ea05c6d3f9176b665f05eb28b6cf6ffaf55ccc850f49516fe3a4d9fb6f41664796f872778d9c088b035c8ec7316ceb9f63c40b6f WHIRLPOOL f5463f5c903cfd916f171965afbaadef0586a1de87c21b12ca0f38d856b1ef5e33167ce7d583fde4f67681954595ff7e1b68006eb00b16197bac21e442d1e24a
+MISC metadata.xml 316 SHA256 4c32e171681ab5fdd7689307fe5fbca67e4b2c64d1ab5f60b17171ee08066234 SHA512 e7dfd938efe4cadbd14069d6c81e541354829da8737e2a6282627cd54cfb7c2081f7bcb1dd2bc30312f97a8c14fa43398e5e09e17a1649e486031b87155a2810 WHIRLPOOL 3e0a03584d3c3df7c8fe4fc62e6dd24f007be4d7e9cbc4db7fc4a16f1c93a601077b378d9bc26ba8a5e4011047e248e40ca8952dbeb8436813bfb1a65d720ac9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEARECAAYFAk93TyYACgkQ/ejvha5XGaP0jACg4GZ1FP6qtiNwj4h2Yua2GeyN
-4w0An3568g9c4KzJYfXY2ZPTg1+RPY49
-=AjZk
+iQIcBAEBCAAGBQJSOJ4KAAoJEJOE+m71LUu6uGUP/0MXNAsNUAumsyRAWw78IMGp
+TlI0jP7HfVMRH1sJkl/IDgSJXsvueg2zGM50BQxkybdsS3an2kIE3xOu71zQfLRu
+NALtvgVaXBS8HvNngC9qpJvdfgTHn1CgUGwEqkDBa4kYTe0wSvpyx7zidPhsmIWj
++wuGciIQx+GOypzirmhx2JhBDgx23bXE8wt57xOq0vvk8hgrxONmVD2q38g/6mxI
+xVoB8i5PhoFp3f/zg33YFZR8Qm2+lLEWspzzatMtiDasET459euntNLVhKI65Uza
+Wi293hOKOhTLkq3lJa4GKzpb5+o9f3cTycsjUn4jD6mBB9D6xEUtwG4i3qJB2kLw
+1bsKdmk2AbO/HN9K/k5McVnlkCUyHEXfEeyXH23OnRNSXShqN0lsnsgnfnh80YCG
+k/UPjC5yQ0fmMCIru/HpR7XYuit/JIkidioLUsqNKkoJpXQXKn3AgkJvXs8R+xXL
+SezC7iOTdhZwelCUh1qik0BZmZST9tyr+Bnypvvw6Wu5nfrH0htokFkIaQ793yCv
+QVcJzWVrT4aAkHtxuqLbAsDih5qee3Bmknlj66WRs/dVJnutZFTMnf2G5jFgPHsy
+vDcA5XQ011pbaSkRtff8qeq1GrN99cWEXYzYKj9Yo2/jwBaE6ZAX304uVCSIl+3L
+wpFx48ugZL2A7ftJeU2E
+=DA4n
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/torsocks/files/fix-docdir-r2.patch b/net-proxy/torsocks/files/fix-docdir-r2.patch
new file mode 100644
index 000000000000..05986ece2d0f
--- /dev/null
+++ b/net-proxy/torsocks/files/fix-docdir-r2.patch
@@ -0,0 +1,21 @@
+diff -Naur torsocks-2.0.0-rc2.orig/doc/Makefile.am torsocks-2.0.0-rc2/doc/Makefile.am
+--- torsocks-2.0.0-rc2.orig/doc/Makefile.am	2013-09-02 14:06:44.000000000 -0400
++++ torsocks-2.0.0-rc2/doc/Makefile.am	2013-09-17 14:19:37.769272561 -0400
+@@ -6,5 +6,5 @@
+ dist_man5_MANS = torsocks.conf.5
+ dist_man8_MANS = torsocks.8
+ 
+-dist_data_DATA = socks/SOCKS5 socks/socks-extensions.txt notes/DEBUG
++#dist_data_DATA = socks/SOCKS5 socks/socks-extensions.txt notes/DEBUG
+ 
+diff -Naur torsocks-2.0.0-rc2.orig/Makefile.am torsocks-2.0.0-rc2/Makefile.am
+--- torsocks-2.0.0-rc2.orig/Makefile.am	2013-09-02 14:06:44.000000000 -0400
++++ torsocks-2.0.0-rc2/Makefile.am	2013-09-17 14:20:07.945273935 -0400
+@@ -2,6 +2,6 @@
+ 
+ SUBDIRS = src doc tests
+ 
+-dist_doc_DATA = ChangeLog
++#dist_doc_DATA = ChangeLog
+ 
+ EXTRA_DIST = gpl-2.0.txt
diff --git a/net-proxy/torsocks/torsocks-2.0.0_rc2.ebuild b/net-proxy/torsocks/torsocks-2.0.0_rc2.ebuild
new file mode 100644
index 000000000000..f539abbf146d
--- /dev/null
+++ b/net-proxy/torsocks/torsocks-2.0.0_rc2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/torsocks/torsocks-2.0.0_rc2.ebuild,v 1.1 2013/09/17 18:22:23 blueness Exp $
+
+EAPI="5"
+
+inherit autotools eutils multilib versionator
+
+MY_PV="$(replace_version_separator 3 -)"
+MY_PF="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_PF}"
+
+DESCRIPTION="Use most socks-friendly applications with Tor."
+HOMEPAGE="http://github.com/dgoulet/torsocks"
+SRC_URI="https://github.com/dgoulet/torsocks/archive/v${MY_PV}.tar.gz -> ${MY_PF}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+# We do not depend on tor which might be running on a different box
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/fix-docdir-r2.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	dodoc ChangeLog README TODO doc/notes/DEBUG doc/socks/{SOCKS5,socks-extensions.txt}
+
+	#Remove libtool .la files
+	cd "${D}"/usr/$(get_libdir)/torsocks
+	rm -f *.la
+}