3 files changed, 2 insertions, 155 deletions
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index f8f00a78d8a1..098eaf38a9cd 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,9 +1,5 @@
-DIST py2cairo-1.10.0.tar.bz2 402070 BLAKE2B 77a0c85d687f286bc77d6c8f05b50d534c7d2569cdd34fc3455c3d1e46580ba10131253ee94f3c5bf8bdcef433b09e75dd7d5f35f0c344cce571ed64979d6c35 SHA512 cb3d54de9af4134460ce731da8166a3127a642c8a2e6184109437ddec115cd55b8dd2413a5c81700277bfe2f22fcfe268db4f3ba0f7649751e85bb34295f79fc
-DIST pycairo-1.10.0-gentoo-patchset.tar.bz2 9669 BLAKE2B c2e0797e60b17bb8a871607abe51ebeb49a34de2036d5fde062abee532f5589156a80c8b6bd8d8906d2ff694a5736e28c6566db4d472a824aaaabd2c006dc297 SHA512 c367a7d8fa771ac900ca3363cb7dfd50de045cf67c73c6e552d05018c6933b13dd5660b033be59e1acf8af79f16253a8e56aaa3f135a262a8148711ae8b7a587
-DIST pycairo-1.10.0.tar.bz2 246556 BLAKE2B fd04135ef5c4591641cd3ec29aad4de70946962cb0473e737b7cb4ab1d88295cbd920a598923e0c28af44175a69ecfa194a7a64ca27dcc109b93f1571cdf2fac SHA512 a03db6f04cea504985f390b0734042390f491f32ae2bee1299dabbafd369fde36bb506ebb941d22bbc11b0d008c4f758baeacf309a7336880529455092db829f
 DIST pycairo-1.15.3.tar.gz 177056 BLAKE2B cba4a212c3537d5718a73742468444b01372902d86f88558cf63ab2ec1999dac036b349d84dff0bdcae5126998c5e921f05bab54b708a29ca2381b8d1371ac44 SHA512 1fc75d193eacb976f2e5a594aa07409a0f80ccb21921065c1794961143785eed48be1966d2d2d3e2d0428f9b4e956994dd851d21f3c3cb91fbc27b007a901ce8
 DIST pycairo-1.15.4.tar.gz 178436 BLAKE2B 23c5064f537b8d8be12bb64df375c1d5be8962f80adf2437115dde59c18c3755a693b0cb8b3bee248ce8c906f23acfa264f2da6e02770bc59d823beba1bc9e7b SHA512 7e785d23393a8d0c5aca9a4440eb64b0eca9a60c1a18b0dc8452edd6de9422c743d082530387bcbedd34d52377d0892ad395998e9467ba08e22c318684cbee34
-EBUILD pycairo-1.10.0-r5.ebuild 4801 BLAKE2B 9ded1e263bdfa4ffb0c3191372936a674afe9f54daea7f322febfa800360d81e0dd5e828307afc4d89b0a1229ebbcb15855f5640e49868e78313afd5adafa1ba SHA512 0af881180b25a67fa8102bbdb03d0fce758343f251b970da05dab48df024e0e46ec35c1d42288a68004d5bde66c925b6f734f985022e404c70b4ece014a3768a
-EBUILD pycairo-1.15.3.ebuild 1608 BLAKE2B 4749c1ad1b98be907999897783bdc3e576457c0c9a678c45ddc12bb39a7c44aded89ba8e2a0ecd4d709a523d64239386748d788260f625d60fb4da36bd1e350e SHA512 5feda5dc1598b37eacac9a93d2d59fd99de65575866f2c98fe911295225c1fa15aeeeaf41c0187ccac170ff6628e431180d2570daf03c5207a2399a6769b1358
+EBUILD pycairo-1.15.3.ebuild 1607 BLAKE2B 0fff3a866314ff4dcf9fdfdfaa865b504859be58ddbce3e7ffc64568d744b5ef0cf7558e045aaf1d9c474c457d9ce50c19c978b27accfe2e52e94cf00a3c9879 SHA512 a61afcf8066d8b14d1b117e7952d82d1265668005f976b20a1d53fcabf3d5bd792a62cc24b765d3113016f9b1870ad7e922d05ee017868fcaed03109866a9618
 EBUILD pycairo-1.15.4.ebuild 1616 BLAKE2B f587a875f864f1d08465f421e48b2935378dfe9c2e5a6d421aa39b1d00f11c6622fae6e0fe95bc3bc79a8126b069f77599daa5a2c191ee47399d58d52fb1753d SHA512 f8fc6a76feb2a2544c558965a2004151e8a259de7466195c02a18657e614fd956b94b21c1038a5868a74c904f8fe20f3eb06c9c352b73a83688d6fcf8ff57c0b
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/pycairo-1.10.0-r5.ebuild b/dev-python/pycairo/pycairo-1.10.0-r5.ebuild
deleted file mode 100644
index b61eec3973dd..000000000000
--- a/dev-python/pycairo/pycairo-1.10.0-r5.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit eutils python-r1 waf-utils toolchain-funcs
-
-PYCAIRO_PYTHON2_VERSION="${PV}"
-PYCAIRO_PYTHON3_VERSION="${PV}"
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="http://cairographics.org/pycairo/ https://pypi.python.org/pypi/pycairo"
-SRC_URI="
-	http://cairographics.org/releases/py2cairo-${PYCAIRO_PYTHON2_VERSION}.tar.bz2
-	http://cairographics.org/releases/pycairo-${PYCAIRO_PYTHON3_VERSION}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
-
-# LGPL-3 for pycairo 1.10.0.
-# || ( LGPL-2.1 MPL-1.1 ) for pycairo 1.8.10.
-LICENSE="LGPL-3 || ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples +svg test xcb"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Note: xpyb is used as the C header, not Python modules
-RDEPEND="${PYTHON_DEPS}
-	>=x11-libs/cairo-1.10.0[svg?,xcb?]
-	xcb? ( x11-libs/xpyb )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-src_prepare() {
-	pushd "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" > /dev/null || die
-	rm -f src/config.h || die
-	epatch \
-		"${WORKDIR}/${P}-gentoo-patchset/${PN}-1.10.0-svg_check.patch" \
-		"${WORKDIR}/${P}-gentoo-patchset/${PN}-1.10.0-xpyb.patch" \
-		"${WORKDIR}/${P}-gentoo-patchset/${PN}-1.10.0-waf-unpack.patch" \
-		"${WORKDIR}/${P}-gentoo-patchset"/py2cairo-1.10.0-ppc-darwin.patch \
-		"${WORKDIR}/${P}-gentoo-patchset"/pycairo-1.10.0-101_pycairo-region.patch
-	popd > /dev/null
-
-	pushd "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" > /dev/null || die
-	rm -f src/config.h || die
-	epatch \
-		"${WORKDIR}/${P}-gentoo-patchset/py2cairo-1.10.0-svg_check.patch" \
-		"${WORKDIR}/${P}-gentoo-patchset/py2cairo-1.10.0-xpyb.patch" \
-		"${WORKDIR}/${P}-gentoo-patchset"/py2cairo-1.10.0-ppc-darwin.patch
-	popd > /dev/null
-
-	preparation() {
-		if python_is_python3; then
-			cp -r -l "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" "${BUILD_DIR}" || die
-			pushd "${BUILD_DIR}" > /dev/null || die
-			wafdir="$(./waf unpack)"
-			pushd "${wafdir}" > /dev/null || die
-			epatch \
-				"${WORKDIR}/${P}-gentoo-patchset/${PN}-1.10.0-waf-py3_4.patch" \
-				"${WORKDIR}/${P}-gentoo-patchset"/pycairo-1.10.0-50_specify-encoding-in-waf.patch \
-				"${WORKDIR}/${P}-gentoo-patchset"/pycairo-1.10.0-80_fix-pickle.patch \
-				"${WORKDIR}/${P}-gentoo-patchset"/pycairo-1.10.0-81_pickling-again.patch
-
-			popd > /dev/null
-			popd > /dev/null
-		else
-			cp -r -l "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" "${BUILD_DIR}" || die
-		fi
-	}
-	python_foreach_impl preparation
-}
-
-src_configure() {
-	if ! use svg; then
-		export PYCAIRO_DISABLE_SVG=1
-	fi
-
-	if ! use xcb; then
-		export PYCAIRO_DISABLE_XPYB=1
-	fi
-
-	tc-export PKG_CONFIG
-	# Also export the var with the slightly diff name that waf uses for no good reason.
-	export PKGCONFIG=${PKG_CONFIG}
-
-	# Added by grobian:
-	# If WAF_BINARY is an absolute path, the configure is different and fails to
-	# find Python.h due to a compiler misconfiguration.  If WAF_BINARY is just
-	# ./waf or python waf, it works fine.  Hooray for reinvented buildsystems
-
-	# floppym:
-	# pycairo and py2cairo bundle different versions of waf (bug 447856)
-	WAF_BINARY="./waf"
-	python_foreach_impl run_in_build_dir waf-utils_src_configure --nopyc --nopyo
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir waf-utils_src_compile
-}
-
-src_test() {
-	test_installation() {
-		./waf install --destdir="${T}/tests/${BUILD_DIR}"
-		PYTHONPATH="${T}/tests/${BUILD_DIR}$(python_get_sitedir)" py.test -v
-	}
-	python_foreach_impl run_in_build_dir test_installation
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir waf-utils_src_install
-
-	dodoc AUTHORS NEWS README
-
-	if use doc; then
-		pushd doc/_build/html > /dev/null || die
-		dohtml -r [a-z]* _static
-		popd > /dev/null || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_names; next to waf producing dylibs (not bundles) and
-		# calling them .bundle, it also has no idea what it should do to create
-		# proper ones (dylibs)
-		fix_darwin_install_names() {
-			local suffix=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("EXT_SUFFIX"))')
-			[[ -z ${suffix} || ${suffix} == "None" ]] && suffix=".bundle"
-			local x="$(python_get_sitedir)/cairo/_cairo${suffix}"
-			install_name_tool -id "${x}" "${D}${x}"
-		}
-		python_foreach_impl fix_darwin_install_names
-	fi
-}
-
-run_in_build_dir() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	"$@"
-	popd > /dev/null || die
-}
diff --git a/dev-python/pycairo/pycairo-1.15.3.ebuild b/dev-python/pycairo/pycairo-1.15.3.ebuild
index 3f400cf8083a..7866b76d519a 100644
--- a/dev-python/pycairo/pycairo-1.15.3.ebuild
+++ b/dev-python/pycairo/pycairo-1.15.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test xcb"
 
 # Note: xpyb is used as the C header, not Python modules