Version bump to v7 git tag, WM_CLASS patch, fixme ocaml[-ocamlopt]

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

5 files changed, 151 insertions, 23 deletions

diff --git a/app-text/llpp/ChangeLog b/app-text/llpp/ChangeLog
index a68b0957ddc3..07b45a674acd 100644
--- a/app-text/llpp/ChangeLog
+++ b/app-text/llpp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/llpp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.12 2011/08/24 19:08:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/ChangeLog,v 1.13 2011/10/04 22:46:00 xmw Exp $
+
+*llpp-7 (04 Oct 2011)
+
+  04 Oct 2011; Michael Weber <xmw@gentoo.org> +llpp-7.ebuild, llpp-9999.ebuild,
+  +files/llpp-WM_CLASS.patch:
+  Version bump to v7 git tag, WM_CLASS patch, fixme ocaml[-ocamlopt]
 
   24 Aug 2011; Markus Meier <maekke@gentoo.org> llpp-0_p20110504.ebuild:
   x86 stable, bug #378429
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 2415a2e5404f..8b64f4e61542 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX llpp-WM_CLASS.patch 839 RMD160 1db1e1b3242b83a076c99e5a68e7b6a0114fff88 SHA1 445cd3e727269d2369bc3d5174ac1baecbfdfc0e SHA256 48ccdba58d12a1efbc4f60b0e3252843bc661d3002229e9aaa5b2e32e94d2af2
 DIST llpp-0_p20110504.tar.bz2 25459 RMD160 579dbf029088e70bd8040c1266c87e9b8b8ec316 SHA1 82567ad727ac84f5c3a3b383e210cd0488ea8b2f SHA256 6ce2c2f2a70143fbfb8434e9ca48288a87e6cc32f445c35af78b193106e7fa70
 DIST llpp-5.tar.gz 28895 RMD160 9db80e88755879ab8a962e3fd74ca34418aeed69 SHA1 710f5f4972f4e36e31512ea024ae2df3b082199d SHA256 05997619d219b62ecdf7941fd3f2ad609c2603b19c56170e2d932e0031926b6b
+DIST llpp-7.tar.gz 46931 RMD160 8887de279c19f33c6e4390a1a793f0c3f00f993b SHA1 512675c5865667cbf7430f050e7e62dd11dc74f7 SHA256 b359380afda9deaec85353e3ca0b603f2c512956b9f7f70970847aec2dfd5a5a
 EBUILD llpp-0_p20110504.ebuild 979 RMD160 567ac8fd33774d05e955c739e690c0d478f65cf7 SHA1 2bdfa1837001bbaa3be69ce6691681cdd15824b7 SHA256 30b5abb2227cae86d0d308abba1a05b69171f9658dac3dbb2d7e641ccf227812
 EBUILD llpp-5.ebuild 1075 RMD160 72a7be1d2065a27c0c8dffbfe87da052f981280b SHA1 64416fc2cb8b6e8453ea1407484ddd5a63ab3d41 SHA256 668d3ba6587e26b9f986773e214b7c95a2308c3880b6f9cb5c1262a0646cdcb0
-EBUILD llpp-9999.ebuild 1187 RMD160 8d8d3305486116331b8ce4c3a66e91d1cccf81bf SHA1 fa8b74fdd1aead3f6a2ce0fd4260b84ba424eb3c SHA256 111492b5ffe17819d96ce69ff68d2730081a801cdd48a0b17524eff9a9c899a0
-MISC ChangeLog 1903 RMD160 8a4df2796528d2cc70a4984dc3ba274e03efc4f4 SHA1 bcdb8db7abd5b50e0c7a5b3f058123e6fe7620fa SHA256 154280918bb499f0090320c3a1ace6bd5c3233ff9d67aa874938a60199ef32a3
+EBUILD llpp-7.ebuild 1966 RMD160 5712c5aad7b6acd31b3be91fa6aa7b3dc666b572 SHA1 5ad92e6a4f6f7e1b7f50ebc8b931fa10df2275e7 SHA256 9652db6cfb1b69a7081288680ca6c525c17f95117ec2414deb961919f0d3849a
+EBUILD llpp-9999.ebuild 1866 RMD160 f12ba51fb59c2c4734bba387902edb6123875986 SHA1 c086715286305a3e25b80640479939ff035daec1 SHA256 5d045623144a0526dcb0427aec71228402a7635ce94799e585813815f281dcdc
+MISC ChangeLog 2103 RMD160 74463119cb864687df1a31dadda700faf5328c9f SHA1 ce38b9b422390e95162dc4239a2f866a39739363 SHA256 e23f4abb4a76ee6cdb01d68841d5ca3a09fe69d7af611262b0a48ee5509aba27
 MISC metadata.xml 229 RMD160 80274fcc36dd67cb7a10e6c31d98b17151628afe SHA1 41a899bc7953d425045ae2cf91d25c2550a5bad1 SHA256 badbe4f1438344ed282db5a8042aa7a5d04d4640fe2a8b6cb342112d73391518
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk5/GLMACgkQfXuS5UK5QB3uJgP7BkABlz0H42IZPfA6nhHvHwaK
-k6F/aMzj92aSf3lqjT5faOcNLtCE8sxnew8aI562F/sRuC8s5YH9pdX1JZnVrgdf
-hDikE1nb+hMx6VyUvWSDVyfCIruDvZ9bIBDnAf8m54S2ZNUD0MtReBYW4iEHS01k
-V6pWuGRQloImEwnezhc=
-=lDRJ
+iF0EAREIAAYFAk6LjLAACgkQknrdDGLu8JBnBAD/YW9FYL8xXwc7BSGAvmgUoxvt
+wdKIDx5fEikqpO0/6RUA9jtGKzfw1N9QAZRxAtNI+cObtc43Gz7m1U9mSqO5h1E=
+=dCCY
 -----END PGP SIGNATURE-----
diff --git a/app-text/llpp/files/llpp-WM_CLASS.patch b/app-text/llpp/files/llpp-WM_CLASS.patch
new file mode 100644
index 000000000000..ead8310c4099
--- /dev/null
+++ b/app-text/llpp/files/llpp-WM_CLASS.patch
@@ -0,0 +1,42 @@
+--- llpp-7/link.c
++++ llpp-7/link.c
+@@ -1982,6 +1982,32 @@
+     CAMLreturn (caml_copy_double (w));
+ }
+ 
++#if !defined (_WIN32) && !defined (__APPLE__)
++#undef pixel
++#include <X11/X.h>
++#include <X11/Xlib.h>
++#include <X11/Xutil.h>
++#include <GL/glx.h>
++
++static void set_wm_class (void)
++{
++    Display *dpy;
++    Window win;
++    int screen;
++    XClassHint hint;
++
++    dpy = XOpenDisplay (getenv ("DISPLAY"));
++    screen = DefaultScreen (dpy);
++    hint.res_name = "llpp";
++    hint.res_class = "llpp";
++    win = glXGetCurrentDrawable ();
++    XSetClassHint (dpy, win, &hint);
++    XCloseDisplay (dpy);
++}
++#else
++#define set_wm_class()
++#endif
++
+ CAMLprim value ml_init (value sock_v, value params_v)
+ {
+     CAMLparam2 (sock_v, params_v);
+@@ -2044,5 +2070,6 @@
+     }
+ #endif
+ 
++    set_wm_class ();
+     CAMLreturn (Val_unit);
+ }
diff --git a/app-text/llpp/llpp-7.ebuild b/app-text/llpp/llpp-7.ebuild
new file mode 100644
index 000000000000..f93e1cec3bc2
--- /dev/null
+++ b/app-text/llpp/llpp-7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-7.ebuild,v 1.1 2011/10/04 22:46:00 xmw Exp $
+
+EAPI=3
+
+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="mirror://gentoo/${P}.tar.gz"
+#SRC_URI="http://repo.or.cz/w/llpp.git/snapshot/dabcf41a34eb6ebb1a539f8369c8fec15f94db1c.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vanilla"
+
+RDEPEND=">=app-text/mupdf-0.8.165
+	dev-ml/lablgl[glut]
+	dev-lang/ocaml[ocamlopt]
+	media-libs/jbig2dec
+	media-libs/openjpeg
+	x11-misc/xsel"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	use vanilla || epatch "${FILESDIR}"/${PN}-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="-lmupdf -lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype"
+	#if use ocamlopt ; then
+		myccopt="${myccopt} -lpthread"
+		ocamlopt -c -o link.o -ccopt "${myccopt}" link.c || die
+		ocamlopt -c -o help.cmx help.ml || die
+		ocamlopt -c -o parser.cmx parser.ml || die
+		ocamlopt -c -o main.cmx -I +lablGL main.ml || die
+	    ocamlopt -o llpp -I +lablGL \
+			str.cmxa unix.cmxa lablgl.cmxa lablglut.cmxa link.o \
+		    -cclib "${mycclib}" help.cmx parser.cmx main.cmx || die
+	#else
+	#	ocamlc -c -o link.o -ccopt "${myccopt}" link.c || die
+	#	ocamlc -c -o help.cmo help.ml || die
+	#	ocamlc -c -o parser.cmo parser.ml || die
+	#	ocamlc -c -o main.cmo -I +lablGL main.ml || die
+	#	ocamlc -custom -o llpp -I +lablGL \
+	#		str.cma unix.cma lablgl.cma lablglut.cma link.o \
+	#		-cclib "${mycclib}" help.cmo parser.cmo main.cmo || die
+	#fi
+}
+
+src_install() {
+	dobin ${PN} || die
+	dodoc KEYS README Thanks fixme || die
+}
diff --git a/app-text/llpp/llpp-9999.ebuild b/app-text/llpp/llpp-9999.ebuild
index a69637b8d58f..33a2a2af7dac 100644
--- a/app-text/llpp/llpp-9999.ebuild
+++ b/app-text/llpp/llpp-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.7 2011/08/09 19:19:37 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-9999.ebuild,v 1.8 2011/10/04 22:46:00 xmw Exp $
 
 EAPI=3
 
@@ -15,30 +15,47 @@ SRC_URI=""
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="vanilla"
 
 RDEPEND=">=app-text/mupdf-0.8.165
 	dev-ml/lablgl[glut]
+	dev-lang/ocaml[ocamlopt]
 	media-libs/jbig2dec
 	media-libs/openjpeg
 	x11-misc/xsel"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	use vanilla || epatch "${FILESDIR}"/${PN}-WM_CLASS.patch
+}
+
 src_compile() {
-	ocaml keystoml.ml KEYS > help.ml || die
-	echo "let version =\"$(git describe --tags)\";;" >> help.ml
-	ocamlopt -c -o link.o -ccopt -O link.c || die
-	ocamlopt -c -o help.cmx help.ml || die
-	ocamlopt -c -o parser.cmx parser.ml || die
-	ocamlopt -c -o main.cmx -I +lablGL main.ml || die
-
-	ocamlopt -o llpp \
-		-I +lablGL str.cmxa unix.cmxa lablgl.cmxa lablglut.cmxa link.o \
-		-cclib "-lmupdf -lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype -lpthread" \
-		help.cmx parser.cmx main.cmx || die
+	ocaml str.cma keystoml.ml KEYS > help.ml || die
+	printf 'let version ="%s";;\n' $(git describe --tags --dirty) >> help.ml || die
+
+	local myccopt="$(freetype-config --cflags) -O -include ft2build.h -D_GNU_SOURCE"
+	local mycclib="-lmupdf -lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype"
+	#if use ocamlopt ; then
+		myccopt="${myccopt} -lpthread"
+		ocamlopt -c -o link.o -ccopt "${myccopt}" link.c || die
+		ocamlopt -c -o help.cmx help.ml || die
+		ocamlopt -c -o parser.cmx parser.ml || die
+		ocamlopt -c -o main.cmx -I +lablGL main.ml || die
+	    ocamlopt -o llpp -I +lablGL \
+			str.cmxa unix.cmxa lablgl.cmxa lablglut.cmxa link.o \
+		    -cclib "${mycclib}" help.cmx parser.cmx main.cmx || die
+	#else
+	#	ocamlc -c -o link.o -ccopt "${myccopt}" link.c || die
+	#	ocamlc -c -o help.cmo help.ml || die
+	#	ocamlc -c -o parser.cmo parser.ml || die
+	#	ocamlc -c -o main.cmo -I +lablGL main.ml || die
+	#	ocamlc -custom -o llpp -I +lablGL \
+	#		str.cma unix.cma lablgl.cma lablglut.cma link.o \
+	#		-cclib "${mycclib}" help.cmo parser.cmo main.cmo || die
+	#fi
 }
 
 src_install() {
 	dobin ${PN} || die
-	dodoc KEYS Thanks fixme || die
+	dodoc KEYS README Thanks fixme || die
 }