Static builds, static openjpeg, desktop file.

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

4 files changed, 68 insertions, 49 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 173b0621cf75..2956fe7e76ba 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,10 @@
 # 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.71 2013/06/08 03:04:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.72 2013/06/08 11:31:51 xmw Exp $
+
+  08 Jun 2013; Michael Weber <xmw@gentoo.org> files/mupdf-9999-openjpeg2.patch,
+  mupdf-1.2.ebuild, mupdf-9999.ebuild:
+  Static builds, static openjpeg, desktop file.
 
   08 Jun 2013; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Remove unneeded useflag description from metadata
diff --git a/app-text/mupdf/files/mupdf-9999-openjpeg2.patch b/app-text/mupdf/files/mupdf-9999-openjpeg2.patch
index 7963326837ee..6c4cfd6c128e 100644
--- a/app-text/mupdf/files/mupdf-9999-openjpeg2.patch
+++ b/app-text/mupdf/files/mupdf-9999-openjpeg2.patch
@@ -1,3 +1,5 @@
+http://bugs.ghostscript.com/show_bug.cgi?id=693518
+
 --- mupdf-9999/Makerules
 +++ mupdf-9999/Makerules
 @@ -52,8 +52,8 @@
diff --git a/app-text/mupdf/mupdf-1.2.ebuild b/app-text/mupdf/mupdf-1.2.ebuild
index 52da14f6b70f..81be0f3bbfa9 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.4 2013/06/07 22:52:15 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.2.ebuild,v 1.5 2013/06/08 11:31:51 xmw Exp $
 
 EAPI=5
 
@@ -15,20 +15,21 @@ SLOT="0/1.2"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X vanilla static static-libs"
 
-RDEPEND="media-libs/freetype:2
-	media-libs/jbig2dec
-	>=media-libs/openjpeg-1.5:0
-	virtual/jpeg
-	X? ( x11-libs/libX11
-		x11-libs/libXext )"
+LIB_DEPEND="media-libs/freetype:2[static-libs?]
+	media-libs/jbig2dec[static-libs?]
+	>=media-libs/openjpeg-1.5:0[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )"
+RDEPEND="${LIB_DEPEND}"
 DEPEND="${RDEPEND}
-	static? ( app-arch/bzip2[static-libs]
-		media-libs/freetype:2[static-libs]
-		media-libs/jbig2dec[static-libs]
-		virtual/jpeg[static-libs]
-		X? ( x11-libs/libX11[static-libs]
-			x11-libs/libXext[static-libs] )	)
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	static-libs? ( ${LIB_DEPEND} )
+	static? ( ${LIB_DEPEND//?}
+		app-arch/bzip2[static-libs]
+		x11-libs/libXau[static-libs]
+		x11-libs/libXdmcp[static-libs]
+		x11-libs/libxcb[static-libs] )"
 
 S=${WORKDIR}/${P}-source
 
@@ -52,7 +53,7 @@ src_prepare() {
 		-e "\$aprefix = ${ED}usr" \
 		-e "\$alibdir = ${ED}usr/$(get_libdir)" \
 		-i Makerules || die
-	
+
 	if ! use X ; then
 		sed -e "\$aNOX11 = yes" \
 			-i Makerules || die
@@ -60,9 +61,11 @@ src_prepare() {
 
 	if use static-libs || use static ; then
 		cp -a "${S}" "${S}"-static || die
-		sed -e '/^LIBS +=/s: -lopenjpeg : :' \
-			-e '/^LIBS +=/s:=\(.*\):= -Wl,-Bstatic \1 -lbz2 -Wl,-Bdynamic -lopenjpeg:' \
-			-i "${S}"-static/Makefile
+		sed -e 's:\(pkg-config --libs\):\1 --static:' \
+		    -e '/^X11_LIBS :=/s:\(.*\):\1 -lbz2 -ldl -lpthread:' \
+			-i "${S}"-static/Makerules || die
+		sed -e '/^LIBS +=/s:\(-lfreetype\):\1 -lbz2:' \
+			-i "${S}"-static/Makefile || die
 	fi
 
 	my_soname=libfitz.so.1.2
@@ -77,29 +80,30 @@ src_compile() {
 	use static-libs && \
 		emake -C "${S}"-static build/debug/libfitz.a
 	use static && \
-		emake -C "${S}"-static
+		emake -C "${S}"-static XLIBS="-static"
 }
 
 src_install() {
 	if use X ; then
 		domenu debian/mupdf.desktop
 		doicon debian/mupdf.xpm
-		use static && dobin "${S}"-static/build/debug/mupdf
 	else
 		rm apps/man/mupdf.1
 	fi
 
 	emake install
 	dosym ${my_soname} /usr/$(get_libdir)/libfitz.so
-	
+
 	use static-libs && \
 		dolib.a "${S}"-static/build/debug/libfitz.a
-	use static && \
+	if use static ; then
 		dobin "${S}"-static/build/debug/mu{tool,draw}
-	
+		use X && dobin "${S}"-static/build/debug/mupdf
+	fi
+
 	insinto /usr/include
 	doins pdf/mupdf-internal.h fitz/fitz-internal.h xps/muxps-internal.h
-		
+
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins debian/mupdf.pc
 
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index 41e01b890356..c13c287ff25c 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.29 2013/06/07 22:52:15 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.30 2013/06/08 11:31:51 xmw Exp $
 
 EAPI=5
 
@@ -16,20 +16,22 @@ SLOT="0/1.2"
 KEYWORDS=""
 IUSE="X vanilla static static-libs"
 
-RDEPEND="media-libs/freetype:2
-	media-libs/jbig2dec
-	media-libs/openjpeg:2
-	virtual/jpeg
-	X? ( x11-libs/libX11
-		x11-libs/libXext )"
+LIB_DEPEND="dev-libs/openssl[static-libs?]
+	media-libs/freetype:2[static-libs?]
+	media-libs/jbig2dec[static-libs?]
+	>=media-libs/openjpeg-1.5:0[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )"
+RDEPEND="${LIB_DEPEND}"
 DEPEND="${RDEPEND}
-	static? ( app-arch/bzip2[static-libs]
-		media-libs/freetype:2[static-libs]
-		media-libs/jbig2dec[static-libs]
-		virtual/jpeg[static-libs]
-		X? ( x11-libs/libX11[static-libs]
-			x11-libs/libXext[static-libs] )	)
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	static-libs? ( ${LIB_DEPEND} )
+	static? ( ${LIB_DEPEND//?}
+		app-arch/bzip2[static-libs]
+		x11-libs/libXau[static-libs]
+		x11-libs/libXdmcp[static-libs]
+		x11-libs/libxcb[static-libs] )"
 
 src_prepare() {
 	rm -rf thirdparty || die
@@ -41,6 +43,10 @@ src_prepare() {
 	use vanilla || epatch \
 		"${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
 
+	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
+	sed -e '/^Actions=/s:=.*:=View;:' \
+		-i debian/${PN}.desktop || die
+
 	sed -e "\$aOS = Linux" \
 		-e "\$aCC = $(tc-getCC)" \
 		-e "\$aLD = $(tc-getCC)" \
@@ -50,7 +56,7 @@ src_prepare() {
 		-e "\$aprefix = ${ED}usr" \
 		-e "\$alibdir = ${ED}usr/$(get_libdir)" \
 		-i Makerules || die
-	
+
 	if ! use X ; then
 		sed -e "\$aNOX11 = yes" \
 			-i Makerules || die
@@ -58,9 +64,11 @@ src_prepare() {
 
 	if use static-libs || use static ; then
 		cp -a "${S}" "${S}"-static || die
-		sed -e '/^LIBS +=/s: -lopenjpeg : :' \
-			-e '/^LIBS +=/s:=\(.*\):= -Wl,-Bstatic \1 -lbz2 -Wl,-Bdynamic -lopenjpeg:' \
-			-i "${S}"-static/Makefile
+		#add missing Libs.private for xcb and freetype
+		sed -e 's:\(pkg-config --libs\):\1 --static:' \
+		    -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
+		    -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
+			-i "${S}"-static/Makerules || die
 	fi
 
 	my_soname=libfitz.so.1.2
@@ -75,29 +83,30 @@ src_compile() {
 	use static-libs && \
 		emake -C "${S}"-static build/debug/libfitz.a
 	use static && \
-		emake -C "${S}"-static
+		emake -C "${S}"-static XLIBS="-static"
 }
 
 src_install() {
 	if use X ; then
 		domenu debian/mupdf.desktop
 		doicon debian/mupdf.xpm
-		use static && dobin "${S}"-static/build/debug/mupdf
 	else
 		rm apps/man/mupdf.1
 	fi
 
 	emake install
 	dosym ${my_soname} /usr/$(get_libdir)/libfitz.so
-	
+
 	use static-libs && \
 		dolib.a "${S}"-static/build/debug/libfitz.a
-	use static && \
+	if use static ; then
 		dobin "${S}"-static/build/debug/mu{tool,draw}
-	
+		use X && dobin "${S}"-static/build/debug/mupdf
+	fi
+
 	insinto /usr/include
 	doins pdf/mupdf-internal.h fitz/fitz-internal.h xps/muxps-internal.h
-		
+
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins debian/mupdf.pc