app-text/mupdf: Version bump. ftjam build system replaced by Makefile

svn path=/sunrise/; revision=10633

5 files changed, 115 insertions, 50 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 0ee0fd5bb..15689a449 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Jun 2010; Michael Weber (xmw) <gentoo@xmw.de> -mupdf-940.ebuild,
+  +mupdf-1170.ebuild, +files/mupdf-1170-buildsystem.patch:
+  Version bump. ftjam build system replaced by Makefile
+
   29 Apr 2010; Michael Weber (xmw) <gentoo@xmw.de> mupdf-940.ebuild:
   HOMEPAGE and SRC_URI updated
 
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 0dad3272b..e4d7df26a 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,4 +1,5 @@
-DIST mupdf-r940.tar.gz 3611853 RMD160 872d495ff4cce1286b032cd2e867fe979e5391c1 SHA1 d3b293e5b5465d2f775d27d7bd6d607c1fbdd890 SHA256 ed00e461f3ad03ee9d7634abdd183f843e41367b6326809255a4b216f452c9bf
-EBUILD mupdf-940.ebuild 1143 RMD160 6393a0d2bde56c044e9fb1b2a20aa02a5e546f30 SHA1 0a7294687af99acd6f815addd41ec5b6ccd8f05b SHA256 55ea3c7ffafd9020d33a85559cc811221c812747edb4d9b590892ba003fc9872
-MISC ChangeLog 626 RMD160 40f7f7569ff2eb9b7fa2ed403cc6c21c04b1f6de SHA1 06bc9aa51716b9c07554aab627fc14f3874b90d1 SHA256 cca03cc3d5da9f2c55f410917ed070b892425f0fec9bc721d8b8e999102e5cc1
+AUX mupdf-1170-buildsystem.patch 1267 RMD160 849e0073ccb27c6fcce2b0529529c31cb8807d23 SHA1 f204a88b2320495ef654b5c3b4332a155940c043 SHA256 c34ae16ed6ec8fcb20a025297e87f4abda97ec5c6823a91a9214baf8a419f613
+DIST mupdf-r1170.tar.gz 3606407 RMD160 909f34560d7e3109b15300afbf915119eefd5744 SHA1 6b36ac33feb5dfed386746166a87123ab914b87d SHA256 00113927c82945288ab5b6530c626d8701b1c2abc1077eea3fb25b9db066f17e
+EBUILD mupdf-1170.ebuild 1385 RMD160 618faefa6915dd8eeec72cc844bae65caf8e75f4 SHA1 304574db86b31e66a0de15481f8ef3915d22075d SHA256 7ffbf678a5f5f0b1e502c57545b80e8e2fbb9f9e2e226c7b7b9e142a8ea81681
+MISC ChangeLog 812 RMD160 234451333e09911fa2828216f72e3bbb3fa33fa8 SHA1 7086edac57e10b5d58f607004d6d68910e5a0a65 SHA256 8bfc1dae2c5fd8d12fc93522568a5f944cfe656797565781d05c6cf92acbeb8f
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/app-text/mupdf/files/mupdf-1170-buildsystem.patch b/app-text/mupdf/files/mupdf-1170-buildsystem.patch
new file mode 100644
index 000000000..76a19dbbc
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1170-buildsystem.patch
@@ -0,0 +1,44 @@
+--- Makefile.old	2010-05-27 19:22:34.000000000 +0200
++++ Makefile	2010-05-29 19:24:55.000000000 +0200
+@@ -7,6 +7,7 @@
+ 
+ build ?= debug
+ prefix ?= /usr/local
++libprefix ?= $(prefix)/lib
+ 
+ OBJDIR := build/$(build)
+ GENDIR := build/generated
+@@ -301,7 +302,8 @@
+ 	rm -rf build
+ 
+ install: $(DIRS) $(APPS) $(MUPDF_LIB)
+-	install $(APPS) $(prefix)/bin
+-	install $(MUPDF_LIB) $(prefix)/lib
+-	install $(MUPDF_HDR) $(prefix)/include
++	install -d $(prefix)/bin $(libprefix) $(prefix)/include
++	install $(APPS) -t $(prefix)/bin
++	install $(MUPDF_LIB) -t $(libprefix)
++	install $(MUPDF_HDR) -t $(prefix)/include
+ 
+--- Makerules.old	2010-05-20 18:37:16.000000000 +0200
++++ Makerules	2010-05-29 19:29:49.000000000 +0200
+@@ -4,8 +4,8 @@
+ OS := $(OS:MINGW%=MINGW)
+ 
+ LIBS := -ljbig2dec -lopenjpeg -lfreetype -ljpeg -lz -lm
+-CFLAGS := -Wall --std=gnu99 -Ifitz -Imupdf
+-LDFLAGS =
++CFLAGS += -Wall --std=gnu99 -Ifitz -Imupdf
++LDFLAGS +=
+ CC = cc
+ LD = $(CC)
+ AR = ar
+@@ -21,7 +21,7 @@
+ ifeq "$(OS)" "Linux"
+ CFLAGS += `pkg-config --cflags freetype2`
+ LDFLAGS += `pkg-config --libs freetype2`
+-X11LIBS = -lX11 -lXext
++X11LIBS += `pkg-config --libs x11 xext`
+ PDFVIEW_EXE = $(X11VIEW_EXE)
+ ifeq  "$(build)" "release"
+ CFLAGS += -mmmx -ftree-vectorize -msse -msse2 -march=k8 -DARCH_X86
diff --git a/app-text/mupdf/mupdf-1170.ebuild b/app-text/mupdf/mupdf-1170.ebuild
new file mode 100644
index 000000000..31be9f4d0
--- /dev/null
+++ b/app-text/mupdf/mupdf-1170.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI="http://${PN}.com/download/${PN}-r${PV}.tar.gz
+	http://xmw.de/mirror/${PN}/${PN}-r${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+S=${WORKDIR}/${PN}
+
+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=
+	if ! use X ; then
+		my_pdfexe="PDFVIEW_EXE="
+	fi
+	emake build=release ${my_pdfexe} CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	emake build=release ${my_pdfexe} prefix="${D}usr" \
+		libprefix="${D}usr/$(get_libdir)" 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"
+}
diff --git a/app-text/mupdf/mupdf-940.ebuild b/app-text/mupdf/mupdf-940.ebuild
deleted file mode 100644
index bc4313fe8..000000000
--- a/app-text/mupdf/mupdf-940.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="http://mupdf.com/"
-SRC_URI="http://${PN}.com/download/${PN}-r${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cjk jbig jpeg2k"
-
-S=${WORKDIR}/${PN}
-
-RDEPEND="media-libs/freetype:2
-	media-libs/jpeg
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXext
-	jbig? ( media-libs/jbigkit )
-	jpeg2k? ( media-libs/jasper )"
-DEPEND="${RDEPEND}
-	dev-util/ftjam"
-
-src_compile() {
-	cat <<EOF >> Jamrules
-LINKFLAGS = ${LDFLAGS} ;
-OPTIM = ${CFLAGS} ;
-ALL_LOCATE_TARGET = [ FDirName \$(TOP) build ] ;
-EOF
-	local my_param=""
-	use cjk || my_param="'-sDEFINES=NOCJK'"
-	use jbig && my_param="${my_param} '-sHAVE_JBIG2DEC=yes'"
-	use jpeg2k && my_param="${my_param} '-sHAVE_JASPER=yes'"
-	jam ${my_param} || die
-}
-
-src_install() {
-	dobin build/{{cmap,font}dump,mupdf,pdf{clean,draw,extract,show}} || die
-	newbin build/pdfinfo mupdf_pdfinfo || die # avoid collision with app-text/poppler-utils
-	dolib build/*.a || die
-
-	dodoc README || die
-}