readd jbig USE-flag, by Fabian Groffen <grobian@gentoo.org> in bug #235131

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc2 i686

4 files changed, 58 insertions, 9 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index aa2998d0d08a..1a0c6b12fa88 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.298 2008/08/19 22:30:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.299 2008/08/20 21:57:08 maekke Exp $
+
+  20 Aug 2008; Markus Meier <maekke@gentoo.org>
+  +files/imagemagick-6.4.2.9-jbig.patch, imagemagick-6.4.2.9.ebuild:
+  readd jbig USE-flag, by Fabian Groffen <grobian@gentoo.org> in bug #235131
 
   19 Aug 2008; Markus Meier <maekke@gentoo.org> imagemagick-6.4.2.9.ebuild:
   do not die if sys-devel/gcc has no openmp USE-flag, just disable it. bug
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 4b4d32f19f4f..14339c1b9a09 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -9,6 +9,7 @@ AUX imagemagick-6.3.3-docs.patch 605 RMD160 5efee8976d9bab8308fdb7d167ab85f5e924
 AUX imagemagick-6.3.7.9-doc.patch 660 RMD160 cdd9e744d4708a2254c3949ee9fed20845c93b91 SHA1 0b42f37ac3ba822908056563d3bb35e0c0429906 SHA256 fbd73289353c0dca7a621b85664c84aa14fb9a758f59f669731f9cb412207e8f
 AUX imagemagick-6.3.8.3-hpgl.patch 1852 RMD160 b6a2b0d1ceacf58a41723e95683aaaee3c050df5 SHA1 05c916506e750811ed76a31542563ac00e3c66f2 SHA256 44321e3a899345d21144e6b4715aba024daf3ccffa96187465eccf74886b6711
 AUX imagemagick-6.3.9.8-hpgl.patch 1852 RMD160 fae8922c63f1c31786c6bbe629e80e399983c644 SHA1 5bfc687e4fc3d6c1621df9d3e292b687b21524df SHA256 18c4ccca1da491e5c496e489065c774287171ed1ee9c531610a1d770acd5543e
+AUX imagemagick-6.4.2.9-jbig.patch 877 RMD160 e7d9c5867d7ef07a1dd3811bcec873fbe2d078fb SHA1 88134e437698f4fbc21514381eb86e2bf8a14477 SHA256 bc3e8888f7418d2ad5b00f861a610eff62ed76b3b11009f4f5315b7666e1e11b
 AUX imagemagick-perl.patch 1864 RMD160 da9d7b2f4f61630f551707ecaffe3c4362c575a0 SHA1 cb52a2281f2fa2930fe948e91619f5a012e2f8a0 SHA256 282b83f713de099eb45af947e6d9eded5f51a51d285ceb5486744c93132e23ad
 DIST ImageMagick-6.3.3-8.tar.bz2 5633820 RMD160 fe9ad987909ae1364257de54463ff1f06240f8c8 SHA1 3a8593f0b5e5458647b3bc954e477eb925672f67 SHA256 e2b557f971fa5875647ad4c848025a095eb5784a4296d884ff162212eab8db4e
 DIST ImageMagick-6.3.4-4.tar.bz2 5796376 RMD160 519126459cd80e4c07f23aa21147d579fa4b7789 SHA1 117fd8552961149992c78c045d7de191f7692bb8 SHA256 bcaac2d9d416c055642b4f92b2c8057e5fed4f8d70703e423ad19b3662b096c3
@@ -23,13 +24,13 @@ EBUILD imagemagick-6.3.5.10.ebuild 3049 RMD160 96173689b9fbe5113923e455bb5f49d82
 EBUILD imagemagick-6.3.8.3-r1.ebuild 3941 RMD160 39c44253826f6e1ba33be5d9770360fb88199e1e SHA1 1cca98a78ad875454005d6e6c5c391bed6e7cd00 SHA256 4f63862b953a7735edcf7275bcb7f6edb8d79ec6f482d00f26dbc70c2034627a
 EBUILD imagemagick-6.4.0.6.ebuild 3919 RMD160 6a493d4c07357433a518c78fbd853130a9d34b9d SHA1 d96f777bf2ab411ce001400163dde0fa06aa48ae SHA256 7e8c86b602c5db0cf3b5e041ef87299562c3e7d3460b67291e262338d7dee521
 EBUILD imagemagick-6.4.2.0.ebuild 4012 RMD160 d3ece0e1fc711f2db697a92404f43a9569271a10 SHA1 eeac6d941851735528d8e4d264e6b188357ccf92 SHA256 ebb34fb5553ebe0c0b430c159f1506d7e26f02fae0a645e249453fce58bf478d
-EBUILD imagemagick-6.4.2.9.ebuild 4391 RMD160 7f88f58cb009ccadacc281f3df15512323c6559d SHA1 70de4478f9bdc342ab67d968a4fe4ea1efce7d34 SHA256 17f270396a8989a923d5ad9196aa3ff2bd51791116374d5e123c9bba253dca17
-MISC ChangeLog 44673 RMD160 93d3dc587af6ea715b9b9aaf9665c76ea38171d8 SHA1 f7a6d1b3051103573e5b9f65fb3dd536dfc12f54 SHA256 474bfdab05b2bbcd1c5f952232632dcd98a3994bc2e1ea0242c2c7de017e3878
+EBUILD imagemagick-6.4.2.9.ebuild 4519 RMD160 7312fbe9796e28c9da305d5652e4ee13073fe01a SHA1 4f8fac5a9e190695eeb02d3ded9a1813d5da9309 SHA256 4e366aded5f8f56d0e8d144d1efe2ec1d8f47deb81d0ae13becabb622c604fed
+MISC ChangeLog 44868 RMD160 759d7687edc22b20a31ccb1c08ae8c3be67c63b6 SHA1 dfc7e510e2420ace3095a6ddd936f38533e09874 SHA256 3e9feeb38510c99da9f0da779b79d9338de42185bb5e1b3f6afb9a33fc9299f6
 MISC metadata.xml 660 RMD160 2627f5184f9f6c97783a9fa561cb82a6c5d52c3c SHA1 7e1487825756530fc7294e9e93cd297de66e1add SHA256 cd412dbd3f7b776a4d587099c805836a60ab430be941282064551e2810a7dc48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkirSgUACgkQkKaRLQcq0GJ9mACgrF9O43Z9X865GcXjxrtMCciF
-bp4AoIS3m29+uYoH6TuLu39Ck6gHlTXH
-=RsTc
+iEYEARECAAYFAkisk4oACgkQkKaRLQcq0GIEHQCfUbYD2DDDrgtFBJzIbNAzV982
+Oo0AnRmSIcS1gVszdwgWaAiWmQ+NAvoh
+=pzip
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/files/imagemagick-6.4.2.9-jbig.patch b/media-gfx/imagemagick/files/imagemagick-6.4.2.9-jbig.patch
new file mode 100644
index 000000000000..2b30c79629b6
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-6.4.2.9-jbig.patch
@@ -0,0 +1,39 @@
+--- configure.ac.orig	2008-08-20 08:04:11 +0200
++++ configure.ac	2008-08-20 08:05:08 +0200
+@@ -1795,6 +1795,11 @@
+ #
+ # Check for JBIG delegate library.
+ #
++AC_ARG_WITH([jbig],
++    [AC_HELP_STRING([--without-jbig],
++                    [disable JBIG support])],
++    [with_jbig=$withval],
++    [with_jbig='yes'])
+ have_jbig='no'
+ JBIG_LIBS=''
+ if test "$with_jbig" != 'no'; then
+--- configure.orig	2008-08-20 08:12:56 +0200
++++ configure	2008-08-20 08:15:05 +0200
+@@ -1261,6 +1261,7 @@
+ with_fontpath
+ with_gs_font_dir
+ with_gvc
++with_jbig
+ with_jpeg
+ with_jp2
+ with_lcms
+@@ -37245,6 +37246,14 @@
+ 
+ 
+ 
++if test "${with_jbig+set}" = set; then
++  withval=$with_jbig; with_jbig=$withval
++else
++  with_jbig='yes'
++fi
++if test "$with_jbig" != 'yes'; then
++    DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-jbig=$with_jbig "
++fi
+ 
+ #
+ # Check for JBIG delegate library.
diff --git a/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild b/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild
index 4b06af6e39c1..56eee2147f29 100644
--- a/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild,v 1.4 2008/08/19 22:30:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.2.9.ebuild,v 1.5 2008/08/20 21:57:08 maekke Exp $
 
-inherit eutils multilib perl-app toolchain-funcs
+inherit eutils multilib perl-app toolchain-funcs autotools
 
 MY_PN=ImageMagick
 MY_P=${MY_PN}-${PV%.*}
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2"
 LICENSE="imagemagick"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 djvu doc fontconfig fpx graphviz gs hdri jpeg jpeg2k lcms nocxx
+IUSE="bzip2 djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms nocxx
 	openexr openmp perl png q8 q32 svg tiff truetype X wmf xml zlib"
 
 RDEPEND="bzip2? ( app-arch/bzip2 )
@@ -24,6 +24,7 @@ RDEPEND="bzip2? ( app-arch/bzip2 )
 	fpx? ( media-libs/libfpx )
 	graphviz? ( >=media-gfx/graphviz-2.6 )
 	gs? ( virtual/ghostscript )
+	jbig? ( media-libs/jbigkit )
 	jpeg? ( >=media-libs/jpeg-6b )
 	jpeg2k? ( media-libs/jasper )
 	lcms? ( >=media-libs/lcms-1.06 )
@@ -73,6 +74,9 @@ src_unpack() {
 		's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \
 		"${S}"/configure || die
 
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-jbig.patch
+	eautoreconf
 }
 
 src_compile() {
@@ -124,6 +128,7 @@ src_compile() {
 		$(use_with gs dps) \
 		$(use_with gs gslib) \
 		$(use_with graphviz gvc) \
+		$(use_with jbig) \
 		$(use_with jpeg jpeg) \
 		$(use_with jpeg2k jp2) \
 		$(use_with lcms) \