clean old impl, tidy deps, remove disused patch, add patch to prevent duplicate insta...

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

diff --git a/dev-python/restkit/ChangeLog b/dev-python/restkit/ChangeLog
index fd237580c82fe0a615c733f92798da4c571f35fa..a4c447a330526214f4826164edad301d367595b3 100644 (file)
--- a/dev-python/restkit/ChangeLog
+++ b/dev-python/restkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/restkit
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/restkit/ChangeLog,v 1.18 2014/08/10 21:21:08 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/restkit/ChangeLog,v 1.19 2015/01/16 13:52:17 idella4 Exp $
+
+  16 Jan 2015; Ian Delaney <idella4@gentoo.org> +files/setup.patch,
+  -files/restkit-exclude-tests.patch, -restkit-4.2.1-r1.ebuild,
+  restkit-4.2.2.ebuild:
+  clean old impl, tidy deps, remove disused patch, add patch to prevent
+  duplicate install of data files, rm old
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> restkit-4.2.1-r1.ebuild,
   restkit-4.2.2.ebuild:

diff --git a/dev-python/restkit/Manifest b/dev-python/restkit/Manifest
index f061527c9b10eb0dc4d4abbf8d2210061f8fa68e..061dbaa615f129587545158ddd061ebc5bc5c0df 100644 (file)
--- a/dev-python/restkit/Manifest
+++ b/dev-python/restkit/Manifest
@@ -1,17 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX restkit-exclude-tests.patch 720 SHA256 97a529b149b6c00e7cdec755e911870703c70d7017561947fbf0cb32c81236bb SHA512 41e411225b27f0506f62f89d8ebc535ab5d9007ee3e8b9f809b1e277a2d3cfb6155b930bdf779c5447958aa2b34d03b6ccdb4cd856ee8b2ed3aadb1e2d23dc3f WHIRLPOOL 4193bf34efd010477ad364c5637d8dbee0a6a6dfef5e3c9c68a5e51825422bf482a64e209853443d560e1b539585b0e5fa3b4f1fe452ed3abcdaa9a0e6e1018f
-DIST restkit-4.2.1.tar.gz 1863612 SHA256 0d5e025a0ae1c00eea8f17df5258679964d95f6e35f3c150764d5b9a4cfb8f79 SHA512 9b65b2c2013babf173d6ab094e5dabd754b42426aa894110a51d0a6784e90995296f7862b991590a3ea3061c7cf4b98ec96c4ca9f4d55819f500b5cd9bae51fd WHIRLPOOL 053e3dd43ac0bd25f3b09d17b8b8a253d37a3a1cae235428a99599b3da1c02646c94fc071656726a4ec54bdddd93b0e7330c223549acfeaf2c44c16ff1c81de3
+AUX setup.patch 843 SHA256 0499f32d84001db049fbff5f1737bc0c4e23624d161e5090ab022225602fbda1 SHA512 200c112cb264271d8c1f043acb22ac476d09a0fc325b74658a950939f71edb8fad84a0fbc5f11335152fe5591be98a14df63f57458b84d35c2511a2079778387 WHIRLPOOL 930ce34c70d9d2093b2002e8e97bf8a9603eb5965211620552d7684da4a0a5578cafe873190914cdccb60eaf72a41ac16ed6bbd449a8b167dd03bed94073f13e
 DIST restkit-4.2.2.tar.gz 1275904 SHA256 c0bda8eb7c643b5e818b612dab49121393abc8589c6cbe9b84085079d598599d SHA512 5ed08535e1a54b5594d97b059d8662ab4bc19c68e71a30719c4a533cba0f2d0e18872119752c62136563a32281e8f747414fbf843fd97dba138107ffcb5d1e4b WHIRLPOOL 6a6e336fc1ce5a6499a9886d6a131d7b9e117323467da62ff11278ae1713254d7ebc05a71221ccb9b3f092999902a94282397b9aa983c89758e39221d9dbee96
-EBUILD restkit-4.2.1-r1.ebuild 1431 SHA256 4985d2a4fdfd5368c4ae88e7c5601e7cf79de8799d5d21c32dadb2d59d4adada SHA512 fe7232a459b092165e5da76cd0ccb32b2cd85eda4a75f6b8a59608c2d1db08b4758e8a4d100f319400f0333bb65006e0248f08e20b2e03ff1cf9c731457c4511 WHIRLPOOL 4b6c5b9686785c53c6f1151cbdee4dd412bfbaa652eaac5e212730da7e10abbec7874d4f5876f4b6a5396d6a9cb88f8ab6238b30170c1dc913a63d6842fb50f7
-EBUILD restkit-4.2.2.ebuild 1321 SHA256 0500b6925068fc05b5fce4345f3d1c4122a7579d5128124de117a80abddcd709 SHA512 3838824c8d9d7fbe20c39a2d8fd058cd0af180d04ecd8e71cf998a4854dbbfabb69926199c06df78f0639b040f5324189125e5f6892b475c284f993332e72cdb WHIRLPOOL 1a28f270c8bbd13a6c1e236f73d5a5e947e0e0935f34233cadd5ebe660c6699d35ba8fb1b9a1c57ed67b1de6f2fe912b90c3cca1299143cb30f99b74f34d0b4c
-MISC ChangeLog 2863 SHA256 8fc0109c3ddc798848aaf88c4228af91579a2c357ab79adee2a2ed86b0173ad9 SHA512 e1255b3907c186db8cd1ff6017269772d1e2927e7055cced9f7a1a2d6f5820cd2a20ee30fdfb35d7aa07b38be32c5ce69f5a2e7a305100b09aac71da4358b0d8 WHIRLPOOL b2fd0cbf37fd34f815b6a78d86829e8786e8d29d567eeffb8e2654ab96e45ac7b77062bceb2ec81416c50a09deb2a9d2e79cb27b86fb587ab0186798625774b3
+EBUILD restkit-4.2.2.ebuild 1396 SHA256 167601b5d9a0e880b7f3151c796102e07e1c4e358faa69f51d3397e17d6c054a SHA512 46120632285459058cd19ab7f30cd4fe8f63005beccbc25b67dbd8de42562131986de73c8afc85b1b695accf71bef6aad5d72a7d7ac1201d78e447305e1bc000 WHIRLPOOL d086927543348b7a7220a37cd040ab51c394db83012850d52c498fbba0e6a97bb836d9220ca316027e956da0db18820bb1d81beb4ed251bbc36520e9209c1d2f
+MISC ChangeLog 3135 SHA256 d10478037057d1436bb03eb60f60b2f6f03a8f6c024f540b6bb66893feb86454 SHA512 c2e8c024982549f314d7e004301d55b05d8b6003a4b343865a9ca25cb81fef0a273015a055c63c7f9a2c422cbf9745fab9360539c95e2c93a2c1b1740afe49e6 WHIRLPOOL db1a6e8b2bb74bded472b011d0bb557639ed03b7a6adee25dd0aeb3b1790a4d38fa53467faf66a6cbad86e27834c4258fff04cc117a38a1a63f4e12cf19aeb40
 MISC metadata.xml 365 SHA256 d3b55f5084a9a6cf238a3b538d292fdb8677def37df1daaf0982287a48009fb8 SHA512 dbdd590df6540d14ad6f17553a6a6619a0bb9bfd2a1d6d6e199f682b92ea584bb9efa27620b373de05a2b43af144cc031820e8d0a1d2bd579938dbcf90740e5e WHIRLPOOL 12c4582f8af92574ee88bd63c9de7ffcaa34eea47c86006c82b61c46b2308b009a1c549038e010673f4cd07a505a72d0ebc82fad7879948dd92c35a741c71566
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn4kQACgkQcaHudmEf86rJvwCfY3cCMtyU62pSe3yd8AP6LIg8
-DsEAnR9AzOdbQV6PL1sN+CFyf5bMLPDy
-=Zpap
+iEYEAREIAAYFAlS5F6MACgkQso7CE7gHKw3NtQCg2KQXWicW420Ka+ff6j4DkovS
+iw4AoOBCkh1gfk41gFnd5CuSPXiGPenR
+=3us2
 -----END PGP SIGNATURE-----

diff --git a/dev-python/restkit/files/restkit-exclude-tests.patch b/dev-python/restkit/files/restkit-exclude-tests.patch
deleted file mode 100644 (file)
index 5347967..0000000
--- a/dev-python/restkit/files/restkit-exclude-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 62a02a962f8b6460a379156108bde09f003821af Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Tue, 26 Feb 2013 00:43:01 -0500
-Subject: [PATCH] Don't install tests.
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index e6613c0..a6a5505 100755
---- a/setup.py
-+++ b/setup.py
-@@ -53,7 +53,7 @@ def main():
-             license = 'MIT',
-             url = 'http://benoitc.github.com/restkit',
-             classifiers = CLASSIFIERS,
--            packages = find_packages(),
-+            packages = find_packages(exclude=['tests']),
-             data_files = DATA_FILES,
-             scripts = SCRIPTS,
-             zip_safe =  False,
--- 
-1.8.1.4
-

diff --git a/dev-python/restkit/files/setup.patch b/dev-python/restkit/files/setup.patch
new file mode 100644 (file)
index 0000000..cfa8959
--- /dev/null
+++ b/dev-python/restkit/files/setup.patch
@@ -0,0 +1,23 @@
+diff -ur restkit-4.2.2.org/setup.py restkit-4.2.2/setup.py
+--- setup.py   2013-08-30 23:07:36.000000000 +0800
++++ setup.py   2015-01-16 21:38:04.342084550 +0800
+@@ -38,11 +38,6 @@
+     with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as f:
+         long_description = f.read()
+ 
+-    DATA_FILES = [
+-        ('restkit', ["LICENSE", "MANIFEST.in", "NOTICE", "README.rst",
+-                        "THANKS", "TODO.txt"])
+-        ]
+-
+     options=dict(
+             name = 'restkit',
+             version = version.__version__,
+@@ -54,7 +49,6 @@
+             url = 'http://benoitc.github.com/restkit',
+             classifiers = CLASSIFIERS,
+             packages = find_packages(exclude=['tests']),
+-            data_files = DATA_FILES,
+             scripts = SCRIPTS,
+             zip_safe =  False,
+             entry_points =  {

diff --git a/dev-python/restkit/restkit-4.2.1-r1.ebuild b/dev-python/restkit/restkit-4.2.1-r1.ebuild
deleted file mode 100644 (file)
index ff33bf1..0000000
--- a/dev-python/restkit/restkit-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,55 +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/restkit/restkit-4.2.1-r1.ebuild,v 1.8 2014/08/10 21:21:08 slyfox Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="A HTTP ressource kit for Python"
-HOMEPAGE="http://github.com/benoitc/restkit http://benoitc.github.com/restkit/ http://pypi.python.org/pypi/restkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="+cli doc examples test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-       doc? ( dev-python/sphinx
-               dev-python/epydoc )
-       test? ( dev-python/webob
-               >=dev-python/socketpool-0.5.0
-               >=dev-python/http-parser-0.7.7 )"
-RDEPEND="cli? ( dev-python/ipython
-       dev-python/setuptools[${PYTHON_USEDEP}] )
-       dev-python/webob
-       >=dev-python/socketpool-0.5.0
-       >=dev-python/http-parser-0.7.7"
-
-PATCHES=( "${FILESDIR}/${PN}-exclude-tests.patch" )
-
-python_compile_all() {
-       if use doc ; then
-               pushd doc > /dev/null
-               PYTHONPATH="${S}" emake html
-               popd > /dev/null
-       fi
-}
-
-python_test() {
-       nosetests -v tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-       use cli || rm "${ED}"/usr/bin/restcli*
-
-       use doc && dohtml -r doc/_build/html/
-       if use examples ; then
-               insinto /usr/share/doc/${PF}
-               doins -r examples
-       fi
-       distutils-r1_python_install_all
-}

diff --git a/dev-python/restkit/restkit-4.2.2.ebuild b/dev-python/restkit/restkit-4.2.2.ebuild
index 994920bb7e0d8b84d34c1871415a75c1cfac0496..9d53d9c7b99b5bcad4bbed5017fa6894f2101446 100644 (file)
--- a/dev-python/restkit/restkit-4.2.2.ebuild
+++ b/dev-python/restkit/restkit-4.2.2.ebuild
@@ -1,10 +1,10 @@
-# 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/dev-python/restkit/restkit-4.2.2.ebuild,v 1.3 2014/08/10 21:21:08 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/restkit/restkit-4.2.2.ebuild,v 1.4 2015/01/16 13:52:17 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} pypy )
+PYTHON_COMPAT=( python2_7 pypy )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+cli doc examples test"
 
-PY27_USEDEP="$(python_gen_usedep 'python2*')"
+PY27_USEDEP="$(python_gen_usedep python2_7)"
 RDEPEND="cli? ( dev-python/ipython[${PY27_USEDEP}] )
        dev-python/webob[${PYTHON_USEDEP}]
        >=dev-python/socketpool-0.5.3[${PYTHON_USEDEP}]
@@ -28,6 +28,9 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
        test? ( ${RDEPEND}
                dev-python/nose[${PYTHON_USEDEP}] )"
 
+# prevent duplicate install of data files
+PATCHES=( "${FILESDIR}"/setup.patch )
+
 python_compile_all() {
        if use doc ; then
                pushd doc > /dev/null