Fix pkg-config files.

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

7 files changed, 50 insertions, 28 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index dd15ceeb5c81..a297b76ac4e0 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.74 2013/06/10 13:25:12 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.75 2013/06/11 08:57:43 xmw Exp $
+
+  11 Jun 2013; Michael Weber <xmw@gentoo.org>
+  +files/mupdf-9999-pkg-config.patch, files/mupdf-1.2-pkg-config.patch,
+  files/mupdf-9999-openjpeg2.patch, mupdf-1.2.ebuild, mupdf-9999.ebuild:
+  Fix pkg-config files.
 
   10 Jun 2013; Michael Weber <xmw@gentoo.org> mupdf-9999.ebuild:
   fix openjpeg:2 dep, thanks Helmut Jarausch (bug 472838)
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 853a092d2468..7b521434ccbd 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -7,9 +7,10 @@ AUX mupdf-1.1_p20121127-desktop-integration.patch 413 SHA256 b32f6a4a403e887935b
 AUX mupdf-1.1_rc1-buildsystem.patch 521 SHA256 b98072f9fab9a687fddd2ba13a08836467b8a70bbda409a28153feca5d9c1ee6 SHA512 5ee24ce5d18c73e028f8e7e33ac9dd67fc851cb9ffbbbd55739a2252b61e58497c6231157299e2a7605144d1f1931029295d7fad1f725b81ecc1b071edbf6be1 WHIRLPOOL c27869b32d5828d1f1bffaca4b4b1615ec3c2472d4a21dbf37a174674b6b81c071841a7c33fb37c511d202d43faef3732e8d44b3214308c3581467977cac5040
 AUX mupdf-1.1_rc1-zoom-2.patch 200 SHA256 c0b9d6bbe627dc12492bf91d2e742a9801580eec69c137f6474a3791b5d94191 SHA512 793ba40424a41aec2c758b7f1ae433fa2ff118f72b984b914ae3ea1734faec4d281ff59d2821ecdb077037afd0e2f5482305fe4b4102c810e602792f766271f8 WHIRLPOOL 52c5d18389f1fc9f5441d0a0f8bf6d152a4e6ef7ccd99b76d8b638a22ce967405b237373437f9297239256aaf89250217217296e5d2ed3ee3b06e46e21cdcaf1
 AUX mupdf-1.2-mubusy_rename_fix.patch 621 SHA256 63b2c440da458c470b276fa59271c6d2fe58b1f254937e621be4580ce16b2ad6 SHA512 7b9d3d8c10bc09bc2b755cc7d27fba8b78bbf7eaf83c93f76f31bb214a61346eca92469f0f1c8ae9ea2b15354fd280b6b0b478175928daa66c84fb4927d805f2 WHIRLPOOL c659fa6e5e29aae26b29e58d96acbe975c2dc847c6819d5648853505d64967f4b6c15b26156652ad5689dfa821f2a9f0a0f0130f686334c8df853dd3705335e1
-AUX mupdf-1.2-pkg-config.patch 367 SHA256 13d0b4ac7ee0ecd44f18b110059c62d2079d00bd90aa9104cb13711094664904 SHA512 5daf764b167fd96c890079bb2c7f55bae77545b786c28f2284131abb865a3f6a7444550a469cf4f55bb6f232dd282a8c61cbcbc891d3b98722cbaf25480686d4 WHIRLPOOL d63d781b92cd85d5d2e47688feb725f657663b96ae384720689c26c8ec4c7d056767e7a3c30d31ff90cfec76529f6bda029f20c79a67d1122251a1265d449909
+AUX mupdf-1.2-pkg-config.patch 504 SHA256 1636b9ed8fa48609298a785625c14c1a9e03f10f2f4c1a502d963f4a05c14612 SHA512 3d49d9734e7390ce47a8313262e1b70b8a95552e6f3b4a9cd7a3e00b265c75d3eda8cc3c2013e379127206737f7d6520bfba7dedfe4103a8e652d4b3b713d3a1 WHIRLPOOL 6f190f196c465e801c7ec019fbdbedece4549d7f00d39c0946836ad22efd80c4702eab85e046792fa75952e83774316534007e387dbc77b4755cc8b9132bbe51
 AUX mupdf-9999-buildsystem.patch 251 SHA256 c2fc5eb9e09527385dd73ced61bf4e5ce0102ee0fac71d64165b582c086c1f21 SHA512 6563e8e28e713e605c1b180903c1097e54d7e35780e0f6b08d7ff86420d707a21ac59262bd34fd69f5fb458d34fb346f2e0f8fcc15bbcfb20199d3d34162a423 WHIRLPOOL 55c3035f21fbf484db631e4db09590611c134540db1859206c8b3930009ac57492a77056dd9b4134244434b334a56024cb1ac9c24bbc22205ab1a361d1482040
-AUX mupdf-9999-openjpeg2.patch 921 SHA256 812989af0d3beaf3c8a0d7f224d3988f8930a462dbb972daf8799f6082162322 SHA512 7feb896a102276513291d3d3542962b4852cc10cea94f9ab7576525186525c6d1a8b191910f1208e6336e6c59fc1a74db14a0702f35fd98977b2dede8b88e92e WHIRLPOOL a6b4e1ed757f8ba04d90e0876703f6c3259ae800ac1b9e97ba31cce3bf89dc4f724c17cfb7a1f052995b293fb826197aaf6a5f7f4995f92a263ef10941f5666c
+AUX mupdf-9999-openjpeg2.patch 567 SHA256 64f0d8946d0fe037a95fd5a58b4622c913622f930b21dd6af39f030d282141e9 SHA512 0a43bc4eadf41bd0bf6a6f0e400d0cc0eb701575ac7fb44c271aa5f298071bfcd7b3c5d83709782c0c935721a27470c58cefd2b385178c2b121b620061a070f5 WHIRLPOOL 76e2a7d1146d8bf55819e0588863a9b21c2272566820d90c3779de00f33b9863995d2b1cab6804be2f42579bf1fa874a78e9380f575aa50461f2908dda3761b6
+AUX mupdf-9999-pkg-config.patch 563 SHA256 5ad0213db3778503c46f94bd69e2b4248dc31f4f265489ee25706a7775ca2256 SHA512 0933fb7cb0624e43a33505ccbc6548e5a3121533e27a8c6de6d98fff20f8f92b00b2295c0c83b4db351a9ee64f37f2427aa5930ecee2cb3e92f99233fd039c96 WHIRLPOOL a30d42461338672576b36cceea770e21761eff7c897bae45a703fd0ffe146187ebf46b63d5f82a17903b7c935ef3906566cc7ea0f0764ed330861a27c2d4b6b9
 DIST mupdf-1.0-source.tar.gz 4208530 SHA256 4f5e12625f7f827f6eb5606026c9a7a7dbdeaf935fcea3bc173ed8d469698ec2 SHA512 00f71288740a137fa3eb3537453f0465949a2dbc590a38651b3dd7a651dad6d0dc5070a3072988439f52729b12478cb467f202157ceb44e5a560431354567861 WHIRLPOOL b58166c37fa6ba81e946e53326dad50426886380b051943f2988657780e3c77e4970541f27ec3efc29ce6693012293bf3104dfd79dfc50f644c6f051431294f3
 DIST mupdf-1.1-source.tar.gz 4281735 SHA256 e54666bbe1d9f0a5464349bfbeffcf676c4a0fcad3efb89eba1f20d4ac991f34 SHA512 d61694041d28309e8119283fb97cef5e1f2effa6e93bfe5ad0b2a0b6b76e38a575a23b0ba367cb59efa77f35b131bf82667f2c7c8df29eb4cdbe3c12b0ad3a33 WHIRLPOOL 67ba7df6c0b94f3213b2e6a709fc3d9ec02945a0825169fb8833b2919b4bd4d8e6fd5f29b2b231df213f8e68d092526b59c152281b56d1c3a9064799ed35e60c
 DIST mupdf-1.1_p20121127.tar.gz 6922632 SHA256 4594bc0473e61200e6d2aba06488ea3127a7d42cd70daa01ea12c3dba5eb654c SHA512 1dff76502a5cf13e26f0bed30046878334730912ddec12f2674de69f62b173182020566f1ddd341bf3a51b28af1334c0cfcc70cac0ac8b0fb1dceacae6b25418 WHIRLPOOL 1597b87b7c53e522a5929b8c0c5c07b0a957084fb4b6974d68feea755d88606930b8a78b998efb94190c00d3d9135a60652f2751c709d49315ae10e30dc9ee0e
@@ -17,14 +18,14 @@ DIST mupdf-1.2-source.zip 13808821 SHA256 9bc9e31ec27c091dad37f70940bd799e46ab6d
 EBUILD mupdf-1.0.ebuild 1515 SHA256 3b298f1cfe6a01d665a14062604e40bbc823fee8df6e4df88e4b9b78f34f22c1 SHA512 1e1573066e2fdb1737d71d963452bada81ec68418a7d32afa2a71e941937781e1e9fef27cf0bc90eac23de62ddf7d12f841bf6ddf389ec042e341e9d5c5184fc WHIRLPOOL 5f09a7019e62a5d83ec7027cb7baa681604bc8ac0b9c7e3539b86d50f060c251157209223a537b371548ab64a9e6d3bb08de424f3d2b50461fdba7d149c3b070
 EBUILD mupdf-1.1.ebuild 1553 SHA256 5957e8e39a40c7bd80c60cc8964dc8cd6f77f5a61e9fe7aa498ea13839a2644e SHA512 494ddc8b2fabb2ba0ac2d12432e22162ecec37b1a4167994f15ffbee4fa8a2460993450591843e6bfdd319673109dd77cd4d02453575e5d0df01c2161e465565 WHIRLPOOL e0c33e733a33723c3ac91b45f001e2afe323260a235435a2a36783fb4c9eb8c5ae98895938bff3a6bd506346efdc582fd8e5575e84f133e733bf12bade4eaecd
 EBUILD mupdf-1.1_p20121127.ebuild 1488 SHA256 4e11b767db4d78de3d5b7e83ca1ec97880c30375249db419265100366fd20585 SHA512 fdbe754cf384c594f754a31e3d5153f25fc43966fc359f999e2852eb3eefbe13d1ca03a022dfbfd0a649a1b1a4f6d84fd5232005a5203ead16768eb12fa32f90 WHIRLPOOL 7b1e8e8b2b2c5209a5cd81de3bc70d0dae0d905d12006800618b1ac31212fe5b2bb0aef6a7e6dd8151052f1d56a1437d0687b10e635ddf2529e35eb9daedb6b8
-EBUILD mupdf-1.2.ebuild 3178 SHA256 1b7d77d09fbcc92deed3b9956f546a349aef3232dd915bed230f97e8b4f96ddf SHA512 7619ec079ae9f10b53484464cc95998e69dc89287dc5f00fb7de5c7bd678be8593c44152c39ef478893c6b5b2e87265ee140c527d4279e5edc01b864ce4b8ee2 WHIRLPOOL d5ef956cd16eb9d94d863426559688d9d442093fe6b0f30ae57c788fbd1438d059115df39ffedf4f56062209687f32583531dc47105153e1616bf92aa8a4a6a9
-EBUILD mupdf-9999.ebuild 3129 SHA256 07ca4efbd4a77bbcd0d1d187a1f3f17462b21a75700fa67fdce9e505a517e426 SHA512 b475b03d0ca8c3979a81aa705a41240603d3c8a597ab628aa939503862f8666a8b3bb62ec64e63a06e32d6c3443fde2ea7b79d060e87fa7eddeceba3c9752732 WHIRLPOOL c97383a8922340d864de95857d80bbe9eca3200e248a734f57cdfe8523e5d0bda9d331aecfac7c594d34e30160692396ef1f4c07b4b4d8e2250764898230a12a
-MISC ChangeLog 11675 SHA256 a07f73c6e5a47cb542222ee52f5de3ec1f6910040fb16cfa0f77ab1500fb1bdb SHA512 d97aebbf4b29866c4fa5415a9a32c9800daa95b0267b4ca5b7c4ec14a9bccaca665a83b41cc506edb1a2eaf52d5ba715a8d4ffca0a7daf62d1c2ed50573ddc78 WHIRLPOOL d3e87fc1873d59c4a3ab5a7c088ade0e9199ff972f14a7b3fb2bca5555cbecfccbc34a2ef7adfbb4c976ac164f49cc3fb64fe7724d6182bc1cdc9ebc5c1be4f8
+EBUILD mupdf-1.2.ebuild 3227 SHA256 b6dd9b0791894618e150c6ddb351cd0f28701bb2eced5310681454d0b3fbbbde SHA512 d568e23ff7ed80db23cc67a2011305c7d8a08c31ea5303f0d965465aefc80da8944c23acf15ab0ad4545da2e4162cd5754aa9262e82e9aa9f387b389d1b95852 WHIRLPOOL c211ee2d423e21c072873ff46bebe2a6a2c545c34753d44c381818427e8971987875b2f89c666162d3d2b17fd7b59b0b58c8b0048e5cc4325a5b26fcdf16c93c
+EBUILD mupdf-9999.ebuild 3169 SHA256 44620b2895f7fe81fb0bf406c1acf15b711ae48dfceb205f424d2b6e5056b3ca SHA512 9aa39032d7d9cc73b55f1bcea420a51a5dc1b235905025166864fa8867fc239986479bd25f600975a7944e2e2583aef687328b086ccceaf05a9636b6f5572f97 WHIRLPOOL bdb6fce8060399336157f527c1211b2f547e83fb5416483724c88985ac63d1aa1ea279c60202fd44c14c0925f4477b4c8a7bd5091687898a11a7530bb8ab32b6
+MISC ChangeLog 11891 SHA256 6c49eab10f3bbd6f878f9ae7cd9b23076ba722e28a1aa6ddf7224c36073acb93 SHA512 0e98a2d1d80709c7d3f7dbac01b82a96cbc9478b9711ab74f0d296e49645b95f03c58de3276df8504860a0c742136b13736992a5090cc8ebb30cc9b3d82064e4 WHIRLPOOL e3076a2ae51e6e0116a651bf17f5f18f86f8bdcaa37c090ef8187fbe7998f1d4087e7e113dc20014cf0bad87742a10e9a3bd700cb9925ae04282d5094f2f56f6
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlG107wACgkQknrdDGLu8JDHqgD9E3uO1bl6RIuTevW9yLPSwSM2
-rf/oJSefaUI62APft1QA+wccN66JBjjWRcxeZB8liV+Dj4ivxD2utsvp9mYZZFMX
-=qJPO
+iF4EAREIAAYFAlG25oYACgkQknrdDGLu8JAl9AEAgbfab7FV+ccWmad/gRYgoCMq
+4lCcvJSB1yVFQqj3dPgA/ifYWlH8VU+9/Sq4+bWZW/62Qgmh7ax/gcG+6TNNnN0p
+=F+5l
 -----END PGP SIGNATURE-----
diff --git a/app-text/mupdf/files/mupdf-1.2-pkg-config.patch b/app-text/mupdf/files/mupdf-1.2-pkg-config.patch
index ce8aadb96902..2505a735b513 100644
--- a/app-text/mupdf/files/mupdf-1.2-pkg-config.patch
+++ b/app-text/mupdf/files/mupdf-1.2-pkg-config.patch
@@ -1,12 +1,17 @@
+no pkgconfig data for jbig2dec and jpeg
 http://bugs.ghostscript.com/show_bug.cgi?id=694301
 
 --- mupdf-1.2-source/debian/mupdf.pc
 +++ mupdf-1.2-source/debian/mupdf.pc
-@@ -7,6 +7,6 @@
+@@ -4,9 +4,8 @@
+ includedir=${prefix}/include
+ 
+ Name: mupdf
  Description: Library for rendering PDF documents
- Requires.private: freetype2
+-Requires.private: freetype2
++Requires: freetype2 libopenjpeg1
  Version: 0.5.0
 -Libs: -L${libdir} -lmupdf
-+Libs: -L${libdir} -lfitz
- Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
++Libs: -L${libdir} -lfitz -ljpeg -ljbig2dec
+-Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
  Cflags: -I${includedir}
diff --git a/app-text/mupdf/files/mupdf-9999-openjpeg2.patch b/app-text/mupdf/files/mupdf-9999-openjpeg2.patch
index 5189974d2baa..68f6c85b794e 100644
--- a/app-text/mupdf/files/mupdf-9999-openjpeg2.patch
+++ b/app-text/mupdf/files/mupdf-9999-openjpeg2.patch
@@ -13,14 +13,3 @@ http://bugs.ghostscript.com/show_bug.cgi?id=693518
  SYS_JBIG2DEC_LIBS = -ljbig2dec
  SYS_JPEG_LIBS = -ljpeg
  SYS_ZLIB_LIBS = -lz
---- mupdf-9999/debian/mupdf.pc
-+++ mupdf-9999/debian/mupdf.pc
-@@ -7,6 +7,6 @@
- Description: Library for rendering PDF documents
- Requires.private: freetype2
- Version: 0.5.0
--Libs: -L${libdir} -lmupdf
-+Libs: -L${libdir} -lfitz
--Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
-+Libs.private: -lopenjp2 -ljbig2dec -ljpeg -lz -lm
- Cflags: -I${includedir}
diff --git a/app-text/mupdf/files/mupdf-9999-pkg-config.patch b/app-text/mupdf/files/mupdf-9999-pkg-config.patch
new file mode 100644
index 000000000000..62ae8c8068d1
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-9999-pkg-config.patch
@@ -0,0 +1,20 @@
+no pkgconfig data for jbig2dec and jpeg
+http://bugs.ghostscript.com/show_bug.cgi?id=694301
+
+openjpeg-2
+http://bugs.ghostscript.com/show_bug.cgi?id=693518
+
+--- mupdf-9999/debian/mupdf.pc
++++ mupdf-9999/debian/mupdf.pc
+@@ -4,9 +4,8 @@
+ includedir=${prefix}/include
+ 
+ Name: mupdf
+ Description: Library for rendering PDF documents
+-Requires.private: freetype2
++Requires: freetype2 libopenjp2 libcrypto
+ Version: 0.5.0
+-Libs: -L${libdir} -lmupdf
++Libs: -L${libdir} -lfitz -ljpeg -ljbig2dec
+-Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
+ Cflags: -I${includedir}
diff --git a/app-text/mupdf/mupdf-1.2.ebuild b/app-text/mupdf/mupdf-1.2.ebuild
index 8466df0794c5..210a101f087a 100644
--- a/app-text/mupdf/mupdf-1.2.ebuild
+++ b/app-text/mupdf/mupdf-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.2.ebuild,v 1.7 2013/06/10 07:22:27 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.2.ebuild,v 1.8 2013/06/11 08:57:43 xmw Exp $
 
 EAPI=5
 
@@ -66,6 +66,7 @@ src_prepare() {
 
 	if use static-libs || use static ; then
 		cp -a "${S}" "${S}"-static || die
+		#add missing Libs.private for xcb and freetype
 		sed -e 's:\(pkg-config --libs\):\1 --static:' \
 		    -e '/^X11_LIBS :=/s:\(.*\):\1 -lbz2 -ldl -lpthread:' \
 			-i "${S}"-static/Makerules || die
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index f0be1679d2d4..b8aa9b5b97b3 100644
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.32 2013/06/10 13:25:12 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.33 2013/06/11 08:57:43 xmw Exp $
 
 EAPI=5
 
@@ -38,7 +38,8 @@ src_prepare() {
 
 	epatch \
 		"${FILESDIR}"/${P}-buildsystem.patch \
-		"${FILESDIR}"/${P}-openjpeg2.patch
+		"${FILESDIR}"/${P}-openjpeg2.patch \
+		"${FILESDIR}"/${P}-pkg-config.patch
 
 	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
 		-e "/^prefix=/s:=.*:=${EROOR}/usr:" \