fix bug #98547 and fix autoreconf mess (ok'd by genstef)

Package-Manager: portage-2.0.52-r1

diff --git a/media-libs/lcms/ChangeLog b/media-libs/lcms/ChangeLog
index 0cb1a11f6f9b57dfbfb107e993766fac5138723d..d5f10d927b433b14ca65e3a7935b908ca096e0d8 100644 (file)
--- a/media-libs/lcms/ChangeLog
+++ b/media-libs/lcms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/lcms
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.48 2005/09/19 06:49:07 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.49 2005/09/24 07:16:43 cardoe Exp $
+
+  24 Sep 2005; Doug Goldstein <cardoe@gentoo.org> +files/lcms.i.diff,
+  lcms-1.14-r1.ebuild:
+  fix bug #98547 and fix autoreconf mess (ok'd by genstef)
 
   19 Sep 2005; Hardave Riar <hardave@gentoo.org> lcms-1.13-r1.ebuild:
   Stable on mips.

diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 814b3ac7b25dc4d6514977ffb6d274350b856f5c..6e467c113252082a62ffdd7773a1cdaa1b1905f0 100644 (file)
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,12 +1,16 @@
-MD5 cdcd934b408106c1325d12897e4ab9e6 ChangeLog 5580
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2ebbfb79290c6081234bc72e11835650 ChangeLog 5732
 MD5 883c9f2b497345fa9c7db0be4f4e78f9 lcms-1.11.ebuild 1113
 MD5 97b2a833f29201681b248eb812f31ea1 lcms-1.12.ebuild 1258
 MD5 334576ae10469f0941aee1d79f48698e lcms-1.13-r1.ebuild 1481
 MD5 c3af94167dca87a3792df4163f76c48d lcms-1.13.ebuild 1428
-MD5 08ed4eb4d1dead0553671533df72cd1f lcms-1.14.ebuild 1487
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+MD5 08ed4eb4d1dead0553671533df72cd1f lcms-1.14.ebuild 1487
 MD5 c8fe1707edc14aaa84c791a5f3617c05 lcms-1.13-r2.ebuild 1454
-MD5 5fcc74ad0310e45dda94322b7cd6e9d4 lcms-1.14-r1.ebuild 1427
+MD5 6dfff5108c02632be3b0eecf77135a5d lcms-1.14-r1.ebuild 1389
+MD5 e51934aa8d241036ecdb6d934b73c468 files/lcms.i.diff 803
 MD5 ec46b226970ad1597b5be73ec187ef6e files/digest-lcms-1.11 61
 MD5 a2d2635e95a30adc03a018d80e7697cf files/digest-lcms-1.12 61
 MD5 58a0f36993082241e2b970733b79087b files/digest-lcms-1.13 61
@@ -14,3 +18,10 @@ MD5 58a0f36993082241e2b970733b79087b files/digest-lcms-1.13-r1 61
 MD5 dfa4e4db5d24a8b527601a744a683197 files/digest-lcms-1.14 61
 MD5 58a0f36993082241e2b970733b79087b files/digest-lcms-1.13-r2 61
 MD5 dfa4e4db5d24a8b527601a744a683197 files/digest-lcms-1.14-r1 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDNP2BBtvusYtCZMsRAj7lAJwN5UfFkb1+l7uORr5wxekMNNpEzwCfT6xm
+hxNgHBFKLqReh6BAEZoMSE0=
+=7wcV
+-----END PGP SIGNATURE-----

diff --git a/media-libs/lcms/files/lcms.i.diff b/media-libs/lcms/files/lcms.i.diff
new file mode 100644 (file)
index 0000000..f5968cf
--- /dev/null
+++ b/media-libs/lcms/files/lcms.i.diff
@@ -0,0 +1,15 @@
+--- lcms-1.14/python/lcms.i.old        2005-07-10 11:12:20.000000000 +0000
++++ lcms-1.14/python/lcms.i    2005-07-10 11:12:37.000000000 +0000
+@@ -109,9 +109,9 @@
+       return NULL;\r
+     }\r
+       \r
+-      if ((SWIG_ConvertPtr(tmp[0], (void **) &gamma[0], SWIGTYPE_LPGAMMATABLE,1)) == -1) return NULL;\r
+-      if ((SWIG_ConvertPtr(tmp[1], (void **) &gamma[1], SWIGTYPE_LPGAMMATABLE,1)) == -1) return NULL;\r
+-      if ((SWIG_ConvertPtr(tmp[2], (void **) &gamma[2], SWIGTYPE_LPGAMMATABLE,1)) == -1) return NULL;\r
++      if ((SWIG_ConvertPtr(tmp[0], (void **) &gamma[0], SWIGTYPE_p_GAMMATABLE,1)) == -1) return NULL;\r
++      if ((SWIG_ConvertPtr(tmp[1], (void **) &gamma[1], SWIGTYPE_p_GAMMATABLE,1)) == -1) return NULL;\r
++      if ((SWIG_ConvertPtr(tmp[2], (void **) &gamma[2], SWIGTYPE_p_GAMMATABLE,1)) == -1) return NULL;\r
+ \r
+     $1 = gamma;\r
+ \r

diff --git a/media-libs/lcms/lcms-1.14-r1.ebuild b/media-libs/lcms/lcms-1.14-r1.ebuild
index e803a040c3cec7b276c9a349ef72f54f165ce571..a567983480d96ce5b83e50328e41ad586a4d325d 100644 (file)
--- a/media-libs/lcms/lcms-1.14-r1.ebuild
+++ b/media-libs/lcms/lcms-1.14-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.14-r1.ebuild,v 1.2 2005/09/05 11:43:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.14-r1.ebuild,v 1.3 2005/09/24 07:16:43 cardoe Exp $
 
-inherit libtool gnuconfig
+inherit libtool gnuconfig autotools
 
 DESCRIPTION="A lightweight, speed optimized color management engine"
 HOMEPAGE="http://www.littlecms.com/"
@@ -26,14 +26,13 @@ src_unpack() {
        # an updated config.sub for the uclibc env
        gnuconfig_update || die
 
-       # fix build on amd64
        cd ${S}
-       einfo "Running autoreconf..."
-       use ppc-macos || {
-               libtoolize --copy --force
-               aclocal || die "aclocal failed"
-               autoreconf || die "autoreconf failed"
-       }
+
+       # fixes bug #98547
+       epatch ${FILESDIR}/lcms.i.diff
+
+       # fix build on amd64
+       use ppc-macos || eautoreconf || die "autoreconf failed"
 
        elibtoolize
 }