version bump to 0.7

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 114 insertions, 2 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index a0674da73a50..ff22f048f604 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.1 2010/08/24 23:08:44 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.2 2010/08/30 12:03:38 xmw Exp $
+
+*mupdf-0.7 (30 Aug 2010)
+
+  30 Aug 2010; Michael Weber (xmw) <xmw@gentoo.org> +mupdf-0.7.ebuild,
+  +files/mupdf-0.7-buildsystem.patch:
+  Version bump, buildsystem still needs a patch for CC and LDFLAGS
 
 *mupdf-0.6 (24 Aug 2010)
 
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 893444171e9c..1fd174711769 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,5 +1,8 @@
 AUX mupdf-0.6-buildsystem.patch 1446 RMD160 dbc139d01e47658a2339b6b8b65fe9fa8bfd9870 SHA1 0f4d9b7b47a24590623ef606ffbd6b878b2327a0 SHA256 bf6c539e530fe30f0bfb4c1c3f0e916d07ac18f035764e5afaf6b280c900b06f
+AUX mupdf-0.7-buildsystem.patch 1111 RMD160 9246a80c1cedf49dc39b694e9913f98f295d6a93 SHA1 17b2691984e799d423d7b90544df15fff054c70a SHA256 bd4dae8cd56579cd873654bf804a26cbad92a4b827673f04ab7a3d16e01d21b9
 DIST mupdf-0.6.tar.gz 3607245 RMD160 50b1ed1c3c07613a1dbb19cfe63cb47d4f2ae2fe SHA1 dd501da6f50c686c6d519fe6ae7c951d2e2d7e1c SHA256 6f87c4f113ee9e0f4bdfd3a316ef44052edc4febc8f7b531c4a3f44ffe149605
+DIST mupdf-0.7.tar.gz 3557621 RMD160 82723652fb967be7665cfc55f4b2bb7c3ff55b69 SHA1 3e97cefa9a65b770cc1be7584d6a5da9dc064d84 SHA256 e7f6307fa472575d27fe893e787ddb3fc927f03ba4ae23105f917189e81960a6
 EBUILD mupdf-0.6.ebuild 1505 RMD160 fc8559615f965b09960f42421fe4922e0971d555 SHA1 d12d6bb8889a7abf07ebb9cdb152c17eb502ed03 SHA256 bc69f17c8475bba04af6ac325ae312af1074eac6309d1ef103e47388ae5ad99c
-MISC ChangeLog 465 RMD160 8a2d46862aa02231abcca532bc704bc4ba8b623a SHA1 b9e3cc96e25beedaa993a68dfd34302567665e0d SHA256 8d295bec6edbca9c30bd44ea10bca9902fd21bdf2f805b1220e8461cf9f897fb
+EBUILD mupdf-0.7.ebuild 1424 RMD160 fd39a6636df7f48898f626adc4b99481908112e7 SHA1 a0ee3a173db5a49e596464cd02c61624d6353077 SHA256 01804ddb7108013a3f6f0c56b2e942fc70954b90a660bd4eca1c35343cc7c4aa
+MISC ChangeLog 668 RMD160 277217a09bdc3d0398b1a00167046caf1afc5a83 SHA1 09a163b6bfafc5461484ed0cfa1e9f979bed1e5c SHA256 4521dffc1e7b48888c8c80ab59479bcb862c8464e9856e8efb81cc5f40e49694
 MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
diff --git a/app-text/mupdf/files/mupdf-0.7-buildsystem.patch b/app-text/mupdf/files/mupdf-0.7-buildsystem.patch
new file mode 100644
index 000000000000..003e22a37e32
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-0.7-buildsystem.patch
@@ -0,0 +1,44 @@
+--- Makefile.orig	2010-08-30 13:49:42.022000015 +0200
++++ Makefile	2010-08-30 13:51:30.274000015 +0200
+@@ -6,7 +6,8 @@
+ default: all
+ 
+ build ?= debug
+-prefix ?= /usr/local
++prefix ?= /usr
++libprefix ?= $(prefix)/lib
+ 
+ OBJDIR := build/$(build)
+ GENDIR := build/generated
+@@ -378,7 +379,7 @@
+ 	rm -rf build
+ 
+ install: $(OBJDIR) $(GENDIR) $(MUPDF_LIB) $(APPS)
+-	install -d $(prefix)/bin $(prefix)/lib $(prefix)/include
++	install -d $(prefix)/bin $(libprefix) $(prefix)/include
+ 	install $(APPS) $(prefix)/bin
+-	install $(MUPDF_LIB) $(prefix)/lib
++	install $(MUPDF_LIB) $(libprefix)
+ 	install $(MUPDF_HDR) $(prefix)/include
+--- Makerules.orig	2010-08-30 13:52:12.870000016 +0200
++++ Makerules	2010-08-30 13:54:08.731000014 +0200
+@@ -4,8 +4,8 @@
+ OS := $(OS:MINGW%=MINGW)
+ 
+ CC ?= cc
+-CFLAGS := -Ifitz -Imupdf -Wall
+-LDFLAGS :=
++CFLAGS += -Ifitz -Imupdf
++LDFLAGS +=
+ 
+ ifeq "$(build)" "debug"
+ CFLAGS += -pipe -g
+@@ -21,7 +21,7 @@
+ 
+ ifeq "$(OS)" "Linux"
+ SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
+-X11LIBS := -lX11 -lXext
++X11LIBS := `pkg-config --libs x11 xext`
+ PDFVIEW_EXE = $(X11VIEW_EXE)
+ endif
+ 
diff --git a/app-text/mupdf/mupdf-0.7.ebuild b/app-text/mupdf/mupdf-0.7.ebuild
new file mode 100644
index 000000000000..ee1f78f0267e
--- /dev/null
+++ b/app-text/mupdf/mupdf-0.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-0.7.ebuild,v 1.1 2010/08/30 12:03:38 xmw Exp $
+
+EAPI=2
+
+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}.com/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="media-libs/freetype:2
+	media-libs/jbig2dec
+	media-libs/jpeg
+	media-libs/openjpeg
+	X? ( x11-libs/libX11
+		x11-libs/libXext )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-buildsystem.patch
+}
+
+src_compile() {
+	my_pdfexe=
+	use X || my_pdfexe="PDFVIEW_EXE="
+
+	emake build=release ${my_pdfexe} CC="$(tc-getCC)" verbose=true || die
+}
+
+src_install() {
+	emake build=release ${my_pdfexe} prefix="${D}usr" \
+		libprefix="${D}usr/$(get_libdir)" verbose=true install || die
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins debian/mupdf.pc || die
+
+	if use X ; then
+		domenu debian/mupdf.desktop || die
+		doicon debian/mupdf.xpm || die
+		doman debian/mupdf.1 || die
+	fi
+	doman debian/pdf{clean,draw,show}.1 || die
+	dodoc README || die
+
+	# avoid collision with app-text/poppler-utils
+	mv "${D}"usr/bin/pdfinfo "${D}"usr/bin/mupdf_pdfinfo || die
+}
+
+pkg_postinst() {
+	elog "pdfinfo was renamed to mupdf_pdfinfo"
+}