[gentoo-commits] repo/gentoo:master commit in: dev-python/python-gflags/files/, dev-python/python-gflags/

[gentoo-commits] repo/gentoo:master commit in: dev-python/python-gflags/files/, dev-python/python-gflags/

[Justin Lecher]

commit:     428b8a3de05f2e1863b2adb0e8a5ccc2120a0b29
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 17:14:37 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 17:14:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=428b8a3d

dev-python/python-gflags: Version Bump

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-python/python-gflags/Manifest                  |  1 +
 .../python-gflags-3.0.2-scripts-install.patch      | 29 ++++++++++++++++++++++
 .../python-gflags/python-gflags-3.0.2.ebuild       | 25 +++++++++++++++++++
 3 files changed, 55 insertions(+)

diff --git a/dev-python/python-gflags/Manifest b/dev-python/python-gflags/Manifest
index 4366693..0d03860 100644
--- a/dev-python/python-gflags/Manifest
+++ b/dev-python/python-gflags/Manifest
@@ -1 +1,2 @@
 DIST python-gflags-2.0.tar.gz 64929 SHA256 311066217acb8cd8519a4c872cb3fe64f02bcf105802bb761ab0de55c2386cd6 SHA512 28566acffd092f09105f3b9ad3be4ada11f024f940914e6efb103907f3779283c63bdfe13edad83aa470c5e887b49ad8b05031fc1895f3bad9b5d9c368bbfe18 WHIRLPOOL 61054cce9033ef26ee6d6296fc761c840f394de07f068a899b52a5d4212de4e4601f9a203fd8033db576e79369e4d53a0bb04bfca0e50cf828ff94105a2b453a
+DIST python-gflags-3.0.2.tar.gz 91481 SHA256 f2ca688f385bba47382a067d2d77322ab974fd4d596baad95bcd7d319241061d SHA512 f24b404a1821d55f2d7423548c241f54962e79b31ade6b718e0c50591756ec269545445326e459a1b02806ca5eab7ccf9c545211e4148b3da050069b9a97088f WHIRLPOOL 4a72cde4f2715d2fd32760b0b69f4ff1b0b14d94ad3d00d002cd16a9d3715f7f61bf14878fca4073c8c573ae853229c15d781eb766ad324ce053645a76cedba5

diff --git a/dev-python/python-gflags/files/python-gflags-3.0.2-scripts-install.patch b/dev-python/python-gflags/files/python-gflags-3.0.2-scripts-install.patch
new file mode 100644
index 0000000..ffa6ec5
--- /dev/null
+++ b/dev-python/python-gflags/files/python-gflags-3.0.2-scripts-install.patch
@@ -0,0 +1,29 @@
+The scripts are installed as 'data' rather than scripts.
+http://code.google.com/p/python-gflags/issues/detail?id=12
+
+From d544cdad63faa5a53ba524e39f091f4a18e1eeb8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 16 Dec 2012 16:27:13 +0100
+Subject: [PATCH] Install Python scripts using 'scripts' key.
+
+This is necessary to ensure that the shebangs are properly replaced when
+installing for multiple Python implementations.
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 573db2d..ddad318 100755
+--- a/setup.py
++++ b/setup.py
+@@ -39,6 +39,6 @@ setup(name='python-gflags',
+       author_email='google-gflags@googlegroups.com',
+       url='https://github.com/google/python-gflags',
+       py_modules=['gflags'],
+-      data_files=[('bin', ['gflags2man.py'])],
++      scripts=['gflags2man.py'],
+       include_package_data=True,
+       )
+-- 
+1.8.0.2
+

diff --git a/dev-python/python-gflags/python-gflags-3.0.2.ebuild b/dev-python/python-gflags/python-gflags-3.0.2.ebuild
new file mode 100644
index 0000000..d26a4bf
--- /dev/null
+++ b/dev-python/python-gflags/python-gflags-3.0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Google's Python argument parsing library"
+HOMEPAGE="https://github.com/gflags/python-gflags"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-scripts-install.patch
+)

[gentoo-commits] repo/gentoo:master commit in: dev-python/python-gflags/files/, dev-python/python-gflags/

[Patrice Clement]

commit:     1340aee7062458eed07f31178450522fd0ef63e9
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 21:46:21 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 22:05:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1340aee7

dev-python/python-gflags: clean up old.

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-python/python-gflags/Manifest                  |  1 -
 .../files/python-gflags-2.0-scripts-install.patch  | 29 ---------
 .../python-gflags-2.0-skip-test-as-root.patch      | 28 ---------
 .../files/python-gflags-2.0-tests-python-2.7.patch | 68 ----------------------
 .../python-gflags-2.0-tests-respect-tmpdir.patch   | 58 ------------------
 dev-python/python-gflags/python-gflags-2.0.ebuild  | 37 ------------
 6 files changed, 221 deletions(-)

diff --git a/dev-python/python-gflags/Manifest b/dev-python/python-gflags/Manifest
index 60380e78e64..645a2051ed1 100644
--- a/dev-python/python-gflags/Manifest
+++ b/dev-python/python-gflags/Manifest
@@ -1,2 +1 @@
-DIST python-gflags-2.0.tar.gz 65094 SHA256 0dff6360423f3ec08cbe3bfaf37b339461a54a21d13be0dd5d9c9999ce531078 SHA512 43bddf631501f08537167c3915a6ace9a5e70b1bac0351614b07d3de1e149475c2cbb04a9770096dc033fefd35d12eea0b4c849f5660f9950db1129023dd36ac WHIRLPOOL 23769400b455352ea9f0d0a09f78df1ddc640a59c3bb65bafc1a0020d678453ed35aec3ee4224a8ded1b83f0b1c62c348c77b1065dc034bbe29a5a177f93f0ad
 DIST python-gflags-3.1.1.tar.gz 52633 SHA256 aaff6449ca74320c709052e4664a52337832b2338f4a4267088564f3e98f6c63 SHA512 28009cdc09b94b416af5237d3897d6ab516cc3b6a3eed18a31adb8c199f31a8c7d07b1d69794cb37de84b50eefbde1de57f9f0afaeac0a4747b352f4024ef12c WHIRLPOOL 2b0bdc5150b87d98c07431203c57aa94e535b564ab4cd3a2e307b9d5030360e06172853c9497895c5b42cc5058ac9c4b73d10db14e935f2569693b86cec7de05

diff --git a/dev-python/python-gflags/files/python-gflags-2.0-scripts-install.patch b/dev-python/python-gflags/files/python-gflags-2.0-scripts-install.patch
deleted file mode 100644
index e29ef951da5..00000000000
--- a/dev-python/python-gflags/files/python-gflags-2.0-scripts-install.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-The scripts are installed as 'data' rather than scripts.
-http://code.google.com/p/python-gflags/issues/detail?id=12
-
-From d544cdad63faa5a53ba524e39f091f4a18e1eeb8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 16 Dec 2012 16:27:13 +0100
-Subject: [PATCH] Install Python scripts using 'scripts' key.
-
-This is necessary to ensure that the shebangs are properly replaced when
-installing for multiple Python implementations.
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 573db2d..ddad318 100755
---- a/setup.py
-+++ b/setup.py
-@@ -39,6 +39,6 @@ setup(name='python-gflags',
-       author_email='google-gflags@googlegroups.com',
-       url='http://code.google.com/p/python-gflags',
-       py_modules=["gflags", "gflags_validators"],
--      data_files=[("bin", ["gflags2man.py"])],
-+      scripts=["gflags2man.py"],
-       include_package_data=True,
-       )
--- 
-1.8.0.2
-

diff --git a/dev-python/python-gflags/files/python-gflags-2.0-skip-test-as-root.patch b/dev-python/python-gflags/files/python-gflags-2.0-skip-test-as-root.patch
deleted file mode 100644
index 5eb2aa35b26..00000000000
--- a/dev-python/python-gflags/files/python-gflags-2.0-skip-test-as-root.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-http://bugs.gentoo.org/475134
-
-From 6e93aa28e1e116619a82e1b78ffbc15ce1133d51 Mon Sep 17 00:00:00 2001
-From: Michael Marineau <mike@marineau.org>
-Date: Thu, 27 Jun 2013 19:26:23 -0400
-Subject: [PATCH 3/3] Skip a permissions check when running as root.
-
----
- tests/gflags_unittest.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tests/gflags_unittest.py b/tests/gflags_unittest.py
-index 091ebd9..ddd3b5c 100755
---- a/tests/gflags_unittest.py
-+++ b/tests/gflags_unittest.py
-@@ -1111,6 +1111,9 @@ class LoadFromFlagFileTest(googletest.TestCase):
- 
-   def testMethod_flagfiles_NoPermissions(self):
-     """Test that --flagfile raises except on file that is unreadable."""
-+    # This test doesn't work as root
-+    if os.getuid() == 0:
-+        return
-     tmp_files = self._SetupTestFiles()
-     # specify our temp file on the fake cmd line
-     fake_cmd_line = ('fooScript --SomeFlag some_arg --flagfile=%s'
--- 
-1.8.1.5
-

diff --git a/dev-python/python-gflags/files/python-gflags-2.0-tests-python-2.7.patch b/dev-python/python-gflags/files/python-gflags-2.0-tests-python-2.7.patch
deleted file mode 100644
index 2210b2b6edd..00000000000
--- a/dev-python/python-gflags/files/python-gflags-2.0-tests-python-2.7.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-https://bugs.gentoo.org/447482
-
-------------------------------------------------------------------------
-r41 | jwilliams@endpoint.com | 2012-02-21 17:17:32 -0500 (Tue, 21 Feb 2012) | 5 lines
-
-Unit test updates for Python 2.7 compatibility
-
-* Add "msg" parameter to our versions of the test functions
-* Change regex to match the updated 2.7 float() ValueError response
-
-
-Index: tests/gflags_googletest.py
-===================================================================
---- tests/gflags_googletest.py	(revision 40)
-+++ tests/gflags_googletest.py	(revision 41)
-@@ -88,22 +88,22 @@ def MultiLineEqual(expected, actual):
- 
- 
- class TestCase(unittest.TestCase):
--  def assertListEqual(self, list1, list2):
-+  def assertListEqual(self, list1, list2, msg=None):
-     """Asserts that, when sorted, list1 and list2 are identical."""
-     # This exists in python 2.7, but not previous versions.  Use the
-     # built-in version if possible.
-     if hasattr(unittest.TestCase, "assertListEqual"):
--      unittest.TestCase.assertListEqual(self, Sorted(list1), Sorted(list2))
-+      unittest.TestCase.assertListEqual(self, Sorted(list1), Sorted(list2), msg)
-     else:
--      self.assertEqual(Sorted(list1), Sorted(list2))
-+      self.assertEqual(Sorted(list1), Sorted(list2), msg)
- 
--  def assertMultiLineEqual(self, expected, actual):
-+  def assertMultiLineEqual(self, expected, actual, msg=None):
-     # This exists in python 2.7, but not previous versions.  Use the
-     # built-in version if possible.
-     if hasattr(unittest.TestCase, "assertMultiLineEqual"):
--      unittest.TestCase.assertMultiLineEqual(self, expected, actual)
-+      unittest.TestCase.assertMultiLineEqual(self, expected, actual, msg)
-     else:
--      self.assertTrue(MultiLineEqual(expected, actual))
-+      self.assertTrue(MultiLineEqual(expected, actual), msg)
- 
-   def assertRaisesWithRegexpMatch(self, exception, regexp, fn, *args, **kwargs):
-     try:
-Index: tests/gflags_unittest.py
-===================================================================
---- tests/gflags_unittest.py	(revision 40)
-+++ tests/gflags_unittest.py	(revision 41)
-@@ -814,7 +814,7 @@ class MultiNumericalFlagsTest(googletest
- 
-     self.assertRaisesWithRegexpMatch(
-         gflags.IllegalFlagValue,
--        'flag --m_float2=abc: invalid literal for float\(\): abc',
-+        'flag --m_float2=abc: (invalid literal for float\(\)||could not convert string to float): abc',
-         gflags.DEFINE_multi_float, 'm_float2', ['abc'], 'desc')
- 
-     # Test non-parseable command line values.
-@@ -831,7 +831,7 @@ class MultiNumericalFlagsTest(googletest
-     argv = ('./program', '--m_float2=def')
-     self.assertRaisesWithRegexpMatch(
-         gflags.IllegalFlagValue,
--        'flag --m_float2=def: invalid literal for float\(\): def',
-+        'flag --m_float2=def: (invalid literal for float\(\)||could not convert string to float): def',
-         FLAGS, argv)
- 
- 
-
-------------------------------------------------------------------------

diff --git a/dev-python/python-gflags/files/python-gflags-2.0-tests-respect-tmpdir.patch b/dev-python/python-gflags/files/python-gflags-2.0-tests-respect-tmpdir.patch
deleted file mode 100644
index b3ae14e6dd6..00000000000
--- a/dev-python/python-gflags/files/python-gflags-2.0-tests-respect-tmpdir.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Tests try to write to /tmp (sandbox).
-http://code.google.com/p/python-gflags/issues/detail?id=13
-
-From 4a430830e75bfe2228e9d953b12f74a20ec2cb8f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 16 Dec 2012 16:53:24 +0100
-Subject: [PATCH] Use tempfile.mkdtemp() to create temporary directory.
-
-This creates an unique directory, and respects TMPDIR.
----
- tests/gflags_unittest.py | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/tests/gflags_unittest.py b/tests/gflags_unittest.py
-index 8e948bf..fcddb7b 100755
---- a/tests/gflags_unittest.py
-+++ b/tests/gflags_unittest.py
-@@ -38,6 +38,7 @@ import cStringIO
- import sys
- import os
- import shutil
-+import tempfile
- 
- import gflags
- from flags_modules_for_testing import module_foo
-@@ -907,17 +908,16 @@ class LoadFromFlagFileTest(googletest.TestCase):
-                       flag_values=self.flag_values)
-     self.files_to_delete = []
- 
-+    # Figure out where to create temporary files
-+    self.tmp_path = tempfile.mkdtemp(prefix='gflags_unittest')
-+
-   def tearDown(self):
-     self._RemoveTestFiles()
- 
-   def _SetupTestFiles(self):
-     """ Creates and sets up some dummy flagfile files with bogus flags"""
- 
--    # Figure out where to create temporary files
--    tmp_path = '/tmp/flags_unittest'
--    if os.path.exists(tmp_path):
--      shutil.rmtree(tmp_path)
--    os.makedirs(tmp_path)
-+    tmp_path = self.tmp_path
- 
-     try:
-       tmp_flag_file_1 = open(tmp_path + '/UnitTestFile1.tst', 'w')
-@@ -973,6 +973,7 @@ class LoadFromFlagFileTest(googletest.TestCase):
-         os.remove(file_name)
-       except OSError, e_msg:
-         print '%s\n, Problem deleting test file' % e_msg
-+    shutil.rmtree(self.tmp_path)
-   #end RemoveTestFiles def
- 
-   def _ReadFlagsFromFiles(self, argv, force_gnu):
--- 
-1.8.0.2
-

diff --git a/dev-python/python-gflags/python-gflags-2.0.ebuild b/dev-python/python-gflags/python-gflags-2.0.ebuild
deleted file mode 100644
index 9686387a8cc..00000000000
--- a/dev-python/python-gflags/python-gflags-2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Google's Python argument parsing library"
-HOMEPAGE="https://github.com/google/python-gflags"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc64 ~s390 ~sh x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${P}-scripts-install.patch
-	"${FILESDIR}"/${P}-tests-respect-tmpdir.patch
-	"${FILESDIR}"/${P}-skip-test-as-root.patch #475134
-	"${FILESDIR}"/${P}-tests-python-2.7.patch #447482
-)
-
-python_test() {
-	# https://code.google.com/p/python-gflags/issues/detail?id=15&thanks=15&ts=1372948007
-	local t
-	cd tests || die
-	for t in *.py; do
-		# (it's ok to run the gflags_googletest.py too)
-		"${PYTHON}" "${t}" || die "Tests fail with ${EPYTHON}"
-	done
-}