From 2e658b5dcdca57158373eef3cee474bcb36d16cf Mon Sep 17 00:00:00 2001
From: Michael Weber <xmw@gentoo.org>
Date: Wed, 28 Aug 2013 10:28:18 +0000
Subject: Version bump, rename patch files, fix desktop file.

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
---
 app-text/mupdf/ChangeLog                           |  14 ++-
 app-text/mupdf/files/mupdf-1.3-CFLAGS.patch        |  11 ++
 app-text/mupdf/files/mupdf-1.3-forward_back.patch  |  25 +++++
 app-text/mupdf/files/mupdf-1.3-openjpeg2.patch     |  15 +++
 app-text/mupdf/files/mupdf-1.3-pkg-config.patch    |  20 ++++
 app-text/mupdf/files/mupdf-1.3-sys_curl.patch      |  11 ++
 app-text/mupdf/files/mupdf-1.3-zoom-2.patch        |  10 ++
 app-text/mupdf/files/mupdf-9999-CFLAGS.patch       |  11 --
 app-text/mupdf/files/mupdf-9999-forward_back.patch |  25 -----
 app-text/mupdf/files/mupdf-9999-openjpeg2.patch    |  15 ---
 app-text/mupdf/files/mupdf-9999-pkg-config.patch   |  20 ----
 app-text/mupdf/files/mupdf-9999-sys_curl.patch     |  11 --
 app-text/mupdf/files/mupdf-9999-zoom-2.patch       |  10 --
 app-text/mupdf/mupdf-1.3.ebuild                    | 125 +++++++++++++++++++++
 app-text/mupdf/mupdf-9999.ebuild                   |  34 +++---
 15 files changed, 247 insertions(+), 110 deletions(-)
 create mode 100644 app-text/mupdf/files/mupdf-1.3-CFLAGS.patch
 create mode 100644 app-text/mupdf/files/mupdf-1.3-forward_back.patch
 create mode 100644 app-text/mupdf/files/mupdf-1.3-openjpeg2.patch
 create mode 100644 app-text/mupdf/files/mupdf-1.3-pkg-config.patch
 create mode 100644 app-text/mupdf/files/mupdf-1.3-sys_curl.patch
 create mode 100644 app-text/mupdf/files/mupdf-1.3-zoom-2.patch
 delete mode 100644 app-text/mupdf/files/mupdf-9999-CFLAGS.patch
 delete mode 100644 app-text/mupdf/files/mupdf-9999-forward_back.patch
 delete mode 100644 app-text/mupdf/files/mupdf-9999-openjpeg2.patch
 delete mode 100644 app-text/mupdf/files/mupdf-9999-pkg-config.patch
 delete mode 100644 app-text/mupdf/files/mupdf-9999-sys_curl.patch
 delete mode 100644 app-text/mupdf/files/mupdf-9999-zoom-2.patch
 create mode 100644 app-text/mupdf/mupdf-1.3.ebuild

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index fab431a4b5c5..eb71c010a820 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,18 @@
 # 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.86 2013/07/22 19:44:33 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.87 2013/08/28 10:28:18 xmw Exp $
+
+*mupdf-1.3 (28 Aug 2013)
+
+  28 Aug 2013; Michael Weber <xmw@gentoo.org> +files/mupdf-1.3-CFLAGS.patch,
+  +files/mupdf-1.3-forward_back.patch, +files/mupdf-1.3-openjpeg2.patch,
+  +files/mupdf-1.3-pkg-config.patch, +files/mupdf-1.3-sys_curl.patch,
+  +files/mupdf-1.3-zoom-2.patch, +mupdf-1.3.ebuild,
+  -files/mupdf-9999-CFLAGS.patch, -files/mupdf-9999-forward_back.patch,
+  -files/mupdf-9999-openjpeg2.patch, -files/mupdf-9999-pkg-config.patch,
+  -files/mupdf-9999-sys_curl.patch, -files/mupdf-9999-zoom-2.patch,
+  mupdf-9999.ebuild:
+  Version bump, rename patch files, fix desktop file.
 
   22 Jul 2013; Michael Weber <xmw@gentoo.org> mupdf-9999.ebuild:
   Update live ebuild for new binary name.
diff --git a/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch
new file mode 100644
index 000000000000..3c44e98db1ae
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch
@@ -0,0 +1,11 @@
+--- mupdf-1.3/Makerules
++++ mupdf-1.3/Makerules
+@@ -6,7 +6,7 @@
+ CFLAGS += -Wall
+ 
+ ifeq "$(build)" "debug"
+-CFLAGS += -pipe -g -DDEBUG
++CFLAGS += -DDEBUG
+ else ifeq "$(build)" "profile"
+ CFLAGS += -pipe -O2 -DNDEBUG -pg
+ LDFLAGS += -pg
diff --git a/app-text/mupdf/files/mupdf-1.3-forward_back.patch b/app-text/mupdf/files/mupdf-1.3-forward_back.patch
new file mode 100644
index 000000000000..aafe35af65d7
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.3-forward_back.patch
@@ -0,0 +1,25 @@
+Add F86XK_Forward and XF86XK_Back for page switch by muhpdf@binkmail.com 
+on http://bugs.ghostscript.com/show_bug.cgi?id=693494
+
+--- mupdf-1.3/platform/x11/x11_main.c
++++ mupdf-1.3/platform/x11/x11_main.c
+@@ -5,6 +5,7 @@
+ #include <X11/Xatom.h>
+ #include <X11/cursorfont.h>
+ #include <X11/keysym.h>
++#include <X11/XF86keysym.h>
+ 
+ #include <sys/select.h>
+ #include <sys/time.h>
+@@ -836,9 +837,11 @@
+ 						break;
+ 
+ 					case XK_Page_Up:
++					case XF86XK_Back:
+ 						len = 1; buf[0] = ',';
+ 						break;
+ 					case XK_Page_Down:
++					case XF86XK_Forward:
+ 						len = 1; buf[0] = '.';
+ 						break;
+ 					}
diff --git a/app-text/mupdf/files/mupdf-1.3-openjpeg2.patch b/app-text/mupdf/files/mupdf-1.3-openjpeg2.patch
new file mode 100644
index 000000000000..789e4420c374
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.3-openjpeg2.patch
@@ -0,0 +1,15 @@
+http://bugs.ghostscript.com/show_bug.cgi?id=693518
+
+--- mupdf-1.3/Makerules
++++ mupdf-1.3/Makerules
+@@ -52,8 +52,8 @@
+ 
+ SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
+ SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
+-SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjpeg1)
+-SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjpeg1)
++SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjp2)
++SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjp2)
+ SYS_JBIG2DEC_LIBS = -ljbig2dec
+ SYS_JPEG_LIBS = -ljpeg
+ SYS_ZLIB_LIBS = -lz
diff --git a/app-text/mupdf/files/mupdf-1.3-pkg-config.patch b/app-text/mupdf/files/mupdf-1.3-pkg-config.patch
new file mode 100644
index 000000000000..f943014a6b1d
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.3-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-1.3/platform/debian/mupdf.pc
++++ mupdf-1.3/platform/debian/mupdf.pc
+@@ -4,9 +4,9 @@
+ 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.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
++Libs.private: -lmupdf-js-none
+ Cflags: -I${includedir}
diff --git a/app-text/mupdf/files/mupdf-1.3-sys_curl.patch b/app-text/mupdf/files/mupdf-1.3-sys_curl.patch
new file mode 100644
index 000000000000..a388c0a26e67
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.3-sys_curl.patch
@@ -0,0 +1,11 @@
+--- mupdf-1.3/Makerules
++++ mupdf-1.3/Makerules
+@@ -63,6 +63,8 @@
+ SYS_JBIG2DEC_LIBS = -ljbig2dec
+ SYS_JPEG_LIBS = -ljpeg
+ SYS_ZLIB_LIBS = -lz
++SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
++SYS_CURL_LIBS = $(shell pkg-config --libs libcurl) -lpthread
+ 
+ endif
+ 
diff --git a/app-text/mupdf/files/mupdf-1.3-zoom-2.patch b/app-text/mupdf/files/mupdf-1.3-zoom-2.patch
new file mode 100644
index 000000000000..353912450236
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.3-zoom-2.patch
@@ -0,0 +1,10 @@
+--- mupdf-1.3/platform/x11/pdfapp.c
++++ mupdf-1.3/platform/x11/pdfapp.c
+@@ -866,6 +867,7 @@
+ 		break;
+ 
+ 	case ' ':
++	case 'F':
+ 		panto = DONT_PAN;
+ 		if (app->numberlen > 0)
+ 			app->pageno += atoi(app->number);
diff --git a/app-text/mupdf/files/mupdf-9999-CFLAGS.patch b/app-text/mupdf/files/mupdf-9999-CFLAGS.patch
deleted file mode 100644
index 487c2128d12f..000000000000
--- a/app-text/mupdf/files/mupdf-9999-CFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mupdf-1.0-source/Makerules
-+++ mupdf-1.0-source/Makerules
-@@ -6,7 +6,7 @@
- CFLAGS += -Wall
- 
- ifeq "$(build)" "debug"
--CFLAGS += -pipe -g -DDEBUG
-+CFLAGS += -DDEBUG
- else ifeq "$(build)" "profile"
- CFLAGS += -pipe -O2 -DNDEBUG -pg
- LDFLAGS += -pg
diff --git a/app-text/mupdf/files/mupdf-9999-forward_back.patch b/app-text/mupdf/files/mupdf-9999-forward_back.patch
deleted file mode 100644
index 35c6f1df1594..000000000000
--- a/app-text/mupdf/files/mupdf-9999-forward_back.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Add F86XK_Forward and XF86XK_Back for page switch by muhpdf@binkmail.com 
-on http://bugs.ghostscript.com/show_bug.cgi?id=693494
-
---- mupdf-9999/platform/x11/x11_main.c
-+++ mupdf-9999/platform/x11/x11_main.c
-@@ -5,6 +5,7 @@
- #include <X11/Xatom.h>
- #include <X11/cursorfont.h>
- #include <X11/keysym.h>
-+#include <X11/XF86keysym.h>
- 
- #include <sys/select.h>
- #include <sys/time.h>
-@@ -836,9 +837,11 @@
- 						break;
- 
- 					case XK_Page_Up:
-+					case XF86XK_Back:
- 						len = 1; buf[0] = ',';
- 						break;
- 					case XK_Page_Down:
-+					case XF86XK_Forward:
- 						len = 1; buf[0] = '.';
- 						break;
- 					}
diff --git a/app-text/mupdf/files/mupdf-9999-openjpeg2.patch b/app-text/mupdf/files/mupdf-9999-openjpeg2.patch
deleted file mode 100644
index 68f6c85b794e..000000000000
--- a/app-text/mupdf/files/mupdf-9999-openjpeg2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.ghostscript.com/show_bug.cgi?id=693518
-
---- mupdf-9999/Makerules
-+++ mupdf-9999/Makerules
-@@ -52,8 +52,8 @@
- 
- SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
- SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
--SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjpeg1)
--SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjpeg1)
-+SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjp2)
-+SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjp2)
- SYS_JBIG2DEC_LIBS = -ljbig2dec
- SYS_JPEG_LIBS = -ljpeg
- SYS_ZLIB_LIBS = -lz
diff --git a/app-text/mupdf/files/mupdf-9999-pkg-config.patch b/app-text/mupdf/files/mupdf-9999-pkg-config.patch
deleted file mode 100644
index f0ccfb3e60ff..000000000000
--- a/app-text/mupdf/files/mupdf-9999-pkg-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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/platform/debian/mupdf.pc
-+++ mupdf-9999/platform/debian/mupdf.pc
-@@ -4,9 +4,9 @@
- 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.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
-+Libs.private: -lmupdf-js-none
- Cflags: -I${includedir}
diff --git a/app-text/mupdf/files/mupdf-9999-sys_curl.patch b/app-text/mupdf/files/mupdf-9999-sys_curl.patch
deleted file mode 100644
index 1866dbdf7e59..000000000000
--- a/app-text/mupdf/files/mupdf-9999-sys_curl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mupdf-9999/Makerules
-+++ mupdf-9999/Makerules
-@@ -63,6 +63,8 @@
- SYS_JBIG2DEC_LIBS = -ljbig2dec
- SYS_JPEG_LIBS = -ljpeg
- SYS_ZLIB_LIBS = -lz
-+SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
-+SYS_CURL_LIBS = $(shell pkg-config --libs libcurl) -lpthread
- 
- endif
- 
diff --git a/app-text/mupdf/files/mupdf-9999-zoom-2.patch b/app-text/mupdf/files/mupdf-9999-zoom-2.patch
deleted file mode 100644
index 2c9c8c9fd874..000000000000
--- a/app-text/mupdf/files/mupdf-9999-zoom-2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mupdf-9999/platform/x11/pdfapp.c
-+++ mupdf-9999/platform/x11/pdfapp.c
-@@ -866,6 +867,7 @@
- 		break;
- 
- 	case ' ':
-+	case 'F':
- 		panto = DONT_PAN;
- 		if (app->numberlen > 0)
- 			app->pageno += atoi(app->number);
diff --git a/app-text/mupdf/mupdf-1.3.ebuild b/app-text/mupdf/mupdf-1.3.ebuild
new file mode 100644
index 000000000000..9c43c4e583a4
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.3.ebuild
@@ -0,0 +1,125 @@
+# 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.3.ebuild,v 1.1 2013/08/28 10:28:18 xmw Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}-source.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/1.2"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X vanilla static static-libs"
+
+LIB_DEPEND="dev-libs/openssl[static-libs?]
+	media-libs/freetype:2[static-libs?]
+	media-libs/jbig2dec[static-libs?]
+	media-libs/openjpeg:2[static-libs?]
+	net-misc/curl[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )"
+RDEPEND="${LIB_DEPEND}"
+DEPEND="${RDEPEND}
+	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
+
+src_prepare() {
+	rm -rf thirdparty || die
+
+	epatch \
+		"${FILESDIR}"/${P}-CFLAGS.patch \
+		"${FILESDIR}"/${P}-openjpeg2.patch \
+		"${FILESDIR}"/${P}-pkg-config.patch \
+		"${FILESDIR}"/${P}-sys_curl.patch
+
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOR}/usr:" \
+		-i platform/debian/${PN}.pc || die
+
+	use vanilla || epatch \
+		"${FILESDIR}"/${P}-zoom-2.patch \
+		"${FILESDIR}"/${P}-forward_back.patch
+
+	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
+	sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
+		-i platform/debian/${PN}.desktop || die
+
+	sed -e "\$aOS = Linux" \
+		-e "\$aCC = $(tc-getCC)" \
+		-e "\$aLD = $(tc-getCC)" \
+		-e "\$aAR = $(tc-getAR)" \
+		-e "\$averbose = true" \
+		-e "\$abuild = debug" \
+		-e "\$aprefix = ${ED}usr" \
+		-e "\$alibdir = ${ED}usr/$(get_libdir)" \
+		-i Makerules || die
+
+	if ! use X ; then
+		sed -e "\$aNOX11 = yes" \
+			-i Makerules || die
+	fi
+
+	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 '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
+		    -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
+			-i "${S}"-static/Makerules || die
+	fi
+
+	my_soname=libmupdf.so.1.2
+	my_soname_js_none=libmupdf-js-none.so.1.2
+	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
+		-e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \
+		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
+		-e "/^MUPDF_JS_NONE_LIB :=/s:=.*:= \$(OUT)/${my_soname_js_none}:" \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake XCFLAGS="-fpic"
+	use static-libs && \
+		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
+	use static && \
+		emake -C "${S}"-static XLIBS="-static"
+}
+
+src_install() {
+	if use X ; then
+		domenu platform/debian/${PN}.desktop
+		doicon platform/debian/${PN}.xpm
+	else
+		rm docs/man/${PN}.1
+	fi
+
+	emake install
+	dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
+
+	use static-libs && \
+		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
+	if use static ; then
+		dobin "${S}"-static/build/debug/mu{tool,draw}
+		use X && dobin "${S}"-static/build/debug/${PN}-x11
+	fi
+	use X && dosym ${PN}-x11 /usr/bin/${PN}
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README docs/*.{txt,c}
+}
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index 43d7df7e511e..95c0cf9d5966 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.40 2013/07/22 19:44:33 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.41 2013/08/28 10:28:18 xmw Exp $
 
 EAPI=5
 
@@ -38,21 +38,21 @@ src_prepare() {
 	rm -rf thirdparty || die
 
 	epatch \
-		"${FILESDIR}"/${P}-CFLAGS.patch \
-		"${FILESDIR}"/${P}-openjpeg2.patch \
-		"${FILESDIR}"/${P}-pkg-config.patch \
-		"${FILESDIR}"/${P}-sys_curl.patch
+		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
+		"${FILESDIR}"/${PN}-1.3-openjpeg2.patch \
+		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
+		"${FILESDIR}"/${PN}-1.3-sys_curl.patch
 
 	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
 		-e "/^prefix=/s:=.*:=${EROOR}/usr:" \
 		-i platform/debian/${PN}.pc || die
 
 	use vanilla || epatch \
-		"${FILESDIR}"/${P}-zoom-2.patch \
-		"${FILESDIR}"/${P}-forward_back.patch
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch \
+		"${FILESDIR}"/${PN}-1.3-forward_back.patch
 
 	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
-	sed -e '/^Actions=/s:=.*:=View;:' \
+	sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
 		-i platform/debian/${PN}.desktop || die
 
 	sed -e "\$aOS = Linux" \
@@ -93,32 +93,32 @@ src_prepare() {
 src_compile() {
 	emake XCFLAGS="-fpic"
 	use static-libs && \
-		emake -C "${S}"-static build/debug/libmupdf{,-js-none}.a
+		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
 	use static && \
 		emake -C "${S}"-static XLIBS="-static"
 }
 
 src_install() {
 	if use X ; then
-		domenu platform/debian/mupdf.desktop
-		doicon platform/debian/mupdf.xpm
+		domenu platform/debian/${PN}.desktop
+		doicon platform/debian/${PN}.xpm
 	else
-		rm docs/man/mupdf.1
+		rm docs/man/${PN}.1
 	fi
 
 	emake install
-	dosym ${my_soname} /usr/$(get_libdir)/libmupdf.so
+	dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
 
 	use static-libs && \
-		dolib.a "${S}"-static/build/debug/libmupdf{,-js-none}.a
+		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
 	if use static ; then
 		dobin "${S}"-static/build/debug/mu{tool,draw}
-		use X && dobin "${S}"-static/build/debug/mupdf-x11
+		use X && dobin "${S}"-static/build/debug/${PN}-x11
 	fi
-	use X && dosym mupdf-x11 /usr/bin/mupdf
+	use X && dosym ${PN}-x11 /usr/bin/${PN}
 
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins platform/debian/mupdf.pc
+	doins platform/debian/${PN}.pc
 
 	dodoc README docs/*.{txt,c}
 }
-- 
cgit v1.2.3-65-gdbad