Version bump, remove old version.

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

4 files changed, 43 insertions, 16 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index c7ca000a7a52..9ab6f86343c9 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.35 2012/04/09 21:16:44 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.36 2012/04/25 22:37:34 xmw Exp $
+
+*mupdf-1.0 (25 Apr 2012)
+
+  25 Apr 2012; Michael Weber <xmw@gentoo.org> -mupdf-0.9_p20120221.ebuild,
+  +mupdf-1.0.ebuild, +files/mupdf-1.0-buildsystem.patch:
+  Version bump, remove old version.
 
   09 Apr 2012; Michael Weber <xmw@gentoo.org> mupdf-1.0_rc1.ebuild,
   mupdf-9999.ebuild:
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index d3d801593dbc..6a27c4a4c50d 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -5,22 +5,23 @@ AUX mupdf-0.8.165-buildsystem.patch 488 RMD160 01672e1df7bbb3829714828ed6a5f45fa
 AUX mupdf-0.8.165-zoom.patch 1281 RMD160 cd4569419735c18e837821453223d27a8f6d96a5 SHA1 d8c21a355ff2dc648c33ce2e30b35b66e8b9ca49 SHA256 8215d4f9c27bf1899524046fe431890e0eb3a1390676b3ad69d97ae0eec0e3d0
 AUX mupdf-0.9-dpi_hack.patch 633 RMD160 23be7c67ef6977e3ccb7b7445ef0b0977ebdfd53 SHA1 2eab36a66487e5aa777ff97924d9b3cd41e96ecd SHA256 76724555c6044864ef01dbdc6f27b7b47d705155556cb6bf7056285ad64e6341
 AUX mupdf-0.9-scroll_hack.patch 1533 RMD160 3e207e8adc85cdcf7d6f3858cae272d85e31e5b3 SHA1 d473df8c6978515638442c1ae66e198b1229a96b SHA256 a5750a052f975c55b58e27f138a0e5fa51cb118483c43a987f4aeaf2abfa0d95
+AUX mupdf-1.0-buildsystem.patch 454 RMD160 0c5f95d82eee7fde8ca09441cb3420f889d111b1 SHA1 2914f4457412d9899b3bbd213fa28a8edaf130a0 SHA256 a56f4fd16512aa21dd7af91c634398ede2a8a82a148f41b91f8eb25b32fefc48
 AUX mupdf-9999-scroll.patch 1368 RMD160 2832510f89cd909a7b4b1fccecbc15c18646217a SHA1 0b4f6c5be5c18d3b1041e184a8e8f0faf590249b SHA256 84b0d2bcdfeac572e510e3aa994b26e84709b0989382df8d669822d263857686
 AUX mupdf-9999-zoom-1.patch 355 RMD160 1d242430b3b1ddf8851a6bd25ca1aa153af5986f SHA1 62272bc3b19a847cb989ccb2880421e567f4632e SHA256 e079ab9c832feb80f0669353606d665378188355bc699a0431241a303ad421a4
 AUX mupdf-9999-zoom.patch 1281 RMD160 1c6fc4b18d5d87a195c7fc7b1e86c5c20806f8af SHA1 91f0d301cde62d30e88c76daebefd943f0f92c1b SHA256 c294cdf096df023a34d573f2c271080845611b84b7d9fd82a1bd634eef54cd07
 DIST mupdf-0.9-source.tar.gz 3917075 RMD160 9ba1df205f9f95c7ff4b0a3be224786ad5a65d99 SHA1 3a3ba42d19e3211199110e7c782263241cdea8a0 SHA256 abed825cb1d73e0e28f0a7ee72b5d7a451ba41d21b0c55837ed2a212f3b16b2d
-DIST mupdf-0.9_p20120221.tar.gz 4064641 RMD160 7fd86bb05834b2338f1daf87ae0459ccb55fc84b SHA1 b2ce4e95b9abec8a299d9e0d936c601d39f196cf SHA256 fae9ca749449d8857a85ecaa8f73d8609a0ef331ff6aa0179972f3896151651f
+DIST mupdf-1.0-source.tar.gz 4208530 RMD160 7820cf68552d64c52c7d08cdcf5a1965df39bd42 SHA1 c5c4496836cdd4bdf7b2d2344ec045c9508e49e4 SHA256 4f5e12625f7f827f6eb5606026c9a7a7dbdeaf935fcea3bc173ed8d469698ec2
 DIST mupdf-1.0rc1-source.tar.gz 4262574 RMD160 58ddc24dc8b972ad282572c16d664cd29b63b1e1 SHA1 6850c155324c0e431edd491a7f04bfc2b3962c7e SHA256 1676f6df404edc3fb965d48ad885e27dd05fbeca6ba62dac7118baba62c0af39
 EBUILD mupdf-0.9.ebuild 1557 RMD160 85a27be3be5fa815e0f771750540ac3d027f4ba8 SHA1 b9cad4067d1ae18a3b1b99890df461068df706b5 SHA256 f274fb3e4fc71fae7e0435745debb2ba2aacb0ce7eddf44a55fe87e060d3c40b
-EBUILD mupdf-0.9_p20120221.ebuild 1346 RMD160 e89a8d168ab841e815bc53a993286b2e4a9d9cfe SHA1 58f82c31d249c4eb1e2ef75997698c7b1bf4e8fc SHA256 b2cc41b50890bb441f207128cd0bc4b5b7155bc810be91a09ca5e79f7469a3c4
+EBUILD mupdf-1.0.ebuild 1420 RMD160 c7f0ee707b3b7d6a8d491120bf0853897d2ba2dd SHA1 5d72ea5da8fdc1576e3b29355bd133b20f1236b6 SHA256 b99ad05bd9f256b488067f066fe48c12034815c5ac024ff53c97b88ca2f4f01c
 EBUILD mupdf-1.0_rc1.ebuild 1449 RMD160 10ad4a93c823606f5cda51570d06043dcf3f14a3 SHA1 c4450787728ae13e0c35652edc4b84b1f30b812f SHA256 3cb62b0fa19f889fc4416c240d7e005e5973cdd029d34dd90003fd052266509d
 EBUILD mupdf-9999.ebuild 1371 RMD160 49e9a9781f1ceed7de60e36a09083b534801f722 SHA1 008cd65a03d7df5e6134bb210da655df3707691d SHA256 51b483ca9e1908117374b1549a7b2a4f97b6fd6b355526ec32657e8e7e008fa0
-MISC ChangeLog 6043 RMD160 f08807b6c7b2666309a7572c2c347d601b58508e SHA1 c4af66a29707511176f20fa21a9e7f892c74bc2a SHA256 a7078d16c2b8a1482250e248c5b3ca2f11b699dab946253fc7e46da280237aea
+MISC ChangeLog 6238 RMD160 af30f1383d406d316a08ba4af7bf932c84e96818 SHA1 78ee5138fce82cfa924ee604f77f2a8d0e310227 SHA256 fdcb64f36b5a577a13dbd155e6098780abb33ca1617e0354cfa608983faeffa4
 MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF0EAREIAAYFAk+DUcYACgkQknrdDGLu8JB2xwD4nBMUd265ihWBzNtlYiPZf0xP
-lMKPiA9g5X7Pmg3qQQEAkFe0ZZZjxHqR9lB4fJXu2hsmRZcwNbwgaiQsNXhLzOw=
-=/SWy
+iF4EAREIAAYFAk+YfLEACgkQknrdDGLu8JB9aQD/fvoKup7pk6XV1Ztg7KhokV+g
+u5QdeBUH0W3fyJ9sQvoA/19BcIX7cfe5MShTNZL03D8dt8fYOda6BOlnqdLn9ukI
+=tm7B
 -----END PGP SIGNATURE-----
diff --git a/app-text/mupdf/files/mupdf-1.0-buildsystem.patch b/app-text/mupdf/files/mupdf-1.0-buildsystem.patch
new file mode 100644
index 000000000000..6a66f3c46e55
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.0-buildsystem.patch
@@ -0,0 +1,20 @@
+--- mupdf-1.0-source/Makerules
++++ mupdf-1.0-source/Makerules
+@@ -6,7 +6,7 @@
+ CFLAGS += -Wall
+ 
+ ifeq "$(build)" "debug"
+-CFLAGS += -pipe -g -DDEBUG
++CFLAGS += -DDEBUG
+ else ifeq "$(build)" "profile"
+ CFLAGS += -pipe -O2 -DNDEBUG -pg
+ LDFLAGS += -pg
+@@ -22,7 +22,7 @@
+ 
+ ifeq "$(OS)" "Linux"
+ SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
+-X11_LIBS := -lX11 -lXext
++X11_LIBS := $(shell pkg-config --libs x11 xext)
+ endif
+ 
+ ifeq "$(OS)" "FreeBSD"
diff --git a/app-text/mupdf/mupdf-0.9_p20120221.ebuild b/app-text/mupdf/mupdf-1.0.ebuild
index 4c834dc3de3a..069a67460ee1 100644
--- a/app-text/mupdf/mupdf-0.9_p20120221.ebuild
+++ b/app-text/mupdf/mupdf-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-0.9_p20120221.ebuild,v 1.5 2012/04/07 22:10:06 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.0.ebuild,v 1.1 2012/04/25 22:37:34 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="mirror://gentoo/${P}.tar.gz"
+SRC_URI=" http://${PN}.googlecode.com/files/${P}-source.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -17,20 +17,17 @@ IUSE="X vanilla"
 
 RDEPEND="media-libs/freetype:2
 	media-libs/jbig2dec
+	>=media-libs/openjpeg-1.5
 	virtual/jpeg
-	media-libs/openjpeg
 	X? ( x11-libs/libX11
 		x11-libs/libXext )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_unpack() {
-	default
-	mv mupdf-* ${P} || die
-}
+S=${WORKDIR}/${P}-source
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.8.165-buildsystem.patch
+	epatch "${FILESDIR}"/${P}-buildsystem.patch
 
 	if ! use vanilla ; then
 		epatch "${FILESDIR}"/${PN}-9999-zoom-1.patch
@@ -49,7 +46,9 @@ src_install() {
 		build=debug verbose=true ${my_nox11} install
 
 	insinto /usr/include
-	doins pdf/mupdf.h fitz/fitz.h xps/muxps.h || die
+	doins pdf/mupdf{,-internal}.h
+	doins fitz/fitz{,-internal}.h
+	doins xps/muxps{,-internal}.h
 
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins debian/mupdf.pc
@@ -58,4 +57,5 @@ src_install() {
 		domenu debian/mupdf.desktop
 		doicon debian/mupdf.xpm
 	fi
+	dodoc README doc/{example.c,overview.txt}
 }