Version bump

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

4 files changed, 87 insertions, 4 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 9e3c9c6043ea..26505a865c78 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.57 2013/02/28 15:46:00 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.58 2013/03/25 09:19:23 xmw Exp $
+
+*mupdf-1.2 (25 Mar 2013)
+
+  25 Mar 2013; Michael Weber <xmw@gentoo.org>
+  +files/mupdf-1.2-mubusy_rename_fix.patch, +mupdf-1.2.ebuild, mupdf-1.1.ebuild:
+  Version bump
 
   28 Feb 2013; Michael Weber <xmw@gentoo.org>
   files/mupdf-9999-buildsystem.patch:
diff --git a/app-text/mupdf/files/mupdf-1.2-mubusy_rename_fix.patch b/app-text/mupdf/files/mupdf-1.2-mubusy_rename_fix.patch
new file mode 100644
index 000000000000..7ac486b94ee5
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.2-mubusy_rename_fix.patch
@@ -0,0 +1,13 @@
+should be upstream, but not included here http://bugs.ghostscript.com/show_bug.cgi?id=693595#c1
+
+--- mupdf-1.2-source/Makefile
++++ mupdf-1.2-source/Makefile
+@@ -212,7 +212,7 @@
+ 	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(incdir) $(DESTDIR)$(mandir)/man1
+ 	install $(FITZ_LIB) $(DESTDIR)$(libdir)
+ 	install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h $(DESTDIR)$(incdir)
+-	install $(MUVIEW) $(MUDRAW) $(MUBUSY) $(DESTDIR)$(bindir)
++	install $(MUVIEW) $(MUDRAW) $(MUTOOL) $(DESTDIR)$(bindir)
+ 	install $(wildcard apps/man/*.1) $(DESTDIR)$(mandir)/man1
+ 
+ # --- Clean and Default ---
diff --git a/app-text/mupdf/mupdf-1.1.ebuild b/app-text/mupdf/mupdf-1.1.ebuild
index db255c9f6c37..1391566a0a1c 100644
--- a/app-text/mupdf/mupdf-1.1.ebuild
+++ b/app-text/mupdf/mupdf-1.1.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.ebuild,v 1.5 2012/11/29 13:11:52 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.1.ebuild,v 1.6 2013/03/25 09:19:23 xmw Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ 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/_rc/-rc}-source.tar.gz"
+SRC_URI="http://${PN}.googlecode.com/files/${P/_rc/-rc}-source.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/app-text/mupdf/mupdf-1.2.ebuild b/app-text/mupdf/mupdf-1.2.ebuild
new file mode 100644
index 000000000000..63ce53fdb441
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.2.ebuild
@@ -0,0 +1,64 @@
+# 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 $
+
+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="http://${PN}.googlecode.com/files/${P}-source.zip"
+
+LICENSE="AGPL-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"
+
+S=${WORKDIR}/${P}-source
+
+src_prepare() {
+	rm -rf thirdparty || die
+
+	epatch "${FILESDIR}"/${PN}-1.1_p20121127-buildsystem.patch
+	epatch "${FILESDIR}"/${PN}-1.2-mubusy_rename_fix.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 CHANGES README doc/{example.c,overview.txt}
+}