mgorny 14/05/21 18:39:27 Modified: ChangeLog Added: gd-2.0.35-r4.ebuild Log: Enable multilib support, as a dependency of libgphoto2. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.89 media-libs/gd/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/ChangeLog?rev=1.89&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/ChangeLog?rev=1.89&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/ChangeLog?r1=1.88&r2=1.89 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- ChangeLog 27 Aug 2013 15:48:38 -0000 1.88 +++ ChangeLog 21 May 2014 18:39:27 -0000 1.89 @@ -1,6 +1,11 @@ # ChangeLog for media-libs/gd -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.88 2013/08/27 15:48:38 kensington Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.89 2014/05/21 18:39:27 mgorny Exp $ + +*gd-2.0.35-r4 (21 May 2014) + + 21 May 2014; Michał Górny <mgo...@gentoo.org> +gd-2.0.35-r4.ebuild: + Enable multilib support, as a dependency of libgphoto2. 27 Aug 2013; Michael Palimaka <kensing...@gentoo.org> gd-2.0.35-r3.ebuild: Pin virtual/jpeg SLOT to 0. 1.1 media-libs/gd/gd-2.0.35-r4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/gd-2.0.35-r4.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/gd-2.0.35-r4.ebuild?rev=1.1&content-type=text/plain Index: gd-2.0.35-r4.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r4.ebuild,v 1.1 2014/05/21 18:39:27 mgorny Exp $ EAPI="5" inherit autotools eutils multilib-minimal DESCRIPTION="A graphics library for fast image creation" HOMEPAGE="http://libgd.org/ http://www.boutell.com/gd/"; SRC_URI="http://libgd.org/releases/${P}.tar.bz2"; LICENSE="gd IJG HPND BSD" SLOT="2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="fontconfig jpeg png static-libs truetype xpm zlib" RDEPEND="fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] ) jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) png? ( >=media-libs/libpng-1.2:0[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.1.5[${MULTILIB_USEDEP}] ) xpm? ( x11-libs/libXpm[${MULTILIB_USEDEP}] x11-libs/libXt[${MULTILIB_USEDEP}] ) zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} virtual/pkgconfig[${MULTILIB_USEDEP}]" MULTILIB_CHOST_TOOLS=( /usr/bin/gdlib-config ) src_prepare() { epatch "${FILESDIR}"/${P}-libpng14.patch #305101 epatch "${FILESDIR}"/${P}-maxcolors.patch #292130 epatch "${FILESDIR}"/${P}-fontconfig.patch #363367 epatch "${FILESDIR}"/${P}-libpng-pkg-config.patch # Avoid programs we never install local make_sed=( -e '/^noinst_PROGRAMS/s:noinst:check:' ) use png || make_sed+=( -e '/_PROGRAMS/s:(gdparttopng|gdtopng|gd2topng|pngtogd|pngtogd2|webpng)::g' ) use zlib || make_sed+=( -e '/_PROGRAMS/s:(gd2topng|gd2copypal|gd2togif|giftogd2|gdparttopng|pngtogd2)::g' ) sed -i -r "${make_sed[@]}" Makefile.am || die # bug 466996 sed -i 's/AM_PROG_CC_STDC/AC_PROG_CC/' configure.ac || die cat <<-EOF > acinclude.m4 m4_ifndef([AM_ICONV],[m4_define([AM_ICONV],[:])]) EOF eautoreconf } multilib_src_configure() { export ac_cv_lib_z_deflate=$(usex zlib) # we aren't actually {en,dis}abling X here ... the configure # script uses it just to add explicit -I/-L paths which we # don't care about on Gentoo systems. ECONF_SOURCE=${S} \ econf \ --without-x \ $(use_enable static-libs static) \ $(use_with fontconfig) \ $(use_with png) \ $(use_with truetype freetype) \ $(use_with jpeg) \ $(use_with xpm) } multilib_src_install_all() { dodoc INSTALL README* dohtml -r ./ prune_libtool_files }
