7 files changed, 47 insertions, 127 deletions
diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 50cba6c7a561..ae9da660afdf 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.8 2011/01/31 14:45:35 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.9 2011/02/17 02:15:26 xmw Exp $
+
+*mupdf-0.7_p20110212 (17 Feb 2011)
+
+  17 Feb 2011; Michael Weber <xmw@gentoo.org> -mupdf-0.6.ebuild,
+  -files/mupdf-0.6-buildsystem.patch, -mupdf-0.7.ebuild,
+  +mupdf-0.7_p20110212.ebuild, +files/mupdf-0.7_p20110212-buildsystem.patch,
+  +files/mupdf-0.7_p20110212-zoom.patch, mupdf-9999.ebuild,
+  -files/mupdf-9999-zoom.patch:
+  Removed old ebuilds. Created a snapshot and added -j1.
 
 *mupdf-9999 (31 Jan 2011)
 
diff --git a/app-text/mupdf/files/mupdf-0.6-buildsystem.patch b/app-text/mupdf/files/mupdf-0.6-buildsystem.patch
deleted file mode 100644
index 56086726e6c3..000000000000
--- a/app-text/mupdf/files/mupdf-0.6-buildsystem.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Michael Weber Jun 5th 2010
-  Possibility to pass /usr/lib64 on multilib/64bit systems.
-  Dropped the hard compiler options for compartibility on older chips.
-
---- Makefile	2010-06-05 16:38:48.000000000 +0200
-+++ Makefile	2010-06-05 16:41:43.000000000 +0200
-@@ -7,6 +7,7 @@
- 
- build ?= debug
- prefix ?= /usr/local
-+libprefix ?= $(prefix)/lib
- 
- OBJDIR := build/$(build)
- GENDIR := build/generated
-@@ -314,8 +315,8 @@
- 	rm -rf build
- 
- install: $(DIRS) $(APPS) $(MUPDF_LIB)
--	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	2010-06-05 16:38:48.000000000 +0200
-+++ Makerules	2010-06-05 16:49:44.000000000 +0200
-@@ -4,8 +4,8 @@
- OS := $(OS:MINGW%=MINGW)
- 
- LIBS := -ljbig2dec -lopenjpeg -ljpeg -lz -lm
--CFLAGS := -Wall --std=gnu99 -Ifitz -Imupdf $(THIRD_INCS)
--LDFLAGS =
-+CFLAGS += -Wall --std=gnu99 -Ifitz -Imupdf $(THIRD_INCS)
-+LDFLAGS +=
- CC = cc
- LD = $(CC)
- AR = ar
-@@ -23,10 +23,10 @@
- CFLAGS += `pkg-config --cflags freetype2`
- LDFLAGS += `pkg-config --libs freetype2`
- endif
--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
-+CFLAGS += 
- ARCH_SRC = archx86.c
- endif
- endif
diff --git a/app-text/mupdf/files/mupdf-0.7_p20110212-buildsystem.patch b/app-text/mupdf/files/mupdf-0.7_p20110212-buildsystem.patch
new file mode 100644
index 000000000000..299179706ea5
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-0.7_p20110212-buildsystem.patch
@@ -0,0 +1,22 @@
+--- mupdf-0.7_p20110212/Makerules.orig
++++ mupdf-0.7_p20110212/Makerules
+@@ -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/files/mupdf-9999-zoom.patch b/app-text/mupdf/files/mupdf-0.7_p20110212-zoom.patch
index 4576ea4407e4..4576ea4407e4 100644
--- a/app-text/mupdf/files/mupdf-9999-zoom.patch
+++ b/app-text/mupdf/files/mupdf-0.7_p20110212-zoom.patch
diff --git a/app-text/mupdf/mupdf-0.6.ebuild b/app-text/mupdf/mupdf-0.6.ebuild
deleted file mode 100644
index 5b579a132c07..000000000000
--- a/app-text/mupdf/mupdf-0.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.6.ebuild,v 1.2 2010/11/11 17:34:49 ssuominen 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/source/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-S=${WORKDIR}/${PN}
-
-RDEPEND="media-libs/freetype:2
-	media-libs/jbig2dec
-	virtual/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() {
-	use x86 && append-cflags -DARCH_X86
-	use amd64 && append-cflags -DARCH_X86_64
-
-	my_pdfexe=
-	use X || my_pdfexe="PDFVIEW_EXE="
-
-	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-0.7.ebuild b/app-text/mupdf/mupdf-0.7_p20110212.ebuild
index 525394e4692c..5a895c46dfbf 100644
--- a/app-text/mupdf/mupdf-0.7.ebuild
+++ b/app-text/mupdf/mupdf-0.7_p20110212.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.2 2010/11/11 17:34:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-0.7_p20110212.ebuild,v 1.1 2011/02/17 02:15:26 xmw Exp $
 
 EAPI=2
 
-inherit eutils flag-o-matic multilib toolchain-funcs
+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/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -26,18 +26,22 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-buildsystem.patch
+
+	epatch "${FILESDIR}"/${P}-zoom.patch
+
+	sed -i -e '/CFLAGS/s: -DNDEBUG : :' Makerules || die
 }
 
 src_compile() {
 	my_pdfexe=
 	use X || my_pdfexe="PDFVIEW_EXE="
 
-	emake build=release ${my_pdfexe} CC="$(tc-getCC)" verbose=true || die
+	emake build=release ${my_pdfexe} CC="$(tc-getCC)" verbose=true -j1 || die
 }
 
 src_install() {
 	emake build=release ${my_pdfexe} prefix="${D}usr" \
-		libprefix="${D}usr/$(get_libdir)" verbose=true install || die
+		LIBDIR="${D}usr/$(get_libdir)" verbose=true install || die
 
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins debian/mupdf.pc || die
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index 69b539b7ce85..074aae01e03d 100644
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.1 2011/01/31 14:45:35 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.2 2011/02/17 02:15:26 xmw Exp $
 
 EAPI=2
 
@@ -27,9 +27,9 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7-buildsystem.patch
+	epatch "${FILESDIR}"/${PN}-0.7_p20110212-buildsystem.patch
 
-	epatch "${FILESDIR}"/${P}-zoom.patch
+	epatch "${FILESDIR}"/${PN}-0.7_p20110212-zoom.patch
 
 	sed -i -e '/CFLAGS/s: -DNDEBUG : :' Makerules || die
 }
@@ -38,12 +38,12 @@ src_compile() {
 	my_pdfexe=
 	use X || my_pdfexe="PDFVIEW_EXE="
 
-	emake build=release ${my_pdfexe} CC="$(tc-getCC)" verbose=true || die
+	emake build=release ${my_pdfexe} CC="$(tc-getCC)" verbose=true -j1 || die
 }
 
 src_install() {
 	emake build=release ${my_pdfexe} prefix="${D}usr" \
-		libprefix="${D}usr/$(get_libdir)" verbose=true install || die
+		LIBDIR="${D}usr/$(get_libdir)" verbose=true install || die
 
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins debian/mupdf.pc || die