Drop old, fix desktop integration (bug 444924, thanks Agostino Sarubbo)

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

6 files changed, 26 insertions, 65 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 26505a865c78..87a3c342f1e7 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,12 @@
 # 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.58 2013/03/25 09:19:23 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.59 2013/03/25 09:50:29 xmw Exp $
+
+  25 Mar 2013; Michael Weber <xmw@gentoo.org> -mupdf-1.1_p20120816.ebuild,
+  mupdf-1.1_p20121127.ebuild,
+  +files/mupdf-1.1_p20121127-desktop-integration.patch, mupdf-1.2.ebuild,
+  mupdf-9999.ebuild:
+  Drop old, fix desktop integration (bug 444924, thanks Agostino Sarubbo)
 
 *mupdf-1.2 (25 Mar 2013)
 
diff --git a/app-text/mupdf/files/mupdf-1.1_p20121127-desktop-integration.patch b/app-text/mupdf/files/mupdf-1.1_p20121127-desktop-integration.patch
new file mode 100644
index 000000000000..f8598d902107
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.1_p20121127-desktop-integration.patch
@@ -0,0 +1,11 @@
+--- mupdf-1.1/debian/mupdf.desktop
++++ mupdf-1.1/debian/mupdf.desktop
+@@ -10,6 +10,8 @@
+ Type=Application
+ MimeType=application/pdf;application/x-pdf;
+ Categories=Viewer;Graphics;
++Actions=View;
+ 
+ [Desktop Action View]
++Name=View with mupdf
+ Exec=mupdf %f
diff --git a/app-text/mupdf/mupdf-1.1_p20120816.ebuild b/app-text/mupdf/mupdf-1.1_p20120816.ebuild
deleted file mode 100644
index 5aeb90346922..000000000000
--- a/app-text/mupdf/mupdf-1.1_p20120816.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.1_p20120816.ebuild,v 1.1 2012/11/28 08:05:27 xmw Exp $
-
-EAPI=4
-
-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="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X vanilla"
-
-RDEPEND="media-libs/freetype:2
-	media-libs/jbig2dec
-	>=media-libs/openjpeg-1.5
-	virtual/jpeg
-	X? ( x11-libs/libX11
-		x11-libs/libXext )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1_rc1-buildsystem.patch
-
-	if ! use vanilla ; then
-		epatch "${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
-	fi
-}
-
-src_compile() {
-	use X || my_nox11="NOX11=yes MUPDF= "
-
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" OS=Linux \
-		build=debug verbose=true ${my_nox11}
-}
-
-src_install() {
-	emake prefix="${ED}usr" libdir="${ED}usr/$(get_libdir)" \
-		build=debug verbose=true ${my_nox11} install
-
-	insinto /usr/include
-	doins pdf/mupdf{,-internal}.h
-	doins fitz/fitz{,-internal}.h
-	doins xps/muxps{,-internal}.h
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins debian/mupdf.pc
-
-	if use X ; then
-		domenu debian/mupdf.desktop
-		doicon debian/mupdf.xpm
-	fi
-	dodoc README doc/{example.c,overview.txt}
-}
diff --git a/app-text/mupdf/mupdf-1.1_p20121127.ebuild b/app-text/mupdf/mupdf-1.1_p20121127.ebuild
index adba64e3041e..de0ed6c92468 100644
--- a/app-text/mupdf/mupdf-1.1_p20121127.ebuild
+++ b/app-text/mupdf/mupdf-1.1_p20121127.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.1_p20121127.ebuild,v 1.1 2012/11/28 08:14:04 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.1_p20121127.ebuild,v 1.2 2013/03/25 09:50:29 xmw Exp $
 
 EAPI=4
 
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-buildsystem.patch
+	epatch "${FILESDIR}"/${P}-desktop-integration.patch
 
 	if ! use vanilla ; then
 		epatch "${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
diff --git a/app-text/mupdf/mupdf-1.2.ebuild b/app-text/mupdf/mupdf-1.2.ebuild
index 63ce53fdb441..8360f9fac6f0 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.1 2013/03/25 09:19:23 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.2.ebuild,v 1.2 2013/03/25 09:50:29 xmw Exp $
 
 EAPI=4
 
@@ -30,6 +30,7 @@ src_prepare() {
 	rm -rf thirdparty || die
 
 	epatch "${FILESDIR}"/${PN}-1.1_p20121127-buildsystem.patch
+	epatch "${FILESDIR}"/${PN}-1.1_p20121127-desktop-integration.patch
 	epatch "${FILESDIR}"/${PN}-1.2-mubusy_rename_fix.patch
 
 	if ! use vanilla ; then
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index 19b3a0e61d23..7a34ef306a52 100644
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.23 2012/11/28 07:33:08 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.24 2013/03/25 09:50:29 xmw Exp $
 
 EAPI=4
 
@@ -25,6 +25,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1_p20121127-desktop-integration.patch
 	epatch "${FILESDIR}"/${PN}-9999-buildsystem.patch
 
 	if ! use vanilla ; then