summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2012-08-09 06:38:23 +0000
committerMichael Weber <xmw@gentoo.org>2012-08-09 06:38:23 +0000
commit8c6fb3f2f22d765ade0f5c965b6d9be2fefb51cb (patch)
tree01d4f2f5d4eb3853bce99e7960e3fb6d4e97de99
parentVersion bump, try parallel build. (diff)
downloadgentoo-2-8c6fb3f2f22d765ade0f5c965b6d9be2fefb51cb.tar.gz
gentoo-2-8c6fb3f2f22d765ade0f5c965b6d9be2fefb51cb.tar.bz2
gentoo-2-8c6fb3f2f22d765ade0f5c965b6d9be2fefb51cb.zip
Fix mupdf dep, apply WM_CLASS patch on -9999 version.
(Portage version: 2.1.11.9/cvs/Linux x86_64)
-rw-r--r--app-text/llpp/ChangeLog6
-rw-r--r--app-text/llpp/llpp-12.ebuild4
-rw-r--r--app-text/llpp/llpp-9999.ebuild6
3 files changed, 11 insertions, 5 deletions
diff --git a/app-text/llpp/ChangeLog b/app-text/llpp/ChangeLog
index 63ec6538f11a..6c2810b2c2ea 100644
--- a/app-text/llpp/ChangeLog
+++ b/app-text/llpp/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-text/llpp
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.29 2012/06/05 19:55:18 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.30 2012/08/09 06:38:23 xmw Exp $
+
+ 09 Aug 2012; Michael Weber <xmw@gentoo.org> llpp-12.ebuild, llpp-9999.ebuild:
+ Fix mupdf dep, apply WM_CLASS patch on -9999 version.
05 Jun 2012; Michael Weber <xmw@gentoo.org> -files/llpp-WM_CLASS.patch:
remove old version
@@ -116,4 +119,3 @@
31 Jan 2011; Michael Weber <xmw@gentoo.org> +llpp-9999.ebuild, +metadata.xml:
Initial import
-
diff --git a/app-text/llpp/llpp-12.ebuild b/app-text/llpp/llpp-12.ebuild
index 30528e6e1f6f..4c6e7fe12afa 100644
--- a/app-text/llpp/llpp-12.ebuild
+++ b/app-text/llpp/llpp-12.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/llpp/llpp-12.ebuild,v 1.4 2012/06/02 18:11:38 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-12.ebuild,v 1.5 2012/08/09 06:38:23 xmw Exp $
EAPI=4
@@ -22,7 +22,7 @@ RDEPEND="media-libs/freetype
x11-libs/libX11
x11-misc/xsel"
DEPEND="${RDEPEND}
- >=app-text/mupdf-1.0
+ <app-text/mupdf-1.1_rc1
dev-lang/ocaml[ocamlopt]
dev-ml/lablgl[glut]"
diff --git a/app-text/llpp/llpp-9999.ebuild b/app-text/llpp/llpp-9999.ebuild
index eaa328cec58e..3fd91c74d072 100644
--- a/app-text/llpp/llpp-9999.ebuild
+++ b/app-text/llpp/llpp-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/llpp/llpp-9999.ebuild,v 1.14 2012/04/29 03:56:55 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-9999.ebuild,v 1.15 2012/08/09 06:38:23 xmw Exp $
EAPI=4
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
dev-lang/ocaml[ocamlopt]
dev-ml/lablgl[glut]"
+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' $(git describe --tags --dirty) >> help.ml || die