Drop old, adjust mupdf dependency

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

4 files changed, 13 insertions, 66 deletions

diff --git a/app-text/llpp/ChangeLog b/app-text/llpp/ChangeLog
index 17a13fbd9306..d80cb0c48b9e 100644
--- a/app-text/llpp/ChangeLog
+++ b/app-text/llpp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/llpp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.34 2013/02/17 23:13:52 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.35 2013/03/25 09:52:52 xmw Exp $
+
+  25 Mar 2013; Michael Weber <xmw@gentoo.org> -llpp-13.ebuild,
+  llpp-13_p20121123.ebuild:
+  Drop old, adjust mupdf dependency
 
   17 Feb 2013; Michael Weber <xmw@gentoo.org> llpp-9999.ebuild:
   update live build to include utils.ml
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index e6fdc19a3d9e..0ec779a97f6a 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -3,18 +3,16 @@ Hash: SHA256
 
 AUX llpp-11-WM_CLASS.patch 872 SHA256 efcbfc78ab6bcc1af0d4c6eafc737b55ef8ec0b1866f9cc9c95435a1e7d79bcc SHA512 15b25daeb9ef3d3845687c84287f477df10ca826f3909a204f20fe448c875e83741158f429c9c10c08000f481901bbf4f74c301c45c55db9dc8eaa6632e56f47 WHIRLPOOL d019176ea03c57c56d96d9dc652975edf7d024f941d0bccacef1bec6244a2a5544ae1e364786258c0de5686ee3fb6d9cbb3efdc89488ff890a0df1faa355036b
 DIST llpp-12.tar.gz 100362 SHA256 30c66684a1b2892bd1125afb99583abad5cc433dee2c623ec0cdefb0ec4c6fe4 SHA512 c6c298bf0fdf8eb10aa1e1812d386022fae26271084b014a3a512fc1c8cf7c8ca5768c3587e7c83e34210354e4219b74cee22fb51edc1fe467de4c11b631416c WHIRLPOOL f2ffe1005b2f0d89dda865c3d0f0a306e311cad6ef45070a702eefe2c44e59ca5067e95de182fb4673526dea801b8969d44260fb32d1fd57549777f95194dfde
-DIST llpp-13.tar.gz 102399 SHA256 43d74cef7f0235766b99aa4ebdd284f1c5f3472c989f2c49cf16fc118c40598e SHA512 7d59d7ad904cc1fcc82420bd893fab3cbc91a7bf8eb0fbc7345ed2fe5a19885c4e417ea76bb397bce8c0c25ce3b2a93242f43a04e4bfacaa590d6e07775a42ba WHIRLPOOL 06de03657d1becd7d930dfeaf1becb92b95313e3a8f4a3f37cee923fb0a6dc87f10aeb71e96a7a2930536b32f1a6a923253ca632c7e02cbd72840a9db87c000c
 DIST llpp-13_p20121123.tar.gz 110436 SHA256 367c01e14478b18c39a34bc515f495b980789e536744e7b698d1639e6935eb35 SHA512 2c8f47adb619416743eb2ee9f43df38989af4e255626810bc9ac34020e37d5e6637589a4e20324184184c1da21d2ed9c3f6083d02cc98a8364946091831edc60 WHIRLPOOL e8ccfbf7a6c782913ea8ba4851b42f30eba171f0c03a14946697e0763f4b95c0f56e629d0d1747f169b6bb138cedbe0bb2487012d9e1b76a902722aaf6866c59
 EBUILD llpp-12.ebuild 1557 SHA256 ad511be40b337ad9c762b3a2a701d67f205b7136cd025977038f3565c4715930 SHA512 a30c1841d7ff621fc39cd3bfbef85e9a9501bbf5d1e2be8b8f58165705054ffa97ebd145fb5f1838e016e0e3972b1f4ea441906d73813c55feb5d7112a779601 WHIRLPOOL d4bf677f4489438c37c9a71a5c24aaae125a4c09eb940ab68bdbd9915074eff835a75de05ce0ed4a7e14ed5115b2089a4ae06460ddd7711888028000611a558d
-EBUILD llpp-13.ebuild 1624 SHA256 b0d20f8a3074add7e636082f6f02cda87a6e82dd5ab72bdc0fe6e5391bfff789 SHA512 de582e08b47ce7943d45e26f95249a9553f6d00342b00b486980d392ee7980d8daa7ae9dc738cf2a76724409f1d1c4706617eaf30c4e7624a1ba68fd36454fac WHIRLPOOL 022ae0d92085a6d6736957ad7f5bd2d250577c0b17bf686c8f33de9e5c986b09f3b97fa8bdb0cfed84e48f750459a308582e93d369ef724aaa08b553f6f8acd4
-EBUILD llpp-13_p20121123.ebuild 1557 SHA256 011e54be95a9f39c9827e646d81d3c7ae94f9e2900e664d5ef462f88d7597f7e SHA512 d9a91861bf23441e2959de0fa79c472167a430f8f507af86eedf06779f3cf2af98b095d7c50fa557c8ece20c3e9cca7ee851607b2a35f6476dca335992c9a54a WHIRLPOOL 273fb0c0946e8cd111bd95b87110d95389d4ee17d68d9682655c4a8d18e2a8d09a4b9fadc36d0065fc37820a3c269420ad0e7dc8b053636c28a4308fa9b2b537
+EBUILD llpp-13_p20121123.ebuild 1556 SHA256 c3af080447578fc1a8b5f3cd4aa78406caf0be10850d1639496b23515902fccf SHA512 5d0abb99f6d0550c3b410426ec924192b4a6dc4e5ea7f5a972ece9fb113fa101ebd91badb8028a1e577eeb60634633ac082882f9099a7f6275c01fe6e30d03c0 WHIRLPOOL 23013d8cdb956ed091d9e225caba5ecb78be50d99e1f4a56a1e36b9878bb7247b5a769d63bc1f64c7967cf455b499216838b1a07e1d349a335774f42e7bcb15e
 EBUILD llpp-9999.ebuild 1631 SHA256 717622abfcbd8a48a5c2a11ab64d34fe20c1935fb8a7f69221ccaa2c69c72b3e SHA512 f49feabb6cb6223c3f6946c87cec52b156b150500e4a12d8d144a114388793598bf1998015660ee21758330a0d3664de808c7ac3919163b6d62ab3a25ce09359 WHIRLPOOL 8ef9441ce94c7d6abeafe2d34aabad2efd04b2d27bbf1721bdc4c7fd7555e12884a3e952718c82872724b4f503245f4180bc40ae3c4c9ff8f5bfdd3dfbcdf96d
-MISC ChangeLog 4721 SHA256 a66cb69cd06a06d004ddfe05d18ca51f42ee5bb5b37d821dcbed31fef5427d00 SHA512 6300bb54c3ac76d6b4c8b4d8a41da54775f51eb2758ce8bfade793f90257a4aece7e4d0dbc7b10173fb3dc2c8f5ac89d149211318dc9d014b6bcce01f59c3aa0 WHIRLPOOL 38b0e0a212b85a28310f2316e797fde999cb23b33c04c3dd3e3d3b569eaeec57fce1ea7ff5b83230a6d2b531f530b200d4c1bd3f6793c0719751c5e35f56be3c
+MISC ChangeLog 4849 SHA256 89f1a5554d25928ac83c23d4f2e2ee6dc900e8db9f09d75cedcf1d50180052b2 SHA512 2ad8f6c7148e812ed14c30c3e4dc8da7e48a3bfc32ef6f31a6b0a9a261d27cc27fd5e22647275ef7842db0e2fbd3e1575bc990683033425c053288940ab30481 WHIRLPOOL fa59077d9fa352dd4844759dcf0c8c9cf9335147d55dabbc127525a549d1b7a00738db2936f24bb902b9dc99ae0e715efb7812450132631b0d9ea09589cdf8cb
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlEhZDAACgkQknrdDGLu8JCc/wD+NEQWjjsvnIA6qN710zL8H42N
-qOvhGV1o7sr69hF/+eQA/ReiTjccDPFXTEiOtkWw+2RFvINgwBJY7Tn4lbS25maa
-=qCck
+iF4EAREIAAYFAlFQHncACgkQknrdDGLu8JCWlQD/QT/nNJWP/ditKDpSNKgmZ7Hq
+iP4OzodUv2dphkSz0MQA/0B+pUr3UPBb3KgAgKIpn+CTh1fuAc7A9BWUx+44GmT6
+=p+z6
 -----END PGP SIGNATURE-----
diff --git a/app-text/llpp/llpp-13.ebuild b/app-text/llpp/llpp-13.ebuild
deleted file mode 100644
index ccd5b528b0ff..000000000000
--- a/app-text/llpp/llpp-13.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-13.ebuild,v 1.1 2012/11/27 12:39:27 xmw Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="http://repo.or.cz/w/llpp.git"
-SRC_URI="http://repo.or.cz/w/llpp.git/snapshot/68f22b01f680b7afaf56c24ec0b4d7eae3d08c35.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="media-libs/freetype
-	media-libs/jbig2dec
-	media-libs/openjpeg
-	virtual/jpeg
-	x11-libs/libX11
-	x11-misc/xsel"
-DEPEND="${RDEPEND}
-	app-text/mupdf
-	dev-lang/ocaml[ocamlopt]
-	dev-ml/lablgl[glut]"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch
-}
-
-src_compile() {
-	ocaml str.cma keystoml.ml KEYS > help.ml || die
-	printf 'let version ="%s";;\n' ${PV} >> help.ml || die
-
-	local myccopt="$(freetype-config --cflags) -O -include ft2build.h -D_GNU_SOURCE"
-	local mycclib="-lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype -lX11 -lpthread"
-	ocamlopt.opt -c -o link.o -ccopt "${myccopt}" link.c || die
-	ocamlopt.opt -c -o help.cmx help.ml || die
-	ocamlopt.opt -c -o wsi.cmi wsi.mli || die
-	ocamlopt.opt -c -o wsi.cmx wsi.ml || die
-	ocamlopt.opt -c -o parser.cmx parser.ml || die
-	ocamlopt.opt -c -o main.cmx -I +lablGL main.ml || die
-	ocamlopt.opt -o llpp -I +lablGL \
-		str.cmxa unix.cmxa lablgl.cmxa link.o \
-	    -cclib "${mycclib}" help.cmx parser.cmx wsi.cmx main.cmx || die
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc KEYS README Thanks fixme
-}
diff --git a/app-text/llpp/llpp-13_p20121123.ebuild b/app-text/llpp/llpp-13_p20121123.ebuild
index 9c4e78f843f3..0ff17d5c2c52 100644
--- a/app-text/llpp/llpp-13_p20121123.ebuild
+++ b/app-text/llpp/llpp-13_p20121123.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-13_p20121123.ebuild,v 1.1 2012/11/28 08:16:43 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-13_p20121123.ebuild,v 1.2 2013/03/25 09:52:52 xmw Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ RDEPEND="media-libs/freetype
 	x11-libs/libX11
 	x11-misc/xsel"
 DEPEND="${RDEPEND}
-	>=app-text/mupdf-1.1_p20121127
+	=app-text/mupdf-1.1_p20121127
 	dev-lang/ocaml[ocamlopt]
 	dev-ml/lablgl[glut]"