gentoo resync : 22.01.2019

3 files changed, 53 insertions, 0 deletions

diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest
index 1310f866fa16..a9cf53ed88ce 100644
--- a/dev-php/pecl-imagick/Manifest
+++ b/dev-php/pecl-imagick/Manifest
@@ -1,3 +1,6 @@
+AUX pecl-imagick-3.4.3-tsrm_ls-is-undeclared.patch 462 BLAKE2B 0dd7b445b3e896fce69522eca802cbe6731535d19ed931a3e2a9e4195bf614503fe827c36726f24ba80824c007ccc063cdfab64d74bec67c62e5fa125ebe8ef0 SHA512 4774244f09152d4542dff8841ebabf7a7370026e0d61b397d69e2766562fea16a2fa93cdf92c778ae289c04daecf3ec2353ee3d0a773893ad89445d0ec52c4fa
 DIST imagick-3.4.3.tgz 245410 BLAKE2B 778c3b8ad3ad5e698044a832d71409eea220a82041544abeb88b59370d4b719388ce13b277d7aad84e67e40fcbbfa06d66a2458d4d9e8d33bb7358ab46368230 SHA512 2cb2b856cf83a78d3542cdf7c69554dcc063a0541e9092b24e5e1fbd8928066a4a3de154049d0202c35addbc5055ccfbb5910ae92f2f13da80ddfc025340ddcd
+DIST pecl-imagick-3.4.3_p20181129.tar.gz 260443 BLAKE2B 43d30514f5faeeaa5894e2eb51d5b2ebbe2940728c7770eec60c41c9f01f86f7423d87a71a9ad2068e388f3994c31e499940c2042994846a6b6ab66542c7ea53 SHA512 7f3719118849857d19b9a35a63de68d4e992780fd41231a041d6d152ab2f0abd3d8215ab2362a998f8fe6a733c087d3c3e5d09fa826480d621739e92f5aeabf2
 EBUILD pecl-imagick-3.4.3.ebuild 619 BLAKE2B 346a2b31b3bd66759246937d2145c00f14af2b86aa8bdb0eae1909c5e94f4627c1429b729f0e2396fbcb65cb69ebe5c9b8edc2dac998bac6a36976250fc2b1c1 SHA512 945955dfa61d5ba5e936a2f8780bdced9e03ec02b2f9288eb3290106e4cd47a80cb55f82a2b31a493bdc1bb849dd8db03abeca02dc98e8bb6f65177dde0eb8c4
+EBUILD pecl-imagick-3.4.3_p20181129.ebuild 958 BLAKE2B 18e4f43fdd2c29b7b51aa964641f367386a5ac3f0a2ce550fb9c473448b6c4245c07740c8f20edb94c7b4c2207caba870617e043d510e2f99fe79a13c2edf6c4 SHA512 74b1927651bca3be6310ac75790e209cb6748bba7754e059a6d4ca2d51ec9919517d84260318f60ce03faeb17f57c8883d4e94ebad471a349ecf5273724ca10a
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-imagick/files/pecl-imagick-3.4.3-tsrm_ls-is-undeclared.patch b/dev-php/pecl-imagick/files/pecl-imagick-3.4.3-tsrm_ls-is-undeclared.patch
new file mode 100644
index 000000000000..ff0a1eb38885
--- /dev/null
+++ b/dev-php/pecl-imagick/files/pecl-imagick-3.4.3-tsrm_ls-is-undeclared.patch
@@ -0,0 +1,18 @@
+https://github.com/mkoppanen/imagick/issues/264
+
+--- a/imagick_file.c
++++ b/imagick_file.c
+@@ -160,11 +160,13 @@ static
+ int php_imagick_read_image_using_imagemagick(php_imagick_object *intern, struct php_imagick_file_t *file, ImagickOperationType type TSRMLS_DC)
+ {
+ 
++#ifdef ZTS
+ #ifndef ZEND_ENGINE_3
+ #if PHP_VERSION_ID >= 50600
+ 	// This suppresses an 'unused parameter' warning.
+ 	(void)tsrm_ls;
+ #endif
++#endif
+ #endif
+ 
+ 	if (type == ImagickReadImage) {
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.4.3_p20181129.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.4.3_p20181129.ebuild
new file mode 100644
index 000000000000..e1c86fc73437
--- /dev/null
+++ b/dev-php/pecl-imagick/pecl-imagick-3.4.3_p20181129.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PHP_EXT_NAME="imagick"
+
+MY_COMMIT="d57a444766a321fa226266f51f1f42ee2cc29cc7"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+
+S="${WORKDIR}/imagick-${MY_COMMIT}"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP wrapper for the ImageMagick library"
+HOMEPAGE="https://pecl.php.net/imagick https://github.com/mkoppanen/imagick"
+SRC_URI="https://github.com/mkoppanen/imagick/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="examples test"
+
+# imagemagick[-openmp] is needed wrt bug 547922 and upstream
+# https://github.com/mkoppanen/imagick#openmp
+RDEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]"
+DEPEND="${RDEPEND}
+	test? ( >=media-gfx/imagemagick-6.2.4:=[jpeg,png,truetype] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.4.3-tsrm_ls-is-undeclared.patch )
+
+PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX%/}/usr"