Version bump

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

3 files changed, 136 insertions, 5 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index e02a38be69ef..c1599ba316e5 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.101 2014/03/07 21:43:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.102 2014/04/15 13:45:00 xmw Exp $
+
+*mupdf-1.4 (15 Apr 2014)
+
+  15 Apr 2014; Michael Weber <xmw@gentoo.org> +mupdf-1.4.ebuild:
+  Version bump
 
   07 Mar 2014; Pacho Ramos <pacho@gentoo.org> mupdf-1.3_p20140118.ebuild:
   amd64 stable, bug 472532
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index e83cd9d4bfd0..2f67554bfb3d 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -17,16 +17,18 @@ AUX mupdf-1.3-zoom-2.patch 214 SHA256 450b10fd3b9ed1d91df283db0086f89b02b9ff7f8a
 DIST mupdf-1.1_p20121127.tar.gz 6922632 SHA256 4594bc0473e61200e6d2aba06488ea3127a7d42cd70daa01ea12c3dba5eb654c SHA512 1dff76502a5cf13e26f0bed30046878334730912ddec12f2674de69f62b173182020566f1ddd341bf3a51b28af1334c0cfcc70cac0ac8b0fb1dceacae6b25418 WHIRLPOOL 1597b87b7c53e522a5929b8c0c5c07b0a957084fb4b6974d68feea755d88606930b8a78b998efb94190c00d3d9135a60652f2751c709d49315ae10e30dc9ee0e
 DIST mupdf-1.2-source.zip 13808821 SHA256 9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b SHA512 49261c5356d4e5648f89bfb783a23a3c3a470e044fe3b234f0906b0f6b71efad557981682e41ce3d754a5a31f1e5518e5e5f5f8dc83d2ca53181dbd3f4726e02 WHIRLPOOL 86fb60a2ac94c8ca4495c0891dd2b43ea49c9e212e2961f02914a3aaa5685566201f561c196da7d4c568dcec938eea8676959bbec839e33a7bff4e6410cc1a25
 DIST mupdf-1.3_p20140118.tar.gz 7448663 SHA256 ed1791966a60be0d8556cf5e0def0e3093867223f0eb4f12fbffd22804520882 SHA512 c159f58539f1e944608ff7da8f41cef5e955de2f21ab1e37a6fad5577134094186a8b8b7ecdf47a427547e3fde7f04f2d484da6709adf3859c3754e2774b6a56 WHIRLPOOL b24bbbd49921edcea93a80a597bb0139937ac1ef365ae63f83cf7df878586ed2a9ecbef65645b9562627fa2bc2a662991a1af1ffd99e10f10a351bccb951eebe
+DIST mupdf-1.4.tar.gz 7470075 SHA256 ccac5ad1129f051dbaecbeec01b85f548c8bdb1c97b5e1dd397299bf7f988438 SHA512 6de95fa02e3ebaf2f268765df7eb4c1b53ef0b3b39b57b8e64097c429727dd483894e3a62c520151197290a8e392b9b1746109fc3eb528b44245040acc82a25e WHIRLPOOL a43ab9bbaf5cd5e40445ace3fdeb9e0b57e4924c7e9a7669899275da2c8a41725d862fb1cd85d779852ec794be8184b7d21aaee932024d7d0557e076de6611a4
 EBUILD mupdf-1.1_p20121127.ebuild 1488 SHA256 4e11b767db4d78de3d5b7e83ca1ec97880c30375249db419265100366fd20585 SHA512 fdbe754cf384c594f754a31e3d5153f25fc43966fc359f999e2852eb3eefbe13d1ca03a022dfbfd0a649a1b1a4f6d84fd5232005a5203ead16768eb12fa32f90 WHIRLPOOL 7b1e8e8b2b2c5209a5cd81de3bc70d0dae0d905d12006800618b1ac31212fe5b2bb0aef6a7e6dd8151052f1d56a1437d0687b10e635ddf2529e35eb9daedb6b8
 EBUILD mupdf-1.2.ebuild 3262 SHA256 c45558c5cabf6397387fb720b2386ae26ca51053476f9c35033ef650e0917224 SHA512 e731b9677189ab672a9964af903f49251013c16ada84da2502a0190a48d09334a6dd32badb8add94c783dab5e26fe90afe45f2447cb19fd1938d737c4937c7bd WHIRLPOOL 65d597df589f05c25a531644eaecce96d0e5e6db293c90d810ff63731cb41e5b970095cf56218213bd6aa2a8d6fe8ecc314f21b510c6c2b4805d178e0d784e2a
 EBUILD mupdf-1.3_p20140118.ebuild 3878 SHA256 6703e7c388dfc74b3235d8f46b8b8da04211a123f40da6e5337881d9b6118265 SHA512 ea986059ec8bd7bfa247ed7812e1de75ebb6cef4e7ca19bf9be617187d314596657cc7e8f95c136258f1de7ad7ad91cf3a5ba36d556572f80c8f95766796a7a5 WHIRLPOOL a3b640eed759229681900c4948b7e90eebde3425da804ab1bf7f6882486ec14da86a118ef96023088adfbc850b36fb5b992a2f396b4fa5cf9a3ffabd7cb2dc35
+EBUILD mupdf-1.4.ebuild 3868 SHA256 502bbcc7c2d6ecdc2a6ad8b0c12359c3f9a1f1933f253493eed63f01d6116ca4 SHA512 4ebf2bc03c4647e138f416be2ea656e4bb8c9626770cba085b7ac5dc2154d9a38195b80e130ed50764cb57d0e4a663f78e626e1428e7b884383b41bad2d20d80 WHIRLPOOL ceb2b3610b782415e215dce4acdb0878809213f284ab7da11f3a60d002f1ab226ba209ec6aee14b86ebffc732ff2cfe396fff1a04ef5afdb7532fee36135fe1d
 EBUILD mupdf-9999.ebuild 3712 SHA256 efa31c6d29c3fc952a65ff6a247e12aabc2c8f4fdcf0c12452b03d36056b1fdf SHA512 9b94172ab94501d7b5b3d7903e38df7e1bf4f6cdc9f09256c46ab40fb1d29dce02ec194f74c2a01c9cfd5a6bf2884343d429cb2689409dce38fe9322d53d6a1f WHIRLPOOL f573d5ec557eb0413d76b69753139526a1e51039280a8ce339faf7a2604d80fc45cc9dd7231038785b5d2626c8fc1fb88c890ec085f040e577c6e0f1152893fa
-MISC ChangeLog 15756 SHA256 dc7448a4bb7d5937b27cffcb99f0ce31551e45e3e11c56aa0bcdbd38dc08497e SHA512 652603a06afceec7e5a26e74346bfb9783e50b8e5a981bf91ef4673f5d2eb788ed8df44aee2efc2e7eb8675ef577c0bcd731d14dfa36870a3b46ee1afada8222 WHIRLPOOL 9437362fcbf799b4e2098b1131eb13a7cae922fbc8908c07ee86df1f4c3c5478947967d7e0b27cd21c60a5023740125b2d1c8ddf41a607f154763fc61b7a5f2f
+MISC ChangeLog 15861 SHA256 0309e706b4a98130bb3d62ee89a1d6014c63223ab6dcb6258de30cb860b60d4f SHA512 eabcf53c8ff88f1e8b44bfb521066077a96b761b3233df0c8cadbf7b1e761b3ba578c7f0c775ef62c03a9731210511bed171cea9a7be089eec7b6c4d6c408677 WHIRLPOOL fdc26473d4b1a214629938241b9f06edd01fa3a2fbddd6b65f709862556954b385327e581665c4e2062ff9bca00257c617c543a7aa4813873af0f53414dc7d18
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMaPYQACgkQCaWpQKGI+9QNFwCcCrjgd9v4u/7n4WljUgeoTP71
-kBgAn0PNDffFWZXhmj5X85byah1jLY9d
-=zprS
+iF4EAREIAAYFAlNNN+EACgkQknrdDGLu8JCbXAEAltLxnKuBFxxaHcUrI2mEmkRK
+UCReKIiBFcunBWocDsIBAIhw+On4Vp44Xu2S2mna5V36nXp4Jzg87Wh2M9Bj88XH
+=9+al
 -----END PGP SIGNATURE-----
diff --git a/app-text/mupdf/mupdf-1.4.ebuild b/app-text/mupdf/mupdf-1.4.ebuild
new file mode 100644
index 000000000000..f055cb92b916
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.4.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.4.ebuild,v 1.1 2014/04/15 13:45:00 xmw Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=eebc3385ebfa60574d78cf41badd6622987c1121;sf=tgz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/1.4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X vanilla static static-libs"
+
+LIB_DEPEND="dev-libs/openssl[static-libs?]
+	media-libs/freetype:2[static-libs?]
+	media-libs/jbig2dec[static-libs?]
+	media-libs/openjpeg:2[static-libs?]
+	net-misc/curl[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )"
+RDEPEND="${LIB_DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	static-libs? ( ${LIB_DEPEND} )
+	static? ( ${LIB_DEPEND//?}
+		app-arch/bzip2[static-libs]
+		x11-libs/libXau[static-libs]
+		x11-libs/libXdmcp[static-libs]
+		x11-libs/libxcb[static-libs] )"
+
+src_prepare() {
+	rm -rf thirdparty || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
+		"${FILESDIR}"/${PN}-1.3-openjpeg2.patch \
+		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
+		"${FILESDIR}"/${PN}-1.3-sys_curl.patch
+
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOR}/usr:" \
+		-i platform/debian/${PN}.pc || die
+
+	use vanilla || epatch \
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch \
+		"${FILESDIR}"/${PN}-1.3-forward_back.patch
+
+	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
+	sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
+		-i platform/debian/${PN}.desktop || die
+
+	sed -e "\$aOS = Linux" \
+		-e "\$aCC = $(tc-getCC)" \
+		-e "\$aLD = $(tc-getCC)" \
+		-e "\$aAR = $(tc-getAR)" \
+		-e "\$averbose = true" \
+		-e "\$abuild = debug" \
+		-e "\$aprefix = ${ED}usr" \
+		-e "\$alibdir = ${ED}usr/$(get_libdir)" \
+		-i Makerules || die
+
+	if ! use X ; then
+		sed -e "\$aNOX11 = yes" \
+			-i Makerules || die
+	fi
+
+	if use static-libs || use static ; then
+		cp -a "${S}" "${S}"-static || die
+		#add missing Libs.private for xcb and freetype
+		sed -e 's:\(pkg-config --libs\):\1 --static:' \
+		    -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
+		    -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
+			-i "${S}"-static/Makerules || die
+	fi
+
+	my_soname=libmupdf.so.1.3
+	my_soname_js_none=libmupdf-js-none.so.1.3
+	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
+		-e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \
+		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
+		-e "/^MUPDF_JS_NONE_LIB :=/s:=.*:= \$(OUT)/${my_soname_js_none}:" \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake XCFLAGS="-fpic"
+	use static-libs && \
+		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
+	use static && \
+		emake -C "${S}"-static XLIBS="-static"
+}
+
+src_install() {
+	if use X ; then
+		domenu platform/debian/${PN}.desktop
+		doicon platform/debian/${PN}.xpm
+		dobin platform/debian/${PN}-select-file
+	else
+		rm docs/man/${PN}.1
+	fi
+
+	emake install
+	dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
+
+	use static-libs && \
+		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
+	if use static ; then
+		dobin "${S}"-static/build/debug/mu{tool,draw}
+		use X && dobin "${S}"-static/build/debug/${PN}-x11
+	fi
+	use X && dosym ${PN}-x11 /usr/bin/${PN}
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README docs/*.{txt,c}
+}