Fix pkg-config files.

(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

6 files changed, 40 insertions, 19 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/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:" \