Gentoo Archives: gentoo-commits

From: Tim Harder <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/llpp/, app-text/llpp/files/
Date: Mon, 26 Oct 2020 06:24:28
Message-Id: 1603693191.b87d7b3eb8186790ca7a9dd537d5bc7fd2d8f820.radhermit@gentoo
1 commit: b87d7b3eb8186790ca7a9dd537d5bc7fd2d8f820
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 26 06:18:38 2020 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 26 06:19:51 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b87d7b3e
7
8 app-text/llpp: version bump to 33
9
10 Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
11
12 app-text/llpp/Manifest | 1 +
13 app-text/llpp/files/llpp-33-makefile | 91 ++++++++++++++++++++++++++++++++++++
14 app-text/llpp/llpp-33.ebuild | 68 +++++++++++++++++++++++++++
15 3 files changed, 160 insertions(+)
16
17 diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
18 index bd31a873817..0825c3930b0 100644
19 --- a/app-text/llpp/Manifest
20 +++ b/app-text/llpp/Manifest
21 @@ -2,3 +2,4 @@ DIST llpp-30.tar.gz 165821 BLAKE2B 755648f9f7e0e0740dd9647559c085ab1626edfceb91d
22 DIST llpp-30_p20190316.tar.gz 169517 BLAKE2B 56dbb4fc1f46e654f15986edf870bec22c3d26c694915db88125d99b8f0460c70ac3bd48c82f45f32939f5a09753a4ec6f2e6d544397a0d6ba242640c363917d SHA512 c736b94595eab1fd45e6fb6aa89a988e0c3ec1f4c7c88f8655d17a88c9ff62c6b7db4396a3934690861b5e61af595baa6736b92c585ad68c51677f3e577bd713
23 DIST llpp-31.tar.gz 169199 BLAKE2B 3f60db741fb94bf1b4753f5443705e68f062a68212fd3d0d8062f54b3b71002dc0ee3ba3040f9be028a40d8e96de11c8c53966196e631458f65d863f90f7226f SHA512 d9e213078899ece4a92291199bc2ea962c40a185b9908a7db241a773f57c64e08b004a8433984b86cc4b59088f97991b2ee8ee94e75d71536ce378dd32316e57
24 DIST llpp-31_p20191016.tar.gz 169480 BLAKE2B af8f01d156863b642ad1c062b4b1a00a744955fdc1e7446b7a5023e6d03b58af77c699140b54d337c0eeacf65fba7a06ccfd6baa6ab9e1920bd7fd0fcfa90d97 SHA512 6fdd2621aec9f026e175c52957c77293a105adc81e42dad33f24631d5d2ae6775978834e84e1cab73cc8d1246af684384f9057a0f613438a19eaf7b607f92ddf
25 +DIST llpp-33.tar.gz 172410 BLAKE2B 6f45d262520bb9e09a08088b9d6b6a1c272ca32d44b507537e7887c76f17ec782d805f4fb94e528d7bca5a9eb87c35ff64b883bd0fdab5609f2807bc8043b1d5 SHA512 f14669eab8934ddc0ac530a67055199a73c7f0c2906dc4a80a729326340691ad53433afce2e638848471852901c88fcc99ae1d66b1abf179e4f5892976b585e8
26
27 diff --git a/app-text/llpp/files/llpp-33-makefile b/app-text/llpp/files/llpp-33-makefile
28 new file mode 100644
29 index 00000000000..3a5c3122e25
30 --- /dev/null
31 +++ b/app-text/llpp/files/llpp-33-makefile
32 @@ -0,0 +1,91 @@
33 +VERSION = $(shell test -d .git && git describe --tags --dirty 2>/dev/null)
34 +ifeq "$(VERSION)" ""
35 +VERSION = 33
36 +endif
37 +
38 +# paths
39 +PREFIX ?= /usr/local
40 +LIBDIR ?= /usr/lib
41 +
42 +# includes and libs
43 +PKGCONF_DEPS := freetype2 harfbuzz libopenjp2 libjpeg mupdf x11 zlib
44 +CPPFLAGS += -D_GNU_SOURCE -DFFP
45 +CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wshadow $(shell pkg-config --cflags $(PKGCONF_DEPS))
46 +LDLIBS = -L$(LIBDIR) -lpthread -ljbig2dec $(shell pkg-config --libs $(PKGCONF_DEPS))
47 +
48 +# ocaml
49 +CAMLOPT = ocamlopt
50 +CAMLFLAGS = -g -w +a -safe-string -I +lablGL
51 +
52 +VPATH = wsi/x11
53 +
54 +C_SRC = cutils.c keysym2ucs.c link.c xlib.c version.c
55 +C_OBJ = $(C_SRC:.c=.o)
56 +OCAML_SRC = utils.ml wsi.ml confstruct.ml parser.ml config.ml ffi.ml glutils.ml help.ml keys.ml utf8syms.ml listview.ml main.ml
57 +OCAML_OBJ = $(OCAML_SRC:.ml=.cmx)
58 +MOD = unix.cmxa str.cmxa lablgl.cmxa
59 +SRCMANS = $(wildcard adoc/*.adoc)
60 +MANS = $(SRCMANS:.adoc=.1)
61 +
62 +DISTFILES := Makefile $(OCAML_SRC) link.c glfont.c keysym2ucs.c wsi.mli
63 +DISTFILES += $(wildcard *.sh) KEYS README BUILDING
64 +DISTFILES += misc/ adoc/
65 +
66 +all: llpp $(MANS)
67 +
68 +# dependency ordering
69 +config.cmx: wsi.cmi parser.cmx utils.cmx confstruct.cmx
70 +confstruct.cmx: wsi.cmx utils.cmx
71 +ffi.cmx: config.cmx
72 +glutils.cmx: ffi.cmx
73 +help.cmx: help.cmi config.cmx utils.cmx
74 +listview.cmx: utils.cmx glutils.cmx config.cmx utf8syms.cmx
75 +main.cmx: main.ml utils.cmx config.cmx glutils.cmx listview.cmx ffi.cmx keys.cmx wsi.cmx
76 +main.cmx: CAMLFLAGS += -thread
77 +parser.cmx: utils.cmx
78 +wsi.cmi: utils.cmx keys.cmx
79 +wsi.cmx: wsi.cmi
80 +
81 +link.o: glfont.c
82 +version.o: CPPFLAGS += -DLLPP_VERSION=$(VERSION)
83 +
84 +# ordinary targets
85 +llpp: $(OCAML_OBJ) $(C_OBJ)
86 + $(CAMLOPT) -o $@ $(CAMLFLAGS) $(C_OBJ) -ccopt '$(LDFLAGS)' -cclib '$(LDLIBS)' $(MOD) $(OCAML_OBJ)
87 +
88 +
89 +confstruct.ml: genconfstr.sh
90 + sh $< >$@
91 +
92 +# pattern rules
93 +%.o: %.c
94 + $(CAMLOPT) -c -o $@ $(CAMLFLAGS) -cc $(CC) -ccopt '$(CFLAGS) $(CPPFLAGS)' $<
95 +
96 +%.cmx: %.ml
97 + $(CAMLOPT) -c -o $@ $(CAMLFLAGS) $<
98 +
99 +%.cmi: %.mli
100 + $(CAMLOPT) -c -o $@ $(CAMLFLAGS) $<
101 +
102 +%.1: %.adoc
103 + a2x -d manpage -f manpage $<
104 +
105 +# special targets
106 +clean:
107 + $(RM) llpp link.o help.ml $(OCAML_OBJ) $(OCAML_OBJ:.cmx=.cmi) $(OCAML_OBJ:.cmx=.o) $(MANS) $(MANS:.1=.xml)
108 +
109 +dist: clean
110 + mkdir llpp-$(VERSION)
111 + cp -r $(DISTFILES) llpp-$(VERSION)
112 + tar czf llpp-$(VERSION).tar.gz llpp-$(VERSION)
113 + rm -rf llpp-$(VERSION)
114 +
115 +install:
116 + install -Dm755 llpp "$(DESTDIR)"$(PREFIX)/bin/llpp
117 + install -Dm644 -t "$(DESTDIR)"$(PREFIX)/share/man/man1 $(MANS)
118 + install -Dm755 misc/llppac "$(DESTDIR)"$(PREFIX)/bin/llppac
119 + install -Dm755 misc/llpp.inotify "$(DESTDIR)"$(PREFIX)/bin/llpp.inotify
120 + install -Dm755 misc/llpphtml "$(DESTDIR)"$(PREFIX)/bin/llpphtml
121 + install -Dm644 misc/llpp.desktop "$(DESTDIR)"$(PREFIX)/share/applications/llpp.desktop
122 +
123 +.PHONY: all clean dist install
124
125 diff --git a/app-text/llpp/llpp-33.ebuild b/app-text/llpp/llpp-33.ebuild
126 new file mode 100644
127 index 00000000000..5161e2bfb42
128 --- /dev/null
129 +++ b/app-text/llpp/llpp-33.ebuild
130 @@ -0,0 +1,68 @@
131 +# Copyright 1999-2020 Gentoo Authors
132 +# Distributed under the terms of the GNU General Public License v2
133 +
134 +EAPI=7
135 +
136 +inherit toolchain-funcs xdg-utils
137 +
138 +DESCRIPTION="Graphical PDF viewer which aims to superficially resemble less(1)"
139 +HOMEPAGE="https://github.com/moosotc/llpp"
140 +SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
141 +
142 +LICENSE="public-domain"
143 +SLOT="0"
144 +KEYWORDS="~amd64 ~ppc ~x86"
145 +IUSE="+ocamlopt static-libs"
146 +
147 +RDEPEND=">=app-text/mupdf-1.17.0:0=[static-libs?]
148 + app-arch/bzip2[static-libs?]
149 + media-libs/fontconfig:1.0[static-libs?]
150 + media-libs/freetype:2[static-libs?]
151 + media-libs/jbig2dec:=[static-libs?]
152 + media-libs/openjpeg:2[static-libs?]
153 + sys-libs/zlib[static-libs?]
154 + virtual/jpeg:0[static-libs?]
155 + x11-libs/libX11[static-libs?]
156 + x11-libs/libXau[static-libs?]
157 + x11-libs/libXdmcp[static-libs?]
158 + x11-misc/xsel"
159 +DEPEND="${RDEPEND}
160 + dev-ml/lablgl[glut,ocamlopt?]"
161 +BDEPEND="
162 + >=dev-lang/ocaml-4.09[ocamlopt?]
163 + app-text/asciidoc
164 + virtual/pkgconfig"
165 +
166 +RESTRICT="!ocamlopt? ( strip )"
167 +
168 +src_prepare() {
169 + default
170 +
171 + # use custom makefile from archlinux with minor changes
172 + cp "${FILESDIR}"/${P}-makefile "${S}"/Makefile || die
173 +
174 + # re-add desktop file removed upstream
175 + cp "${FILESDIR}"/llpp.desktop "${S}"/misc || die
176 +
177 + # remove empty interface definition
178 + rm "${S}"/main.mli || die
179 +}
180 +
181 +src_compile() {
182 + emake -j1 VERSION=${PV} CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
183 +}
184 +
185 +src_install() {
186 + emake DESTDIR="${D}" PREFIX="/usr" install
187 + dodoc README Thanks
188 +}
189 +
190 +pkg_postinst() {
191 + xdg_desktop_database_update
192 + xdg_mimeinfo_database_update
193 +}
194 +
195 +pkg_postrm() {
196 + xdg_desktop_database_update
197 + xdg_mimeinfo_database_update
198 +}