ssuominen 14/03/09 17:18:18 Modified: libmatchbox-1.9-r1.ebuild ChangeLog Log: Fix underlinking wrt #367683 by Diego Elio Pettenò (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path 1.6 x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild?r1=1.5&r2=1.6 Index: libmatchbox-1.9-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libmatchbox-1.9-r1.ebuild 4 Jun 2012 00:20:42 -0000 1.5 +++ libmatchbox-1.9-r1.ebuild 9 Mar 2014 17:18:18 -0000 1.6 @@ -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 @@ } 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 @@ default use doc && dohtml doc/html/* - find "${ED}" -name '*.la' -exec rm -f {} + + prune_libtool_files --all } 1.24 x11-libs/libmatchbox/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libmatchbox/ChangeLog?rev=1.24&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libmatchbox/ChangeLog?rev=1.24&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libmatchbox/ChangeLog?r1=1.23&r2=1.24 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/ChangeLog,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ChangeLog 4 Jun 2012 00:20:42 -0000 1.23 +++ ChangeLog 9 Mar 2014 17:18:18 -0000 1.24 @@ -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 <[email protected]> + +files/libmatchbox-1.9-underlinking.patch, libmatchbox-1.9-r1.ebuild: + Fix underlinking wrt #367683 by Diego Elio Pettenò 04 Jun 2012; Michael Weber <[email protected]> libmatchbox-1.9-r1.ebuild: ppc stable (bug 309407) @@ -92,4 +96,3 @@ 12 Mar 2006; <[email protected]> +metadata.xml, +libmatchbox-1.7.ebuild: - Initial import. Original ebuild by Priit Laes, modificationsby Björn Ruberg and Yuri Vasilevski. -
