Fix bug #534542. Remove older RCs.

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

5 files changed, 35 insertions, 97 deletions

diff --git a/net-proxy/torsocks/ChangeLog b/net-proxy/torsocks/ChangeLog
index 8ac31d5df437..88f4dc1ae1e3 100644
--- a/net-proxy/torsocks/ChangeLog
+++ b/net-proxy/torsocks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/torsocks
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/torsocks/ChangeLog,v 1.16 2014/12/21 21:34:58 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/torsocks/ChangeLog,v 1.17 2015/01/04 13:26:36 blueness Exp $
+
+  04 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
+  -torsocks-2.0.0_rc2.ebuild, -torsocks-2.0.0_rc3.ebuild, torsocks-2.0.0.ebuild:
+  Fix bug #534542.  Remove older RCs.
 
 *torsocks-2.0.0 (21 Dec 2014)
 
diff --git a/net-proxy/torsocks/Manifest b/net-proxy/torsocks/Manifest
index 68de6107ac68..344e2388ddee 100644
--- a/net-proxy/torsocks/Manifest
+++ b/net-proxy/torsocks/Manifest
@@ -1,15 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX fix-docdir-r2.patch 818 SHA256 119103f6c6e9a8891fe026ac0071b9b9b74197b3b92ff9328cc54bb6600c3564 SHA512 64468f0d4784e9c4b7009ed5e6ac1a1291f57c82a8226d1a35065435d790c8b9d99310998e7f0ac3a5a06634e7f5db13403dc08753ab3dcabb1660e9883372f7 WHIRLPOOL 5f7e68d05d14ed6cd1e2f195fa29272e58c92798ea80b1f65c6eb5b2a6c3d5c016d43f2c02a23b4507d0119d769b72ac75f16c5a6aaf3d890d4898532ff097eb
 AUX fix-docdir.patch 1245 SHA256 0f5e2a84b1c77893902a35f2df5575087558822536bd64335c543f91d4bb70f0 SHA512 ff137987df93ad9ff6eb9e82cd1b0bee06088d8ca87bf4a87c4bf4496d21cc0a65c8fb8fa8746bbd521aca6a97b1e4e79918435c61236d3a814c99e7da1c8999 WHIRLPOOL cbf0c8609d3247396d380542c769e61f625ac5ddf50a89c4f8b5ac6e9043b1e5c84c053e0bf0ab1a34e43de5cb322bdb61d7b8f07a52f83c06d8469c0ecff424
 AUX fix-find-libc.so.patch 634 SHA256 f355092a265584b560ec8255b99ce54b8708c5a0ef1ae3efc518721641aa039f SHA512 bcaacf3c270cec290d0ee3949ec3cbb1b0b228ae11eec3c18663f2db96d199a1174b80d855047a0e44a7f36f5877a1385f5f77f1864b3ff944327940413b72c2 WHIRLPOOL ba0fef2bd5ee7e04feb31ea008df7968a0e950295315fbe07ccc0d61aa08995392e2cbe76aecf5bf12d783e7a8618a93aec3aab4bdac08284cb43822ef9826a6
 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
-DIST torsocks-2.0.0-rc3.tar.gz 109998 SHA256 6d3ddb8856a12ff39365e359a06b057c0ea03edc7733b25437a3638d2a973244 SHA512 c10b8ae2f0115eae2b36baa46f48f586c1efaf101d391c4ace95e4b3fbc7287c1b281968524808a752e77e4be077b1583fe7b96d24643c7f27205a379fd9f946 WHIRLPOOL fcb474ff6d8e75265cec9b04914cb7a9f5826b2fc2f1ebec61d6bef7a8b29ee5e86b1882fae0658528b79b4de0da1ec04977ef062a9c77cb94ce4c49b9dac673
 DIST torsocks-2.0.0.tar.gz 96281 SHA256 a01f9e5ccc8a6e1d4e13704581ec9675129c147d10d08f86635f7bceb8001f48 SHA512 fa30244a5a06c6371a86090088b3abe9f4513eefce90580e7c7899843887b8a1eac641500dee81e576f27fa0f1b447b34f7b8300a889bcda2119779deb69d77d WHIRLPOOL 41ea31225866c50153dd0d46bc0659311835c5617f42a3c8275d5046cc0019fc4caa0ab9ef06d1b3552c1f082cb01a2036fc14c61a061378d01f988ff586a9c5
 EBUILD torsocks-1.2-r2.ebuild 981 SHA256 87f50b8a941a23492aa1ed4250df01dc1d13409ed5b6d821695d6f5711c61536 SHA512 253ffe340bec3611fe7269298d0bebfebcb7ae314683119d242df4ab84ebe3dba5a5d05ca961ccb026f3fb9e3801f9bd05a2f961a355fda07622b75e2cf2ee1d WHIRLPOOL a7331db87b9975d99bc0578baf16483f376a29367116fe12514f92ca1ef6d585862545e4a00f35d85bb70ca2a95f55077c0440bc9d7c1a513bd9901028911a74
 EBUILD torsocks-1.2.ebuild 767 SHA256 7b6fc94c85685ce6191ac9381ff90f3b9aae2b76e00075da777dc0e6a1bb1cb1 SHA512 a004fc2ed9350a7e2e3929c754b21ff943604aa84a3c505bfe417f97fd997462c0e45ef1e77b9f861be76d75d5635fd4b2760dfd6bf7213bffcb22fec50de98a WHIRLPOOL 16a3f017f4f6cd8084cb5b25a64061be265741055894db444ae88112f9e315d1180db0e5112ea5ef603e191e318afd23c64f61844c0485203002a1e61657c035
-EBUILD torsocks-2.0.0.ebuild 1090 SHA256 ce483f5f904337a6b024c7e6b66e80e75381f68ef86e2f2bcdc43eedc429a552 SHA512 fa818b754865657db0cc101c6725c4e285eb131f9ba733d0d2b440315a3fce333d1ccf1f9764280d51ada76ca34078ff55608c20ddf7bf8f60748e7d583c5ac9 WHIRLPOOL 15823db58d222a2ab429849db88cef3d81c87cbef82ddb65e6042db5761776f5d62ac21366831b43173c103a3d2a80da67661637fdcbf5fe998a85b241970055
-EBUILD torsocks-2.0.0_rc2.ebuild 1068 SHA256 a1cdef44f05123a0220ee76f3618f85fa3f07c0140d0518b956caa60b3746078 SHA512 dc245eb13c1a29ef15e619c71c9615c10fc6eb903d924efa82998ce5b303df3a7dfce81ec766a4934230186d6e849827fe96fc7ba9226a837a345bac97d5cc1e WHIRLPOOL c086b4f9d1f34204fa29578e932cddcf972c60bd605c5eb9b6bfef3cfa82c64ae9cb34a5c8e965191d784d50b72547d83d2c2bd8057a3569781f56da9e3bcb1a
-EBUILD torsocks-2.0.0_rc3.ebuild 1113 SHA256 487f1d6b91ff5bb913c5a2dbbc3abbd37c348981c020abfc8245d91494d44835 SHA512 c0a491887a118f39f8849b460eecb875dfe0753df497f376bb495d9fe8a16d57f313693553460231f48bf89266607eaddac131114b7cb3f2cfaa62239f6916d8 WHIRLPOOL 14f5b4fe008f12e6ebd55d0f6e4e72a664cc3a2edfeb40152da8ce44448f78fa3266c0bdfef2142d7b2aa52b90665cec68bdec438e32de9bec47ffd8ee485dd5
-MISC ChangeLog 2485 SHA256 542405864816063a05412ed4b5da2db8bda231db35721ec24060463361e45e0b SHA512 f6d28aaa9d5e0798e2dbb62c3780d769a06dc83f4b419d78a815072efdbf9d6e994dacf9c804e582fd0769be4674e99b6fcd07c11c2e2658df5a6f8314f3b97a WHIRLPOOL 32008925f0655056450ac12f5bd708e5a3aad36888ce01bd08f8dc40c9b95c6ac5300c8b8fff59cf9ebe7af4b43a03e4198465693ab59eb802f89b1a0b89babc
+EBUILD torsocks-2.0.0.ebuild 1230 SHA256 f0e321fd17ff9bf9c8436092b6dbd49360e6378f39e6ce28a858d6e61568371c SHA512 4d504d95534f013e8d00a43c8f486667b48b8abb0d950d214f1ef41a684492a07aab491e2f251e7130b90c5cadd0e728fbb62114e54c8953f7034900feefb4ac WHIRLPOOL fe13e016d0bcc6abfb57a98bb54b78bf9a9a38f62384a13d1335347347d93f42d0d3769d50cfb966a11a99d1b55648d7c9d7d6dd0803416fef594136b5b61b2c
+MISC ChangeLog 2663 SHA256 82de23623536e3e4d40b55936e9f6ce8e2d83447af89513e7de86c8e87adb36d SHA512 d1f0601eac28b030bf7c55f376d844e2402966ac165bb64d1d295f36e81a8dd25e731adbdc72511c495ab71a7ad99b95bf747c701a0182b3610360fccd9483c1 WHIRLPOOL 180638d62128401a851802000435e71c7bd43b5c68058321151d91395ac0e548772c579dbbdf1d1aa4f9434cc870c1ae7f09b8829c603671fa1778580ae1b76f
 MISC metadata.xml 316 SHA256 4c32e171681ab5fdd7689307fe5fbca67e4b2c64d1ab5f60b17171ee08066234 SHA512 e7dfd938efe4cadbd14069d6c81e541354829da8737e2a6282627cd54cfb7c2081f7bcb1dd2bc30312f97a8c14fa43398e5e09e17a1649e486031b87155a2810 WHIRLPOOL 3e0a03584d3c3df7c8fe4fc62e6dd24f007be4d7e9cbc4db7fc4a16f1c93a601077b378d9bc26ba8a5e4011047e248e40ca8952dbeb8436813bfb1a65d720ac9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJUqUAWAAoJEJOE+m71LUu6tnUP/3tKzw6Lhk9zFl0ECAG2kpme
+Wbqj8TQG0irmKEUrku2dvwBlCHKtZIqiXb6jrv/i3rt3SEGgXcLFiEihd9V2nF2E
+5lylUjXhYqxAywWe8bCEIFYfmAIFDP2tUTSZOSDi7UVVOThVto8mtnkSmydlJPn+
+C1Mu3Oh4hL59b+Qnc87+7slGuHiy9fBDNml/sCsUjZyGZ+8Swe8bXqSg0INeEqtj
+wQWdbX6NnNtqFv+lchJfijUGsU2qyyIOlKAAxgtzUK0jUXQ4ZBzmQav4ZkUj1ZPC
+xk/q36aa9Gc/pXWfYFIEvcec7dBAo50ia8XguDc/OEhwjmE3LAnVnUOWYUdapL8N
+fK8upcLPfMlJ4bbThhuD/PNo2rKRvpsFOdy8M3LYs1pkXzVRUblWqOTzSewH5wlY
+uXw1Ev219OfRZdMs4WsOZOolfxHmsiP5q407Eq/GqbksVC6Aq8ZDIbStowE61QGM
+YOBEMIF547GvLLjMRLyyH5pXj8ggPYqDBznGIqMwo5hPZJcSp7RK5tEFe1fUtv42
+nZfx/9EpgPbKS7b5tkcN3wp+TwnisdWrWkiPDcLLh0XHAWmnTHKlaMHAuATviIlP
+WQGYx1vstpTmPcvSB0/0IuumDEZZsGmC/W44+eJfZ+Fuf7oiLEHXFpl/lLg94eg+
+COHh02u+cBgHYKpeuZYI
+=kTPI
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/torsocks/torsocks-2.0.0.ebuild b/net-proxy/torsocks/torsocks-2.0.0.ebuild
index c7e4611575b5..39564e3b4635 100644
--- a/net-proxy/torsocks/torsocks-2.0.0.ebuild
+++ b/net-proxy/torsocks/torsocks-2.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.ebuild,v 1.1 2014/12/21 21:34:58 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/torsocks/torsocks-2.0.0.ebuild,v 1.2 2015/01/04 13:26:36 blueness Exp $
 
 EAPI=5
 
@@ -25,6 +25,11 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	sed -i -e "/dist_doc_DATA/s/^/#/" Makefile.am doc/Makefile.am || die
+
+	# Disable tests requiring network access.
+	sed -i -e '/^\.\/test_dns$/d' tests/test_list || \
+		die "failed to disable network tests"
+
 	eautoreconf
 }
 
diff --git a/net-proxy/torsocks/torsocks-2.0.0_rc2.ebuild b/net-proxy/torsocks/torsocks-2.0.0_rc2.ebuild
deleted file mode 100644
index 9cfb02354012..000000000000
--- a/net-proxy/torsocks/torsocks-2.0.0_rc2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 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.3 2014/08/10 20:35:52 slyfox 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 ~arm ~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
-}
diff --git a/net-proxy/torsocks/torsocks-2.0.0_rc3.ebuild b/net-proxy/torsocks/torsocks-2.0.0_rc3.ebuild
deleted file mode 100644
index 766913afdf53..000000000000
--- a/net-proxy/torsocks/torsocks-2.0.0_rc3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 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_rc3.ebuild,v 1.2 2014/08/10 20:35:52 slyfox 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 ~arm ~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
-	epatch "${FILESDIR}"/fix-find-libc.so.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
-}