* [gentoo-commits] repo/gentoo:master commit in: app-text/llpp/files/, app-text/llpp/
@ 2015-08-11 10:29 Michael Weber
0 siblings, 0 replies; 3+ messages in thread
From: Michael Weber @ 2015-08-11 10:29 UTC (permalink / raw
To: gentoo-commits
commit: 12c61a248f47a9d53ac26cbe0f9afaca041515bb
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 10:11:37 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 10:11:37 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12c61a24
app-text/llpp: drop old.
Package-Manager: portage-2.2.20
app-text/llpp/Manifest | 5 --
app-text/llpp/files/llpp-11-WM_CLASS.patch | 42 --------------
app-text/llpp/llpp-13_p20121123.ebuild | 53 ------------------
app-text/llpp/llpp-15.ebuild | 86 -----------------------------
app-text/llpp/llpp-17_p20140112.ebuild | 87 -----------------------------
app-text/llpp/llpp-18.ebuild | 87 -----------------------------
app-text/llpp/llpp-19.ebuild | 89 ------------------------------
7 files changed, 449 deletions(-)
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 55aacfd..ec7ef24 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,8 +1,3 @@
-DIST llpp-13_p20121123.tar.gz 110436 SHA256 367c01e14478b18c39a34bc515f495b980789e536744e7b698d1639e6935eb35 SHA512 2c8f47adb619416743eb2ee9f43df38989af4e255626810bc9ac34020e37d5e6637589a4e20324184184c1da21d2ed9c3f6083d02cc98a8364946091831edc60 WHIRLPOOL e8ccfbf7a6c782913ea8ba4851b42f30eba171f0c03a14946697e0763f4b95c0f56e629d0d1747f169b6bb138cedbe0bb2487012d9e1b76a902722aaf6866c59
-DIST llpp-15.tar.gz 109546 SHA256 cc415775a62144f8e4185f5d550952b6d2d573072b5b7d91bc8c09c564ce156c SHA512 96f4720f2ee0d9d2d5903ed452e7314e08d14a5806b13d439e01bfd4121fe714f5146e0cb6b33bced3c9c4b652ed8c9334070643e66276f07ea9e9b50d8b5b93 WHIRLPOOL 097871bcb121807eb1d5211254e8670c0cc08eb79787d9255217d10841a0e2436ee50194f038023efa052a4db4e5ac251dd88215ef44ae966689ff03cf79252a
-DIST llpp-17_p20140112.tar.gz 118951 SHA256 7d1ae89762054d9cb4fc06af11f766ab1c638ed230213dbcf36837b9379cc612 SHA512 38249f67a7151622833cba7e19de218f43110724ca9a304f4b80ac95661c71d01a1024fac30cf66c5013669545fb08bf320225d9463d2c31844446dc3c99de0c WHIRLPOOL c67b3e60bce82dc142624d3183144230d5a42921a203f19337f0a14942aec6fb395c57edf123b1d8127ce92c90df142b3caa11b4c14ec986aa2ad6d2fae6a383
-DIST llpp-18.tar.gz 119085 SHA256 fd87f99198c26071e898e65f9d7ee2b698a8a39768a44d740733ba935fb9fe4f SHA512 994d48fe690514078a708b9a52d94f96506693863ec0c277014fc2ab5b3aa831254a3b6e227524eb46d094bb06cfe3c51ec0f2dfe50cf83d6e97198e43e9cd1c WHIRLPOOL 51862737ca0144d09db19a46a456b808a9db9d2a78a637118dc4277170f43a287e1396d0634b9d90565de120bdf86a6b625c41e27b78f7fd534ca8504e380011
-DIST llpp-19.tar.gz 122875 SHA256 a050d78ac9e3ea7b3ae285e5c860a2e52b35c3533b3c705787350ad80992c64c SHA512 997f067fc8836869657db709255e7973b4b0510a1bf7e5daef4ede524d9f60921bbc3d19cf650b7554c88781da29898d2e014b3f0c4ed4f50a97277c2d828956 WHIRLPOOL 683df1615b31a416725f38763659c0dba7755bd64aab459842bfc48fe98130b834e0e219565e0ae699595100e0e577b94204721b7e33960c99fe6c4a6e1db672
DIST llpp-20_p20140818.tar.gz 127805 SHA256 959862916f6ee4261903bd8192dd7b6203cf9b5fa989b4bb3c19377e61fe23ea SHA512 f529414ce1731f2f155e80615792a1d79e62f58f40238b83f0c5fd59e65429a8a95fe02f6556e7b1c51619f0cac670494e4844b444b428ea3ddb991361268790 WHIRLPOOL e190b8bbed54b8e5157c477bc071bcb16681017838cb0c0295bccddff2244be426ff4c925c3effab43dd2939e5ceb0397e2d860c6e53538139d38f340dd05a71
DIST llpp-21.tar.gz 130945 SHA256 bb846ce57269848e830d2665400df107bc23146f4004a755e16fb70d90c3a971 SHA512 8194b9806fecf3f1387aa15f6bbff65ae72df545e8e79fa9244a0c6ea58bf0b96632db11a3abec8afe315acd88c41bd11f17c3b12cf76384b398fd4401f7a909 WHIRLPOOL c24c28df50669f5d684b58d0c90b497430e644b6ef61a9642a1da80324511657fbc01356b36a10754f658ead676105e4e46f94207bd422a462d7a56cc5eb37ef
DIST llpp-21_p20150427.tar.gz 132728 SHA256 c8f1eb8eb0f8fb2e92140be7c177be9418b7cf9641f2649e7aee82101e0f0997 SHA512 8eb3c5d21cc1ae5a1d7b6d1d28cd3f8147fba62c98456d25039c90814665afdf417bb2d3ef5eb738c2561a62454f9ce8c663444d889510609cab93deaea77e81 WHIRLPOOL 1ffe07c520393fb36801f9047aa53db8ff1c48c48885e4f1972f485470781d17673b96217ef16d4e08967f5edabe15fb20ffc1e47678ddd17ed31e53251a33eb
diff --git a/app-text/llpp/files/llpp-11-WM_CLASS.patch b/app-text/llpp/files/llpp-11-WM_CLASS.patch
deleted file mode 100644
index 1e767ad..0000000
--- a/app-text/llpp/files/llpp-11-WM_CLASS.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- llpp/link.c
-+++ llpp/link.c
-@@ -2792,6 +2792,32 @@
- CAMLreturn (Val_unit);
- }
-
-+#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 pipe_v, value params_v)
- {
- CAMLparam2 (pipe_v, params_v);
-@@ -2852,5 +2878,6 @@
- errx (1, "pthread_create: %s", strerror (ret));
- }
-
-+ set_wm_class ();
- CAMLreturn (Val_unit);
- }
diff --git a/app-text/llpp/llpp-13_p20121123.ebuild b/app-text/llpp/llpp-13_p20121123.ebuild
deleted file mode 100644
index f3f6a30..0000000
--- a/app-text/llpp/llpp-13_p20121123.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="media-libs/freetype
- media-libs/jbig2dec
- media-libs/openjpeg:0
- virtual/jpeg
- x11-libs/libX11
- x11-misc/xsel"
-DEPEND="${RDEPEND}
- =app-text/mupdf-1.1_p20121127
- 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' ${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-15.ebuild b/app-text/llpp/llpp-15.ebuild
deleted file mode 100644
index dda82e2..0000000
--- a/app-text/llpp/llpp-15.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE="+ocamlopt static"
-
-LIB_DEPEND="~app-text/mupdf-1.2:=[static-libs]
- media-libs/openjpeg:0[static-libs]
- media-libs/freetype:2[static-libs]
- media-libs/jbig2dec[static-libs]
- sys-libs/zlib[static-libs]
- virtual/jpeg:0[static-libs]
- x11-libs/libX11[static-libs]"
-RDEPEND="x11-misc/xsel
- !static? ( ${LIB_DEPEND//\[static-libs]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND}
- app-arch/bzip2[static-libs]
- media-libs/libXcm[static-libs]
- x11-libs/libXau[static-libs]
- x11-libs/libXdmcp[static-libs]
- x11-libs/libXmu[static-libs] )
- dev-lang/ocaml[ocamlopt?]
- dev-ml/lablgl[glut,ocamlopt?]"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch
-}
-
-src_compile() {
- local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
- local cmo=$(usex ocamlopt cmx cmo)
- local cma=$(usex ocamlopt cmxa cma)
- local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE"
- if use static ; then
- local cclib=""
- local slib=""
- local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g') )
- for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11) -ljpeg -ljbig2dec ; do
- case ${slib} in
- -lm|-ldl|-lpthread)
- einfo "${slib}: shared"
- cclib+="${slib} " ;;
- *)
- local ccnew=$(find ${spath} -name "lib${slib/-l}.a")
- einfo "${slib}: use ${ccnew}"
- cclib+="${ccnew} " ;;
- esac
- done
- else
- local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11) -lpthread"
- fi
-
- verbose() { echo "$@" >&2 ; "$@" || die ; }
- verbose ocaml str.cma keystoml.ml < KEYS > help.ml
- verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
- verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
- verbose ${ocaml} -c -o help.${cmo} help.ml
- verbose ${ocaml} -c -o utils.${cmo} utils.ml
- verbose ${ocaml} -c -o wsi.cmi wsi.mli
- verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
- verbose ${ocaml} -c -o parser.${cmo} parser.ml
- verbose ${ocaml} -c -o main.${cmo} -I +lablGL main.ml
- verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
- str.${cma} unix.${cma} lablgl.${cma} link.o \
- -cclib "${cclib}" \
- help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} main.${cmo}
-}
-
-src_install() {
- dobin ${PN}
- dodoc KEYS README Thanks fixme
-}
diff --git a/app-text/llpp/llpp-17_p20140112.ebuild b/app-text/llpp/llpp-17_p20140112.ebuild
deleted file mode 100644
index 3b0bea7..0000000
--- a/app-text/llpp/llpp-17_p20140112.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-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/db515851a5cf04ecb4c06311c79ce9685324bc81.tar.gz -> ${P}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~xmw/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+ocamlopt static"
-
-LIB_DEPEND="~app-text/mupdf-1.3_p20140118:=[static-libs]
- media-libs/openjpeg:2[static-libs]
- media-libs/freetype:2[static-libs]
- media-libs/jbig2dec[static-libs]
- sys-libs/zlib[static-libs]
- virtual/jpeg:0[static-libs]
- x11-libs/libX11[static-libs]"
-RDEPEND="x11-misc/xsel
- !static? ( ${LIB_DEPEND//\[static-libs]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND}
- app-arch/bzip2[static-libs]
- media-libs/libXcm[static-libs]
- x11-libs/libXau[static-libs]
- x11-libs/libXdmcp[static-libs]
- x11-libs/libXmu[static-libs] )
- dev-lang/ocaml[ocamlopt?]
- dev-ml/lablgl[glut,ocamlopt?]"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch
-}
-
-src_compile() {
- local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
- local cmo=$(usex ocamlopt cmx cmo)
- local cma=$(usex ocamlopt cmxa cma)
- local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE"
- if use static ; then
- local cclib=""
- local slib=""
- local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g') )
- for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11) -ljpeg -ljbig2dec ; do
- case ${slib} in
- -lm|-ldl|-lpthread)
- einfo "${slib}: shared"
- cclib+="${slib} " ;;
- *)
- local ccnew=$(find ${spath} -name "lib${slib/-l}.a")
- einfo "${slib}: use ${ccnew}"
- cclib+="${ccnew} " ;;
- esac
- done
- else
- local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11) -lpthread"
- fi
-
- verbose() { echo "$@" >&2 ; "$@" || die ; }
- verbose ocaml str.cma keystoml.ml < KEYS > help.ml
- verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
- verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
- verbose ${ocaml} -c -o help.${cmo} help.ml
- verbose ${ocaml} -c -o utils.${cmo} utils.ml
- verbose ${ocaml} -c -o wsi.cmi wsi.mli
- verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
- verbose ${ocaml} -c -o parser.${cmo} parser.ml
- verbose ${ocaml} -c -o main.${cmo} -I +lablGL main.ml
- verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
- str.${cma} unix.${cma} lablgl.${cma} link.o \
- -cclib "${cclib}" \
- help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} main.${cmo}
-}
-
-src_install() {
- dobin ${PN}
- dodoc KEYS README Thanks fixme
-}
diff --git a/app-text/llpp/llpp-18.ebuild b/app-text/llpp/llpp-18.ebuild
deleted file mode 100644
index 4bfb26a..0000000
--- a/app-text/llpp/llpp-18.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="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/23585c732e608b486dffd2c210dc2cab43b1d4cb.tar.gz -> ${P}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~xmw/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ocamlopt static"
-
-LIB_DEPEND=">app-text/mupdf-1.3_p20140118:0=[static-libs]
- media-libs/openjpeg:2[static-libs]
- media-libs/freetype:2[static-libs]
- media-libs/jbig2dec[static-libs]
- sys-libs/zlib[static-libs]
- virtual/jpeg:0[static-libs]
- x11-libs/libX11[static-libs]"
-RDEPEND="x11-misc/xsel
- !static? ( ${LIB_DEPEND//\[static-libs]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND}
- app-arch/bzip2[static-libs]
- media-libs/libXcm[static-libs]
- x11-libs/libXau[static-libs]
- x11-libs/libXdmcp[static-libs]
- x11-libs/libXmu[static-libs] )
- dev-lang/ocaml[ocamlopt?]
- dev-ml/lablgl[glut,ocamlopt?]"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch
-}
-
-src_compile() {
- local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
- local cmo=$(usex ocamlopt cmx cmo)
- local cma=$(usex ocamlopt cmxa cma)
- local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE"
- if use static ; then
- local cclib=""
- local slib=""
- local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g') )
- for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11) -ljpeg -ljbig2dec ; do
- case ${slib} in
- -lm|-ldl|-lpthread)
- einfo "${slib}: shared"
- cclib+="${slib} " ;;
- *)
- local ccnew=$(find ${spath} -name "lib${slib/-l}.a")
- einfo "${slib}: use ${ccnew}"
- cclib+="${ccnew} " ;;
- esac
- done
- else
- local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11) -lpthread"
- fi
-
- verbose() { echo "$@" >&2 ; "$@" || die ; }
- verbose ocaml str.cma keystoml.ml < KEYS > help.ml
- verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
- verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
- verbose ${ocaml} -c -o help.${cmo} help.ml
- verbose ${ocaml} -c -o utils.${cmo} utils.ml
- verbose ${ocaml} -c -o wsi.cmi wsi.mli
- verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
- verbose ${ocaml} -c -o parser.${cmo} parser.ml
- verbose ${ocaml} -c -o main.${cmo} -I +lablGL main.ml
- verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
- str.${cma} unix.${cma} lablgl.${cma} link.o \
- -cclib "${cclib}" \
- help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} main.${cmo}
-}
-
-src_install() {
- dobin ${PN}
- dodoc KEYS README Thanks fixme
-}
diff --git a/app-text/llpp/llpp-19.ebuild b/app-text/llpp/llpp-19.ebuild
deleted file mode 100644
index e3dcb62..0000000
--- a/app-text/llpp/llpp-19.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="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/7311f1b13aaf010525c477934fe1ea49ae733625.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ocamlopt static"
-
-LIB_DEPEND=">=app-text/mupdf-1.5:0=[static-libs]
- media-libs/openjpeg:2[static-libs]
- media-libs/fontconfig:1.0[static-libs]
- media-libs/freetype:2[static-libs]
- media-libs/jbig2dec[static-libs]
- sys-libs/zlib[static-libs]
- virtual/jpeg:0[static-libs]
- x11-libs/libX11[static-libs]"
-RDEPEND="x11-misc/xsel
- !static? ( ${LIB_DEPEND//\[static-libs]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND}
- app-arch/bzip2[static-libs]
- media-libs/libXcm[static-libs]
- x11-libs/libXau[static-libs]
- x11-libs/libXdmcp[static-libs]
- x11-libs/libXmu[static-libs] )
- dev-lang/ocaml[ocamlopt?]
- dev-ml/lablgl[glut,ocamlopt?]"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch
-}
-
-src_compile() {
- local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
- local cmo=$(usex ocamlopt cmx cmo)
- local cma=$(usex ocamlopt cmxa cma)
- local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE -DUSE_FONTCONFIG"
- if use static ; then
- local cclib=""
- local slib=""
- local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 | sed 's:-L::g') )
- ewarn ${spath}
- for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11 fontconfig) -ljpeg -ljbig2dec ; do
- case ${slib} in
- -lm|-ldl|-lpthread)
- einfo "${slib}: shared"
- cclib+="${slib} " ;;
- *)
- local ccnew=$(find ${spath} -name "lib${slib/-l}.a")
- einfo "${slib}: use ${ccnew}"
- cclib+="${ccnew} " ;;
- esac
- done
- else
- local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 fontconfig) -lpthread"
- fi
-
- verbose() { echo "$@" >&2 ; "$@" || die ; }
- verbose ocaml str.cma keystoml.ml < KEYS > help.ml
- verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
- verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
- verbose ${ocaml} -c -o help.${cmo} help.ml
- verbose ${ocaml} -c -o utils.${cmo} utils.ml
- verbose ${ocaml} -c -o wsi.cmi wsi.mli
- verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
- verbose ${ocaml} -c -o parser.${cmo} parser.ml
- verbose ${ocaml} -c -o config.${cmo} -I +lablGL config.ml
- verbose ${ocaml} -c -o main.${cmo} -I +lablGL main.ml
- verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
- str.${cma} unix.${cma} lablgl.${cma} link.o \
- -cclib "${cclib}" \
- help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
-}
-
-src_install() {
- dobin ${PN}
- dodoc KEYS README Thanks fixme
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/llpp/files/, app-text/llpp/
@ 2019-02-20 21:40 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2019-02-20 21:40 UTC (permalink / raw
To: gentoo-commits
commit: 4f6b6d92438be51bda1b9dcb065a001f9c674ab5
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 20 21:37:44 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Feb 20 21:37:44 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f6b6d92
app-text/llpp: Drop old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
app-text/llpp/Manifest | 1 -
app-text/llpp/files/llpp-26b-WM_CLASS.patch | 41 --------------
app-text/llpp/llpp-26b_p20180114.ebuild | 86 -----------------------------
3 files changed, 128 deletions(-)
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index b3c280baf7e..6dba89603d9 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,2 +1 @@
-DIST llpp-26b_p20180114.tar.gz 170204 BLAKE2B c7f46491d69350e8e94b444f0be4d7375f5658cccded792ecce2a246c907ae98bcca45d73e3b6c15765bd926d559327491559b5e5eec63bf2645cba84f6ee0d3 SHA512 1bc544f4bae268f573c2c111b69f7129bd3d1c1c8cc635c06f76e12670ad9476b4c2a2776e3959203ab6e53ea8ad1c68be290619298f7ebc1ae8203875f88314
DIST llpp-30.tar.gz 165821 BLAKE2B 755648f9f7e0e0740dd9647559c085ab1626edfceb91d8df4aa783610f32499d744f24a2e0ac0d6f13e747695e8829112e59bcf0fc78c7ef5f4b2427c759353d SHA512 1dfcf273bdabfb3c7b38366bac60659555b943f459cb3fd6e656df1a33c0f84e6745d62522c5498df0bd6182bda13973144724054588c07145018bb3e758d893
diff --git a/app-text/llpp/files/llpp-26b-WM_CLASS.patch b/app-text/llpp/files/llpp-26b-WM_CLASS.patch
deleted file mode 100644
index e99d9a4e4e5..00000000000
--- a/app-text/llpp/files/llpp-26b-WM_CLASS.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- llpp-26b/link.c
-+++ llpp-26b/link.c
-@@ -4392,6 +4392,31 @@
- return caml_copy_string (FZ_VERSION);
- }
-
-+#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;
-+ XClassHint hint;
-+
-+ dpy = XOpenDisplay (getenv ("DISPLAY"));
-+ 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 void ml_init (value csock_v, value params_v)
- {
- CAMLparam2 (csock_v, params_v);
-@@ -4460,5 +4485,6 @@
- errx (1, "pthread_create: %s", strerror (ret));
- }
-
-+ set_wm_class ();
- CAMLreturn0;
- }
diff --git a/app-text/llpp/llpp-26b_p20180114.ebuild b/app-text/llpp/llpp-26b_p20180114.ebuild
deleted file mode 100644
index 4c83f9fd324..00000000000
--- a/app-text/llpp/llpp-26b_p20180114.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="http://repo.or.cz/w/llpp.git"
-SRC_URI="https://distfiles.gentoo.org/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+ocamlopt static"
-
-LIB_DEPEND=">=app-text/mupdf-1.12.0:0=[static-libs]
- media-libs/openjpeg:2[static-libs]
- media-libs/fontconfig:1.0[static-libs]
- media-libs/freetype:2[static-libs]
- media-libs/jbig2dec[static-libs]
- sys-libs/zlib[static-libs]
- virtual/jpeg:0[static-libs]
- x11-libs/libX11[static-libs]"
-RDEPEND="x11-misc/xsel
- !static? ( ${LIB_DEPEND//\[static-libs]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND}
- app-arch/bzip2[static-libs]
- media-libs/libXcm[static-libs]
- x11-libs/libXau[static-libs]
- x11-libs/libXdmcp[static-libs]
- x11-libs/libXmu[static-libs] )
- >=dev-lang/ocaml-4.02[ocamlopt?]
- dev-ml/lablgl[glut,ocamlopt?]"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-PATCHES=( "${FILESDIR}"/${PN}-26b-WM_CLASS.patch )
-
-src_compile() {
- local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
- local cmo=$(usex ocamlopt cmx cmo)
- local cma=$(usex ocamlopt cmxa cma)
- 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"
- if use static ; then
- local cclib=""
- local slib=""
- local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 ${egl} | sed 's:-L::g') )
- for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11 ${egl} fontconfig) -ljpeg -ljbig2dec ; do
- case ${slib} in
- -lm|-ldl|-lpthread)
- einfo "${slib}: shared"
- cclib+="${slib} " ;;
- *)
- local ccnew=$(find ${spath} -name "lib${slib/-l}.a")
- einfo "${slib}: use ${ccnew}"
- cclib+="${ccnew} " ;;
- esac
- done
- else
- local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 ${egl} fontconfig) -lpthread"
- fi
-
- verbose() { echo "$@" >&2 ; "$@" || die ; }
- verbose sh mkhelp.sh KEYS ${PV} > help.ml
- verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
- verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
- verbose ${ocaml} -c -o keys.${cmo} keys.ml
- verbose ${ocaml} -c -o help.${cmo} help.ml
- verbose ${ocaml} -c -o utils.${cmo} utils.ml
- verbose ${ocaml} -c -o wsi/x11/wsi.cmi wsi/x11/wsi.mli
- verbose ${ocaml} -c -o wsi/x11/wsi.${cmo} -I wsi/x11 wsi/x11/wsi.ml
- verbose ${ocaml} -c -o parser.${cmo} parser.ml
- verbose ${ocaml} -c -o config.${cmo} -I +lablGL -I wsi/x11 config.ml
- verbose ${ocaml} -c -o main.${cmo} -I +lablGL -I wsi/x11 main.ml
- verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL -I wsi/x11 \
- str.${cma} unix.${cma} lablgl.${cma} link.o \
- -cclib "${cclib}" \
- help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
-}
-
-src_install() {
- dobin ${PN} misc/${PN}ac
- dodoc KEYS README Thanks
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/llpp/files/, app-text/llpp/
@ 2021-03-16 19:23 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-03-16 19:23 UTC (permalink / raw
To: gentoo-commits
commit: 0b355a7af9492adf20bbfa49018ed8d139fcad05
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 16 18:34:06 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 19:22:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b355a7a
app-text/llpp: drop 30
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-text/llpp/Manifest | 1 -
app-text/llpp/files/llpp-30-keysym.patch | 55 ----------------------------
app-text/llpp/llpp-30.ebuild | 63 --------------------------------
3 files changed, 119 deletions(-)
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 1c44ba978be..11ef261f10d 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,2 +1 @@
-DIST llpp-30.tar.gz 165821 BLAKE2B 755648f9f7e0e0740dd9647559c085ab1626edfceb91d8df4aa783610f32499d744f24a2e0ac0d6f13e747695e8829112e59bcf0fc78c7ef5f4b2427c759353d SHA512 1dfcf273bdabfb3c7b38366bac60659555b943f459cb3fd6e656df1a33c0f84e6745d62522c5498df0bd6182bda13973144724054588c07145018bb3e758d893
DIST llpp-33.tar.gz 172410 BLAKE2B 6f45d262520bb9e09a08088b9d6b6a1c272ca32d44b507537e7887c76f17ec782d805f4fb94e528d7bca5a9eb87c35ff64b883bd0fdab5609f2807bc8043b1d5 SHA512 f14669eab8934ddc0ac530a67055199a73c7f0c2906dc4a80a729326340691ad53433afce2e638848471852901c88fcc99ae1d66b1abf179e4f5892976b585e8
diff --git a/app-text/llpp/files/llpp-30-keysym.patch b/app-text/llpp/files/llpp-30-keysym.patch
deleted file mode 100644
index b1527e1856f..00000000000
--- a/app-text/llpp/files/llpp-30-keysym.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6e40f7315cb620fef1d96bbe56cfe24dd91e182a Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Tue, 5 Jun 2018 11:56:06 -0400
-Subject: [PATCH] Do not use CPPFLAGS to add headers to source files
-
-Source code, e.g. #include, belongs in the source code, not the build
-system. Build systems are for defining include paths, not the includes
-themselves.
-
-Drop the KeySym keyword since it seems to be a useless alias for
-uint32_t which might as well be used directly instead of indirectly
-using #define everywhere.
----
- link.c | 4 ++--
- wsi/x11/keysym2ucs.c | 4 +++-
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/link.c b/link.c
-index 783b12f..e8dcac3 100644
---- a/link.c
-+++ b/link.c
-@@ -3437,9 +3437,9 @@ CAMLprim value ml_keysymtoutf8 (value keysym_v)
- {
- CAMLparam1 (keysym_v);
- CAMLlocal1 (str_v);
-- KeySym keysym = Int_val (keysym_v);
-+ uint32_t keysym = Int_val (keysym_v);
- Rune rune;
-- extern long keysym2ucs (KeySym);
-+ extern long keysym2ucs (uint32_t);
- int len;
- char buf[5];
-
-diff --git a/wsi/x11/keysym2ucs.c b/wsi/x11/keysym2ucs.c
-index 38f9f1f..0f907c2 100644
---- a/wsi/x11/keysym2ucs.c
-+++ b/wsi/x11/keysym2ucs.c
-@@ -37,6 +37,8 @@
- * AUTOMATICALLY GENERATED FILE, DO NOT EDIT !!! (unicode/convmap.pl)
- */
-
-+#include <inttypes.h>
-+
- struct codepair {
- unsigned short keysym;
- unsigned short ucs;
-@@ -816,7 +818,7 @@ struct codepair {
- { 0x20ac, 0x20ac }, /* EuroSign € EURO SIGN */
- };
-
--long keysym2ucs(KeySym keysym)
-+long keysym2ucs(uint32_t keysym)
- {
- int min = 0;
- int max = sizeof(keysymtab) / sizeof(struct codepair) - 1;
diff --git a/app-text/llpp/llpp-30.ebuild b/app-text/llpp/llpp-30.ebuild
deleted file mode 100644
index 31eafbf3035..00000000000
--- a/app-text/llpp/llpp-30.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs xdg
-
-DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="https://github.com/moosotc/llpp"
-SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+ocamlopt"
-
-BDEPEND="
- >=dev-lang/ocaml-4.02:=[ocamlopt?]
- virtual/pkgconfig
-"
-RDEPEND="
- >=app-text/mupdf-1.12.0:0=
- media-libs/openjpeg:2
- media-libs/fontconfig:1.0
- media-libs/freetype:2
- media-libs/jbig2dec:=
- sys-libs/zlib
- virtual/jpeg:0
- x11-libs/libX11
- x11-misc/xsel
-"
-DEPEND="${RDEPEND}
- app-arch/bzip2
- app-text/asciidoc
- dev-ml/lablgl:=[glut,ocamlopt?]
- media-libs/libXcm
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libXmu
-"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-PATCHES=( "${FILESDIR}"/${P}-keysym.patch )
-
-src_prepare() {
- default
-
- # use custom makefile from archlinux with minor changes
- cp "${FILESDIR}"/Makefile "${S}" || die
-
- # re-add desktop file removed upstream
- cp "${FILESDIR}"/llpp.desktop "${S}"/misc || die
-}
-
-src_compile() {
- emake -j1 VERSION=${PV} CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
-}
-
-src_install() {
- emake DESTDIR="${ED}" PREFIX="/usr" install
- dodoc README Thanks
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-16 19:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-16 19:23 [gentoo-commits] repo/gentoo:master commit in: app-text/llpp/files/, app-text/llpp/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2019-02-20 21:40 Pacho Ramos
2015-08-11 10:29 Michael Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox