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

[Mike Gilbert]

commit:     ade3f8280f4988896dc995008d0b8b61492ed832
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Wed Apr 25 18:21:38 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 15:12:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ade3f828

dev-python/protobuf-python: Delete old versions (<3.4.0).

 dev-python/protobuf-python/Manifest                |  1 -
 ...on-3.0.0_beta3-link-against-installed-lib.patch | 33 ------------------
 .../protobuf-python/protobuf-python-3.1.0.ebuild   | 39 ----------------------
 3 files changed, 73 deletions(-)

diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 44f48926c1d..aa6d99043ce 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,4 +1,3 @@
-DIST protobuf-3.1.0.tar.gz 4051503 BLAKE2B af93f125a6b7b3e0be6f50ff5eaabe0db21f62b01a694d37c0b069956ef5d658df1beef68514b00a22005a36293b4a8a18654b5656f8c614309f0a744039c2fb SHA512 8d3289a16944c255bd1cceab696e515e52467f2bfe1cc10f6b32fabdf082d5acdc248ec9cadc572223a24d04d431f75921076153109cea2f90ee533f502ab47a
 DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
 DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181

diff --git a/dev-python/protobuf-python/files/protobuf-python-3.0.0_beta3-link-against-installed-lib.patch b/dev-python/protobuf-python/files/protobuf-python-3.0.0_beta3-link-against-installed-lib.patch
deleted file mode 100644
index c0b7aadcd6f..00000000000
--- a/dev-python/protobuf-python/files/protobuf-python-3.0.0_beta3-link-against-installed-lib.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur python/setup.py python/setup.py
---- python/setup.py 2015-12-30 22:21:46.000000000 +0100
-+++ python/setup.py 2016-04-18 00:51:49.490809789 +0200
-@@ -190,15 +190,27 @@
-       extra_compile_args.append('-Werror')
-       sys.argv.remove(warnings_as_errors)
- 
-+    inclD = ['.', '../src']
-+    libD = []
-+    try:
-+        subprocess.check_call(['pkg-config', '--exists', 'protobuf'])
-+        inclD += subprocess.check_output(['pkg-config','--variable=includedir','protobuf']).decode().split()
-+        libD = subprocess.check_output(['pkg-config','--variable=libdir','protobuf']).decode().split()
-+    except OSError as osex:
-+        if osex.errno == errno.ENOENT:
-+            info('pkg-config not found')
-+        else:
-+            warn("Running pkg-config failed - %s." % osex)
-+            libD = ['../src/.libs']
-     # C++ implementation extension
-     ext_module_list.extend([
-         Extension(
-             "google.protobuf.pyext._message",
-             glob.glob('google/protobuf/pyext/*.cc'),
--            include_dirs=[".", "../src"],
-+            include_dirs=inclD,
-             libraries=libraries,
-             extra_objects=extra_objects,
--            library_dirs=['../src/.libs'],
-+            library_dirs=libD,
-             extra_compile_args=extra_compile_args,
-         ),
-         Extension(

diff --git a/dev-python/protobuf-python/protobuf-python-3.1.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.1.0.ebuild
deleted file mode 100644
index c0b3867674b..00000000000
--- a/dev-python/protobuf-python/protobuf-python-3.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# pypy fails tests; pypy3 fails even running tests
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-MY_PV=${PV/_beta/-beta-}
-MY_PV=${MY_PV/_p/.}
-
-DESCRIPTION="Google's Protocol Buffers - official Python bindings"
-HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
-SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/11"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-# Protobuf is only a build-time dep, but depends on the exact same version
-# (excluding revision), since we are using the same tarball.
-# In case of using the (linked) cpp implementation we should be fine with the same subslot.
-RDEPEND="${PYTHON_DEPS}
-	!<dev-libs/protobuf-3[python(-)]"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/protobuf-3
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.0_beta3-link-against-installed-lib.patch" )
-
-S="${WORKDIR}/protobuf-${MY_PV}/python"
-python_test() {
-	distutils_install_for_testing
-	esetup.py test
-}