Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/llpp/files/, app-text/llpp/
Date: Wed, 20 Feb 2019 21:40:27
Message-Id: 1550698664.4f6b6d92438be51bda1b9dcb065a001f9c674ab5.pacho@gentoo
1 commit: 4f6b6d92438be51bda1b9dcb065a001f9c674ab5
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 20 21:37:44 2019 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 20 21:37:44 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f6b6d92
7
8 app-text/llpp: Drop old
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
12
13 app-text/llpp/Manifest | 1 -
14 app-text/llpp/files/llpp-26b-WM_CLASS.patch | 41 --------------
15 app-text/llpp/llpp-26b_p20180114.ebuild | 86 -----------------------------
16 3 files changed, 128 deletions(-)
17
18 diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
19 index b3c280baf7e..6dba89603d9 100644
20 --- a/app-text/llpp/Manifest
21 +++ b/app-text/llpp/Manifest
22 @@ -1,2 +1 @@
23 -DIST llpp-26b_p20180114.tar.gz 170204 BLAKE2B c7f46491d69350e8e94b444f0be4d7375f5658cccded792ecce2a246c907ae98bcca45d73e3b6c15765bd926d559327491559b5e5eec63bf2645cba84f6ee0d3 SHA512 1bc544f4bae268f573c2c111b69f7129bd3d1c1c8cc635c06f76e12670ad9476b4c2a2776e3959203ab6e53ea8ad1c68be290619298f7ebc1ae8203875f88314
24 DIST llpp-30.tar.gz 165821 BLAKE2B 755648f9f7e0e0740dd9647559c085ab1626edfceb91d8df4aa783610f32499d744f24a2e0ac0d6f13e747695e8829112e59bcf0fc78c7ef5f4b2427c759353d SHA512 1dfcf273bdabfb3c7b38366bac60659555b943f459cb3fd6e656df1a33c0f84e6745d62522c5498df0bd6182bda13973144724054588c07145018bb3e758d893
25
26 diff --git a/app-text/llpp/files/llpp-26b-WM_CLASS.patch b/app-text/llpp/files/llpp-26b-WM_CLASS.patch
27 deleted file mode 100644
28 index e99d9a4e4e5..00000000000
29 --- a/app-text/llpp/files/llpp-26b-WM_CLASS.patch
30 +++ /dev/null
31 @@ -1,41 +0,0 @@
32 ---- llpp-26b/link.c
33 -+++ llpp-26b/link.c
34 -@@ -4392,6 +4392,31 @@
35 - return caml_copy_string (FZ_VERSION);
36 - }
37 -
38 -+#if !defined (_WIN32) && !defined (__APPLE__)
39 -+#undef pixel
40 -+#include <X11/X.h>
41 -+#include <X11/Xlib.h>
42 -+#include <X11/Xutil.h>
43 -+#include <GL/glx.h>
44 -+
45 -+static void set_wm_class (void)
46 -+{
47 -+ Display *dpy;
48 -+ Window win;
49 -+ XClassHint hint;
50 -+
51 -+ dpy = XOpenDisplay (getenv ("DISPLAY"));
52 -+ DefaultScreen (dpy);
53 -+ hint.res_name = "llpp";
54 -+ hint.res_class = "llpp";
55 -+ win = glXGetCurrentDrawable ();
56 -+ XSetClassHint (dpy, win, &hint);
57 -+ XCloseDisplay (dpy);
58 -+}
59 -+#else
60 -+#define set_wm_class()
61 -+#endif
62 -+
63 - CAMLprim void ml_init (value csock_v, value params_v)
64 - {
65 - CAMLparam2 (csock_v, params_v);
66 -@@ -4460,5 +4485,6 @@
67 - errx (1, "pthread_create: %s", strerror (ret));
68 - }
69 -
70 -+ set_wm_class ();
71 - CAMLreturn0;
72 - }
73
74 diff --git a/app-text/llpp/llpp-26b_p20180114.ebuild b/app-text/llpp/llpp-26b_p20180114.ebuild
75 deleted file mode 100644
76 index 4c83f9fd324..00000000000
77 --- a/app-text/llpp/llpp-26b_p20180114.ebuild
78 +++ /dev/null
79 @@ -1,86 +0,0 @@
80 -# Copyright 1999-2018 Gentoo Foundation
81 -# Distributed under the terms of the GNU General Public License v2
82 -
83 -EAPI=6
84 -
85 -inherit eutils multilib toolchain-funcs vcs-snapshot
86 -
87 -DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
88 -HOMEPAGE="http://repo.or.cz/w/llpp.git"
89 -SRC_URI="https://distfiles.gentoo.org/distfiles/${P}.tar.gz"
90 -
91 -LICENSE="GPL-3"
92 -SLOT="0"
93 -KEYWORDS="amd64 ~ppc x86"
94 -IUSE="+ocamlopt static"
95 -
96 -LIB_DEPEND=">=app-text/mupdf-1.12.0:0=[static-libs]
97 - media-libs/openjpeg:2[static-libs]
98 - media-libs/fontconfig:1.0[static-libs]
99 - media-libs/freetype:2[static-libs]
100 - media-libs/jbig2dec[static-libs]
101 - sys-libs/zlib[static-libs]
102 - virtual/jpeg:0[static-libs]
103 - x11-libs/libX11[static-libs]"
104 -RDEPEND="x11-misc/xsel
105 - !static? ( ${LIB_DEPEND//\[static-libs]} )"
106 -DEPEND="${RDEPEND}
107 - static? ( ${LIB_DEPEND}
108 - app-arch/bzip2[static-libs]
109 - media-libs/libXcm[static-libs]
110 - x11-libs/libXau[static-libs]
111 - x11-libs/libXdmcp[static-libs]
112 - x11-libs/libXmu[static-libs] )
113 - >=dev-lang/ocaml-4.02[ocamlopt?]
114 - dev-ml/lablgl[glut,ocamlopt?]"
115 -
116 -RESTRICT="!ocamlopt? ( strip )"
117 -
118 -PATCHES=( "${FILESDIR}"/${PN}-26b-WM_CLASS.patch )
119 -
120 -src_compile() {
121 - local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
122 - local cmo=$(usex ocamlopt cmx cmo)
123 - local cma=$(usex ocamlopt cmxa cma)
124 - local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE -DUSE_FONTCONFIG -std=c99 -Wextra -Wall -pedantic-errors -Wunused-parameter -Wsign-compare -Wshadow"
125 - if use static ; then
126 - local cclib=""
127 - local slib=""
128 - local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 ${egl} | sed 's:-L::g') )
129 - for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11 ${egl} fontconfig) -ljpeg -ljbig2dec ; do
130 - case ${slib} in
131 - -lm|-ldl|-lpthread)
132 - einfo "${slib}: shared"
133 - cclib+="${slib} " ;;
134 - *)
135 - local ccnew=$(find ${spath} -name "lib${slib/-l}.a")
136 - einfo "${slib}: use ${ccnew}"
137 - cclib+="${ccnew} " ;;
138 - esac
139 - done
140 - else
141 - local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 ${egl} fontconfig) -lpthread"
142 - fi
143 -
144 - verbose() { echo "$@" >&2 ; "$@" || die ; }
145 - verbose sh mkhelp.sh KEYS ${PV} > help.ml
146 - verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
147 - verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
148 - verbose ${ocaml} -c -o keys.${cmo} keys.ml
149 - verbose ${ocaml} -c -o help.${cmo} help.ml
150 - verbose ${ocaml} -c -o utils.${cmo} utils.ml
151 - verbose ${ocaml} -c -o wsi/x11/wsi.cmi wsi/x11/wsi.mli
152 - verbose ${ocaml} -c -o wsi/x11/wsi.${cmo} -I wsi/x11 wsi/x11/wsi.ml
153 - verbose ${ocaml} -c -o parser.${cmo} parser.ml
154 - verbose ${ocaml} -c -o config.${cmo} -I +lablGL -I wsi/x11 config.ml
155 - verbose ${ocaml} -c -o main.${cmo} -I +lablGL -I wsi/x11 main.ml
156 - verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL -I wsi/x11 \
157 - str.${cma} unix.${cma} lablgl.${cma} link.o \
158 - -cclib "${cclib}" \
159 - help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
160 -}
161 -
162 -src_install() {
163 - dobin ${PN} misc/${PN}ac
164 - dodoc KEYS README Thanks
165 -}