app-text/mupdf: Version bump, cleaned up the CFLAGS situation in the build system.

svn path=/sunrise/; revision=10659

5 files changed, 68 insertions, 54 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 15689a449..a33e2e8fd 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Jun 2010; Michael Weber (xmw) <gentoo@xmw.de> +mupdf-0.6.ebuild,
+  +files/mupdf-0.6-buildsystem.patch, -mupdf-1170.ebuild,
+  -files/mupdf-1170-buildsystem.patch:
+  Version bump, cleaned up the CFLAGS situation in the build system.
+
   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
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index e4d7df26a..b1520039c 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,5 +1,5 @@
-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
+AUX mupdf-0.6-buildsystem.patch 1446 RMD160 dbc139d01e47658a2339b6b8b65fe9fa8bfd9870 SHA1 0f4d9b7b47a24590623ef606ffbd6b878b2327a0 SHA256 bf6c539e530fe30f0bfb4c1c3f0e916d07ac18f035764e5afaf6b280c900b06f
+DIST mupdf-0.6-source.tar.gz 3607245 RMD160 50b1ed1c3c07613a1dbb19cfe63cb47d4f2ae2fe SHA1 dd501da6f50c686c6d519fe6ae7c951d2e2d7e1c SHA256 6f87c4f113ee9e0f4bdfd3a316ef44052edc4febc8f7b531c4a3f44ffe149605
+EBUILD mupdf-0.6.ebuild 1469 RMD160 599be1f9fe355c0e2088a58121786ade7b0242d1 SHA1 deed5087824b81622626fe7da3566f7ff5ec5a95 SHA256 859abf89c34ee282bf62fe2e94226e395a09b414f6adaf9d39c76f7b68f221f5
+MISC ChangeLog 1049 RMD160 3df28ef58476e7c1b74eb6658fefbad9fab39e94 SHA1 9a83cec7979a5a81fee048387029e8ab09c87f86 SHA256 7cfc8000e4df13c7183d1cf354f74796ab1459aad504de924b5888ae7d79bacb
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/app-text/mupdf/files/mupdf-0.6-buildsystem.patch b/app-text/mupdf/files/mupdf-0.6-buildsystem.patch
new file mode 100644
index 000000000..56086726e
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-0.6-buildsystem.patch
@@ -0,0 +1,51 @@
+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-1170-buildsystem.patch b/app-text/mupdf/files/mupdf-1170-buildsystem.patch
deleted file mode 100644
index 76a19dbbc..000000000
--- a/app-text/mupdf/files/mupdf-1170-buildsystem.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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-0.6.ebuild
index 31be9f4d0..d0546bb7d 100644
--- a/app-text/mupdf/mupdf-1170.ebuild
+++ b/app-text/mupdf/mupdf-0.6.ebuild
@@ -4,12 +4,12 @@
 
 EAPI=2
 
-inherit eutils multilib toolchain-funcs
+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/${PN}-r${PV}.tar.gz
-	http://xmw.de/mirror/${PN}/${PN}-r${PV}.tar.gz"
+SRC_URI="http://${PN}.com/download/source/${P}-source.tar.gz
+	http://xmw.de/mirror/${PN}/${P}-source.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -32,10 +32,12 @@ src_prepare() {
 }
 
 src_compile() {
+	use x86 && append-cflags -DARCH_X86
+	use amd64 && append-cflags -DARCH_X86_64
+
 	my_pdfexe=
-	if ! use X ; then
-		my_pdfexe="PDFVIEW_EXE="
-	fi
+	use X || my_pdfexe="PDFVIEW_EXE="
+
 	emake build=release ${my_pdfexe} CC="$(tc-getCC)" || die
 }