gentoo resync : 13.06.2020

3 files changed, 21 insertions, 30 deletions

diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest
index 9944bc61dbfa..00764ff7a9a6 100644
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -2,5 +2,5 @@ AUX exact-image-0.7.5-libpng14.patch 2435 BLAKE2B ca832920ad7bd1b2f1def6faa04e0b
 AUX exact-image-0.8.1-gcc6.patch 6101 BLAKE2B 3dba7f2688a5c59282486f492131edaf104c3c9e7d335f1893467ef6d968b466e344ae1c1992ea080cee4d267001dd6555aaea3a23dfbb0a5748c5262d364fbb SHA512 e11a9dca3c5c6ac4ca5557e6ca212354346b307c38abe77ceaea9f15ef35f5a8de8d24628b290c4ecfdaf84dee44af49414d57c89b067e78b60a02d4e09a5dd4
 AUX exact-image-0.8.1-libpng15.patch 754 BLAKE2B 81b47c6198103f37cc5f0a382001129a10140bead8f98119eb52079ed97d67d9bfd56b60278023f680d66107aaa6f2dea4a035a194c404e33e548f2e37f90f49 SHA512 7f3d271d908e55e3731b38e072dcadcb0d99cbf3de327d5bd486e232c2827055b8f712052e04c9bc81b20fd42d27cc18627a6bc118c9d1ece58b91c18fa9bf13
 DIST exact-image-0.8.1.tar.bz2 283660 BLAKE2B 49aa68640b785da59fd0e04d0a0892ad06adbc286a98bf908e60e77cfd273263e83dce3c9eb75c30f422c2b6eef2178dd0585aada63f992291abf298b369f3aa SHA512 0adc51c5a29415e236a963cfdaf8f5527e628e9a645e87d00c69a7185e60639cfcd9b1c2b4c3abe1826c5364f0c5d45a0ebb8923cfed53d041d1d36b2604b565
-EBUILD exact-image-0.8.1-r3.ebuild 2591 BLAKE2B 07f2f6c12f8407e28d566194fd625b6f7883859442c5720a33cfa4448e518ae5d04d5d9453c70426db0fbde4fc51fe172181f408c5f33676c33ce7caf2db5b66 SHA512 49c37dac5ce842452dd001842cb957ef892fb2a8b6f9d13d7bd52515146dad5b330d8e9fa7d4b438f4a5d1533ba97766a642708a056d07eed8f0d516879ef488
-MISC metadata.xml 337 BLAKE2B fa437dc19cd237e491f57598a2305280c39b6218eded9646d51220eb6f914ae5928946495f1441c3cfb2c3b6a3b57a3d0b5c22ca5ed5685ccc37e00282cc1a1b SHA512 733bb28cd21c30454b7e0f62ab91f88d6b4df6694eee70d9854336421d905c5babfb7e1d169849ca5109253a16c8fe5c8b7482c65cb1de1bbae038024c2934f0
+EBUILD exact-image-0.8.1-r3.ebuild 2289 BLAKE2B 93a144bd88c5d743e24f34cf9920d97662cd5db725e952012237e2ad89c9f2a53734989a2e94d20346752ec275c940f2ff3ffe8e72c1d134a8d9818f434b1bb2 SHA512 dc14b66c56f7733019b433ac5b7b348bf105dccac9157c3a1ef03789bb5e33d7a2e0d2fd466a097d950c7a50a123581f40d62b81c1d2abce2213cde851465ef0
+MISC metadata.xml 329 BLAKE2B ceb9ef8fb31cd43ccaeec69b64fe88a4894da38dd2c45a1b74dde46161daa3d437fc9e2d7a699c8ca57acd8bb6ad06dbbbe173eefcf243ee2f78233046a7006b SHA512 eb4d23c96cd7e20afb64bf80075a0cfcdb27c69ca075261d54676c47044ca6d120dd5b80cb2217787b71a9db02688764b0b3f2147c6a6e652954e43cafaebf57
diff --git a/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild b/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
index 5eaeb57c3e47..91c362a6c1e9 100644
--- a/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
+++ b/media-gfx/exact-image/exact-image-0.8.1-r3.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
 
-inherit eutils multilib python-single-r1 toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="A fast, modern and generic image processing library"
 HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/"
@@ -13,20 +12,18 @@ SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="expat jpeg lua openexr php perl png python ruby swig tiff truetype X"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="expat jpeg lua openexr php perl png ruby swig tiff truetype X"
 
 RDEPEND="x11-libs/agg[truetype]
 	sys-libs/zlib
 	expat? ( dev-libs/expat )
 	jpeg? ( virtual/jpeg )
-	lua? ( dev-lang/lua )
+	lua? ( dev-lang/lua:= )
 	openexr? ( media-libs/openexr )
-	php? ( dev-lang/php )
+	php? ( dev-lang/php:* )
 	perl? ( dev-lang/perl )
 	png? ( >=media-libs/libpng-1.2.43 )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby )
+	ruby? ( dev-lang/ruby:* )
 	tiff? ( media-libs/tiff )
 	truetype? ( >=media-libs/freetype-2 )
 	X? (
@@ -39,21 +36,14 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	swig? ( dev-lang/swig )"
 
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.5-libpng14.patch
+	"${FILESDIR}"/${P}-libpng15.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
 
 src_prepare() {
-	eapply \
-		"${FILESDIR}"/${PN}-0.7.5-libpng14.patch \
-		"${FILESDIR}"/${P}-libpng15.patch \
-		"${FILESDIR}"/${P}-gcc6.patch
-	eapply_user
-
-	# fix python hardcoded path wrt bug #327171
-	sed -i -e "s:python2.5:${EPYTHON}:" \
-		-e "s:\$(libdir):usr/$(get_libdir):" \
-		"${S}"/api/python/Makefile || die
+	default
 
 	# Respect user CFLAGS/CXXFLAGS.
 	sed -i \
@@ -79,6 +69,7 @@ src_configure() {
 	# evas -> enlightenment overlay
 	# bardecode -> protected by custom license
 	# libungif -> not supported anymore
+	# python -> allegedly not python3, but python2 only
 
 	./configure \
 		--prefix=/usr \
@@ -98,7 +89,7 @@ src_configure() {
 		$(use_with lua) \
 		$(use_with swig) \
 		$(use_with perl) \
-		$(use_with python) \
+		--without-python \
 		$(use_with php) \
 		$(use_with ruby) || die
 }
diff --git a/media-gfx/exact-image/metadata.xml b/media-gfx/exact-image/metadata.xml
index 24dec3e96522..b4fce831a061 100644
--- a/media-gfx/exact-image/metadata.xml
+++ b/media-gfx/exact-image/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>graphics@gentoo.org</email>
-	<name>Gentoo Graphics Project</name>
-</maintainer>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
 <use>
 	<flag name="swig">Adds Swig support <pkg>dev-lang/swig</pkg></flag>
 </use>