gentoo resync : 15.12.2019

3 files changed, 13 insertions, 61 deletions

diff --git a/dev-python/pycdio/Manifest b/dev-python/pycdio/Manifest
index d922dea18bd8..57efd2f4c628 100644
--- a/dev-python/pycdio/Manifest
+++ b/dev-python/pycdio/Manifest
@@ -1,5 +1,3 @@
-DIST pycdio-0.20.tar.gz 197736 BLAKE2B 98ca603dba80a13dc3d1805869e190b9defa1a5c50b398ac4c7122629101df92ca8ad0071101bd8d53cbf48f41211017350a89944944028052899911b32d54e8 SHA512 b53a535440008dc637b31fd2cda22845c91b98e78c30f90c866af3b9bf7cb3faad39f0784b5063a39bd97bb18fc58c75ad0833d53421182d408c2889c491846b
-DIST pycdio-2.0.0.tar.gz 242131 BLAKE2B cbe014ea42ecf2b84f736d4b714f0fa76c94b10e0b16da148334521ac4a141db606793be541ee532b7542e58256377bbc6139945232942ef2ef0beeda4b66ef5 SHA512 b73d49e143e4b5ebf5e8514d526a57f71d004b9ce4298743bb109902ee9551fa586384a236b26da9cd86284b2aa8c31fb02a324a1cebc03f2071d06fbd3e3285
-EBUILD pycdio-0.20-r1.ebuild 1111 BLAKE2B 7fa1e7b201a208f754bbfaff91279e52f6cb31ce907f7550511baf52ad8436729fcc2433b420940cd775cd8f05cb71ffaa8cfd1b7c1e0724a081a1392ddbd51a SHA512 d543af529927c957600b6a15404c851aec2b5a32589f1960ec45fdc5031450cdbd5af0428837a273db8304b59c4eb255c438201b21971da00cae6bba8a336f37
-EBUILD pycdio-2.0.0.ebuild 1115 BLAKE2B 68128b352e910e364caaaed058b8bc78902396748ba215c019d90c587b8d3199a8034006f4531c558c44029955185273bb2bf3639d4d274ebb7e6c7fbaef1cea SHA512 60d6871f50bc68d614cddd7ad34aab371af7c887f7e5cd50d3d65f1a626c44661ab29733a88dbde036372ec1fbdebf89f35e80453714cf79e456b47cd00beeec
+DIST pycdio-2.1.0.tar.gz 241434 BLAKE2B eb981fdf52b205e14c6dd353ac4aca9a9e82dba6967a53b9059f8a265ef80832fe7236d68b2af7a6e408665fce0f5ed3541289e0b7d282834c4feb8e6b428fc4 SHA512 dc18fbd212f7040b8b06efaf263b17568e9c2d089cff7dfc4dda50a7225059e44c9c86e2d81ade92cf09c823f7189b5723fb601cb12f0884dc04e9f5418c5927
+EBUILD pycdio-2.1.0.ebuild 1059 BLAKE2B 845c1aa6ec99b7501ac46a02e5b55f2ceb3edecb73636018803549e938432cac00244e0d418bc130b827d7f98c6bc6f2c341538bbdf071893a3744ba1eaebba0 SHA512 78b7d78f91f2b5b4e8845efe1a631d92f53984e9dba228e67d85870f744418ec7af8faaa355e24b3f87b42340191c63a39f623d3af8bed4490d85cb5ed924348
 MISC metadata.xml 551 BLAKE2B cb87788bd6a8cd15e83547dba1f44f710a27db24b962790484b252553e6e3563493000a8f9e17ad72bdc205d7692aac19f6aefefd4b586dc2c5469c6045aff1a SHA512 e74e3c72794ff1356a6d91482162adfbed24320821e8df6ea4043416f586f6e30f91980e4c15281e59c6428a64550986eb69007da30390de6d7de51b250900c7
diff --git a/dev-python/pycdio/pycdio-0.20-r1.ebuild b/dev-python/pycdio/pycdio-0.20-r1.ebuild
deleted file mode 100644
index 3e7c20678893..000000000000
--- a/dev-python/pycdio/pycdio-0.20-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Python OO interface to libcdio (CD Input and Control library)"
-HOMEPAGE="https://savannah.gnu.org/projects/libcdio/ https://pypi.org/project/pycdio/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND=">=dev-libs/libcdio-0.90"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RESTRICT="test"  # currently tests fail
-
-python_prepare_all() {
-	append-cflags -fno-strict-aliasing
-	# Remove obsolete sys.path and adjust 'data' paths in examples.
-	sed -i \
-		-e "s:^sys.path.insert.*::" \
-		-e "s:\.\./data:./data:g" \
-		example/*.py || die
-
-	# Disable failing tests.
-	sed -i -e "s/test_get_set/_&/" test/test-cdtext.py || die
-	sed -i -e "s/test_fs/_&/" test/test-isocopy.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all(){
-	use examples && local EXAMPLES=( example/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycdio/pycdio-2.0.0.ebuild b/dev-python/pycdio/pycdio-2.1.0.ebuild
index dbde3585e0e0..bf82efeba6ad 100644
--- a/dev-python/pycdio/pycdio-2.0.0.ebuild
+++ b/dev-python/pycdio/pycdio-2.1.0.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
 
 DESCRIPTION="Python OO interface to libcdio (CD Input and Control library)"
 HOMEPAGE="https://savannah.gnu.org/projects/libcdio/ https://pypi.org/project/pycdio/"
@@ -16,17 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
+BDEPEND="dev-lang/swig"
 RDEPEND=">=dev-libs/libcdio-2.0.0"
-
-DEPEND="
-	${RDEPEND}
-	dev-lang/swig
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RESTRICT="test"  # currently tests fail
+DEPEND="${RDEPEND}"
 
 python_prepare_all() {
-	append-cflags -fno-strict-aliasing
 	# Remove obsolete sys.path and adjust 'data' paths in examples.
 	sed -i \
 		-e "s:^sys.path.insert.*::" \
@@ -40,6 +33,10 @@ python_prepare_all() {
 }
 
 python_install_all(){
-	use examples && local EXAMPLES=( example/. )
 	distutils-r1_python_install_all
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
 }