Fix compiling with USE='-jpeg'. without-jpeg didn't really remove the depend.

Package-Manager: portage-2.1.2_pre2-r1

4 files changed, 37 insertions, 14 deletions

diff --git a/media-libs/libmng/ChangeLog b/media-libs/libmng/ChangeLog
index a1961d42e958..9f02a84ed146 100644
--- a/media-libs/libmng/ChangeLog
+++ b/media-libs/libmng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmng
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/ChangeLog,v 1.36 2006/04/14 11:33:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/ChangeLog,v 1.37 2006/10/04 01:25:13 cardoe Exp $
+
+  04 Oct 2006; Doug Goldstein <cardoe@gentoo.org>
+  +files/libmng-1.0.9-jpeg-compile.patch, libmng-1.0.9.ebuild:
+  Fix compiling with USE='-jpeg'. without-jpeg didn't really remove the depend.
 
   14 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> libmng-1.0.9.ebuild:
   Don't provide zlib useflag as it's an hard-dependency, bug #129928.
diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index d14dacbca99a..32d5bf86e9c3 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libmng-1.0.9-jpeg-compile.patch 483 RMD160 32139b8c39f6e09be33ddf83836effb366539fe3 SHA1 860f663ec35ff7c5c75e4530dc36027eefc562ae SHA256 5f4246f771e560c71325432a302f0658898e442d5b2b6704affce767295f3565
+MD5 664074344ec648b8b855b83485cb9d2c files/libmng-1.0.9-jpeg-compile.patch 483
+RMD160 32139b8c39f6e09be33ddf83836effb366539fe3 files/libmng-1.0.9-jpeg-compile.patch 483
+SHA256 5f4246f771e560c71325432a302f0658898e442d5b2b6704affce767295f3565 files/libmng-1.0.9-jpeg-compile.patch 483
 DIST libmng-1.0.8.tar.gz 509823 RMD160 55b0e310f690ac341cdf90035d17e81787ba0ed6 SHA1 4d9f4d309922d87770cc0806cb08dbfbae72bf34 SHA256 321c2dc105dfbe61ddde859040c79dec65e4daef8fb44167484d1ce99119c14c
 DIST libmng-1.0.9.tar.gz 554848 RMD160 b81c69e20d4d3cc313115de84af6ad8e07292160 SHA1 d32e939ec95caff7839c6c9a5896e4d575c77d35 SHA256 395a261be1ce90f54e1d76b7c33f9a0a725288952b896affc09d8a274595a82a
 EBUILD libmng-1.0.8-r1.ebuild 1134 RMD160 608534e90845a4781446452a2c0eb5faccf46ae5 SHA1 147cda18e11a4880b75a55adc717eb487e0ccb17 SHA256 f80ca018a1dbf3917b6d34abb809cb11ce428cb3b3c2120030f420f98126b3e8
@@ -11,14 +15,14 @@ EBUILD libmng-1.0.8-r2.ebuild 1047 RMD160 621ac0724a2553aeeae4a710aa753308a71ee7
 MD5 85ce8eee3cd2c6f9d33cf32723644195 libmng-1.0.8-r2.ebuild 1047
 RMD160 621ac0724a2553aeeae4a710aa753308a71ee79d libmng-1.0.8-r2.ebuild 1047
 SHA256 2b7d52fe6ab00523865caa1f043c36848dde6f5d6193f79a2750311bdf16e4f9 libmng-1.0.8-r2.ebuild 1047
-EBUILD libmng-1.0.9.ebuild 965 RMD160 5736605d4a92eae1cc9c8136698664ccca827755 SHA1 0b080d77acaa32819e6652ebebc39e636eabbd7e SHA256 5144dffa35754a7c537f19430f39da23e31eff73e811d420692ee9d5e7571319
-MD5 5a23cd5bf3a3bc1b8f084adf69ae5c62 libmng-1.0.9.ebuild 965
-RMD160 5736605d4a92eae1cc9c8136698664ccca827755 libmng-1.0.9.ebuild 965
-SHA256 5144dffa35754a7c537f19430f39da23e31eff73e811d420692ee9d5e7571319 libmng-1.0.9.ebuild 965
-MISC ChangeLog 4921 RMD160 3d3d7cd8aa2cb3629d5dbac4da88fd2020530b2a SHA1 9cfc927e1f93bfe8678d757b7d92f4a779a6e916 SHA256 729acf63139ad6d77e44d9c2ea395aab7137c59d806bb5785c60e9b6e1c4e6c1
-MD5 669fdab126e6672250384a2da70eb5d1 ChangeLog 4921
-RMD160 3d3d7cd8aa2cb3629d5dbac4da88fd2020530b2a ChangeLog 4921
-SHA256 729acf63139ad6d77e44d9c2ea395aab7137c59d806bb5785c60e9b6e1c4e6c1 ChangeLog 4921
+EBUILD libmng-1.0.9.ebuild 1058 RMD160 ed5d116d0af9ef7b604b9737e9313153c89a4cb8 SHA1 0b3571fed4488ba3272b7f8f1f4634013b6ca1e1 SHA256 1256aa7efca2e88f2254361903f66526651c16bdabf6a36323f8c453abda0645
+MD5 94a9c16a39693106ca330db7a3530b78 libmng-1.0.9.ebuild 1058
+RMD160 ed5d116d0af9ef7b604b9737e9313153c89a4cb8 libmng-1.0.9.ebuild 1058
+SHA256 1256aa7efca2e88f2254361903f66526651c16bdabf6a36323f8c453abda0645 libmng-1.0.9.ebuild 1058
+MISC ChangeLog 5112 RMD160 52c8cb1c9b31dd6068dd9c04f1042ba333f7f2d9 SHA1 d7ce0b3002b8c2554ca9a0db0ddc1ede7882d66f SHA256 5ed7a7320bd8db6af9101705e67c0f24b2b0bbeb74cd18c18a41d5a420f895a9
+MD5 7e58ac4c18850fab04d0f3d9a3111221 ChangeLog 5112
+RMD160 52c8cb1c9b31dd6068dd9c04f1042ba333f7f2d9 ChangeLog 5112
+SHA256 5ed7a7320bd8db6af9101705e67c0f24b2b0bbeb74cd18c18a41d5a420f895a9 ChangeLog 5112
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 metadata.xml 161
@@ -33,9 +37,9 @@ MD5 4df919f7fa4000927e41ebedab127bed files/digest-libmng-1.0.9 238
 RMD160 bcc8a40a5761d2e9fcad760bf29cbd648ca8c97c files/digest-libmng-1.0.9 238
 SHA256 65996eee4f53b9b30ef995e9704f0b47dfa1ce4e9eb8d55bd90dd471cf2e428c files/digest-libmng-1.0.9 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE00iQamhnQswr0vIRAmkbAJ9AJe3C2MibIEFaIrscgk9bSAgceACeM1vf
-EVgYafSGrkcWPTl8DJj77L8=
-=h+Re
+iD8DBQFFIw1foeSe8B0zEfwRAvCPAJ4ttMp2dkZwNB40Wwv2ykaIaB4GNwCghgJn
+WbBBr7Z4d1nagMr64MJtzAc=
+=sm9i
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmng/files/libmng-1.0.9-jpeg-compile.patch b/media-libs/libmng/files/libmng-1.0.9-jpeg-compile.patch
new file mode 100644
index 000000000000..59b27ac25232
--- /dev/null
+++ b/media-libs/libmng/files/libmng-1.0.9-jpeg-compile.patch
@@ -0,0 +1,13 @@
+--- libmng_conf.h	2006-10-03 05:11:10.000000000 -0400
++++ libmng_conf.h.new	2006-10-03 05:11:03.000000000 -0400
+@@ -94,6 +94,10 @@
+    so choose the one you've defined in jconfig.h; if you don't know what

+    the heck I'm talking about, just leave it at 8-bit support (thank you!) */

+ 

++#ifndef HAVE_LIBJPEG

++#define MNG_NO_INCLUDE_JNG

++#endif

++

+ #ifndef MNG_NO_INCLUDE_JNG

+ #ifdef MNG_SUPPORT_FULL                /* full support includes JNG */

+ #define MNG_SUPPORT_IJG6B

diff --git a/media-libs/libmng/libmng-1.0.9.ebuild b/media-libs/libmng/libmng-1.0.9.ebuild
index 0be50d912fab..2e0f5edfb2e5 100644
--- a/media-libs/libmng/libmng-1.0.9.ebuild
+++ b/media-libs/libmng/libmng-1.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/libmng-1.0.9.ebuild,v 1.2 2006/04/14 11:33:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/libmng-1.0.9.ebuild,v 1.3 2006/10/04 01:25:13 cardoe Exp $
 
 inherit autotools
 
@@ -21,6 +21,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	#Fixes issue with compiling without JPEG support
+	epatch "${FILESDIR}"/${P}-jpeg-compile.patch
 	ln -s makefiles/configure.in .
 	ln -s makefiles/Makefile.am .