Fix libpng14 detection wrt #305111 by Lars Wendler.

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index 26a47ecab67f9a49b76ee41ebfee99d1d7e7191a..81591899d23c62ccc040b0e6b472ef61f531d456 100644 (file)
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/ghostscript-gpl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.82 2010/03/07 17:08:03 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.83 2010/03/08 10:25:36 ssuominen Exp $
+
+  08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  ghostscript-gpl-8.71-r1.ebuild:
+  Fix libpng14 detection wrt #305111 by Lars Wendler.
 
 *ghostscript-gpl-8.71-r1 (07 Mar 2010)
 

diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index d31983baeb23800d35278bad3e32d025ea7ed9bc..0bd260bfba9928f2e7a8ec407b4a524934595fcc 100644 (file)
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -10,6 +10,6 @@ DIST gsdjvu-1.3.tar.gz 204330 RMD160 a6d2326ba9098e801000b957ab5508e998e17be8 SH
 DIST gsdjvu-1.4.tar.gz 208611 RMD160 ecbb2fded61a29c4f49f852f99d106a0ba0eb48d SHA1 2650c85481de3aef66a4f7970d14a7dd36a1bc96 SHA256 7b5992f5203d662a7e03ce57d4a1b7a97990b0d3e09eb46ef1b4cb66d8d8c57d
 EBUILD ghostscript-gpl-8.64-r3.ebuild 5567 RMD160 b60c7d8aacf28be202909a97578975e817962bed SHA1 d20fbb12defe85fafbf4bb22ae11ceb4ae21ddf1 SHA256 0f1e85db127407d2d7f223c268419b4c1404f4f2dc57afb3c0054326b2dd0e01
 EBUILD ghostscript-gpl-8.70-r1.ebuild 5457 RMD160 88076a489ae14790beca13ee3828dc9b4912330e SHA1 61c7b01dcf96b530f08b7ab556e9de1db05c09d7 SHA256 30c961d0aa04bf87d66e511bdbb274018d5a7b0cb40ea7b67e17d9c11e161992
-EBUILD ghostscript-gpl-8.71-r1.ebuild 5711 RMD160 c76417fd73280b1a2c39efdb66ca7fe8184e7cdf SHA1 50678f77c66515fcbf7e8b4d5a425d95697d625a SHA256 d4b91f1a633e0cec68f704077b96e6917d7126dfd447b73850b7deb8f2f160ff
-MISC ChangeLog 16124 RMD160 c9167f45736caf049c769535da57b290b1e18724 SHA1 de538d7d49a294dba7c2a8a4dc77f43723bef128 SHA256 89eefd1d7cfb776798b4f4ac0b1f8a8385ebb7360c79ba5197f1e73593217484
+EBUILD ghostscript-gpl-8.71-r1.ebuild 5976 RMD160 69bd73466248f5ed39018de30fb6b0f14d7b76f2 SHA1 cf94d75b8c08a87aa8d8d253756530a0770e8b15 SHA256 4f24c66b0355d032b84fecb5b7532ebc4208bd411c684c43937e99b948c6c6f5
+MISC ChangeLog 16271 RMD160 763a093308646eae959cb3778874e05aa91c551a SHA1 552f9f41d6d6684cc94aa316f42f51d18e254662 SHA256 84d49297c832823299dc3186a09ec6266e814c72d1b76dec9e25f2a0b1329073
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76

diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r1.ebuild
index 9107d6e7efa8444b6dcec1e149681805796934b4..55a630c448f42b829281bcaf5d8a80c3e875db0b 100644 (file)
--- a/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r1.ebuild,v 1.1 2010/03/07 17:08:03 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r1.ebuild,v 1.2 2010/03/08 10:25:36 ssuominen Exp $
 
 inherit autotools eutils versionator flag-o-matic
 
@@ -114,9 +114,19 @@ src_unpack() {
                -e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
                base/Makefile.in base/*.mak || die "sed failed"
 
+       # http://repos.archlinux.org/wsvn/packages/ghostscript/trunk/libpng14.patch
+       if has_version ">=media-libs/libpng-1.4"; then
+               sed -i \
+                       -e 's:png_check_sig:png_sig_cmp:' \
+                       "${S}"/{,base,jbig2dec}/configure.ac || die
+       fi
+
        cd "${S}"
        eautoreconf
 
+       cd "${S}/jbig2dec"
+       eautoreconf
+
        cd "${S}/ijs"
        eautoreconf
 }