mgorny 14/05/17 07:54:31 Modified: imlib2-9999.ebuild ChangeLog Removed: imlib2-9999-r1.ebuild Log: Collapse the live ebuilds, and forward-port the MULTILIB_USEDEP fix. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.19 media-libs/imlib2/imlib2-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild?rev=1.19&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild?rev=1.19&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild?r1=1.18&r2=1.19 Index: imlib2-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- imlib2-9999.ebuild 28 Sep 2013 09:37:31 -0000 1.18 +++ imlib2-9999.ebuild 17 May 2014 07:54:31 -0000 1.19 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild,v 1.18 2013/09/28 09:37:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild,v 1.19 2014/05/17 07:54:31 mgorny Exp $ EAPI="4" @@ -11,33 +11,33 @@ EKEY_STATE="stable" fi -inherit enlightenment toolchain-funcs +inherit enlightenment toolchain-funcs multilib-minimal DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm" HOMEPAGE="http://www.enlightenment.org/"; IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib" -RDEPEND="=media-libs/freetype-2* - bzip2? ( app-arch/bzip2 ) - zlib? ( sys-libs/zlib ) - gif? ( >=media-libs/giflib-4.1.0 ) - png? ( media-libs/libpng:0 ) - jpeg? ( virtual/jpeg:0 ) - tiff? ( media-libs/tiff:0 ) +RDEPEND="=media-libs/freetype-2*[${MULTILIB_USEDEP}] + bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) + gif? ( >=media-libs/giflib-4.1.0[${MULTILIB_USEDEP}] ) + png? ( media-libs/libpng:0[${MULTILIB_USEDEP}] ) + jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) X? ( - x11-libs/libX11 - x11-libs/libXext + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] ) - mp3? ( media-libs/libid3tag )" + mp3? ( media-libs/libid3tag[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - png? ( virtual/pkgconfig ) + png? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) X? ( - x11-proto/xextproto - x11-proto/xproto + x11-proto/xextproto[${MULTILIB_USEDEP}] + x11-proto/xproto[${MULTILIB_USEDEP}] )" -src_configure() { +multilib_src_configure() { # imlib2 has diff configure options for x86/amd64 mmx if [[ $(tc-arch) == amd64 ]]; then E_ECONF+=( $(use_enable mmx amd64) --disable-mmx ) @@ -47,6 +47,7 @@ [[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding ) + ECONF_SOURCE="${S}" \ E_ECONF+=( $(use_enable static-libs static) $(use_with X x) @@ -62,9 +63,6 @@ enlightenment_src_configure } -src_install() { +multilib_src_install() { enlightenment_src_install - - # enlightenment_src_install should take care of this for us, but it doesn't - find "${ED}" -name '*.la' -delete } 1.123 media-libs/imlib2/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/ChangeLog?rev=1.123&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/ChangeLog?rev=1.123&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/ChangeLog?r1=1.122&r2=1.123 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- ChangeLog 17 May 2014 07:46:07 -0000 1.122 +++ ChangeLog 17 May 2014 07:54:31 -0000 1.123 @@ -1,6 +1,10 @@ # ChangeLog for media-libs/imlib2 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.122 2014/05/17 07:46:07 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.123 2014/05/17 07:54:31 mgorny Exp $ + + 17 May 2014; Michał Górny <[email protected]> -imlib2-9999-r1.ebuild, + imlib2-9999.ebuild: + Collapse the live ebuilds, and forward-port the MULTILIB_USEDEP fix. 17 May 2014; Michał Górny <[email protected]> imlib2-1.4.6-r2.ebuild: Add missing MULTILIB_USEDEPs.
