gentoo resync : 10.02.2020

6 files changed, 2 insertions, 119 deletions

diff --git a/dev-python/python-lzo/Manifest b/dev-python/python-lzo/Manifest
index d1fbb52849b6..84c536ca56ef 100644
--- a/dev-python/python-lzo/Manifest
+++ b/dev-python/python-lzo/Manifest
@@ -1,9 +1,3 @@
-AUX lzo2compat.patch 417 BLAKE2B 56aeec39b58a59a66fac3f99ca5e8299723f73897916b45d8891b623cea6cf30dff5ecc87e98fef5f0c7b645f5cac2202343cbdc5cd9de4f5b1e7f8d83ec0d00 SHA512 eb433f90ac40fc85de8872f2bf94805712ff4b085bbcac168aec230a55b325ab5474746b2aa0a81b0e58b04e9da50e10877bbee66768106a03f7d83c97c7ffb3
-DIST python-lzo-1.08.tar.gz 13046 BLAKE2B ce4e2d2b1497ed93cdc15d157228bd7b3b6395b19808ac9c91ebfc3da6506a0af4d4e770f6e13a23e6ffd6f38cb2fd6e91f949d44680a6ea236e4c3704fb43aa SHA512 94b33e3b0e62b9c8a97147507f4516706d25d62c63ea938f0748e520a3e27760f0e3be142cb3e68aea132ae06759c91b3a4dac8e5010cdfab633e6c8d5904d8c
-DIST python-lzo-1.11.tar.gz 13823 BLAKE2B 4be60c85aae64e8837f7f8ec332c16f8c86d2e8b2e965e783cb9b0c6c942aa13750dc194679b71a6a0d733bee66313b8ca376853cee7063a46567222f80daa7e SHA512 580c68d2a5fdc43f6cb904507795c25b686c42074f217d067f51b336afa75d3eea10fcb7925c84aea352ce4383c591ff70583bef6c2fbc74116487ae87e1f87f
 DIST python-lzo-1.12.tar.gz 14042 BLAKE2B 7375e9b200a17cc1ad2c4dfdbe6491082af8d120b2b659b1e9bbff00eaae568e04dc12e5c13de3a028267a1e8e02bd1522a9335db73fa6a5a4ebc7ca4b341fff SHA512 811bdb282cfaf33427ad641d0342900c5af1f17b7033d76593288c3846b0feefe6ef93253152add97b2d6420f937de2745c8e7508dadf33e72b11545cac3be4d
-EBUILD python-lzo-1.08-r1.ebuild 622 BLAKE2B 58ad08becc27f5f6bab25a9e4beb590b049ffe0a0a0c35315ba665bbb415a9333e22e315cb6a64b9f0c8daa77e6d73acc225d9f028e14cf72deba7b65dbc7bc4 SHA512 908c281da215817826e0b9b2dbbc3b5b24179c504d0ddf2aa5b7b58a766a023a52f713a84f61a387518323658850b061c29a48babcee461624711b8d17c05fc7
-EBUILD python-lzo-1.11.ebuild 742 BLAKE2B 1b175d164c58ac9cfd3612c673b7ae9058a8b65575561e64f377857fde69181200e4a83cc2d26043441ba372cbb771aca8b0e01a535471000c136241f5da2274 SHA512 e4c9dbf5ec6fc39d5d9c54a74313abdd86706b91ebf569ab74c2824ba1c0fe047dd1341b0475790a60f37fd30175ff25d68c1585824d78531c54d0974a6b376b
-EBUILD python-lzo-1.12-r1.ebuild 752 BLAKE2B 3c1144aef629d45a267e583a00ca2dfa1a7529878026f59dc60a5592e4488cc38812c81ade93dcadfc974da3098ae4cfa5b594bc24daa5ff4624584230cb51c1 SHA512 bc10a73a5451440b294dd44960985ed68af8a15c13c45a098c78cca85b68af1df4cd3be008ea15752a5148c944ae53ccd0401d34dabe20964cf56f4a9098fe06
-EBUILD python-lzo-1.12.ebuild 746 BLAKE2B 8474c4bd1d1a0bc6034cd7f983a48db6b74b729ac23e0d23f4a9dc37d8834c6c13216bbc5ccf08b4dc93edc9a1bb31f7c1fa0cbc2aca01de86e923a5d6de3765 SHA512 a4798158a09428b77359f8a3a8298b1183a10750ae00fcd81904614d7100940b9e8b79c442671915d0bb5056670168bdc4a3a0f9feb67882c1f188cdd7fe06b1
+EBUILD python-lzo-1.12-r1.ebuild 742 BLAKE2B 3481c38740136f1f0713dd304ca59ee052b7b9a92d2c67aaf2e0eeb9a4c5e8f259f2454c59ae10eced4791a58506d39fcdc05004141980fe46bc9a729944003f SHA512 a030edc91129a28c10c2e9ec6f982a7b621e71dab8d1e039b9b6c843e39c8c5611a4742b004748e21ed1044624c498611e29ead5c18c7bac07894147b85d0831
 MISC metadata.xml 385 BLAKE2B 4a726b1896f55aa03b8b9a1a1f39107751f372b7bb7b0b9759447a7d42fcc97c142ea6ea3a2de8358d0bc00cb0e73b12c78c0b03e8c52c93092220761b6eecef SHA512 634d30e62ce3a8c09b3de241642e9ce8b059d9d3ff02e6530642dea4b0b4bcc8f108566bdc5ba52f6e63214546e11f734bdc094ef60ad13197b9f74cab71d03c
diff --git a/dev-python/python-lzo/files/lzo2compat.patch b/dev-python/python-lzo/files/lzo2compat.patch
deleted file mode 100644
index 6ce728753df6..000000000000
--- a/dev-python/python-lzo/files/lzo2compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -24,8 +24,8 @@
-     include_dirs.append(os.path.join(CURL_DIR, "include"))
-     extra_objects.append(os.path.join(CURL_DIR, "lzo.lib"))
- else:
--    libraries = ["lzo"]
--    ##include_dirs.append("/usr/local/include")
-+    libraries = ["lzo2"]
-+    include_dirs.append("/usr/include/lzo")
-     ##library_dirs.append("/usr/local/lib")
-     ##runtime_library_dirs.append("/usr/local/lib")
- 
diff --git a/dev-python/python-lzo/python-lzo-1.08-r1.ebuild b/dev-python/python-lzo/python-lzo-1.08-r1.ebuild
deleted file mode 100644
index 2c2c9210601d..000000000000
--- a/dev-python/python-lzo/python-lzo-1.08-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils prefix
-
-DESCRIPTION="Python interface to lzo"
-HOMEPAGE="http://www.oberhumer.com/opensource/lzo/"
-SRC_URI="http://www.oberhumer.com/opensource/lzo/download/LZO-v1/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/lzo:2"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	"${PYTHON}" tests/test.py || die "tests failed"
-}
-
-src_prepare() {
-	epatch "$(PREFIX_LINE_MATCH='/##/!' \
-		prefixify_ro "${FILESDIR}"/lzo2compat.patch)"
-}
diff --git a/dev-python/python-lzo/python-lzo-1.11.ebuild b/dev-python/python-lzo/python-lzo-1.11.ebuild
deleted file mode 100644
index a335c433c109..000000000000
--- a/dev-python/python-lzo/python-lzo-1.11.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1 prefix
-
-DESCRIPTION="Python interface to lzo"
-HOMEPAGE="https://github.com/jd-boyd/python-lzo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/lzo:2"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-src_prepare() {
-	distutils-r1_src_prepare
-	hprefixify setup.py
-}
-
-python_test() {
-	distutils_install_for_testing
-	PYTHONPATH="${TEST_DIR}"/lib nosetests -v || die "tests failed"
-}
diff --git a/dev-python/python-lzo/python-lzo-1.12-r1.ebuild b/dev-python/python-lzo/python-lzo-1.12-r1.ebuild
index ef22bd911221..4a7a1b29084b 100644
--- a/dev-python/python-lzo/python-lzo-1.12-r1.ebuild
+++ b/dev-python/python-lzo/python-lzo-1.12-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 prefix
 
diff --git a/dev-python/python-lzo/python-lzo-1.12.ebuild b/dev-python/python-lzo/python-lzo-1.12.ebuild
deleted file mode 100644
index de8b68f68bb8..000000000000
--- a/dev-python/python-lzo/python-lzo-1.12.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1 prefix
-
-DESCRIPTION="Python interface to lzo"
-HOMEPAGE="https://github.com/jd-boyd/python-lzo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/lzo:2"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	distutils-r1_src_prepare
-	hprefixify setup.py
-}
-
-python_test() {
-	distutils_install_for_testing
-	PYTHONPATH="${TEST_DIR}"/lib nosetests -v || die "tests failed"
-}