Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/gd: gd-2.0.35-r4.ebuild ChangeLog
Date: Wed, 21 May 2014 18:39:31
Message-Id: 20140521183927.91B682004C@flycatcher.gentoo.org
1 mgorny 14/05/21 18:39:27
2
3 Modified: ChangeLog
4 Added: gd-2.0.35-r4.ebuild
5 Log:
6 Enable multilib support, as a dependency of libgphoto2.
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
9
10 Revision Changes Path
11 1.89 media-libs/gd/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/ChangeLog?rev=1.89&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/ChangeLog?rev=1.89&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/ChangeLog?r1=1.88&r2=1.89
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v
20 retrieving revision 1.88
21 retrieving revision 1.89
22 diff -u -r1.88 -r1.89
23 --- ChangeLog 27 Aug 2013 15:48:38 -0000 1.88
24 +++ ChangeLog 21 May 2014 18:39:27 -0000 1.89
25 @@ -1,6 +1,11 @@
26 # ChangeLog for media-libs/gd
27 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.88 2013/08/27 15:48:38 kensington Exp $
29 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.89 2014/05/21 18:39:27 mgorny Exp $
31 +
32 +*gd-2.0.35-r4 (21 May 2014)
33 +
34 + 21 May 2014; Michał Górny <mgorny@g.o> +gd-2.0.35-r4.ebuild:
35 + Enable multilib support, as a dependency of libgphoto2.
36
37 27 Aug 2013; Michael Palimaka <kensington@g.o> gd-2.0.35-r3.ebuild:
38 Pin virtual/jpeg SLOT to 0.
39
40
41
42 1.1 media-libs/gd/gd-2.0.35-r4.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/gd-2.0.35-r4.ebuild?rev=1.1&view=markup
45 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
46
47 Index: gd-2.0.35-r4.ebuild
48 ===================================================================
49 # Copyright 1999-2014 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $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 $
52
53 EAPI="5"
54
55 inherit autotools eutils multilib-minimal
56
57 DESCRIPTION="A graphics library for fast image creation"
58 HOMEPAGE="http://libgd.org/ http://www.boutell.com/gd/"
59 SRC_URI="http://libgd.org/releases/${P}.tar.bz2"
60
61 LICENSE="gd IJG HPND BSD"
62 SLOT="2"
63 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
64 IUSE="fontconfig jpeg png static-libs truetype xpm zlib"
65
66 RDEPEND="fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
67 jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
68 png? ( >=media-libs/libpng-1.2:0[${MULTILIB_USEDEP}] )
69 truetype? ( >=media-libs/freetype-2.1.5[${MULTILIB_USEDEP}] )
70 xpm? ( x11-libs/libXpm[${MULTILIB_USEDEP}] x11-libs/libXt[${MULTILIB_USEDEP}] )
71 zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
72 DEPEND="${RDEPEND}
73 virtual/pkgconfig[${MULTILIB_USEDEP}]"
74
75 MULTILIB_CHOST_TOOLS=(
76 /usr/bin/gdlib-config
77 )
78
79 src_prepare() {
80 epatch "${FILESDIR}"/${P}-libpng14.patch #305101
81 epatch "${FILESDIR}"/${P}-maxcolors.patch #292130
82 epatch "${FILESDIR}"/${P}-fontconfig.patch #363367
83 epatch "${FILESDIR}"/${P}-libpng-pkg-config.patch
84
85 # Avoid programs we never install
86 local make_sed=( -e '/^noinst_PROGRAMS/s:noinst:check:' )
87 use png || make_sed+=( -e '/_PROGRAMS/s:(gdparttopng|gdtopng|gd2topng|pngtogd|pngtogd2|webpng)::g' )
88 use zlib || make_sed+=( -e '/_PROGRAMS/s:(gd2topng|gd2copypal|gd2togif|giftogd2|gdparttopng|pngtogd2)::g' )
89 sed -i -r "${make_sed[@]}" Makefile.am || die
90
91 # bug 466996
92 sed -i 's/AM_PROG_CC_STDC/AC_PROG_CC/' configure.ac || die
93
94 cat <<-EOF > acinclude.m4
95 m4_ifndef([AM_ICONV],[m4_define([AM_ICONV],[:])])
96 EOF
97
98 eautoreconf
99 }
100
101 multilib_src_configure() {
102 export ac_cv_lib_z_deflate=$(usex zlib)
103 # we aren't actually {en,dis}abling X here ... the configure
104 # script uses it just to add explicit -I/-L paths which we
105 # don't care about on Gentoo systems.
106 ECONF_SOURCE=${S} \
107 econf \
108 --without-x \
109 $(use_enable static-libs static) \
110 $(use_with fontconfig) \
111 $(use_with png) \
112 $(use_with truetype freetype) \
113 $(use_with jpeg) \
114 $(use_with xpm)
115 }
116
117 multilib_src_install_all() {
118 dodoc INSTALL README*
119 dohtml -r ./
120 prune_libtool_files
121 }