Add patch to link against libiconv when needed.

Package-Manager: portage-2.1_pre9-r3

5 files changed, 54 insertions, 19 deletions

diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog
index f584a083645a..4240eaeca392 100644
--- a/media-libs/gd/ChangeLog
+++ b/media-libs/gd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/gd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.30 2006/04/23 00:21:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.31 2006/04/23 20:48:09 flameeyes Exp $
+
+  23 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/gd-2.0.33-iconv.patch, gd-2.0.33.ebuild:
+  Add patch to link against libiconv when needed.
 
   23 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> gd-2.0.33.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index d621b4885f65..d02878bd31e9 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,31 +1,44 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8cfa1a9f23583d105918e1c040117385 ChangeLog 9804
-RMD160 453a518300238e279c11d1f6d61ef51b83fe4543 ChangeLog 9804
-SHA256 acab3ea3ab83c4dce99bb3f56e539ed0e88c9656ea6d471c8bbe24b53103e1a4 ChangeLog 9804
-MD5 ef1f623ab65a05b7e14e9bd61bb02c65 files/digest-gd-2.0.32 61
-RMD160 2a42d9afa64fcaa0a5ab1ead0a752c54359fcf80 files/digest-gd-2.0.32 61
-SHA256 d091404d0d1ed95f2963a7fd44d4cd674a2c2f913b3a65c88b5095e30a20205a files/digest-gd-2.0.32 61
-MD5 ba0985339b94b8c354d8e3246b8972e0 files/digest-gd-2.0.33 61
-RMD160 2eeb9906eb960100f3871b996a64239c0fa7b514 files/digest-gd-2.0.33 61
-SHA256 fece417b2a62a6615f53081f1087b367b241cddeb555068e7c8754f130985bb4 files/digest-gd-2.0.33 61
+AUX gd-2.0.33-iconv.patch 623 RMD160 30601cef7cb880dedcb47a71802ce886d5fab933 SHA1 b93734326bd6167c101d9cfe2ee465f6f3fbf177 SHA256 5553125acac575e83607f1c74f16427755aeb432b995631e64350a3bc09d215e size 623
+MD5 25cc34ad9a25becbc391081ffabd9e81 files/gd-2.0.33-iconv.patch 623
+RMD160 30601cef7cb880dedcb47a71802ce886d5fab933 files/gd-2.0.33-iconv.patch 623
+SHA256 5553125acac575e83607f1c74f16427755aeb432b995631e64350a3bc09d215e files/gd-2.0.33-iconv.patch 623
+AUX gd-2.0.33-overflow-checks.patch 1382 RMD160 56ff5499f52a7c0d1c922de26e2b50467593f9e3 SHA1 add6006a44bbbaae88fed70ca43c93b397447dff SHA256 a867b6b0087edf8937b82eefb496afe3461e87459af694356b91defe1c186672 size 1382
 MD5 e87c929b6ea7468d13cc8f2e176f6aaa files/gd-2.0.33-overflow-checks.patch 1382
 RMD160 56ff5499f52a7c0d1c922de26e2b50467593f9e3 files/gd-2.0.33-overflow-checks.patch 1382
 SHA256 a867b6b0087edf8937b82eefb496afe3461e87459af694356b91defe1c186672 files/gd-2.0.33-overflow-checks.patch 1382
+DIST gd-2.0.32.tar.gz 587498 size 587498
+DIST gd-2.0.33.tar.gz 587617 RMD160 6c573638387bb36044f3d4d480b10229445b9a6b SHA256 2ba10c830e24781ec2e0594c6e49353e512e8bda782bc9a1851e70a5e8ced93e size 587617
+EBUILD gd-2.0.32.ebuild 1036 RMD160 330890b981181c65689b88496b73b6d6c604a147 SHA1 076e755595a3c5fba11b6585f9f8ccfc1dc0a6bb SHA256 b646a90031cd551551be7091241076cf4eb84aa6118b8c93075c27c331593760 size 1036
 MD5 443d33c752b7b89f31fa94f2b443e42d gd-2.0.32.ebuild 1036
 RMD160 330890b981181c65689b88496b73b6d6c604a147 gd-2.0.32.ebuild 1036
 SHA256 b646a90031cd551551be7091241076cf4eb84aa6118b8c93075c27c331593760 gd-2.0.32.ebuild 1036
-MD5 9b9d960c1b1ef89ae0b6914731783480 gd-2.0.33.ebuild 1171
-RMD160 9f3f109c3cff20e64bcbd07c5218ce3e52cfa706 gd-2.0.33.ebuild 1171
-SHA256 48ac50e2ef937046622f2d20b81ea1208fbfcf239e95b6aa467a72991ab677cf gd-2.0.33.ebuild 1171
+EBUILD gd-2.0.33.ebuild 1233 RMD160 774c64339830d04786e1973531edfc545fe944ef SHA1 2e4c5ca638a195c2eeb26c12c94287b2a0bebfa2 SHA256 130655766cb3feb729ef18c586b9366a0298a35e55cccb5593d722f51ef99be2 size 1233
+MD5 b9340c5879acd9de706a3ca6829fa45b gd-2.0.33.ebuild 1233
+RMD160 774c64339830d04786e1973531edfc545fe944ef gd-2.0.33.ebuild 1233
+SHA256 130655766cb3feb729ef18c586b9366a0298a35e55cccb5593d722f51ef99be2 gd-2.0.33.ebuild 1233
+MISC ChangeLog 9958 RMD160 1b1f8e5ba24136bbc55f33af2b651d2861e9612d SHA1 1aad419152dbc28d5db74bd1198c47ea1005ee05 SHA256 7ecec0d51617528744c7788043395dd7011deba31903cc4a30fd81d1f3a12fd0 size 9958
+MD5 51772928ff42dffcdb75983571818ea1 ChangeLog 9958
+RMD160 1b1f8e5ba24136bbc55f33af2b651d2861e9612d ChangeLog 9958
+SHA256 7ecec0d51617528744c7788043395dd7011deba31903cc4a30fd81d1f3a12fd0 ChangeLog 9958
+MISC metadata.xml 1227 RMD160 6e641c5605e4bfe651447b43ce34d8d1b85ee799 SHA1 07f0589f3b1e086962490319d4c33058150812bd SHA256 a8d59e3487d6534644d91689778c9088469f0fe5b4099fd49f18cd33542dab18 size 1227
 MD5 312563b7288a2111976b24b0865d9df8 metadata.xml 1227
 RMD160 6e641c5605e4bfe651447b43ce34d8d1b85ee799 metadata.xml 1227
 SHA256 a8d59e3487d6534644d91689778c9088469f0fe5b4099fd49f18cd33542dab18 metadata.xml 1227
+MD5 ef1f623ab65a05b7e14e9bd61bb02c65 files/digest-gd-2.0.32 61
+RMD160 2a42d9afa64fcaa0a5ab1ead0a752c54359fcf80 files/digest-gd-2.0.32 61
+SHA256 d091404d0d1ed95f2963a7fd44d4cd674a2c2f913b3a65c88b5095e30a20205a files/digest-gd-2.0.32 61
+size 61 files/digest-gd-2.0.32 61
+MD5 67da75e5e7c5923af8614be9099e8375 files/digest-gd-2.0.33 229
+RMD160 cd00b4e261495452ab216b235b860d68db5b4b0a files/digest-gd-2.0.33 229
+SHA256 abf31211599ab7a783e655ccf46bf33dece52cdc0f55720a992f7853b4cb85aa files/digest-gd-2.0.33 229
+size 229 files/digest-gd-2.0.33 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFESsfBAiZjviIA2XgRAsv2AJ0Tk0pKfQj48tnGFgh8+w1cJxAyOQCgwjgp
-pMCHYWKQFOx9c5r1ykKtn00=
-=RqQ3
+iD8DBQFES+gQAiZjviIA2XgRAox2AKDfie+mpEsNerj0bIoxrAeYQeIemgCgno1m
+qtqSAqobZXBGGHZQbnHFzeU=
+=HWKv
 -----END PGP SIGNATURE-----
diff --git a/media-libs/gd/files/digest-gd-2.0.33 b/media-libs/gd/files/digest-gd-2.0.33
index 0fae85af693b..e16d48ca2999 100644
--- a/media-libs/gd/files/digest-gd-2.0.33
+++ b/media-libs/gd/files/digest-gd-2.0.33
@@ -1 +1,3 @@
 MD5 be0a6d326cd8567e736fbc75df0a5c45 gd-2.0.33.tar.gz 587617
+RMD160 6c573638387bb36044f3d4d480b10229445b9a6b gd-2.0.33.tar.gz 587617
+SHA256 2ba10c830e24781ec2e0594c6e49353e512e8bda782bc9a1851e70a5e8ced93e gd-2.0.33.tar.gz 587617
diff --git a/media-libs/gd/files/gd-2.0.33-iconv.patch b/media-libs/gd/files/gd-2.0.33-iconv.patch
new file mode 100644
index 000000000000..bd29c29b481b
--- /dev/null
+++ b/media-libs/gd/files/gd-2.0.33-iconv.patch
@@ -0,0 +1,12 @@
+Index: gd-2.0.33/Makefile.am
+===================================================================
+--- gd-2.0.33.orig/Makefile.am
++++ gd-2.0.33/Makefile.am
+@@ -20,6 +20,7 @@ lib_LTLIBRARIES = libgd.la
+ libgd_la_SOURCES = gd.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdkanji.c gdtables.c gdxpm.c jisx0208.h wbmp.c wbmp.h
+ 
+ libgd_la_LDFLAGS = -version-info 2:0:0
++libgd_la_LIBADD = $(LTLIBICONV)
+ 
+ LDADD = ./libgd.la
+ 
diff --git a/media-libs/gd/gd-2.0.33.ebuild b/media-libs/gd/gd-2.0.33.ebuild
index da2795026d78..e553bf7cea40 100644
--- a/media-libs/gd/gd-2.0.33.ebuild
+++ b/media-libs/gd/gd-2.0.33.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.33.ebuild,v 1.11 2006/04/23 00:21:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.33.ebuild,v 1.12 2006/04/23 20:48:09 flameeyes Exp $
 
-inherit eutils libtool
+inherit eutils libtool autotools
 
 DESCRIPTION="A graphics library for fast image creation"
 HOMEPAGE="http://www.boutell.com/gd/"
@@ -23,6 +23,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-overflow-checks.patch
+	epatch "${FILESDIR}/${P}-iconv.patch"
+
+	eautomake
+
 	elibtoolize #117078
 }