Revbump to add php5-6 wrt bug 548038

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

3 files changed, 53 insertions, 11 deletions

diff --git a/dev-php/pecl-haru/ChangeLog b/dev-php/pecl-haru/ChangeLog
index a678a59ba06b..e7c408152ad5 100644
--- a/dev-php/pecl-haru/ChangeLog
+++ b/dev-php/pecl-haru/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/pecl-haru
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-haru/ChangeLog,v 1.6 2014/10/09 20:51:00 grknight Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-haru/ChangeLog,v 1.7 2015/04/29 00:59:21 grknight Exp $
+
+*pecl-haru-1.0.4-r1 (29 Apr 2015)
+
+  29 Apr 2015; Brian Evans <grknight@gentoo.org> +pecl-haru-1.0.4-r1.ebuild:
+  Revbump to add php5-6 wrt bug 548038
 
   30 Sep 2014; Brian Evans <grknight@gentoo.org> -pecl-haru-1.0.3.ebuild:
   Drop support for php5.3
diff --git a/dev-php/pecl-haru/Manifest b/dev-php/pecl-haru/Manifest
index e3820f24c550..1d9d40a64295 100644
--- a/dev-php/pecl-haru/Manifest
+++ b/dev-php/pecl-haru/Manifest
@@ -2,17 +2,26 @@
 Hash: SHA256
 
 DIST haru-1.0.4.tgz 27538 SHA256 ab35e25521b486cc35a645727acd59dabfa0a7c85432f863ddad9e3d01a2ac70 SHA512 75cb8ae200cd41372ac738f5a4ed57607e13d538e2c9a46236dc05b7d0283ed4d152478e12fdff81735a4acd914055ebd58ff937ea0ca0a80056f255217b04c0 WHIRLPOOL a7c930847f2ff71abd9068896b650273f38bfb14d9e9a3f0a8724f43d52db669a27d7290398e70a68d146b18b3b664047f8cec40620ae1f202ef435df522a603
+EBUILD pecl-haru-1.0.4-r1.ebuild 699 SHA256 540f4b0388f7bda0bfedd30d9f369fb61e3beb75d15e2795f8d529236d97ae9d SHA512 7d7df195767d75b4224f0d1c98c4bb34eaa8dfe6b2bec59a5ddddbda3c49cfb997dfb62d3672b69e2c06339b74ecf08c8d556109885c80913f2523bb4fcca487 WHIRLPOOL 7ac3c957e26b17be8ef7b7fe54fde35fb7120bad5a5035251975f046bfe2e9e7689658a94f538c7ef4c2fa360dbb62c77e3dfcebe7c93ccff862d1d1a5cbb5a2
 EBUILD pecl-haru-1.0.4.ebuild 685 SHA256 270c58eaa519b42ad74fdc30435707d043922a93c8019b0036a799cade758925 SHA512 5cb4b9cccd9336bafbb4ebad7b5a1f3f64bce60c9b0f120273bfa7581350ac3beb762ffe72a29a211a4facd2fcd55b5c51c12246ce5eb6c41c9e7a562a54a0c6 WHIRLPOOL 4fcdcd51a4b42fb7f0b3232708e3ac0ce70d47d63e1cc91f9488623865385145bd314a545125af8ac891e979c391a5013c2678c780a5958fc204ffad04525ca5
-MISC ChangeLog 1011 SHA256 a6e6a923e829e85c454a5879c71b72be256e9a27183a8a34b6e9d8d134d69282 SHA512 22004ba28c8eb243620d07f737d020b191b8d81922c8bb84f56ef10a164d2a5c0ad803d419b989a812f8f6f15033c2271d0f852d19bc144b0848e9b187239ba8 WHIRLPOOL c147873e6a5ab8a585f44c45428ba22807b9850332d73af9bafc0af503b5ac17b4d0b1691679f68d39aa1eb077f53d199751dfcb7efeafc10805ee59cb8f7f86
+MISC ChangeLog 1163 SHA256 524939eb63bea4357282364bfcb09dadcdf3fe7f6b068ff0a78c193033395b96 SHA512 30685b622808bdef577d03b73cef0d06d12d64bf8a478139771810149b5d4d189f057dcbf11abad8f75ec1f4b3492698fd65091e1da01b0aebd2b35d9b2539b6 WHIRLPOOL 961abb50e0602fa32da026cfc27ac1b02ce99bfe0a24081cf75d75909aa358fb06f392d834993d302c71a39ef5aea7c3cfa335884455dfc0cf1f16037a255ba3
 MISC metadata.xml 291 SHA256 928f03bc41d212cb804a7a3d4df9b2ebc61149835f133bacca230ed6e46c7cb7 SHA512 09a381845e2b774d07633e9040478f68b8aac51606bc634047042e4a979e884386a11f84059777f4027cd37b6fe24b9ac9a424887652f41e7065d6a436302f01 WHIRLPOOL 2ef8f214145fdf20318d51304046f9caf69ecae1f90af5c5ff0866a7cfbe55faa7040817d7e9659e190550e31599bd7a48699c39c420cac47d74b1e3179315d4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJUNvU1AAoJEE4V4vFnx44dYtIH+gNarTqzVj15wvlwtml+47B7
-23r/6JitxdL67eCEs9fkdn/CPv2QdHPl+PByDUF6wWw7c2SRJDa3YQKpkqYE6ecU
-+FlT8IltZ2QYoNyzO/hMinlfOJA0KqEBGfi6VRGon4HISJUWn97auhCAUYIS1cTt
-al5oZo0zpy4/3/4bcq0ITPzXs1h8EpEItkJv+L3V/wcI4Qstas8r5j/S+rwPgt7i
-c3tyPuTLdlT8zB4ZmipXSIY6KAuX11sbfPHmkqFvsGj4fyuTBtor3C/8ZCxC7T6J
-kJ/m8OPhMZ5ePuJZPx8PSCRPPXrrialWdI9DOYdDcMfiDPfsGIpiKCB1bMZc1Ys=
-=vMAg
+iQJ8BAEBCABmBQJVQCztXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO23/oQAKzYZ6BsDgxlT0oFEooCjtPy
+XKCOXWzvArNIBB3LkUvwAF1z2m6tI3efxSa9DFdspkzVPe7b4Sm9ZHeHiH403y5a
+xPNugRs017Iup0J6N5PlryOaM3pIoBwNKEVfrTGrOx4OFflzGKTa2wdt7CW/n7Ii
+uKDo/QibSyLFJHjweKLczK4wxoKOC8qX12i8Hw3UdzZiUKYsI2gtit2AKKwfVDsl
+sZS0bHfcm9kg1GrlyYZJYtpzCfnebuqwQq69zG34ZfjIGuR+T4x1nkenSf7AHJOa
+5OTNBSB7xJOR843TH0Faq1/VqfaV1EADxr+d4vDUuMIdN7LltSfL3m6LbGGYvh9r
+UAt8vYw5z/MtO+THJhk6dXVwzTaJ10HZt1Oh8RNITT4S7voEi/SqF3xMfFsQmhLq
+UZkYhSS6thf8ATnQykugLI0+K3QCHMwtlOR6c8FqSgJPUWxJN9N1/kpHgIyP1xyq
+r/Wja7lHymWTcTIEYjHkKkBIlxiDJ7vVd9eQlHUd5u8Arvukx/6OntP9mX5UO/7X
+RPriHxQFrb2dhq51LhHYNXmb24g5QfQeIH3O3PNjyBv9FKq50DzS0vaCcmYeHoHh
+gGwYC9FHr1t6FjqvqjDUMAkdHBrkgykrUaqpOkgtWboyo1LB+jrVGOJIOTwJ0n66
+WzhI77RhLZSYiz2uJgkS
+=K/Jj
 -----END PGP SIGNATURE-----
diff --git a/dev-php/pecl-haru/pecl-haru-1.0.4-r1.ebuild b/dev-php/pecl-haru/pecl-haru-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..7513ad61d538
--- /dev/null
+++ b/dev-php/pecl-haru/pecl-haru-1.0.4-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-haru/pecl-haru-1.0.4-r1.ebuild,v 1.1 2015/04/29 00:59:21 grknight Exp $
+
+EAPI=5
+
+USE_PHP="php5-4 php5-5 php5-6"
+
+inherit php-ext-pecl-r2
+
+DESCRIPTION="An interface to libharu, a PDF generator"
+
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="png zlib"
+
+DEPEND="media-libs/libharu[png?,zlib?]"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# config.m4 is broken checking paths, so we need to override it
+	my_conf=""
+	use png && my_conf+=" --with-png-dir=/usr"
+	use zlib && my_conf+=" --with-zlib-dir=/usr"
+
+	php-ext-source-r2_src_configure
+}