Fix underlinking wrt #367683 by Diego Elio Pettenò

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 37 insertions, 17 deletions

diff --git a/x11-libs/libmatchbox/ChangeLog b/x11-libs/libmatchbox/ChangeLog
index 34a83b4683f6..7ae09c57e92e 100644
--- a/x11-libs/libmatchbox/ChangeLog
+++ b/x11-libs/libmatchbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libmatchbox
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/ChangeLog,v 1.23 2012/06/04 00:20:42 xmw Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/ChangeLog,v 1.24 2014/03/09 17:18:18 ssuominen Exp $
+
+  09 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/libmatchbox-1.9-underlinking.patch, libmatchbox-1.9-r1.ebuild:
+  Fix underlinking wrt #367683 by Diego Elio Pettenò
 
   04 Jun 2012; Michael Weber <xmw@gentoo.org> libmatchbox-1.9-r1.ebuild:
   ppc stable (bug 309407)
@@ -92,4 +96,3 @@
   12 Mar 2006; <yvasilev@gentoo.org> +metadata.xml, +libmatchbox-1.7.ebuild:
   - Initial import. Original ebuild by Priit Laes, modificationsby Björn
   Ruberg and Yuri Vasilevski.
-
diff --git a/x11-libs/libmatchbox/files/libmatchbox-1.9-underlinking.patch b/x11-libs/libmatchbox/files/libmatchbox-1.9-underlinking.patch
new file mode 100644
index 000000000000..f8b2feeea332
--- /dev/null
+++ b/x11-libs/libmatchbox/files/libmatchbox-1.9-underlinking.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/367683
+
+--- tests/Makefile.am
++++ tests/Makefile.am
+@@ -19,6 +19,7 @@
+ 
+ noinst_PROGRAMS = dump-image
+ dump_image_SOURCES=dump-image.c
++dump_image_LDADD= @XLIBS_LIBS@
+ 
+ EXTRA_DIST = oh-overlayed.png oh.png oh-scaled.png overlay.png oh.jpg oh.xpm \
+              dot-desktop.c pixbuf.c oh.h
diff --git a/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild b/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild
index 5863ccaaab87..8463ea45ad41 100644
--- a/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild
+++ b/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 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.5 2012/06/04 00:20:42 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild,v 1.6 2014/03/09 17:18:18 ssuominen Exp $
 
-EAPI=4
-inherit eutils libtool
+EAPI=5
+inherit autotools eutils
 
 DESCRIPTION="The Matchbox Library."
 HOMEPAGE="http://matchbox-project.org/"
-SRC_URI="http://matchbox-project.org/sources/${PN}/${PV}/${P}.tar.bz2"
+SRC_URI="http://matchbox-project.org/sources/${PN}/${PV}/${P}.tar.bz2
+	mirror://sourceforge/check/check-0.9.12.tar.gz" # For check.m4
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~hppa ~mips ppc x86"
 IUSE="debug doc jpeg pango png static-libs test truetype X xsettings"
 
-RDEPEND="x11-libs/libXext
-	truetype? ( x11-libs/libXft )
-	pango? ( x11-libs/pango )
-	jpeg? ( virtual/jpeg )
-	png? ( media-libs/libpng )
+RDEPEND="x11-libs/libXext:=
+	truetype? ( x11-libs/libXft:= )
+	pango? ( x11-libs/pango:= )
+	jpeg? ( virtual/jpeg:0 )
+	png? ( media-libs/libpng:0= )
 	xsettings? ( x11-libs/libxsettings-client )"
-
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	test? ( dev-libs/check )"
@@ -40,8 +40,13 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng1{4,5}.patch
-	elibtoolize
+	mv "${WORKDIR}"/check-*/check.m4 "${WORKDIR}"/ || die
+
+	epatch \
+		"${FILESDIR}"/${P}-libpng1{4,5}.patch \
+		"${FILESDIR}"/${P}-underlinking.patch
+	
+	AT_M4DIR="${WORKDIR}" eautoreconf
 }
 
 src_configure() {
@@ -62,5 +67,5 @@ src_install() {
 	default
 	use doc && dohtml doc/html/*
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	prune_libtool_files --all
 }