Remove old.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

7 files changed, 6 insertions, 290 deletions

diff --git a/dev-python/requests/ChangeLog b/dev-python/requests/ChangeLog
index 7320906f743c..8786091d58be 100644
--- a/dev-python/requests/ChangeLog
+++ b/dev-python/requests/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/requests
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/ChangeLog,v 1.25 2012/12/20 07:11:23 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/ChangeLog,v 1.26 2012/12/20 07:14:06 radhermit Exp $
+
+  20 Dec 2012; Tim Harder <radhermit@gentoo.org> -requests-0.13.6.ebuild,
+  -requests-0.13.9.ebuild, -requests-0.14.0.ebuild, -requests-0.14.1.ebuild,
+  -requests-1.0.0.ebuild, -files/requests-1.0.0-system-libs.patch:
+  Remove old.
 
 *requests-1.0.3 (20 Dec 2012)
 
diff --git a/dev-python/requests/files/requests-1.0.0-system-libs.patch b/dev-python/requests/files/requests-1.0.0-system-libs.patch
deleted file mode 100644
index a4182b61bad9..000000000000
--- a/dev-python/requests/files/requests-1.0.0-system-libs.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- requests-1.0.0/requests/adapters.py
-+++ requests-1.0.0/requests/adapters.py
-@@ -13,15 +13,15 @@
- 
- from .models import Response
- from .auth import HTTPProxyAuth
--from .packages.urllib3.poolmanager import PoolManager
-+from urllib3.poolmanager import PoolManager
- from .hooks import dispatch_hook
- from .compat import urlparse
- from .utils import DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers
- from .structures import CaseInsensitiveDict
--from .packages.urllib3.exceptions import MaxRetryError
--from .packages.urllib3.exceptions import TimeoutError
--from .packages.urllib3.exceptions import SSLError as _SSLError
--from .packages.urllib3.exceptions import HTTPError as _HTTPError
-+from urllib3.exceptions import MaxRetryError
-+from urllib3.exceptions import TimeoutError
-+from urllib3.exceptions import SSLError as _SSLError
-+from urllib3.exceptions import HTTPError as _HTTPError
- from .cookies import extract_cookies_to_jar
- from .exceptions import ConnectionError, Timeout, SSLError
- 
---- requests-1.0.0/requests/compat.py
-+++ requests-1.0.0/requests/compat.py
-@@ -4,7 +4,7 @@
- pythoncompat
- """
- 
--from .packages import charade as chardet
-+import charade as chardet
- 
- import sys
- 
-@@ -89,7 +89,7 @@
-     import cookielib
-     from Cookie import Morsel
-     from StringIO import StringIO
--    from .packages.urllib3.packages.ordered_dict import OrderedDict
-+    from urllib3.packages.ordered_dict import OrderedDict
- 
-     builtin_str = str
-     bytes = str
---- requests-1.0.0/requests/models.py
-+++ requests-1.0.0/requests/models.py
-@@ -17,7 +17,7 @@
- 
- from .auth import HTTPBasicAuth, HTTPProxyAuth
- from .cookies import cookiejar_from_dict, extract_cookies_to_jar, get_cookie_header
--from .packages.urllib3.filepost import encode_multipart_formdata
-+from urllib3.filepost import encode_multipart_formdata
- from .exceptions import (
-     ConnectionError, HTTPError, RequestException, Timeout, TooManyRedirects,
-     URLRequired, SSLError, MissingSchema, InvalidSchema, InvalidURL)
---- requests-1.0.0/setup.py
-+++ requests-1.0.0/setup.py
-@@ -16,11 +16,6 @@
- 
- packages = [
-     'requests',
--    'requests.packages',
--	'requests.packages.charade',
--    'requests.packages.urllib3',
--    'requests.packages.urllib3.packages',
--    'requests.packages.urllib3.packages.ssl_match_hostname'
- ]
- 
- requires = []
diff --git a/dev-python/requests/requests-0.13.6.ebuild b/dev-python/requests/requests-0.13.6.ebuild
deleted file mode 100644
index a58437215223..000000000000
--- a/dev-python/requests/requests-0.13.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-0.13.6.ebuild,v 1.1 2012/08/17 19:54:27 floppym Exp $
-
-EAPI="4"
-PYTHON_DEPEND="*:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ http://pypi.python.org/pypi/requests"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES=1
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.13-python2.6.patch"
-
-	# Different packages are installed depending on the python version.
-	# Need to remove stale egg-info data and build in separate directories.
-	rm -r requests.egg-info || die
-
-	distutils_src_prepare
-}
-
-src_test() {
-	echoit() { echo "$@"; "$@"; }
-	testing() {
-		echoit nosetests --verbosity=1 tests/*.py
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/requests/requests-0.13.9.ebuild b/dev-python/requests/requests-0.13.9.ebuild
deleted file mode 100644
index 7af43349ab17..000000000000
--- a/dev-python/requests/requests-0.13.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-0.13.9.ebuild,v 1.1 2012/09/02 20:10:41 radhermit Exp $
-
-EAPI="4"
-PYTHON_DEPEND="*:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ http://pypi.python.org/pypi/requests"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES=1
-
-src_prepare() {
-	# Different packages are installed depending on the python version.
-	# Need to remove stale egg-info data and build in separate directories.
-	rm -r requests.egg-info || die
-
-	distutils_src_prepare
-}
-
-src_test() {
-	echoit() { echo "$@"; "$@"; }
-	testing() {
-		echoit nosetests --verbosity=1 tests/*.py
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/requests/requests-0.14.0.ebuild b/dev-python/requests/requests-0.14.0.ebuild
deleted file mode 100644
index 462a1a8c6132..000000000000
--- a/dev-python/requests/requests-0.14.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-0.14.0.ebuild,v 1.1 2012/09/07 18:47:02 floppym Exp $
-
-EAPI="4"
-PYTHON_DEPEND="*:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ http://pypi.python.org/pypi/requests"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES=1
-
-src_prepare() {
-	# Different packages are installed depending on the python version.
-	# Need to remove stale egg-info data and build in separate directories.
-	rm -r requests.egg-info || die
-
-	distutils_src_prepare
-}
-
-src_test() {
-	echoit() { echo "$@"; "$@"; }
-	testing() {
-		echoit nosetests --verbosity=1 tests/*.py
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/requests/requests-0.14.1.ebuild b/dev-python/requests/requests-0.14.1.ebuild
deleted file mode 100644
index 347d17d37f6e..000000000000
--- a/dev-python/requests/requests-0.14.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-0.14.1.ebuild,v 1.2 2012/10/06 02:03:36 blueness Exp $
-
-EAPI="4"
-PYTHON_DEPEND="*:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ http://pypi.python.org/pypi/requests"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="app-misc/ca-certificates
-	dev-python/chardet
-	dev-python/oauthlib
-	dev-python/urllib3"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES=1
-
-# tests connect to various remote sites
-RESTRICT="test"
-
-src_prepare() {
-	# use system libs for chardet, oauthlib, and urllib3
-	rm -r requests/packages || die
-	epatch "${FILESDIR}"/${P}-system-libs.patch
-
-	# use system ca-certificates
-	rm requests/cacert.pem || die
-	epatch "${FILESDIR}"/${P}-system-cacerts.patch
-
-	# Different packages are installed depending on the python version.
-	# Need to remove stale egg-info data and build in separate directories.
-	rm -r requests.egg-info || die
-
-	distutils_src_prepare
-}
-
-src_test() {
-	echoit() { echo "$@"; "$@"; }
-	testing() {
-		echoit nosetests --verbosity=1 tests/*.py
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/requests/requests-1.0.0.ebuild b/dev-python/requests/requests-1.0.0.ebuild
deleted file mode 100644
index e12f587e510a..000000000000
--- a/dev-python/requests/requests-1.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.0.0.ebuild,v 1.1 2012/12/17 22:33:55 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ http://pypi.python.org/pypi/requests"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="app-misc/ca-certificates
-	dev-python/charade
-	dev-python/urllib3"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	test? ( dev-python/nose )"
-
-# tests connect to various remote sites
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${P}-system-libs.patch )
-
-python_prepare_all() {
-	# use system libs for charade and urllib3
-	rm -r requests/packages || die
-
-	# use system ca-certificates
-	rm requests/cacert.pem || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v || die
-}