Put doc files in proper docdir, bug #395951

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

4 files changed, 76 insertions, 9 deletions

diff --git a/net-proxy/torsocks/ChangeLog b/net-proxy/torsocks/ChangeLog
index 9bc0d319c34c..9f578f7d5218 100644
--- a/net-proxy/torsocks/ChangeLog
+++ b/net-proxy/torsocks/ChangeLog
@@ -1,4 +1,11 @@
 
+
+*torsocks-1.2-r1 (27 Dec 2011)
+
+  27 Dec 2011; Anthony G. Basile <blueness@gentoo.org> +torsocks-1.2-r1.ebuild,
+  +files/fix-docdir.patch:
+  Put doc files in proper docdir, bug #395951
+
   19 Dec 2011; Agostino Sarubbo <ago@gentoo.org> torsocks-1.2.ebuild:
   Stable for AMD64, wrt bug #395215
 
diff --git a/net-proxy/torsocks/Manifest b/net-proxy/torsocks/Manifest
index 1f2d7ed45a37..439219c88f5e 100644
--- a/net-proxy/torsocks/Manifest
+++ b/net-proxy/torsocks/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX fix-docdir.patch 1245 RMD160 e2b79f7a841a31504e49c89306a957a586831fec SHA1 1cb59c1e7f60983de5279f3b8b56d6da0d115ddf SHA256 0f5e2a84b1c77893902a35f2df5575087558822536bd64335c543f91d4bb70f0
 DIST torsocks-1.1a.tar.gz 375896 RMD160 ace896fad0dfccb18259cda03709e1bc7bf6ebe3 SHA1 7889bb0680d911689d1c280ec41ae6918b9241cb SHA256 86cdf9eb88aff7a2fe9ff327aaf5b0663448c0a2104901cf87e6a39da897420f
 DIST torsocks-1.2.tar.gz 456453 RMD160 eb4b16833c5f7a09424d7acb9993c6dd04f8a8d0 SHA1 b8afeb217db299892a628e28f2327a1d2697f9ad SHA256 bea57d3624d723724fd1e260f0e6b2a354c0da742c023aa994c7692270d111d4
 EBUILD torsocks-1.1a.ebuild 771 RMD160 7584c2718d17763e383efef655c689575c4527b5 SHA1 0aeb1d0d699d32c2ca88a68ca4d983bec675b90a SHA256 9adf24498712dfdf9c0b0f0dff8619ed2fba9dfe23dec5384d4f8cd9783fe394
+EBUILD torsocks-1.2-r1.ebuild 898 RMD160 5abd95156495a1e96ef952025fcde4b1cb15fe07 SHA1 2267c46dfd9ff09be3741d47541994d790a89240 SHA256 8acea63fe39a7dc14529350eeab08f291b398f7804ab3b688c13484e38ba995e
 EBUILD torsocks-1.2.ebuild 765 RMD160 e11bdbe7312184d4cebb5819eac36290db8b9d4a SHA1 ce348904f983364425d7d82abf5c3b4e359f2f9b SHA256 516e12861139063a948e720de4efcff760c66d97a53e306c3a5ca8affd1bd9ca
-MISC ChangeLog 475 RMD160 a2c8dbb7fee815991d65fdbf53ca97faac024a0d SHA1 0c8f4290799bbf7c27b71095d9c2caebef0741d0 SHA256 1bec6a455684a40b6b05e04891b0b35361321e3980c556acab9fd360860c9642
+MISC ChangeLog 662 RMD160 92cea37eb50ccfa30fa24c05a0f1780116983396 SHA1 e02c3e3fe141afa3e4d72ba04e6f3ec8aab1b26a SHA256 633c645e8b0498906aefd480e0bba612355e86c368ebcb34e1cf5c0733c2664e
 MISC metadata.xml 238 RMD160 6401efde1642c40e91d5a41a966b9dbff0512eab SHA1 9751c07b46aec3d4f96133758cdd23a3e2ca2835 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO71bhAAoJEOTDgjZ80txdoCYH/31YdsZZXQMNEaxRywp2Uzfb
-dY24/heHezbRrBA9IcfGmYXCkadepKn2/OtctdkHEJCY1/neKG2zVyjhMHjyRCwF
-yXTihyhkv/Cc/4qJLI19/2EmE8SYRA/iIs/GXc1FCjzPTqK+tZ2bAQNVdaM97uoM
-QVtdiSnrBGpPkHToj4uQlWyPtS8oKT+ovLaXTM1+C0/8gpz04Ju+ME5x9eM74q4A
-6wL7k5xDxtQxdIm0qLQB+QJ4GsbYH94i+ENIyHklipjuX6xv7bbTBLaH3v/FMJYB
-d/iri1W0tcSpwuGJdebn4dwTduoWZibg7h0txDEF4+nrLVKhEaRBqBrlyD5OljU=
-=SDDP
+iEYEAREIAAYFAk75HE4ACgkQl5yvQNBFVTXLugCfYqPNcHjkTbWcO9iLQNrwZHU0
+B10AnR72iOaMrq9QEhvN0FX8oHquWPI9
+=2hBE
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/torsocks/files/fix-docdir.patch b/net-proxy/torsocks/files/fix-docdir.patch
new file mode 100644
index 000000000000..899c15b16721
--- /dev/null
+++ b/net-proxy/torsocks/files/fix-docdir.patch
@@ -0,0 +1,24 @@
+diff -Naur torsocks-1.2.orig/doc/Makefile.am torsocks-1.2/doc/Makefile.am
+--- torsocks-1.2.orig/doc/Makefile.am	2011-10-26 14:30:26.000000000 -0400
++++ torsocks-1.2/doc/Makefile.am	2011-12-26 20:05:40.000000000 -0500
+@@ -7,8 +7,6 @@
+ # Install man pages
+ dist_man_MANS = torsocks.1 torsocks.8 usewithtor.1 torsocks.conf.5
+ 
+-dist_data_DATA = socks/SOCKS5 socks/SOCKS4.protocol socks/socks-extensions.txt \
+-                 patches/compilewarnings.patch patches/conffile.patch patches/getaddrbyhost.patch \
+-                 patches/getpeername.patch patches/infiniteloop.patch patches/localaddresses.patch \
+-                 patches/README patches/README.TORDNS patches/tordns.patch notes/DEBUG
++dist_doc_DATA =  socks/SOCKS5 socks/SOCKS4.protocol socks/socks-extensions.txt \
++                 notes/DEBUG
+ 
+diff -Naur torsocks-1.2.orig/test/Makefile.am torsocks-1.2/test/Makefile.am
+--- torsocks-1.2.orig/test/Makefile.am	2011-10-26 14:21:57.000000000 -0400
++++ torsocks-1.2/test/Makefile.am	2011-12-26 20:04:34.000000000 -0500
+@@ -4,4 +4,4 @@
+ test_torsocks_LDFLAGS= $(TESTLDFLAGS)
+ CLEANFILES= test_torsocks
+ 
+-dist_data_DATA = run_tests.sh expectedresults.txt
+\ No newline at end of file
++dist_doc_DATA = run_tests.sh expectedresults.txt
diff --git a/net-proxy/torsocks/torsocks-1.2-r1.ebuild b/net-proxy/torsocks/torsocks-1.2-r1.ebuild
new file mode 100644
index 000000000000..9d782807d5e9
--- /dev/null
+++ b/net-proxy/torsocks/torsocks-1.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/torsocks/torsocks-1.2-r1.ebuild,v 1.1 2011/12/27 01:15:48 blueness Exp $
+
+EAPI="4"
+
+inherit autotools eutils multilib
+
+DESCRIPTION="Use most socks-friendly applications with Tor."
+HOMEPAGE="http://code.google.com/p/torsocks"
+SRC_URI="http://${PN}.googlecode.com/files/${PN}-1.2.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.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf --docdir=/usr/share/doc/${PF} \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	#Remove libtool .la files
+	cd "${D}"/usr/$(get_libdir)/torsocks
+	rm -f *.la
+}