4 files changed, 57 insertions, 22 deletions
diff --git a/x11-libs/libmatchbox/ChangeLog b/x11-libs/libmatchbox/ChangeLog
index e9cc58ee6229..8ede5518e735 100644
--- a/x11-libs/libmatchbox/ChangeLog
+++ b/x11-libs/libmatchbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/libmatchbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/ChangeLog,v 1.18 2011/03/20 12:51:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/ChangeLog,v 1.19 2011/09/17 13:06:30 ssuominen Exp $
+
+  17 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
+  libmatchbox-1.9-r1.ebuild, +files/libmatchbox-1.9-libpng15.patch:
+  Fix building with libpng15 wrt #383201 by Diego Elio Pettenò.
+  USE="static-libs" and punt libtool archive in favour of pkg-config file.
 
 *libmatchbox-1.9-r1 (20 Mar 2011)
 
diff --git a/x11-libs/libmatchbox/Manifest b/x11-libs/libmatchbox/Manifest
index 2f48f38fe90a..e14ff4920c45 100644
--- a/x11-libs/libmatchbox/Manifest
+++ b/x11-libs/libmatchbox/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libmatchbox-1.9-libpng14.patch 412 RMD160 266e67527e3bfd6cb92933fc9abafa3fd619657c SHA1 709ddfcd9fbf74fe99fed2ac01eb5dd1afb73c89 SHA256 f7d44711c682650583bb5cde53961aedf027d5174c5f91774eae448dbd4fb37b
+AUX libmatchbox-1.9-libpng15.patch 627 RMD160 34ee36647c202d635d939b8cb8a515831d851ea1 SHA1 e35fe8e41567ba960e4b4dac8dbd5cde8443dade SHA256 95465d2209be4e991b4a5dd75068021ed21cae92a726b92d612ee0b50378d125
 DIST libmatchbox-1.9.tar.bz2 316575 RMD160 5c72d1a86de1d6b4ffbe07b6a80ac705d2633fb3 SHA1 7820b2723581c20db92d8a36e1a75d4a0c57579a SHA256 db01e218e8d09540459c8f7c5698c159cd84c3d5b8caa9763bf0e5a35f6edf00
-EBUILD libmatchbox-1.9-r1.ebuild 1731 RMD160 bd5a31edf4e104055976e160c56bd03ddb335276 SHA1 4cdb6d1341284c493a630858a05fcd2f70914cb2 SHA256 23241f85a1e83e1644a308ac670adf2e314f5917ad5d00d57c400a285648f458
-MISC ChangeLog 2799 RMD160 a77bce749ec9af4d045c36638ce916be70457fdb SHA1 3bf89228569a17bfbad475115c966ed4a4174c52 SHA256 88caea20369ac7f71104fad72546f72ac3197401092b2b995e8c8087ec2726cd
+EBUILD libmatchbox-1.9-r1.ebuild 1672 RMD160 75dc478a82228d8db6d497ba550fb81f2e27f63c SHA1 f68f8e8e01ef1cd766433db267e27d54f35a2ee3 SHA256 33a195d2eb3f5b9be15a23cf158db55fd57897d82c6714603828bfc6bb4dee82
+MISC ChangeLog 3062 RMD160 977922a2414cb2652bdf4d80deb7c2c0ccddb27a SHA1 d22a88fc28f16e2f53e822020a7be5b1f9aafb89 SHA256 71ee4415738e9158ce11c7be54b5b57aebb0b9651c4edfeca97a9e4eeb727c7d
 MISC metadata.xml 413 RMD160 f5e5747505deb75f2af51d8f2c9ce571ddfa497e SHA1 7a9593a01566b4010552683107f4bb551903c220 SHA256 59b98562a4c53d3933bd84631651f38b7b9a1b761ab03b9e0e6a15fe058a7f51
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk50m5IACgkQXkR9YqOcLPFL/wD+K7OqrBDeojRZwORNVrVYe5yY
+Qmpd5qW0tWa5c9gFL3EBAJbL05yVFSPyjeNfRCnZVSWegfoQdj0G0HIyFs5I7X/I
+=1NvD
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/libmatchbox/files/libmatchbox-1.9-libpng15.patch b/x11-libs/libmatchbox/files/libmatchbox-1.9-libpng15.patch
new file mode 100644
index 000000000000..25f68575032c
--- /dev/null
+++ b/x11-libs/libmatchbox/files/libmatchbox-1.9-libpng15.patch
@@ -0,0 +1,22 @@
+--- libmb/mbpixbuf.c
++++ libmb/mbpixbuf.c
+@@ -247,7 +247,7 @@
+     return NULL;
+   }
+ 
+-  if ( setjmp( png_ptr->jmpbuf ) ) {
++  if ( setjmp( png_jmpbuf(png_ptr) ) ) {
+     png_destroy_read_struct( &png_ptr, &info_ptr, NULL);
+     fclose(fd);
+     return NULL;
+@@ -269,8 +269,8 @@
+       ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA ))
+     png_set_gray_to_rgb(png_ptr);
+  
+-  if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA 
+-       || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA
++  if ( color_type == PNG_COLOR_TYPE_RGB_ALPHA 
++       || color_type == PNG_COLOR_TYPE_GRAY_ALPHA
+        )
+     *has_alpha = 1;
+   else
diff --git a/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild b/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild
index b9e3276adfc8..8fc5fd8fca85 100644
--- a/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild
+++ b/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild,v 1.1 2011/03/20 12:51:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild,v 1.2 2011/09/17 13:06:30 ssuominen Exp $
 
+EAPI=4
 inherit eutils libtool
 
 DESCRIPTION="The Matchbox Library."
 HOMEPAGE="http://matchbox-project.org/"
 SRC_URI="http://matchbox-project.org/sources/${PN}/${PV}/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
-
 KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
-IUSE="debug doc jpeg pango png test truetype X xsettings"
+IUSE="debug doc jpeg pango png static-libs test truetype X xsettings"
 
 RDEPEND="x11-libs/libXext
 	truetype? ( x11-libs/libXft )
@@ -27,27 +28,26 @@ DEPEND="${RDEPEND}
 # Test suite broken, missing files and such.
 RESTRICT="test"
 
+DOCS=( AUTHORS ChangeLog NEWS README )
+
 pkg_setup() {
 	# Bug #138135
 	if use truetype && use pango; then
 		ewarn "You have both the truetype and pango USE flags set, pango"
 		ewarn "overrides and disables the XFT support truetype enables."
 		ewarn "If this isn't what you intended you should stop the build!"
-		ebeep 3
-		epause 3
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-libpng14.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng1{4,5}.patch
 	elibtoolize
 }
 
-src_compile() {
-	econf	$(use_enable debug) \
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable debug) \
 		$(use_enable doc doxygen-docs) \
 		$(use_enable truetype xft) \
 		$(use_enable pango) \
@@ -55,15 +55,12 @@ src_compile() {
 		$(use_enable png) \
 		$(use_enable xsettings) \
 		$(use_with X x) \
-		$(use_enable test unit-tests) \
-		|| die "Configuration failed"
-
-	emake || die "Compilation failed"
+		$(use_enable test unit-tests)
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
+	default
 	use doc && dohtml doc/html/*
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }