Version bump to -1.0rc1, cleanup -9999

(Portage version: 2.1.10.49/cvs/Linux x86_64)

3 files changed, 73 insertions, 6 deletions

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/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