Split out USE=zlib logic from USE=png, and add fix from upstream for fontconfig #363367 by genbug.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

3 files changed, 88 insertions, 1 deletions

diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog
index a17dca3e6542..03e58de21f50 100644
--- a/media-libs/gd/ChangeLog
+++ b/media-libs/gd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/gd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.66 2011/04/11 14:21:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.67 2011/04/13 06:32:59 vapier Exp $
+
+*gd-2.0.35-r3 (13 Apr 2011)
+
+  13 Apr 2011; Mike Frysinger <vapier@gentoo.org> +gd-2.0.35-r3.ebuild,
+  +files/gd-2.0.35-fontconfig.patch:
+  Split out USE=zlib logic from USE=png, and add fix from upstream for
+  fontconfig #363367 by genbug.
 
   11 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> gd-2.0.35-r2.ebuild:
   Remove libtool and static archive if USE="static-libs" is not set wrt #362959
diff --git a/media-libs/gd/files/gd-2.0.35-fontconfig.patch b/media-libs/gd/files/gd-2.0.35-fontconfig.patch
new file mode 100644
index 000000000000..ca313024870e
--- /dev/null
+++ b/media-libs/gd/files/gd-2.0.35-fontconfig.patch
@@ -0,0 +1,25 @@
+fix from upstream
+
+http://bugs.gentoo.org/363367
+
+# HG changeset patch
+# User tabe
+# Date 1239812355 0
+# Node ID 3ea283efcdafcb2acc1dd0ace1d3d48da6d8cec8
+# Parent  4f29a877875f63cee5a64e7bea406a61882a565e
+fixed FS#199
+
+199, Fixed useFontConfig() to work as documented (Ethan Merritt)
+ 
+diff -r 4f29a877875f -r 3ea283efcdaf src/gdft.c
+--- a/src/gdft.c	Sat Apr 04 12:00:37 2009 +0000
++++ b/src/gdft.c	Wed Apr 15 16:19:15 2009 +0000
+@@ -1688,7 +1688,7 @@
+ BGD_DECLARE(int) gdFTUseFontConfig(int flag)
+ {
+ #ifdef HAVE_LIBFONTCONFIG
+-	fontConfigFlag = 1;
++	fontConfigFlag = flag;
+ 	return 1;
+ #else
+ 	return 0;
diff --git a/media-libs/gd/gd-2.0.35-r3.ebuild b/media-libs/gd/gd-2.0.35-r3.ebuild
new file mode 100644
index 000000000000..370c5d7ca1ce
--- /dev/null
+++ b/media-libs/gd/gd-2.0.35-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2011 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-r3.ebuild,v 1.1 2011/04/13 06:32:59 vapier Exp $
+
+EAPI="2"
+
+inherit autotools eutils
+
+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="|| ( as-is BSD )"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="fontconfig jpeg png static-libs truetype xpm zlib"
+
+RDEPEND="fontconfig? ( media-libs/fontconfig )
+	jpeg? ( virtual/jpeg )
+	png? ( >=media-libs/libpng-1.4 )
+	truetype? ( >=media-libs/freetype-2.1.5 )
+	xpm? ( x11-libs/libXpm x11-libs/libXt )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng14.patch #305101
+	epatch "${FILESDIR}"/${P}-maxcolors.patch #292130
+	epatch "${FILESDIR}"/${P}-fontconfig.patch #363367
+
+	# Try libpng14 first, then fallback to plain libpng
+	sed -i -e 's:png12:png14:' configure.ac || die
+
+	eautoconf
+	find . -type f -print0 | xargs -0 touch -r configure
+}
+
+usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }
+src_configure() {
+	export ac_cv_lib_z_deflate=$(usex zlib)
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with fontconfig) \
+		$(use_with png) \
+		$(use_with truetype freetype) \
+		$(use_with jpeg) \
+		$(use_with xpm)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc INSTALL README*
+	dohtml -r ./
+	use static-libs || rm -f "${D}"/usr/*/libgd.la
+}