revbump; correction to sed statement to prevent double installation of doc data_files, fixes Bug #525792, rm 7.19.3.1-r1 and old

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

6 files changed, 23 insertions, 134 deletions

diff --git a/dev-python/pycurl/ChangeLog b/dev-python/pycurl/ChangeLog
index 2f9a7acfee2e..8857f5fe8b2e 100644
--- a/dev-python/pycurl/ChangeLog
+++ b/dev-python/pycurl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/pycurl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.101 2014/07/16 03:51:45 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.102 2014/10/23 16:00:50 idella4 Exp $
+
+*pycurl-7.19.3.1-r2 (23 Oct 2014)
+
+  23 Oct 2014; Ian Delaney <idella4@gentoo.org> +pycurl-7.19.3.1-r2.ebuild,
+  -pycurl-7.19.0-r1.ebuild, -pycurl-7.19.0-r2.ebuild,
+  -pycurl-7.19.3.1-r1.ebuild, pycurl-7.19.0.ebuild:
+  revbump; correction to sed statement to prevent double installation of doc
+  data_files, fixes Bug #525792, rm 7.19.3.1-r1 and old
 
   16 Jul 2014; Mike Gilbert <floppym@gentoo.org> pycurl-7.19.3.1-r1.ebuild:
   Update dependency on dev-python/bottle to resolve test failures on python3.4.
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index bbf8a6880652..f02e8aa4bbbd 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -7,17 +7,15 @@ AUX pycurl-7.19.0-python3.patch 40859 SHA256 9050a00ea37846f803c7e6420670c54056b
 AUX pycurl-7.19.3.1-ssl-test.patch 2523 SHA256 6f7d0cacd7bdbef34e2de85b92abe54e040d823c9e76cc1a5e60ca203a64ed4c SHA512 f99ba41b13ba5052f213cfa7cdc025c99b93860085aae8651685274fabffec029f16b00b2f14461b32e5980bac037437a2e5455ab5c20417b23f0425f21df96a WHIRLPOOL e414c1522dd49ef7443d608d9a15b765f60d328341ed27dd6843cee426f4172076f82914f29d2424482d349b75454b4eb50d4238e92372770b9abf076c9d7ee8
 DIST pycurl-7.19.0.tar.gz 71346 SHA256 eb782dfcc5a7c023539a077462b83c167e178128ee9f7201665b9fbb1a8b0642 SHA512 18db8d923d1193f72b964817ceef5acaf3b1acab36a7d14aed9301dcace301d72e19cda5c79c8cb7335f1327f5900d1c03b34311ba086dd2bf2fd3d5710336e0 WHIRLPOOL f21d502a4244ee0022cc2ab1ddf48647c2e0dee042b5075e37a5b30e746ca450202e4305a9d7007b75e3fa85cde6e547896b17774fe4d2f2b807980a9a5d0d3c
 DIST pycurl-7.19.3.1.tar.gz 116687 SHA256 c0d673fe99a9de07239eabe77c798f1b043f60c02afaec1430ceaf59d7501a4f SHA512 65ccb07638c663bc2a723664f1ade50f08eafa70bbcdc492cc99362a91873f453b63336a6b393d9f6591308f1450dadc64ce729b29990f37b170dda0eae0b23f WHIRLPOOL bf25bbb959e30140a261b9bede2e1a3675ec99c8f6c36f8afc8ca73288aa7f7cea6fa1d28385ca808872b251a676aebf8d77d203aed60619dab8852cac17b296
-EBUILD pycurl-7.19.0-r1.ebuild 1939 SHA256 7c4147a478a76e69d1297b76f2cfe66cd698b6b1446a4d5425759c29e49e239f SHA512 985cb7878408b1bae77392276f02af2305c9b9016ff894df36003e2b1b843a99fc150e227d9b780da80c4ff40f41f15353131236d7d4aa0bd2361a5a09686da6 WHIRLPOOL b3030b69ff60fe6997b6cd32a435f05aa99630012e04064daa0b714ad087e0f37919ad22608cfdf09c2106e3f74761305790931f5d95bafec279a0d015051b42
-EBUILD pycurl-7.19.0-r2.ebuild 1850 SHA256 f356ea2232ce14207daf19f6133411cb699e08aeac1b94122ef71d26ad5b6548 SHA512 a2a99f1a42f5ed1cf2da7cd4fe210c2a4277b144d87b72ff2e5cf41a796cd5669d23ca91eb2d3d6ea856af7c7fa1b0edff4bf09e595a8183752529ba014d9a58 WHIRLPOOL d7407a54d7cc034973348d3623d70fcb0e71c404112a90d39a1a450e2b6c2d6c80f67bd5993b0d6b620240babb37e1dead2b57d9f42881caff9b9289218474c1
 EBUILD pycurl-7.19.0-r4.ebuild 2121 SHA256 dd1ad66d3931e769ec932b511a8d9ec2def5ecded5e97ab142f1dcee3d7b6cdb SHA512 aa319ddb75383cc81ee458e8c3761b12e452119eeaedc84b4b5119ea409f6bf5ae5f98a1ab6e56c686225595228de976a5a289bbed817cd60d5ad51ba3b17c82 WHIRLPOOL 5a1c9f8e55da570de5edf0d2dde60865b9d1c4e144b1937a272ed7f1263a9b90fa7805ff0cf34dbfbb35517583bd1a68e5b681e11f5a7f78c7bb738685992b39
-EBUILD pycurl-7.19.0.ebuild 1294 SHA256 56309f8ad5c8bcfda86ff052970247c3140cffff6a906c59b7d9bcccc0e3c67f SHA512 a8e491accef2beb38faf8a8a16cb6f3a9be235b1d4e151e2ef51c38916e46018275752ce412ad269721f46c3bb629e19faf1a954dcbc79b8590587ca72d9a429 WHIRLPOOL 14337dd68f25be650bd77a8828af747268ab0e5b08719607b26692afc7ea866333b52a2a88804d438310f06a9025b43e51da8b87aa5642fa307c562ab7260288
-EBUILD pycurl-7.19.3.1-r1.ebuild 2413 SHA256 0dd3db05632b4bb5f0048447bc795c2881a419d8bc2a913f64c4ca935e4d93d7 SHA512 219fc1a6a7af54c1849db40a8ff201fe2b188b4d6c4f45944009d954bdfc572e9358cc7483a5ebd94e0d0fe4fc519260aa6983d997e6847b6880dfe9fd33fbd9 WHIRLPOOL cee0acc2e96727a144ab43032ab185931d6fb0605db2a481528caddd097e03d723b5f750de868df28a80264143c075e8125dd0e5ad6eecdb3221e42d177c1c88
-MISC ChangeLog 14117 SHA256 064533de727b2b09d3b4dd72b01c1e06e69c260fec4d3e5d46f48bc28d9804e9 SHA512 2c6f90a48cbc4060f3951c7d3ca54c44731be69b13e9f95917ef182aeff8892b81775fb8c3719f64cbc4a6cf3dfee4276ac054cec1a2165335e68ccb831e6d65 WHIRLPOOL 645a196fddd806002fee3fdc11f031cd516510ca919e2dedf540ed8cf61c1719c5b7a69648641273bbf9ae595225ead23539faf5d906c0d70f5ccf1c8c0368cd
+EBUILD pycurl-7.19.0.ebuild 1293 SHA256 3c6c97f33a00cbe22abd3d6fa0c50f4a1828463a856b95d5ba46f8e4fd438b2a SHA512 6316ffa211ecc161d98ecf648573c2ad9d0b8fd9a38fe7db2b7817afb5cda65079d3ff7d4755bd1e052d4c0fcf10505cb86b46b170508d10632a9380eeaa416c WHIRLPOOL 16c87bf989a7fb403fe230f62ef8950434dd1f503a5695a91287b43dce78a444015e9b97e732259d08e0dfaf2e669705fa2d8f7f8cb96476577343d688d79eda
+EBUILD pycurl-7.19.3.1-r2.ebuild 2435 SHA256 39963fccaf1b0d63f502d54f57a84ee7250cc731e01860b607e5a2ffc01b372a SHA512 772bdcaa988a3e32878c671d864541abe18e122d9ef9978734197b5336a4ff0fc84d0ac49ce239f6084a94d5605ba020491f5fb18b84fa21f0ddc522f69f6b96 WHIRLPOOL b2b6763c4fa774c3ea580776014cdc3df41cb24365bd1f4b150114ca35ec89b050372d5b6bcca6baf90418cead39b12745a2b0d2b196ed848c5e2c78b194dbb6
+MISC ChangeLog 14468 SHA256 a5c24cfd84e7b20157c2b8b9ae0f0814bae56a2c6c9cdd3fad686ce9dd7df2e6 SHA512 9bbcc246a44b0c2979db86924f2acaf48233c9e1c64a0b73d2cdae84e445bc5b3baedbc5122a719e708d3184491bc0082a3c0c5257c05a7cfa36591ffc4aa1ef WHIRLPOOL 3327441f2468b0eecadc503f9df98c51b1a8ab311575c5cf04284b43f1e4dbb0d5950a71041cb36b46ca1c4b4918abcf6fe58478d5e9d86e4c019a3cca53dee7
 MISC metadata.xml 826 SHA256 fdc8c57902acabf11f4b07cd9ac36960db5c41d8f9e94e238cf9e40903a51dad SHA512 cd860d6a4151ac15bb7d9c355d0222f91b429993d56083670f3325ecde4f4fda8f4bf374aba3b1c65270a786e12c30c0344917fd04b608ebdc0c94b392279e61 WHIRLPOOL 397cf201be522437cc691b94d0aee887c8678b73e4533938edbbd1774c0a26907585b18584b39ce83e2868c6d896445c3dc940c2a2abf061ecb703ddbd35ca72
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlPF+LwACgkQC77qH+pIQ6R1zwD/cWi4yt6zGdP+qcrfXCmfqk47
-jraTpW0OUqmMCBozD78A/3sfv28dyNRnv20EAfLdBdsKXRdWXwaFjGK1G0APWgHg
-=eMxp
+iEYEAREIAAYFAlRJJkkACgkQso7CE7gHKw3TcwCgiPgLizIpMZtjXAk/iYlOuiSi
+eBoAn2crTqUow6pEWOHS/xsOnbJQVk0Y
+=p0Sl
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pycurl/pycurl-7.19.0-r1.ebuild b/dev-python/pycurl/pycurl-7.19.0-r1.ebuild
deleted file mode 100644
index 84d5559ff62f..000000000000
--- a/dev-python/pycurl/pycurl-7.19.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r1.ebuild,v 1.10 2014/06/15 15:22:12 mgorny Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-# The selftests fail with pypy, and urlgrabber segfaults for me.
-RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
-
-inherit distutils eutils
-
-DESCRIPTION="python binding for curl/libcurl"
-HOMEPAGE="http://pycurl.sourceforge.net/ http://pypi.python.org/pypi/pycurl"
-SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
-
-# Depend on a curl with curl_ssl_* USE flags.
-# libcurl must not be using an ssl backend we do not support.
-# If the libcurl ssl backend changes pycurl should be recompiled.
-# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
-# does not need to initialize gcrypt threading and we do not need to
-# explicitly link to libgcrypt.
-DEPEND=">=net-misc/curl-7.25.0-r1[ssl=]
-	ssl? (
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)]
-		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 )
-	)"
-RDEPEND="${DEPEND}"
-
-PYTHON_MODNAME="curl"
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}/${P}-linking-v2.patch"
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" tests/test_internals.py -q
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	sed -e "/data_files=/d" -i setup.py || die "sed in setup.py failed"
-
-	distutils_src_install
-
-	dohtml -r doc/*
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples tests
-	fi
-}
diff --git a/dev-python/pycurl/pycurl-7.19.0-r2.ebuild b/dev-python/pycurl/pycurl-7.19.0-r2.ebuild
deleted file mode 100644
index c227b5d238b2..000000000000
--- a/dev-python/pycurl/pycurl-7.19.0-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r2.ebuild,v 1.3 2014/06/15 15:22:12 mgorny Exp $
-
-EAPI=5
-
-# The selftests fail with pypy, and urlgrabber segfaults for me.
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="python binding for curl/libcurl"
-HOMEPAGE="http://pycurl.sourceforge.net/ http://pypi.python.org/pypi/pycurl"
-SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
-
-# Depend on a curl with curl_ssl_* USE flags.
-# libcurl must not be using an ssl backend we do not support.
-# If the libcurl ssl backend changes pycurl should be recompiled.
-# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
-# does not need to initialize gcrypt threading and we do not need to
-# explicitly link to libgcrypt.
-DEPEND=">=net-misc/curl-7.25.0-r1[ssl=]
-	ssl? (
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)]
-		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 )
-	)"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-linking-v2.patch"
-	)
-
-	sed -e "/data_files=/d" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" tests/test_internals.py -q || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/pycurl/pycurl-7.19.0.ebuild b/dev-python/pycurl/pycurl-7.19.0.ebuild
index 36e38d510c20..c7f9abf52944 100644
--- a/dev-python/pycurl/pycurl-7.19.0.ebuild
+++ b/dev-python/pycurl/pycurl-7.19.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0.ebuild,v 1.19 2011/04/10 12:35:03 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0.ebuild,v 1.20 2014/10/23 16:00:50 idella4 Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
diff --git a/dev-python/pycurl/pycurl-7.19.3.1-r1.ebuild b/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild
index 85906e9d0e58..415565349f19 100644
--- a/dev-python/pycurl/pycurl-7.19.3.1-r1.ebuild
+++ b/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.3.1-r1.ebuild,v 1.5 2014/07/16 03:59:55 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.3.1-r2.ebuild,v 1.1 2014/10/23 16:00:50 idella4 Exp $
 EAPI=5
 
 # The selftests fail with pypy, and urlgrabber segfaults for me.
@@ -38,10 +38,10 @@ DISTUTILS_IN_SOURCE_BUILD=1
 
 PATCHES=( "${FILESDIR}"/${P}-ssl-test.patch )
 
-python_prepare_all() {
-	sed -e "/data_files=/d" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
+#python_prepare_all() {
+#	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
+#	distutils-r1_python_prepare_all
+#}
 
 src_configure() {
 	# Override faulty detection in setup.py, bug 510974.