gentoo auto-resync : 15:09:2023 - 10:49:51

3 files changed, 5 insertions, 87 deletions

diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest
index 3ecad1001cc5..cc91a9a6182b 100644
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -1,7 +1,6 @@
 AUX exact-image-1.0.2-dcraw.patch 496 BLAKE2B d9d86facb3b0f9721d3f5791d4744bbf71d3802c094e4d1f20de44898d817a8319b78c0cd011670d53beec35bbf9efb477c9b3e20ac2724a48017c5d0746c634 SHA512 409cf7ad9963b5e6f4997ad5b466a86c5c3179bbfe63f14311a1297c9e87423f7d838b2b037109029a8dfa6125d7bbacd53f069d8634c1ffdd2c946d40e70b99
 AUX exact-image-1.0.2-g++.patch 936 BLAKE2B 6ab787c1393228bb1671c8a2d7b76969fcd11d26f0c14ca08a95cee7241422205d8cb398f2a6b711e884c476cba662718705848a818b1944428b2a207133fede SHA512 44fafd62c713bc59c1cb774924394ad32a13c33b79696a4762e3730108650ccd3033f554fc8b0d7cf9b71126367bce5b90074f2c954ca57c8389975b57eac5e1
 AUX exact-image-1.0.2-gcc6.patch 2795 BLAKE2B 17282b91baa020b94654c92d87611001584f82360303a56e70cb8f081caf400394a367982e115bff094dfe11a0798503a606de106f1bf6427b57a9ede1cd6ed5 SHA512 ef42fccab6d0958df2dcf86578f9df1f84254515c2bea611f256e23227b9d6dc917467f2d8f54230f9386e9726152c6bbe4ab4f3d117e0da5a3e99b00e93e348
-AUX exact-image-1.0.2-php.patch 481 BLAKE2B bf9a3935813098c5248bac843c580d61266b60cf7063824c90e5b87df552d2b0fa125648f4ebcba46acc29d72f9bcd0a0c647467ebdc0d433616da5d8c16225f SHA512 b984095cc071558ce8b7d4b7db2915f793ed8d468f38757d2faab0f7ffc9e866a06838a5d0c578f67e9cc3e88f2bd07b0cde00ce95d909cdc07e5fbf24f3e62e
 DIST exact-image-1.0.2.tar.bz2 322174 BLAKE2B 67afefb4c5a52416459cd4ac6198012eb6d7895a73ea8363fae05286c7e7f62aa1a02166985f53b5638c7dc7b23b4dc1fb1c7b2272a9dc595ce329a7083ee1b9 SHA512 8ba5a198a236ddf5fa58f40c80f32ba9d300376c637a13a7acf3d2db7906fced373b33a7ecff9cff4d09d8b21de9ce1fb9f5bfb1f4522557bd01af0e3d6dcc65
-EBUILD exact-image-1.0.2-r8.ebuild 4124 BLAKE2B c0e53ed946aaf29bf960b6b1b729b8057db96af12f9a7d70ea293dbbd2a5702135e5a94f6c1343f39d3a94266328f7430d779406632d652f024e1d1a00186ccb SHA512 9a6aed9e081eb2154ff92641303af8d2f598daf19caadb30b6ba632a7edc9fbc7acd9fc2741357f3fe72c0689354f92eacbeb1d3acb2f3f8437ebd03b73e2e08
+EBUILD exact-image-1.0.2-r8.ebuild 2530 BLAKE2B 7d9e4ee881614b7df2f5c43dde2d4429883a7a97b79a94ce3fab06dfbf1cc50eae912d319acd35e237872e51db07ee867dced911849b71fb42dff343540533c6 SHA512 ea2f363b59052c719d0667125963a068b63037fc7762905464f979a3becb5c33c88650b6564640b4968dc5e8287611c573b0fb00e66caa04c30b5f1d8629d59a
 MISC metadata.xml 330 BLAKE2B 468dfd9c9bc2687f285c5a7496aa989843c32929b4c410253f1d046df2e2416604f6ff8b1cb4622e85e27f13f26cede91825d04b7748cb4f74fdff13478046c1 SHA512 01bc80b3dc7ed3ff2f3402ecd3214793d18267be1e1e4c4b42718b6f6a4982404e243771917fbbae7a1bd6b12a1cd80534d9738149ec9b2a88bbc1ad62fcdf14
diff --git a/media-gfx/exact-image/exact-image-1.0.2-r8.ebuild b/media-gfx/exact-image/exact-image-1.0.2-r8.ebuild
index 134a56faca8d..11e8e28d2a8b 100644
--- a/media-gfx/exact-image/exact-image-1.0.2-r8.ebuild
+++ b/media-gfx/exact-image/exact-image-1.0.2-r8.ebuild
@@ -1,16 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PHP_EXT_NAME="exactimage"
-USE_PHP="php7-4"
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_SKIP_PATCHES="yes"
-PHP_EXT_SKIP_PHPIZE="yes"
 LUA_COMPAT=( lua5-{1..4} luajit )
 
-inherit php-ext-source-r3 lua-single toolchain-funcs
+inherit lua-single toolchain-funcs
 
 DESCRIPTION="A fast, modern and generic image processing library"
 HOMEPAGE="https://exactcode.com/opensource/exactimage/"
@@ -19,8 +14,8 @@ 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 ruby swig tiff truetype X"
-REQUIRED_USE="lua? ( swig ) perl? ( swig ) php? ( swig ) ruby? ( swig )"
+IUSE="expat jpeg lua openexr perl png ruby swig tiff truetype X"
+REQUIRED_USE="lua? ( swig ) perl? ( swig ) ruby? ( swig )"
 # Tests are broken; 'make check' fails and referenced testsuite dir not found
 RESTRICT="test"
 
@@ -53,7 +48,6 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc6.patch
 	"${FILESDIR}"/${P}-g++.patch
 	"${FILESDIR}"/${P}-dcraw.patch
-	"${FILESDIR}"/${P}-php.patch
 )
 
 src_prepare() {
@@ -82,17 +76,6 @@ src_prepare() {
 	sed -i \
 		-e 's:Int64:uint64_t:g' \
 		codecs/openexr.cc || die
-
-	# When using PHP, the php-config binary should be specified by slot
-	# Cannot be done in a patch as it is live
-	if use php ; then
-		php-ext-source-r3_src_prepare
-		local slot
-		for slot in $(php_get_slots); do
-			php_init_slot_env "${slot}"
-			sed -i "s~php-config~${PHPCONFIG}~" configure || die
-		done
-	fi
 }
 
 src_configure() {
@@ -122,57 +105,4 @@ src_configure() {
 		--without-python \
 		--without-php \
 		$(use_with ruby) || die
-	if use php; then
-		local slot
-		for slot in $(php_get_slots); do
-			php_init_slot_env "${slot}"
-			./configure \
-				--prefix=/usr \
-				--libdir=/usr/$(get_libdir) \
-				--without-x11 \
-				$(use_with truetype freetype) \
-				--without-evas \
-				$(use_with jpeg libjpeg) \
-				$(use_with tiff libtiff) \
-				$(use_with png libpng) \
-				--without-jasper \
-				--without-libgif \
-				$(use_with openexr) \
-				$(use_with expat) \
-				--without-lcms \
-				--without-bardecode \
-				--without-lua \
-				--with-swig \
-				--without-perl \
-				--without-python \
-				--with-php \
-				--without-ruby || die
-		done
-	fi
-}
-
-src_compile() {
-	default
-	if use php ; then
-		local slot
-		for slot in $(php_get_slots); do
-			php_init_slot_env "${slot}"
-			# Copy built objects from default
-			cp -a "${S}/objdir" . || die
-			emake
-		done
-	fi
-}
-
-src_install() {
-	default
-	if use php ; then
-		local slot
-		for slot in $(php_get_slots); do
-			php_init_slot_env "${slot}"
-			exeinto "${EXT_DIR#$EPREFIX}"
-			newexe objdir/api/php/ExactImage.so "${PHP_EXT_NAME}.so"
-		done
-		php-ext-source-r3_createinifiles
-	fi
 }
diff --git a/media-gfx/exact-image/files/exact-image-1.0.2-php.patch b/media-gfx/exact-image/files/exact-image-1.0.2-php.patch
deleted file mode 100644
index 787d71335f38..000000000000
--- a/media-gfx/exact-image/files/exact-image-1.0.2-php.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/api/php/Makefile	2020-10-06 08:28:04.511865454 +0200
-+++ b/api/php/Makefile	2020-10-06 08:28:18.109638538 +0200
-@@ -8,7 +8,7 @@
- 
- $($(X_MODULE)_OUTPUT)/api-php-wrap.cc: $(X_MODULE)/../api.hh $(X_MODULE)/../api-swig.hh
- 	$(Q)echo "  SWIG      $(dir $@)"
--	$(Q)swig -php5 -c++ -outdir $(dir $@) -o '$@' $(X_MODULE)/../api-swig.hh
-+	$(Q)swig -php7 -c++ -outdir $(dir $@) -o '$@' $(X_MODULE)/../api-swig.hh
- 
- # we have an own install
- _X_BUILD_IMPLICIT := $(_X_BUILD_IMPLICIT)