Version bump to -1.0rc1, cleanup -9999

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

5 files changed, 85 insertions, 16 deletions

diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 0431bdd2cfad..059fdd61ee29 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -7,13 +7,13 @@ DIST llpp-11.tar.gz 94957 RMD160 d16e4defdc1d8d8d850d27b8a1e6ca89727ae144 SHA1 e
 DIST llpp-7.tar.gz 46931 RMD160 8887de279c19f33c6e4390a1a793f0c3f00f993b SHA1 512675c5865667cbf7430f050e7e62dd11dc74f7 SHA256 b359380afda9deaec85353e3ca0b603f2c512956b9f7f70970847aec2dfd5a5a
 EBUILD llpp-11.ebuild 1557 RMD160 2cdd7cf25135056a356fcd3f54d3c72f254b6b61 SHA1 59a9cb2fa44482c00a805d3699d1ed5ccf9b0b42 SHA256 eaf730fb93be6dee2873263f99a30a822dcc71312cfd10730a7b2b25482860cc
 EBUILD llpp-7.ebuild 1974 RMD160 a5b8ff00760b2af17949b93aa038140746ff276c SHA1 915f8569ff20e7675116df1d72e3027ec697f30d SHA256 e387a5b3a320671b3442b498682bf22bc574103431a7d4e20c4158f234a084dd
-EBUILD llpp-9999.ebuild 1506 RMD160 9675d8a015a53a077c26dbcf1511abdd2160d8f6 SHA1 d31fb7474ef88131be402954c9ce7bef1c3cb408 SHA256 3aece582355a5b4041e83d0c1e05155bbd2d9207139a5f2d9b386160871de3f5
-MISC ChangeLog 3129 RMD160 c0cfd94b002db1919467ed626d67248fce497179 SHA1 15b1c570a4bffc7178a621f7f4e7180012df4886 SHA256 19b8b404d3a8ffa5b377b1e5ebd5b8a82354483e4dbe6d2df9d099c09b103d9a
+EBUILD llpp-9999.ebuild 1510 RMD160 5fc9c01b2a12b4f5b0d2f33d251813cfcf59465d SHA1 658d3faa09f4c8608aad89405f7d97ee489b700f SHA256 e65111efc5d70916b7ab86cdcb2757d862066bc3ceb390a1725b92894648fb80
+MISC ChangeLog 3236 RMD160 0efeffe5d4cb176a9e8e788235439255b667f4c0 SHA1 8b0f1c33bb26f8225d47d5dbba500abbc03a5efe SHA256 54a02e2f111573d71aa7eb9b165db509e05fd0b11f38e924d5c4d6041e58074e
 MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9wGXkACgkQknrdDGLu8JCo3QD+PRUrpbp9e0h3tnLcNB+GaCES
-0Gi7M5WmmX6oXmbOVPcA/AltCFdB8MPzgoSYXncdvMTApJZ8F1ST20al87ykcI76
-=DON0
+iF4EAREIAAYFAk+AjOQACgkQknrdDGLu8JBb2QEAjRtdC570L2VimmxeHkHv5sf/
+5eUuNoVCRQz5rQFYmAMBAI3kmxUsIiYl3+cUgIO5Yo/bkZwjszhEZ03BVusaEq4L
+=5qey
 -----END PGP SIGNATURE-----
diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index b1f77bac9803..e3b35af9666f 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.32 2012/04/07 18:15:30 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.33 2012/04/07 18:50:27 xmw Exp $
+
+*mupdf-1.0_rc1 (07 Apr 2012)
+
+  07 Apr 2012; Michael Weber <xmw@gentoo.org> +mupdf-1.0_rc1.ebuild,
+  mupdf-9999.ebuild:
+  Version bump to -1.0rc1, cleanup -9999
 
   07 Apr 2012; Michael Weber <xmw@gentoo.org> mupdf-0.9.ebuild,
   mupdf-0.9_p20120221.ebuild, mupdf-9999.ebuild:
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 2f04beb6b59b..a6417646eb55 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -10,15 +10,17 @@ AUX mupdf-9999-zoom-1.patch 355 RMD160 1d242430b3b1ddf8851a6bd25ca1aa153af5986f
 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.0rc1-source.tar.gz 4262574 RMD160 58ddc24dc8b972ad282572c16d664cd29b63b1e1 SHA1 6850c155324c0e431edd491a7f04bfc2b3962c7e SHA256 1676f6df404edc3fb965d48ad885e27dd05fbeca6ba62dac7118baba62c0af39
 EBUILD mupdf-0.9.ebuild 1557 RMD160 e6397039a7ca366e6a601d94f80078689e6185f3 SHA1 85281a12f09c255a1ad7c0e433954c218d5eced8 SHA256 aa2d1bd5fc856b5d99204970161df82fe0ef0efb0541acf1def1c4d0b7bed5dc
 EBUILD mupdf-0.9_p20120221.ebuild 1346 RMD160 cacb0d84a92a9244e56512b7b6710c2520c0cfb7 SHA1 4439d0bbb35f93b257fda5df1142ed291bd72d06 SHA256 aa45cc9e1ae3ee81d10b1dc891323ba3645cf329afd38b94ae5194bbcaeeb6dd
-EBUILD mupdf-9999.ebuild 1397 RMD160 d4640c1f9e64bb029e372a904764a0cfbd2aa2ff SHA1 b95278af6bbc93f761aa6a406ab7b047918ef4a3 SHA256 e030e84eafa74d1eeb433d359178e26e86dbc082d5e9ab11632654c37bf41fda
-MISC ChangeLog 5520 RMD160 2bc9ff4a10f09dd63a197322575dee8f98d42d52 SHA1 145498aa0a76a222b9abc8879928a73f0fb348bf SHA256 fdc58b0089f09fec4840a9a7a0ec60a58c47be95c2f72482ffa57537c6fe5afe
+EBUILD mupdf-1.0_rc1.ebuild 1444 RMD160 0702f8ebcc4c0f592082c7c0fdf0c36a0ff948c9 SHA1 689e6b3a3be44b6ab6c627e8511d4c9269e955b3 SHA256 d3c2a226954a4a71a36c8a334ba6418716972de91c420bb4c772a1c2fa195e13
+EBUILD mupdf-9999.ebuild 1366 RMD160 c3286e3af197a2abad9f70d2e7409ccca47088d8 SHA1 062a694272f7af28ab08381ec3e934cb6dee3810 SHA256 5ffae55c4c945edc72cb7984b4845cd71fbc487ea69007faa2f738e6dfb795b9
+MISC ChangeLog 5682 RMD160 aeb4d80f080a54315e5ea968034c22290fc3e50e SHA1 0ec890f81d49cada1205a7fb31436fc3fd863eff SHA256 e3c4c691b5c82544cff77078d9c1ba712bf637b098307e5a2e145630fd337835
 MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk+AhEoACgkQknrdDGLu8JAv7QD7BE4jVEkCYS0XEpNLDQhdZoF/
-+RwH2+Wkn2Y8DYzToMwBAJZyFBYcpA7epaPhhj7FrBmsBmyLjIV+4yBtidRvnDgY
-=ZGUa
+iF4EAREIAAYFAk+AjHoACgkQknrdDGLu8JBgTwEAgBDvy9C2PXAEdy3Mfu3D0JKX
+SK71rWm531QBZCriVLoA/jVipbKg2PDA4IvXKej2aSv00+fN3jhSugwQbP4wVw6w
+=U1ZW
 -----END PGP SIGNATURE-----
diff --git a/app-text/mupdf/mupdf-1.0_rc1.ebuild b/app-text/mupdf/mupdf-1.0_rc1.ebuild
new file mode 100644
index 000000000000..ea85aadfc719
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.0_rc1.ebuild
@@ -0,0 +1,62 @@
+# 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-1.0_rc1.ebuild,v 1.1 2012/04/07 18:50:27 xmw Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+MY_P=${P/_rc/rc}
+SRC_URI=" http://${PN}.googlecode.com/files/${MY_P}-source.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+IUSE="X vanilla"
+
+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"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.8.165-buildsystem.patch
+
+	if ! use vanilla ; then
+		epatch "${FILESDIR}"/${PN}-9999-zoom-1.patch
+	fi
+}
+
+src_compile() {
+	use X || my_nox11="NOX11=yes MUPDF= "
+
+	emake CC="$(tc-getCC)" \
+		build=debug verbose=true ${my_nox11} -j1
+}
+
+src_install() {
+	emake prefix="${ED}usr" LIBDIR="${ED}usr/$(get_libdir)" \
+		build=debug verbose=true ${my_nox11} install
+
+	insinto /usr/include
+	doins pdf/mupdf{,-internal}.h 
+	doins fitz/fitz{,-internal}.h
+	doins xps/muxps{,-internal}.h
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins debian/mupdf.pc
+
+	if use X ; then
+		domenu debian/mupdf.desktop
+		doicon debian/mupdf.xpm
+	fi
+	dodoc README doc/{example.c,overview.txt}
+}
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index 77a215d44c33..2fe453df25d8 100644
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-9999.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-9999.ebuild,v 1.13 2012/04/07 18:15:30 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.14 2012/04/07 18:50:27 xmw Exp $
 
 EAPI=4
 
@@ -10,7 +10,6 @@ inherit eutils flag-o-matic git-2 multilib toolchain-funcs
 
 DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
 HOMEPAGE="http://mupdf.com/"
-SRC_URI=""
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -46,9 +45,9 @@ src_install() {
 		build=debug verbose=true ${my_nox11} install
 
 	insinto /usr/include
-	doins pdf/mupdf{,-internal}.h || die
-	doins fitz/fitz{,-internal}.h || die
-	doins xps/muxps{,-internal}.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