Remove automagic detection of jbig present on the system, #392675

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

4 files changed, 37 insertions, 8 deletions

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index 7dc2922c3454..4307bd9228c4 100644
--- a/dev-tcltk/tkimg/ChangeLog
+++ b/dev-tcltk/tkimg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/tkimg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.40 2011/11/20 11:08:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.41 2011/12/01 08:23:21 jlec Exp $
+
+  01 Dec 2011; Justin Lecher <jlec@gentoo.org> tkimg-1.4-r4.ebuild,
+  +files/tkimg-1.4-jbig.patch:
+  Remove automagic detection of jbig present on the system, #392675
 
 *tkimg-1.4-r4 (20 Nov 2011)
 
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 3b7a6edf4f3c..a58f33ed2b19 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX tkimg-1.4-jbig.patch 910 RMD160 26df09bb627c645b03301f75988f1738b9dfcbdd SHA1 0fe27edef929b9317e118a07d2d36101b472d20b SHA256 7ee39eb27556b3e990ff2514065a8a8c4b1e128aa1d7e2e61afb19d1e2384714
 AUX tkimg-1.4.20100510-boolean.patch 373 RMD160 ff69fb2a48110947f38e30a0fe01c8827628bef8 SHA1 e9b12c418d87e7933fa64f6b183ec8802a1c9b37 SHA256 b68d29f6396bda665c5b11996a9f4c3b8295059a876ed7499509c6460e06fb97
 AUX tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch 6257 RMD160 c326a3fb052747c1494805f922a75b8f9cab455a SHA1 51b7f03a5095bcc7bd1443b9b64b4daffe4dc528 SHA256 b8b6eb2b2fe94fcb18fda0dd8d690abe963fd4e1422488942e8e9f770cafe718
 AUX tkimg-1.5_pre324-unbundle.patch 9950 RMD160 ceda455ef2abc0417eab3b5cee9473937a071f9f SHA1 c894acae64e0f408b12cb6b92048b057c2e4413a SHA256 6a83f1490ab55635cdf9d48255ad7a2910914b908ca164645afa0ed02c90a1f3
@@ -8,13 +9,13 @@ DIST tkimg-1.4-gentoo+bundled-tiff.patch.xz 10960 RMD160 9ef4c328573de85cdd160b7
 DIST tkimg-1.4-gentoo.patch.xz 12132 RMD160 74af1404b50c971f7817fe1d9373acb7af79a0eb SHA1 9b379805e57b60a1f3828cbc52d3f0f476843665 SHA256 79dbf148134fb7862d51ab3a13c44476d41828dfce7c2b31d48510288b20e57b
 DIST tkimg1.4.tar.bz2 4912894 RMD160 a05adf3e911ce7ab9304bddd89cf53c55c27b8fc SHA1 aa519474e3eb9640977a0ea7c61da6ba5129220b SHA256 a6beb98a8f98040f979eee60c133319f4338f1a5a3ab87379fb69b473e73e3b1
 EBUILD tkimg-1.4-r3.ebuild 1669 RMD160 1d271e250579cd8f6cd36aee1830bf2168d1c3ea SHA1 35339d5cb7c21c1e48ec2a1d3495840034d21fe6 SHA256 14c45b8c890059d145b8ba6fb7c48a9ab18a1fc1bd06d42f73a670338995f26b
-EBUILD tkimg-1.4-r4.ebuild 1685 RMD160 83e69e2f06bf097e3b9331fdaf2f4c048751fd14 SHA1 81d842c82b9acd5cfa53db875c103c652d9e9cf3 SHA256 5aef98974bf06ed52900cacc4267e0f937fc92d6c81f153ba985e3012bf55499
-MISC ChangeLog 7242 RMD160 39c0b4c72bc3cf3bd9edf3a5f61604d64464e44e SHA1 e46ddf97f7804bc1fecaa10362afaad9b8fd4801 SHA256 c27b6624fbc26639a1bfce232c844f456983b2a4136e8b1287e703d948404e8a
+EBUILD tkimg-1.4-r4.ebuild 1723 RMD160 1f7432898f745b7e713ae9baf183aa86e486c3c0 SHA1 0db4ac94e7eaad77dfa1116fe66b94ac0473aaab SHA256 8ecc2eeeb8e94c0a8fd3e92e69a579cf934b1561b53f1108c9756a0dd84ba7de
+MISC ChangeLog 7410 RMD160 1d3546add945fc5e534c20db9bfaa0874160635b SHA1 c83d6499957258ce58b0e79922cc1024caa67b4f SHA256 0d6628ec33d774d70b986f359c90599195162e87991eed858986140182172754
 MISC metadata.xml 266 RMD160 d7c5f086c7291a9ac127633d31c5f78b0dbf6297 SHA1 88e958c8725427b9ce9156c4457703914a19992c SHA256 fe07b2bee63764c9cb9e3aaeac927f511dd11d3ff45e40021def110ac46cebbe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk7I368ACgkQgAnW8HDreRZINwCfdVNC6jCREsFzhIYMEHtuB+aS
-WucAoLk+Xr/MpeV7hFheTY9WsyMd1Nug
-=PD0I
+iEYEAREKAAYFAk7XOX4ACgkQgAnW8HDreRaQZgCguNtFZ0m6xcNceeXWgs0VaHDZ
+NOcAn1RULgMy3o9TrI5tMB9lajwJ6sqV
+=fQ0Z
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-jbig.patch b/dev-tcltk/tkimg/files/tkimg-1.4-jbig.patch
new file mode 100644
index 000000000000..4f7ebc42e0f6
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4-jbig.patch
@@ -0,0 +1,22 @@
+--- tkimg1.4/libtiff/configure.in	2010-07-06 15:48:46.000000000 +0200
++++ tkimg1.4/libtiff/configure.in	2011-02-28 23:24:18.471259943 +0100
+@@ -67,7 +67,7 @@
+ else
+     TIFFHOST="$host"
+ fi
+-${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg \
++${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg --disable-jbig \
+ 	"--with-CC=$TIFFCC" $TIFFHOST
+ mv -f tifftcl_confdefs.h confdefs.h
+ 
+--- tkimg1.4/libtiff/configure	2010-07-07 10:09:46.000000000 +0200
++++ tkimg1.4/libtiff/configure	2011-02-28 23:25:53.529824614 +0100
+@@ -5133,7 +5133,7 @@
+ else
+     TIFFHOST="$host"
+ fi
+-${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg \
++${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg --disable-jbig \
+ 	"--with-CC=$TIFFCC" $TIFFHOST
+ mv -f tifftcl_confdefs.h confdefs.h
+ 
diff --git a/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild
index 3b3deda1bd08..3ef4ad0f8366 100644
--- a/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild,v 1.1 2011/11/20 11:08:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild,v 1.2 2011/12/01 08:23:21 jlec Exp $
 
 EAPI=3
 
@@ -40,7 +40,9 @@ RESTRICT="test"
 S="${WORKDIR}/${MYP}"
 
 src_prepare() {
-	epatch "${WORKDIR}"/${P}-gentoo+bundled-tiff.patch
+	epatch \
+		"${WORKDIR}"/${P}-gentoo+bundled-tiff.patch \
+		"${FILESDIR}"/${P}-jbig.patch
 	find compat/{libjpeg,libpng,zlib} -delete
 	sed \
 		-e 's:-O2 -fomit-frame-pointer::g' \