[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Agostino Sarubbo]

commit:     02513b27d7321d63035b0abcd2cbeefda28f5d32
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 14:48:48 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 14:48:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02513b27

app-text/llpp: x86 stable wrt bug #589826

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-text/llpp/llpp-23.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/llpp/llpp-23.ebuild b/app-text/llpp/llpp-23.ebuild
index fd4fcb0..80189bc 100644
--- a/app-text/llpp/llpp-23.ebuild
+++ b/app-text/llpp/llpp-23.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://repo.or.cz/llpp.git/snapshot/b51644926dda712aebdc3f075bdc0771f35
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+ocamlopt static"
 
 LIB_DEPEND=">=app-text/mupdf-1.10a:0=[static-libs]

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Arthur Zamarin]

commit:     de804b5623cf46347561a51df0e30a730520856c
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Mar 27 18:24:31 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr  5 15:26:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de804b56

app-text/llpp: add missing remote-id

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-text/llpp/metadata.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-text/llpp/metadata.xml b/app-text/llpp/metadata.xml
index 85e4ed814fa2..6554536432ea 100644
--- a/app-text/llpp/metadata.xml
+++ b/app-text/llpp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="github">moosotc/llpp</remote-id>
+  </upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Sam James]

commit:     e6a1246762ee482b6c12db4599d613cebc80e80d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 23:39:29 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 23:40:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6a12467

app-text/llpp: Stabilize 33 amd64, #733332

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/llpp/llpp-33.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/llpp/llpp-33.ebuild b/app-text/llpp/llpp-33.ebuild
index 5899dc63eac..d8c83ada075 100644
--- a/app-text/llpp/llpp-33.ebuild
+++ b/app-text/llpp/llpp-33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+ocamlopt"
 
 RDEPEND=">=app-text/mupdf-1.17.0:0=

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Thomas Deutschmann]

commit:     4071d0b6b7f6ddd0657d21f1c4e809477110467e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 00:28:21 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 00:35:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4071d0b6

app-text/llpp: x86 stable (bug #733332)

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-text/llpp/llpp-33.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/llpp/llpp-33.ebuild b/app-text/llpp/llpp-33.ebuild
index 865b33f4568..5899dc63eac 100644
--- a/app-text/llpp/llpp-33.ebuild
+++ b/app-text/llpp/llpp-33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="+ocamlopt"
 
 RDEPEND=">=app-text/mupdf-1.17.0:0=

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Sam James]

commit:     c93103835c13398057231ed89885538860f53af7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 05:36:25 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 05:36:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9310383

app-text/llpp: drop static-libs

Dropped in mupdf now.

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/llpp/llpp-30.ebuild | 61 ++++++++++++++++++++------------------------
 app-text/llpp/llpp-33.ebuild | 50 +++++++++++++++---------------------
 2 files changed, 48 insertions(+), 63 deletions(-)

diff --git a/app-text/llpp/llpp-30.ebuild b/app-text/llpp/llpp-30.ebuild
index 782d76c46a4..31eafbf3035 100644
--- a/app-text/llpp/llpp-30.ebuild
+++ b/app-text/llpp/llpp-30.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs xdg-utils
+inherit toolchain-funcs xdg
 
 DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
 HOMEPAGE="https://github.com/moosotc/llpp"
@@ -12,29 +12,32 @@ 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 static"
+IUSE="+ocamlopt"
 
-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]} )"
+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
-	virtual/pkgconfig
-	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?]"
+	dev-ml/lablgl:=[glut,ocamlopt?]
+	media-libs/libXcm
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXmu
+"
 
 RESTRICT="!ocamlopt? ( strip )"
 
@@ -55,16 +58,6 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
+	emake DESTDIR="${ED}" PREFIX="/usr" install
 	dodoc README Thanks
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}

diff --git a/app-text/llpp/llpp-33.ebuild b/app-text/llpp/llpp-33.ebuild
index 5161e2bfb42..865b33f4568 100644
--- a/app-text/llpp/llpp-33.ebuild
+++ b/app-text/llpp/llpp-33.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs xdg-utils
+inherit toolchain-funcs xdg
 
 DESCRIPTION="Graphical PDF viewer which aims to superficially resemble less(1)"
 HOMEPAGE="https://github.com/moosotc/llpp"
@@ -12,26 +12,28 @@ SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ocamlopt static-libs"
-
-RDEPEND=">=app-text/mupdf-1.17.0:0=[static-libs?]
-	app-arch/bzip2[static-libs?]
-	media-libs/fontconfig:1.0[static-libs?]
-	media-libs/freetype:2[static-libs?]
-	media-libs/jbig2dec:=[static-libs?]
-	media-libs/openjpeg:2[static-libs?]
-	sys-libs/zlib[static-libs?]
-	virtual/jpeg:0[static-libs?]
-	x11-libs/libX11[static-libs?]
-	x11-libs/libXau[static-libs?]
-	x11-libs/libXdmcp[static-libs?]
-	x11-misc/xsel"
+IUSE="+ocamlopt"
+
+RDEPEND=">=app-text/mupdf-1.17.0:0=
+	app-arch/bzip2
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/jbig2dec:=
+	media-libs/openjpeg:2
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-misc/xsel
+"
 DEPEND="${RDEPEND}
-	dev-ml/lablgl[glut,ocamlopt?]"
+	dev-ml/lablgl:=[glut,ocamlopt?]"
 BDEPEND="
-	>=dev-lang/ocaml-4.09[ocamlopt?]
 	app-text/asciidoc
-	virtual/pkgconfig"
+	>=dev-lang/ocaml-4.09[ocamlopt?]
+	virtual/pkgconfig
+"
 
 RESTRICT="!ocamlopt? ( strip )"
 
@@ -53,16 +55,6 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
+	emake DESTDIR="${ED}" PREFIX="/usr" install
 	dodoc README Thanks
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Tim Harder]

commit:     fa34b5c80403d8131f45f4680f715f71f013bb69
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 06:21:11 2020 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 06:22:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa34b5c8

app-text/llpp: remove old

Closes: https://bugs.gentoo.org/734888
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 app-text/llpp/Manifest                 |  3 --
 app-text/llpp/llpp-30_p20190316.ebuild | 72 ---------------------------------
 app-text/llpp/llpp-31.ebuild           | 61 ----------------------------
 app-text/llpp/llpp-31_p20191016.ebuild | 73 ----------------------------------
 4 files changed, 209 deletions(-)

diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 0825c3930b0..1c44ba978be 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,5 +1,2 @@
 DIST llpp-30.tar.gz 165821 BLAKE2B 755648f9f7e0e0740dd9647559c085ab1626edfceb91d8df4aa783610f32499d744f24a2e0ac0d6f13e747695e8829112e59bcf0fc78c7ef5f4b2427c759353d SHA512 1dfcf273bdabfb3c7b38366bac60659555b943f459cb3fd6e656df1a33c0f84e6745d62522c5498df0bd6182bda13973144724054588c07145018bb3e758d893
-DIST llpp-30_p20190316.tar.gz 169517 BLAKE2B 56dbb4fc1f46e654f15986edf870bec22c3d26c694915db88125d99b8f0460c70ac3bd48c82f45f32939f5a09753a4ec6f2e6d544397a0d6ba242640c363917d SHA512 c736b94595eab1fd45e6fb6aa89a988e0c3ec1f4c7c88f8655d17a88c9ff62c6b7db4396a3934690861b5e61af595baa6736b92c585ad68c51677f3e577bd713
-DIST llpp-31.tar.gz 169199 BLAKE2B 3f60db741fb94bf1b4753f5443705e68f062a68212fd3d0d8062f54b3b71002dc0ee3ba3040f9be028a40d8e96de11c8c53966196e631458f65d863f90f7226f SHA512 d9e213078899ece4a92291199bc2ea962c40a185b9908a7db241a773f57c64e08b004a8433984b86cc4b59088f97991b2ee8ee94e75d71536ce378dd32316e57
-DIST llpp-31_p20191016.tar.gz 169480 BLAKE2B af8f01d156863b642ad1c062b4b1a00a744955fdc1e7446b7a5023e6d03b58af77c699140b54d337c0eeacf65fba7a06ccfd6baa6ab9e1920bd7fd0fcfa90d97 SHA512 6fdd2621aec9f026e175c52957c77293a105adc81e42dad33f24631d5d2ae6775978834e84e1cab73cc8d1246af684384f9057a0f613438a19eaf7b607f92ddf
 DIST llpp-33.tar.gz 172410 BLAKE2B 6f45d262520bb9e09a08088b9d6b6a1c272ca32d44b507537e7887c76f17ec782d805f4fb94e528d7bca5a9eb87c35ff64b883bd0fdab5609f2807bc8043b1d5 SHA512 f14669eab8934ddc0ac530a67055199a73c7f0c2906dc4a80a729326340691ad53433afce2e638848471852901c88fcc99ae1d66b1abf179e4f5892976b585e8

diff --git a/app-text/llpp/llpp-30_p20190316.ebuild b/app-text/llpp/llpp-30_p20190316.ebuild
deleted file mode 100644
index 019afdb0c6c..00000000000
--- a/app-text/llpp/llpp-30_p20190316.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="Graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="https://github.com/moosotc/llpp"
-MY_COMMIT="1f3ae0843d5877a0e599d8411d433bd9b0078157"
-SRC_URI="https://github.com/moosotc/llpp/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ocamlopt static-libs"
-
-RDEPEND=">=app-text/mupdf-1.15.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=]
-	x11-misc/xsel"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig
-	static-libs? (
-		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.05[ocamlopt?]
-	dev-ml/lablgl[glut,ocamlopt?]"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-PATCHES=( "${FILESDIR}"/${PN}-30-keysym.patch )
-
-S="${WORKDIR}"/"${PN}"-"${MY_COMMIT}"
-
-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="${D}" PREFIX="/usr" install
-	dodoc README Thanks
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}

diff --git a/app-text/llpp/llpp-31.ebuild b/app-text/llpp/llpp-31.ebuild
deleted file mode 100644
index 439e1c537ab..00000000000
--- a/app-text/llpp/llpp-31.ebuild
+++ /dev/null
@@ -1,61 +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="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ocamlopt static-libs"
-
-BDEPEND="
-	app-text/asciidoc
-	virtual/pkgconfig"
-RDEPEND="
-	=app-text/mupdf-1.16*:0=[static-libs?]
-	app-arch/bzip2[static-libs?]
-	media-libs/fontconfig:1.0[static-libs?]
-	media-libs/freetype:2[static-libs?]
-	media-libs/jbig2dec:=[static-libs?]
-	media-libs/openjpeg:2=[static-libs?]
-	sys-libs/zlib:=[static-libs?]
-	virtual/jpeg:0[static-libs?]
-	x11-libs/libX11[static-libs?]
-	x11-libs/libXau[static-libs?]
-	x11-libs/libXdmcp[static-libs?]
-	x11-misc/xsel"
-DEPEND="${RDEPEND}
-	>=dev-lang/ocaml-4.09[ocamlopt?]
-	dev-ml/lablgl[glut,ocamlopt?]"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-PATCHES=( "${FILESDIR}"/${PN}-30-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
-
-	# remove empty interface definition
-	rm "${S}"/main.mli || 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
-}

diff --git a/app-text/llpp/llpp-31_p20191016.ebuild b/app-text/llpp/llpp-31_p20191016.ebuild
deleted file mode 100644
index 71908e87e15..00000000000
--- a/app-text/llpp/llpp-31_p20191016.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="Graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="https://github.com/moosotc/llpp"
-MY_COMMIT="25c10de38cbfe0874d377e7599108e6b2a8a92ff"
-SRC_URI="https://github.com/moosotc/llpp/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ocamlopt static-libs"
-
-RDEPEND=">=app-text/mupdf-1.17.0:0=[static-libs?]
-	app-arch/bzip2[static-libs?]
-	media-libs/fontconfig:1.0[static-libs?]
-	media-libs/freetype:2[static-libs?]
-	media-libs/jbig2dec:=[static-libs?]
-	media-libs/openjpeg:2[static-libs?]
-	sys-libs/zlib[static-libs?]
-	virtual/jpeg:0[static-libs?]
-	x11-libs/libX11[static-libs?]
-	x11-libs/libXau[static-libs?]
-	x11-libs/libXdmcp[static-libs?]
-	x11-misc/xsel"
-DEPEND="${RDEPEND}
-	dev-ml/lablgl[glut,ocamlopt?]"
-BDEPEND="
-	>=dev-lang/ocaml-4.09[ocamlopt?]
-	app-text/asciidoc
-	virtual/pkgconfig"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-PATCHES=( "${FILESDIR}"/${PN}-30-keysym.patch )
-
-S="${WORKDIR}"/"${PN}"-"${MY_COMMIT}"
-
-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
-
-	# remove empty interface definition
-	rm "${S}"/main.mli || die
-}
-
-src_compile() {
-	emake -j1 VERSION=${PV} CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-	dodoc README Thanks
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Sam James]

commit:     ab7362c35f6de29e3b9733d5e7afde79079bcf97
Author:     Jouni Kosonen <jouni.kosonen <AT> tukesoft <DOT> com>
AuthorDate: Fri Aug 14 09:10:21 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 21:53:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab7362c3

app-text/llpp: snapshot version p20191016

llpp v31 doesn't build against >=mupdf-1.17 and v32 against ocaml<4.10

Signed-off-by: Jouni Kosonen <jouni.kosonen <AT> tukesoft.com>
Closes: https://github.com/gentoo/gentoo/pull/16797
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/llpp/Manifest                 |  1 +
 app-text/llpp/llpp-31_p20191016.ebuild | 73 ++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index bbcec5684f1..bd31a873817 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,3 +1,4 @@
 DIST llpp-30.tar.gz 165821 BLAKE2B 755648f9f7e0e0740dd9647559c085ab1626edfceb91d8df4aa783610f32499d744f24a2e0ac0d6f13e747695e8829112e59bcf0fc78c7ef5f4b2427c759353d SHA512 1dfcf273bdabfb3c7b38366bac60659555b943f459cb3fd6e656df1a33c0f84e6745d62522c5498df0bd6182bda13973144724054588c07145018bb3e758d893
 DIST llpp-30_p20190316.tar.gz 169517 BLAKE2B 56dbb4fc1f46e654f15986edf870bec22c3d26c694915db88125d99b8f0460c70ac3bd48c82f45f32939f5a09753a4ec6f2e6d544397a0d6ba242640c363917d SHA512 c736b94595eab1fd45e6fb6aa89a988e0c3ec1f4c7c88f8655d17a88c9ff62c6b7db4396a3934690861b5e61af595baa6736b92c585ad68c51677f3e577bd713
 DIST llpp-31.tar.gz 169199 BLAKE2B 3f60db741fb94bf1b4753f5443705e68f062a68212fd3d0d8062f54b3b71002dc0ee3ba3040f9be028a40d8e96de11c8c53966196e631458f65d863f90f7226f SHA512 d9e213078899ece4a92291199bc2ea962c40a185b9908a7db241a773f57c64e08b004a8433984b86cc4b59088f97991b2ee8ee94e75d71536ce378dd32316e57
+DIST llpp-31_p20191016.tar.gz 169480 BLAKE2B af8f01d156863b642ad1c062b4b1a00a744955fdc1e7446b7a5023e6d03b58af77c699140b54d337c0eeacf65fba7a06ccfd6baa6ab9e1920bd7fd0fcfa90d97 SHA512 6fdd2621aec9f026e175c52957c77293a105adc81e42dad33f24631d5d2ae6775978834e84e1cab73cc8d1246af684384f9057a0f613438a19eaf7b607f92ddf

diff --git a/app-text/llpp/llpp-31_p20191016.ebuild b/app-text/llpp/llpp-31_p20191016.ebuild
new file mode 100644
index 00000000000..71908e87e15
--- /dev/null
+++ b/app-text/llpp/llpp-31_p20191016.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="Graphical PDF viewer which aims to superficially resemble less(1)"
+HOMEPAGE="https://github.com/moosotc/llpp"
+MY_COMMIT="25c10de38cbfe0874d377e7599108e6b2a8a92ff"
+SRC_URI="https://github.com/moosotc/llpp/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt static-libs"
+
+RDEPEND=">=app-text/mupdf-1.17.0:0=[static-libs?]
+	app-arch/bzip2[static-libs?]
+	media-libs/fontconfig:1.0[static-libs?]
+	media-libs/freetype:2[static-libs?]
+	media-libs/jbig2dec:=[static-libs?]
+	media-libs/openjpeg:2[static-libs?]
+	sys-libs/zlib[static-libs?]
+	virtual/jpeg:0[static-libs?]
+	x11-libs/libX11[static-libs?]
+	x11-libs/libXau[static-libs?]
+	x11-libs/libXdmcp[static-libs?]
+	x11-misc/xsel"
+DEPEND="${RDEPEND}
+	dev-ml/lablgl[glut,ocamlopt?]"
+BDEPEND="
+	>=dev-lang/ocaml-4.09[ocamlopt?]
+	app-text/asciidoc
+	virtual/pkgconfig"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+PATCHES=( "${FILESDIR}"/${PN}-30-keysym.patch )
+
+S="${WORKDIR}"/"${PN}"-"${MY_COMMIT}"
+
+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
+
+	# remove empty interface definition
+	rm "${S}"/main.mli || die
+}
+
+src_compile() {
+	emake -j1 VERSION=${PV} CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+	dodoc README Thanks
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Sam James]

commit:     0c564292d877f05eb7ca73f951ca459586bad220
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 21:50:59 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 21:53:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c564292

app-text/llpp: port to xdg eclass

The xdg eclass has some nice detection for when
we need to call the metadata/cache re-generation,
so let's make use of that instead.

Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/llpp/llpp-31.ebuild | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/app-text/llpp/llpp-31.ebuild b/app-text/llpp/llpp-31.ebuild
index 78104778ab6..439e1c537ab 100644
--- a/app-text/llpp/llpp-31.ebuild
+++ b/app-text/llpp/llpp-31.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs xdg-utils
+inherit toolchain-funcs xdg
 
 DESCRIPTION="Graphical PDF viewer which aims to superficially resemble less(1)"
 HOMEPAGE="https://github.com/moosotc/llpp"
@@ -14,24 +14,25 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="+ocamlopt static-libs"
 
-RDEPEND="=app-text/mupdf-1.16*:0=[static-libs?]
+BDEPEND="
+	app-text/asciidoc
+	virtual/pkgconfig"
+RDEPEND="
+	=app-text/mupdf-1.16*:0=[static-libs?]
 	app-arch/bzip2[static-libs?]
 	media-libs/fontconfig:1.0[static-libs?]
 	media-libs/freetype:2[static-libs?]
 	media-libs/jbig2dec:=[static-libs?]
-	media-libs/openjpeg:2[static-libs?]
-	sys-libs/zlib[static-libs?]
+	media-libs/openjpeg:2=[static-libs?]
+	sys-libs/zlib:=[static-libs?]
 	virtual/jpeg:0[static-libs?]
 	x11-libs/libX11[static-libs?]
 	x11-libs/libXau[static-libs?]
 	x11-libs/libXdmcp[static-libs?]
 	x11-misc/xsel"
 DEPEND="${RDEPEND}
-	dev-ml/lablgl[glut,ocamlopt?]"
-BDEPEND="
 	>=dev-lang/ocaml-4.09[ocamlopt?]
-	app-text/asciidoc
-	virtual/pkgconfig"
+	dev-ml/lablgl[glut,ocamlopt?]"
 
 RESTRICT="!ocamlopt? ( strip )"
 
@@ -55,16 +56,6 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
+	emake DESTDIR="${ED}" PREFIX="/usr" install
 	dodoc README Thanks
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Sam James]

commit:     0c66b1512801731efb3c03fd9a6e79895a22aecc
Author:     Jouni Kosonen <jouni.kosonen <AT> tukesoft <DOT> com>
AuthorDate: Fri Jul 24 12:05:30 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 21:53:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c66b151

app-text/llpp: version bump to 31

v31 works with mupdf-1.16.1 and ocaml-4.09.0 currently in the tree

Bug: https://bugs.gentoo.org/733332
Signed-off-by: Jouni Kosonen <jouni.kosonen <AT> tukesoft.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/llpp/Manifest       |  1 +
 app-text/llpp/llpp-31.ebuild | 70 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 5a5f1b30293..bbcec5684f1 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,2 +1,3 @@
 DIST llpp-30.tar.gz 165821 BLAKE2B 755648f9f7e0e0740dd9647559c085ab1626edfceb91d8df4aa783610f32499d744f24a2e0ac0d6f13e747695e8829112e59bcf0fc78c7ef5f4b2427c759353d SHA512 1dfcf273bdabfb3c7b38366bac60659555b943f459cb3fd6e656df1a33c0f84e6745d62522c5498df0bd6182bda13973144724054588c07145018bb3e758d893
 DIST llpp-30_p20190316.tar.gz 169517 BLAKE2B 56dbb4fc1f46e654f15986edf870bec22c3d26c694915db88125d99b8f0460c70ac3bd48c82f45f32939f5a09753a4ec6f2e6d544397a0d6ba242640c363917d SHA512 c736b94595eab1fd45e6fb6aa89a988e0c3ec1f4c7c88f8655d17a88c9ff62c6b7db4396a3934690861b5e61af595baa6736b92c585ad68c51677f3e577bd713
+DIST llpp-31.tar.gz 169199 BLAKE2B 3f60db741fb94bf1b4753f5443705e68f062a68212fd3d0d8062f54b3b71002dc0ee3ba3040f9be028a40d8e96de11c8c53966196e631458f65d863f90f7226f SHA512 d9e213078899ece4a92291199bc2ea962c40a185b9908a7db241a773f57c64e08b004a8433984b86cc4b59088f97991b2ee8ee94e75d71536ce378dd32316e57

diff --git a/app-text/llpp/llpp-31.ebuild b/app-text/llpp/llpp-31.ebuild
new file mode 100644
index 00000000000..78104778ab6
--- /dev/null
+++ b/app-text/llpp/llpp-31.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs xdg-utils
+
+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="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt static-libs"
+
+RDEPEND="=app-text/mupdf-1.16*:0=[static-libs?]
+	app-arch/bzip2[static-libs?]
+	media-libs/fontconfig:1.0[static-libs?]
+	media-libs/freetype:2[static-libs?]
+	media-libs/jbig2dec:=[static-libs?]
+	media-libs/openjpeg:2[static-libs?]
+	sys-libs/zlib[static-libs?]
+	virtual/jpeg:0[static-libs?]
+	x11-libs/libX11[static-libs?]
+	x11-libs/libXau[static-libs?]
+	x11-libs/libXdmcp[static-libs?]
+	x11-misc/xsel"
+DEPEND="${RDEPEND}
+	dev-ml/lablgl[glut,ocamlopt?]"
+BDEPEND="
+	>=dev-lang/ocaml-4.09[ocamlopt?]
+	app-text/asciidoc
+	virtual/pkgconfig"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+PATCHES=( "${FILESDIR}"/${PN}-30-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
+
+	# remove empty interface definition
+	rm "${S}"/main.mli || die
+}
+
+src_compile() {
+	emake -j1 VERSION=${PV} CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+	dodoc README Thanks
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Mikle Kolyada]

commit:     f8e7830cb22aa3e7d62e3631cf8bc52fdd7f1deb
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 20 13:25:26 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Feb 20 13:25:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8e7830c

app-text/llpp: amd64 stable wrt bug #676444

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 app-text/llpp/llpp-30.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/llpp/llpp-30.ebuild b/app-text/llpp/llpp-30.ebuild
index 5b309272745..9fc50c6f10e 100644
--- a/app-text/llpp/llpp-30.ebuild
+++ b/app-text/llpp/llpp-30.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+ocamlopt static"
 
 LIB_DEPEND=">=app-text/mupdf-1.12.0:0=[static-libs]

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Thomas Deutschmann]

commit:     9a3d507646ebfc4d2dacf441523033083cc17ed0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 15 00:01:03 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Feb 15 00:17:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a3d5076

app-text/llpp: x86 stable (bug #676444)

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-text/llpp/llpp-30.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/llpp/llpp-30.ebuild b/app-text/llpp/llpp-30.ebuild
index 3ba1ce6fe45..5b309272745 100644
--- a/app-text/llpp/llpp-30.ebuild
+++ b/app-text/llpp/llpp-30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="+ocamlopt static"
 
 LIB_DEPEND=">=app-text/mupdf-1.12.0:0=[static-libs]

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Virgil Dupras]

commit:     cebe033037940c160c42dd00fb574b7a1ba9c9a5
Author:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 18 18:15:53 2018 +0000
Commit:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Sat Aug 18 18:15:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cebe0330

app-text/llpp: remove old and vulnerable

Was forced to drop ppc stable keyword due to slow stabilization.

Bug: https://bugs.gentoo.org/645974
Bug: https://bugs.gentoo.org/658618
Package-Manager: Portage-2.3.47, Repoman-2.3.10

 app-text/llpp/Manifest        |  1 -
 app-text/llpp/llpp-26b.ebuild | 87 -------------------------------------------
 2 files changed, 88 deletions(-)

diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index c1cd1df5611..bfbf28930ce 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,2 +1 @@
-DIST llpp-26b.tar.gz 169385 BLAKE2B 9a80c22d013af063e3908bda69108ce6a4e0f72efb1c0b930308591d2b8a0f94f7b71a5f1057543e102b95b01440d567e6648d1ed77f1e85728f5ea31718ea28 SHA512 ce7d743d8ec998a93cf272083dc5926ce6a250aee6ac768814f511ecb309ffe94fb0e2561ca1778e1c7fbd5824545477937618c8e66d32fd273f9b5e5e3fd143
 DIST llpp-26b_p20180114.tar.gz 170204 BLAKE2B c7f46491d69350e8e94b444f0be4d7375f5658cccded792ecce2a246c907ae98bcca45d73e3b6c15765bd926d559327491559b5e5eec63bf2645cba84f6ee0d3 SHA512 1bc544f4bae268f573c2c111b69f7129bd3d1c1c8cc635c06f76e12670ad9476b4c2a2776e3959203ab6e53ea8ad1c68be290619298f7ebc1ae8203875f88314

diff --git a/app-text/llpp/llpp-26b.ebuild b/app-text/llpp/llpp-26b.ebuild
deleted file mode 100644
index 607103b2b3e..00000000000
--- a/app-text/llpp/llpp-26b.ebuild
+++ /dev/null
@@ -1,87 +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="http://repo.or.cz/llpp.git/snapshot/606ca0f5b7d9c1f031e558c17d66591daa04e3a4.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+ocamlopt static"
-
-LIB_DEPEND=">=app-text/mupdf-1.11:0=[static-libs]
-	<app-text/mupdf-1.12: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
-}

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Aaron Bauman]

commit:     334df12deaa3f0d46908f593104b4e8112353d8a
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 14 17:22:19 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Apr 14 17:22:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=334df12d

app-text/llpp: amd64 stable

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 app-text/llpp/llpp-26b_p20180114.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/llpp/llpp-26b_p20180114.ebuild b/app-text/llpp/llpp-26b_p20180114.ebuild
index 4c39269b6b5..4c83f9fd324 100644
--- a/app-text/llpp/llpp-26b_p20180114.ebuild
+++ b/app-text/llpp/llpp-26b_p20180114.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://distfiles.gentoo.org/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+ocamlopt static"
 
 LIB_DEPEND=">=app-text/mupdf-1.12.0:0=[static-libs]

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Thomas Deutschmann]

commit:     9954b237b68136d49c5acd5d664df07d97407577
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 12 00:53:23 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 12 00:54:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9954b237

app-text/llpp: x86 stable (bug #645974)

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 app-text/llpp/llpp-26b_p20180114.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/llpp/llpp-26b_p20180114.ebuild b/app-text/llpp/llpp-26b_p20180114.ebuild
index 296e6579cdb..4c39269b6b5 100644
--- a/app-text/llpp/llpp-26b_p20180114.ebuild
+++ b/app-text/llpp/llpp-26b_p20180114.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://distfiles.gentoo.org/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="+ocamlopt static"
 
 LIB_DEPEND=">=app-text/mupdf-1.12.0:0=[static-libs]

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Michael Weber]

commit:     4c29238d67ab0f60f97a98a61ebf2d1741623864
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 28 13:30:24 2018 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 13:30:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c29238d

app-text/llpp: Version bump to git version for mupdf-1.12.

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 app-text/llpp/Manifest                                       | 1 +
 app-text/llpp/llpp-26b.ebuild                                | 3 ++-
 app-text/llpp/{llpp-26b.ebuild => llpp-26b_p20180114.ebuild} | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index c382b3ba98a..c1cd1df5611 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1 +1,2 @@
 DIST llpp-26b.tar.gz 169385 BLAKE2B 9a80c22d013af063e3908bda69108ce6a4e0f72efb1c0b930308591d2b8a0f94f7b71a5f1057543e102b95b01440d567e6648d1ed77f1e85728f5ea31718ea28 SHA512 ce7d743d8ec998a93cf272083dc5926ce6a250aee6ac768814f511ecb309ffe94fb0e2561ca1778e1c7fbd5824545477937618c8e66d32fd273f9b5e5e3fd143
+DIST llpp-26b_p20180114.tar.gz 170204 BLAKE2B c7f46491d69350e8e94b444f0be4d7375f5658cccded792ecce2a246c907ae98bcca45d73e3b6c15765bd926d559327491559b5e5eec63bf2645cba84f6ee0d3 SHA512 1bc544f4bae268f573c2c111b69f7129bd3d1c1c8cc635c06f76e12670ad9476b4c2a2776e3959203ab6e53ea8ad1c68be290619298f7ebc1ae8203875f88314

diff --git a/app-text/llpp/llpp-26b.ebuild b/app-text/llpp/llpp-26b.ebuild
index a597bef81e8..607103b2b3e 100644
--- a/app-text/llpp/llpp-26b.ebuild
+++ b/app-text/llpp/llpp-26b.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ KEYWORDS="amd64 ppc x86"
 IUSE="+ocamlopt static"
 
 LIB_DEPEND=">=app-text/mupdf-1.11:0=[static-libs]
+	<app-text/mupdf-1.12:0=[static-libs]
 	media-libs/openjpeg:2[static-libs]
 	media-libs/fontconfig:1.0[static-libs]
 	media-libs/freetype:2[static-libs]

diff --git a/app-text/llpp/llpp-26b.ebuild b/app-text/llpp/llpp-26b_p20180114.ebuild
similarity index 92%
copy from app-text/llpp/llpp-26b.ebuild
copy to app-text/llpp/llpp-26b_p20180114.ebuild
index a597bef81e8..296e6579cdb 100644
--- a/app-text/llpp/llpp-26b.ebuild
+++ b/app-text/llpp/llpp-26b_p20180114.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,14 +7,14 @@ 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/llpp.git/snapshot/606ca0f5b7d9c1f031e558c17d66591daa04e3a4.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://distfiles.gentoo.org/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="+ocamlopt static"
 
-LIB_DEPEND=">=app-text/mupdf-1.11:0=[static-libs]
+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]

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Michael Weber]

commit:     8d343ded1ea62564c12b05b5c2ae786ad8ca02fa
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 22:42:40 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat May 13 22:46:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d343ded

app-text/llpp: ppc stable (bug 614044).

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --include-arches="ppc"

 app-text/llpp/llpp-26b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/llpp/llpp-26b.ebuild b/app-text/llpp/llpp-26b.ebuild
index 5fc8ab97d58..a597bef81e8 100644
--- a/app-text/llpp/llpp-26b.ebuild
+++ b/app-text/llpp/llpp-26b.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://repo.or.cz/llpp.git/snapshot/606ca0f5b7d9c1f031e558c17d66591daa0
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="+ocamlopt static"
 
 LIB_DEPEND=">=app-text/mupdf-1.11:0=[static-libs]

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Agostino Sarubbo]

commit:     9f2dd98b97a32210d7ee85a941be16ae864d4794
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun May  7 10:36:34 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun May  7 10:36:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f2dd98b

app-text/llpp: x86 stable wrt bug #614852

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-text/llpp/llpp-26b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/llpp/llpp-26b.ebuild b/app-text/llpp/llpp-26b.ebuild
index c79e1774ace..5fc8ab97d58 100644
--- a/app-text/llpp/llpp-26b.ebuild
+++ b/app-text/llpp/llpp-26b.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://repo.or.cz/llpp.git/snapshot/606ca0f5b7d9c1f031e558c17d66591daa0
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+ocamlopt static"
 
 LIB_DEPEND=">=app-text/mupdf-1.11:0=[static-libs]

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Agostino Sarubbo]

commit:     c0da6e4ae32b399953f53b636ac19834cac393b5
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat May  6 13:25:12 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat May  6 13:25:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0da6e4a

app-text/llpp: amd64 stable wrt bug #614852

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-text/llpp/llpp-26b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/llpp/llpp-26b.ebuild b/app-text/llpp/llpp-26b.ebuild
index fc38b4614cc..c79e1774ace 100644
--- a/app-text/llpp/llpp-26b.ebuild
+++ b/app-text/llpp/llpp-26b.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://repo.or.cz/llpp.git/snapshot/606ca0f5b7d9c1f031e558c17d66591daa0
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="+ocamlopt static"
 
 LIB_DEPEND=">=app-text/mupdf-1.11:0=[static-libs]

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Michael Weber]

commit:     ae55863d2d742b0163f2b3e8f6b735b878373871
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 28 09:37:26 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri Apr 28 09:37:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae55863d

app-text/llpp: Compile fails with new mupdf-1.11.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-text/llpp/llpp-23.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-text/llpp/llpp-23.ebuild b/app-text/llpp/llpp-23.ebuild
index 15ef43fa54b..18de8073587 100644
--- a/app-text/llpp/llpp-23.ebuild
+++ b/app-text/llpp/llpp-23.ebuild
@@ -15,6 +15,7 @@ KEYWORDS="amd64 ppc x86"
 IUSE="+ocamlopt static"
 
 LIB_DEPEND=">=app-text/mupdf-1.10a:0=[static-libs]
+	<app-text/mupdf-1.11:0=[static-libs]
 	media-libs/openjpeg:2[static-libs]
 	media-libs/fontconfig:1.0[static-libs]
 	media-libs/freetype:2[static-libs]

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Michael Weber]

commit:     5cbe503b6649fdafbdda5cbaa10653ffccb67578
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 19:22:55 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 19:23:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cbe503b

app-text/llpp: Drop old versions.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-text/llpp/Manifest                 |  3 --
 app-text/llpp/llpp-20_p20140818.ebuild | 97 ----------------------------------
 app-text/llpp/llpp-22.ebuild           | 95 ---------------------------------
 app-text/llpp/llpp-22_p20160324.ebuild | 94 --------------------------------
 4 files changed, 289 deletions(-)

diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index d5cfb25..abff6c4 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,4 +1 @@
-DIST llpp-20_p20140818.tar.gz 127805 SHA256 959862916f6ee4261903bd8192dd7b6203cf9b5fa989b4bb3c19377e61fe23ea SHA512 f529414ce1731f2f155e80615792a1d79e62f58f40238b83f0c5fd59e65429a8a95fe02f6556e7b1c51619f0cac670494e4844b444b428ea3ddb991361268790 WHIRLPOOL e190b8bbed54b8e5157c477bc071bcb16681017838cb0c0295bccddff2244be426ff4c925c3effab43dd2939e5ceb0397e2d860c6e53538139d38f340dd05a71
-DIST llpp-22.tar.gz 153700 SHA256 06dff0377bb47c172f5cb498f8bce0f362cca910f90e8663fcd3f1500ce8fa0e SHA512 8db70d7c9f10094aef0928b5f69bd9544c3cac427710d409c593708f18e06a96c0f0051b255eb81f1cb3ad9cd2e5c627121bd897db0fac6a9ade1698f9a78738 WHIRLPOOL d8a2dfb889abeebe6a8b7d9bcd57f15198d84cd16de3f9519962c6de84e67722d911b26064c0f70c9fc7087ef5631d8d82d4ec38af0fc752c644facd12ee0aaa
-DIST llpp-22_p20160324.tar.gz 159647 SHA256 8326369aa84aa70073e26ed1905643a2ee8d442a02a10fccd9cd0ab1cf8eabb8 SHA512 b0a2675d55184282492bcfb3af7b47fb97ff3b98b9ff5cf25d515f70fad60e135b870f30dbe13e57a7cd2e401d87f81b330cddf92fd27705d0c1726e4e7e3fe1 WHIRLPOOL bb26ecda248e458e8b5e407ec196938bcd60b2b9118534c792677bed98982a648262e3f662a404fc9e2cf755639ca79806e1471e170b21ca4ba6d84f7efc8fbe
 DIST llpp-23.tar.gz 159922 SHA256 83bf72ad88f0532a0163a6dc9bd285ad5ce8604116ec64764738cdb066748927 SHA512 ef89bead66c22ed218a4f7eb06f6f7d9b1d48f6ab6ef4785a5dc73ad486cdf4a5b1131a8a8cec9020e9caa14468528d9f27c88a29ab221e13c9c55616d20c296 WHIRLPOOL e2c5468b744e71036745de63e9172b32cfa7cb2aae3c61c2a71d0ffe8b3a8b0e2502ff300d1a23446619353c6e43b7b6e051a6126ddc45b1997213c67cfd2764

diff --git a/app-text/llpp/llpp-20_p20140818.ebuild b/app-text/llpp/llpp-20_p20140818.ebuild
deleted file mode 100644
index 938dfaa..00000000
--- a/app-text/llpp/llpp-20_p20140818.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2016 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/4fc967506989680faf64fb6c1dd0e0d13c678124.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+ocamlopt static"
-#IUSE="egl +ocamlopt static"
-
-LIB_DEPEND=">=app-text/mupdf-1.5:0=[static-libs]
-	<app-text/mupdf-1.9a: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]"
-# egl? ( media-libs/mesa[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}-20-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 egl ; then
-	#	ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)"
-	#	local egl="egl"
-	#fi
-	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') )
-		ewarn ${spath}
-		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 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 bo.${cmo} le/bo.ml
-	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 -pp "sed -f pp.sed" -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}" \
-		bo.${cmo} help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
-}
-
-src_install() {
-	dobin ${PN} misc/${PN}ac
-	dodoc KEYS README Thanks fixme
-}

diff --git a/app-text/llpp/llpp-22.ebuild b/app-text/llpp/llpp-22.ebuild
deleted file mode 100644
index bc3878f..00000000
--- a/app-text/llpp/llpp-22.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 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/561dc5673cea431e930668b0d87b0c4b31a36b39.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+ocamlopt static"
-#IUSE="egl +ocamlopt static"
-
-LIB_DEPEND=">=app-text/mupdf-1.7a:0=[static-libs]
-	<app-text/mupdf-1.9a: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]"
-# egl? ( media-libs/mesa[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 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20-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 egl ; then
-	#	ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)"
-	#	local egl="egl"
-	#fi
-	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 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 -pp "sed -f pp.sed" -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} misc/${PN}ac
-	dodoc KEYS README Thanks fixme
-}

diff --git a/app-text/llpp/llpp-22_p20160324.ebuild b/app-text/llpp/llpp-22_p20160324.ebuild
deleted file mode 100644
index e406c32..00000000
--- a/app-text/llpp/llpp-22_p20160324.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 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/llpp.git/snapshot/794a8bce7716bf4571ca24c2574caa0f73851aa3.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ocamlopt static"
-#IUSE="egl +ocamlopt static"
-
-LIB_DEPEND=">=app-text/mupdf-1.9a: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]"
-# egl? ( media-libs/mesa[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 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20-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 egl ; then
-	#	ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)"
-	#	local egl="egl"
-	#fi
-	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 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 -pp "sed -f pp.sed" -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} misc/${PN}ac
-	dodoc KEYS README Thanks fixme
-}

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Agostino Sarubbo]

commit:     47f9acb0512f316a1a1370c4cdc27b57f30641c5
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 14:48:15 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 14:48:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47f9acb0

app-text/llpp: amd64 stable wrt bug #589826

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-text/llpp/llpp-23.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/llpp/llpp-23.ebuild b/app-text/llpp/llpp-23.ebuild
index 3383551..fd4fcb0 100644
--- a/app-text/llpp/llpp-23.ebuild
+++ b/app-text/llpp/llpp-23.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://repo.or.cz/llpp.git/snapshot/b51644926dda712aebdc3f075bdc0771f35
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="+ocamlopt static"
 
 LIB_DEPEND=">=app-text/mupdf-1.10a:0=[static-libs]

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Michael Weber]

commit:     81e7d29b7308c16f68066d423fe96642bd877f21
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 01:12:00 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 01:12:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81e7d29b

app-text/llpp: Version bump.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-text/llpp/Manifest       |  1 +
 app-text/llpp/llpp-23.ebuild | 86 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)

diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 0c00cd8..d5cfb25 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,3 +1,4 @@
 DIST llpp-20_p20140818.tar.gz 127805 SHA256 959862916f6ee4261903bd8192dd7b6203cf9b5fa989b4bb3c19377e61fe23ea SHA512 f529414ce1731f2f155e80615792a1d79e62f58f40238b83f0c5fd59e65429a8a95fe02f6556e7b1c51619f0cac670494e4844b444b428ea3ddb991361268790 WHIRLPOOL e190b8bbed54b8e5157c477bc071bcb16681017838cb0c0295bccddff2244be426ff4c925c3effab43dd2939e5ceb0397e2d860c6e53538139d38f340dd05a71
 DIST llpp-22.tar.gz 153700 SHA256 06dff0377bb47c172f5cb498f8bce0f362cca910f90e8663fcd3f1500ce8fa0e SHA512 8db70d7c9f10094aef0928b5f69bd9544c3cac427710d409c593708f18e06a96c0f0051b255eb81f1cb3ad9cd2e5c627121bd897db0fac6a9ade1698f9a78738 WHIRLPOOL d8a2dfb889abeebe6a8b7d9bcd57f15198d84cd16de3f9519962c6de84e67722d911b26064c0f70c9fc7087ef5631d8d82d4ec38af0fc752c644facd12ee0aaa
 DIST llpp-22_p20160324.tar.gz 159647 SHA256 8326369aa84aa70073e26ed1905643a2ee8d442a02a10fccd9cd0ab1cf8eabb8 SHA512 b0a2675d55184282492bcfb3af7b47fb97ff3b98b9ff5cf25d515f70fad60e135b870f30dbe13e57a7cd2e401d87f81b330cddf92fd27705d0c1726e4e7e3fe1 WHIRLPOOL bb26ecda248e458e8b5e407ec196938bcd60b2b9118534c792677bed98982a648262e3f662a404fc9e2cf755639ca79806e1471e170b21ca4ba6d84f7efc8fbe
+DIST llpp-23.tar.gz 159922 SHA256 83bf72ad88f0532a0163a6dc9bd285ad5ce8604116ec64764738cdb066748927 SHA512 ef89bead66c22ed218a4f7eb06f6f7d9b1d48f6ab6ef4785a5dc73ad486cdf4a5b1131a8a8cec9020e9caa14468528d9f27c88a29ab221e13c9c55616d20c296 WHIRLPOOL e2c5468b744e71036745de63e9172b32cfa7cb2aae3c61c2a71d0ffe8b3a8b0e2502ff300d1a23446619353c6e43b7b6e051a6126ddc45b1997213c67cfd2764

diff --git a/app-text/llpp/llpp-23.ebuild b/app-text/llpp/llpp-23.ebuild
new file mode 100644
index 00000000..3383551
--- /dev/null
+++ b/app-text/llpp/llpp-23.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://repo.or.cz/llpp.git/snapshot/b51644926dda712aebdc3f075bdc0771f35d6f7b.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt static"
+
+LIB_DEPEND=">=app-text/mupdf-1.10a: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}-20-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 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 -pp "sed -f pp.sed" -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} misc/${PN}ac
+	dodoc KEYS README Thanks
+}

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Michael Weber]

commit:     c13b35a0c103bee59fa5cb8adcb36775fc6eeac5
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 01:12:48 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 01:12:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c13b35a0

app-text/llpp: Drop live ebuild.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-text/llpp/llpp-9999.ebuild | 92 ------------------------------------------
 1 file changed, 92 deletions(-)

diff --git a/app-text/llpp/llpp-9999.ebuild b/app-text/llpp/llpp-9999.ebuild
deleted file mode 100644
index 46ef4c6..00000000
--- a/app-text/llpp/llpp-9999.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils git-2 multilib toolchain-funcs
-
-DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="http://repo.or.cz/w/llpp.git"
-EGIT_REPO_URI="git://repo.or.cz/llpp.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="+ocamlopt static"
-
-LIB_DEPEND=">=app-text/mupdf-1.9a: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 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20-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 egl ; then
-	#	ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)"
-	#	local egl="egl"
-	#fi
-	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 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 -pp "sed -f pp.sed" -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} misc/${PN}ac
-	dodoc KEYS README Thanks fixme
-}

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Pacho Ramos]

commit:     96fb85a85479d9b2a7b1921d2c1e07a7ed0de989
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 08:15:23 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 08:16:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96fb85a8

app-text/llpp: amd64/x86 stable, bug #571322

Package-Manager: portage-2.3.2

 app-text/llpp/llpp-22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/llpp/llpp-22.ebuild b/app-text/llpp/llpp-22.ebuild
index f4c28d5..bc3878f 100644
--- a/app-text/llpp/llpp-22.ebuild
+++ b/app-text/llpp/llpp-22.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://repo.or.cz/w/llpp.git/snapshot/561dc5673cea431e930668b0d87b0c4b3
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+ocamlopt static"
 #IUSE="egl +ocamlopt static"
 

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Michael Weber]

commit:     953d644edc203e477e36c9bc2012354b319c93c6
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 23:08:16 2016 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 23:08:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=953d644e

app-text/llpp: Version bump for latest mupdf release.

Package-Manager: portage-2.3.0_rc1

 app-text/llpp/Manifest                 |  1 +
 app-text/llpp/llpp-22_p20160324.ebuild | 94 ++++++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+)

diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 048d438..0c00cd8 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,2 +1,3 @@
 DIST llpp-20_p20140818.tar.gz 127805 SHA256 959862916f6ee4261903bd8192dd7b6203cf9b5fa989b4bb3c19377e61fe23ea SHA512 f529414ce1731f2f155e80615792a1d79e62f58f40238b83f0c5fd59e65429a8a95fe02f6556e7b1c51619f0cac670494e4844b444b428ea3ddb991361268790 WHIRLPOOL e190b8bbed54b8e5157c477bc071bcb16681017838cb0c0295bccddff2244be426ff4c925c3effab43dd2939e5ceb0397e2d860c6e53538139d38f340dd05a71
 DIST llpp-22.tar.gz 153700 SHA256 06dff0377bb47c172f5cb498f8bce0f362cca910f90e8663fcd3f1500ce8fa0e SHA512 8db70d7c9f10094aef0928b5f69bd9544c3cac427710d409c593708f18e06a96c0f0051b255eb81f1cb3ad9cd2e5c627121bd897db0fac6a9ade1698f9a78738 WHIRLPOOL d8a2dfb889abeebe6a8b7d9bcd57f15198d84cd16de3f9519962c6de84e67722d911b26064c0f70c9fc7087ef5631d8d82d4ec38af0fc752c644facd12ee0aaa
+DIST llpp-22_p20160324.tar.gz 159647 SHA256 8326369aa84aa70073e26ed1905643a2ee8d442a02a10fccd9cd0ab1cf8eabb8 SHA512 b0a2675d55184282492bcfb3af7b47fb97ff3b98b9ff5cf25d515f70fad60e135b870f30dbe13e57a7cd2e401d87f81b330cddf92fd27705d0c1726e4e7e3fe1 WHIRLPOOL bb26ecda248e458e8b5e407ec196938bcd60b2b9118534c792677bed98982a648262e3f662a404fc9e2cf755639ca79806e1471e170b21ca4ba6d84f7efc8fbe

diff --git a/app-text/llpp/llpp-22_p20160324.ebuild b/app-text/llpp/llpp-22_p20160324.ebuild
new file mode 100644
index 0000000..e406c32
--- /dev/null
+++ b/app-text/llpp/llpp-22_p20160324.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 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/llpp.git/snapshot/794a8bce7716bf4571ca24c2574caa0f73851aa3.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt static"
+#IUSE="egl +ocamlopt static"
+
+LIB_DEPEND=">=app-text/mupdf-1.9a: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]"
+# egl? ( media-libs/mesa[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 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-20-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 egl ; then
+	#	ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)"
+	#	local egl="egl"
+	#fi
+	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 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 -pp "sed -f pp.sed" -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} misc/${PN}ac
+	dodoc KEYS README Thanks fixme
+}

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Michael Weber]

commit:     b083a4313d586d6b6cdb0b1af00cd747da3a0f45
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 21:02:47 2016 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat Jun  4 19:46:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b083a431

app-text/llpp: incompatible with latest mupdf

Package-Manager: portage-2.3.0_rc1

 app-text/llpp/llpp-20_p20140818.ebuild | 3 ++-
 app-text/llpp/llpp-22.ebuild           | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-text/llpp/llpp-20_p20140818.ebuild b/app-text/llpp/llpp-20_p20140818.ebuild
index 28ba8ac..938dfaa 100644
--- a/app-text/llpp/llpp-20_p20140818.ebuild
+++ b/app-text/llpp/llpp-20_p20140818.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,6 +17,7 @@ IUSE="+ocamlopt static"
 #IUSE="egl +ocamlopt static"
 
 LIB_DEPEND=">=app-text/mupdf-1.5:0=[static-libs]
+	<app-text/mupdf-1.9a:0=[static-libs]
 	media-libs/openjpeg:2[static-libs]
 	media-libs/fontconfig:1.0[static-libs]
 	media-libs/freetype:2[static-libs]

diff --git a/app-text/llpp/llpp-22.ebuild b/app-text/llpp/llpp-22.ebuild
index 58d774e..f4c28d5 100644
--- a/app-text/llpp/llpp-22.ebuild
+++ b/app-text/llpp/llpp-22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,6 +17,7 @@ IUSE="+ocamlopt static"
 #IUSE="egl +ocamlopt static"
 
 LIB_DEPEND=">=app-text/mupdf-1.7a:0=[static-libs]
+	<app-text/mupdf-1.9a:0=[static-libs]
 	media-libs/openjpeg:2[static-libs]
 	media-libs/fontconfig:1.0[static-libs]
 	media-libs/freetype:2[static-libs]

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Michael Weber]

commit:     b0390600df5f715e2900c222bf6712941444f4a4
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 20:58:33 2016 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat Jun  4 19:45:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0390600

app-text/llpp: need latest mupdf

Package-Manager: portage-2.3.0_rc1

 app-text/llpp/llpp-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/llpp/llpp-9999.ebuild b/app-text/llpp/llpp-9999.ebuild
index c39e01a..46ef4c6 100644
--- a/app-text/llpp/llpp-9999.ebuild
+++ b/app-text/llpp/llpp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="+ocamlopt static"
 
-LIB_DEPEND=">=app-text/mupdf-1.7a:0=[static-libs]
+LIB_DEPEND=">=app-text/mupdf-1.9a:0=[static-libs]
 	media-libs/openjpeg:2[static-libs]
 	media-libs/fontconfig:1.0[static-libs]
 	media-libs/freetype:2[static-libs]

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Michael Weber]

commit:     749a7526454f8195e7d6a3c33661b8e1844ea7dd
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  8 19:19:15 2016 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 00:35:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=749a7526

app-text/llpp: drop old.

Package-Manager: portage-2.2.28

 app-text/llpp/Manifest                 |  2 -
 app-text/llpp/llpp-21.ebuild           | 96 ----------------------------------
 app-text/llpp/llpp-21_p20150427.ebuild | 95 ---------------------------------
 3 files changed, 193 deletions(-)

diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 7860e37..048d438 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,4 +1,2 @@
 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
 DIST llpp-22.tar.gz 153700 SHA256 06dff0377bb47c172f5cb498f8bce0f362cca910f90e8663fcd3f1500ce8fa0e SHA512 8db70d7c9f10094aef0928b5f69bd9544c3cac427710d409c593708f18e06a96c0f0051b255eb81f1cb3ad9cd2e5c627121bd897db0fac6a9ade1698f9a78738 WHIRLPOOL d8a2dfb889abeebe6a8b7d9bcd57f15198d84cd16de3f9519962c6de84e67722d911b26064c0f70c9fc7087ef5631d8d82d4ec38af0fc752c644facd12ee0aaa

diff --git a/app-text/llpp/llpp-21.ebuild b/app-text/llpp/llpp-21.ebuild
deleted file mode 100644
index 21cdfd7..0000000
--- a/app-text/llpp/llpp-21.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 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/973e613ec9062e5c41323fc58fa3435fc6c45551.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ocamlopt static"
-#IUSE="egl +ocamlopt static"
-
-LIB_DEPEND=">=app-text/mupdf-1.5:0=[static-libs]
-	<app-text/mupdf-1.7: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]"
-# egl? ( media-libs/mesa[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 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20-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 egl ; then
-	#	ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)"
-	#	local egl="egl"
-	#fi
-	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 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 bo.${cmo} le/bo.ml
-	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 -pp "sed -f pp.sed" -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}" \
-		bo.${cmo} help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
-}
-
-src_install() {
-	dobin ${PN} misc/${PN}ac
-	dodoc KEYS README Thanks fixme
-}

diff --git a/app-text/llpp/llpp-21_p20150427.ebuild b/app-text/llpp/llpp-21_p20150427.ebuild
deleted file mode 100644
index a061c0a..0000000
--- a/app-text/llpp/llpp-21_p20150427.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 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/66868744188151eaa433d42c807e1efc5f623aa4.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ocamlopt static"
-#IUSE="egl +ocamlopt static"
-
-LIB_DEPEND=">=app-text/mupdf-1.7a: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]"
-# egl? ( media-libs/mesa[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 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20-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 egl ; then
-	#	ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)"
-	#	local egl="egl"
-	#fi
-	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 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 bo.${cmo} le/bo.ml
-	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 -pp "sed -f pp.sed" -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}" \
-		bo.${cmo} help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
-}
-
-src_install() {
-	dobin ${PN} misc/${PN}ac
-	dodoc KEYS README Thanks fixme
-}

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Michael Weber]

commit:     fc31b82604ef2d4b6c55d60f52bbb410c809b5ea
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 12 22:34:00 2016 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Jan 12 22:43:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc31b826

app-text/llpp: adopt -std=c99 for gcc-4.9 and some other -W flags form upstream (thanks kaste for the report).

Package-Manager: portage-2.2.26

 app-text/llpp/llpp-22.ebuild   | 2 +-
 app-text/llpp/llpp-9999.ebuild | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app-text/llpp/llpp-22.ebuild b/app-text/llpp/llpp-22.ebuild
index 5043975..58d774e 100644
--- a/app-text/llpp/llpp-22.ebuild
+++ b/app-text/llpp/llpp-22.ebuild
@@ -47,7 +47,7 @@ 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"
+	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 egl ; then
 	#	ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)"
 	#	local egl="egl"

diff --git a/app-text/llpp/llpp-9999.ebuild b/app-text/llpp/llpp-9999.ebuild
index fc2df01..c39e01a 100644
--- a/app-text/llpp/llpp-9999.ebuild
+++ b/app-text/llpp/llpp-9999.ebuild
@@ -45,7 +45,11 @@ 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"
+	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 egl ; then
+	#	ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)"
+	#	local egl="egl"
+	#fi
 	if use static ; then
 		local cclib=""
 		local slib=""

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Michael Weber]

commit:     46950238707e951af8fc5592d16401d9510d002e
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  9 00:09:45 2016 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat Jan  9 00:09:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46950238

app-text/llpp: Version bump.

Package-Manager: portage-2.2.26

 app-text/llpp/Manifest                             |  1 +
 app-text/llpp/{llpp-9999.ebuild => llpp-22.ebuild} | 25 +++++++++++++---------
 app-text/llpp/llpp-9999.ebuild                     | 11 +++++-----
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index ec7ef24..7860e37 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,3 +1,4 @@
 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
+DIST llpp-22.tar.gz 153700 SHA256 06dff0377bb47c172f5cb498f8bce0f362cca910f90e8663fcd3f1500ce8fa0e SHA512 8db70d7c9f10094aef0928b5f69bd9544c3cac427710d409c593708f18e06a96c0f0051b255eb81f1cb3ad9cd2e5c627121bd897db0fac6a9ade1698f9a78738 WHIRLPOOL d8a2dfb889abeebe6a8b7d9bcd57f15198d84cd16de3f9519962c6de84e67722d911b26064c0f70c9fc7087ef5631d8d82d4ec38af0fc752c644facd12ee0aaa

diff --git a/app-text/llpp/llpp-9999.ebuild b/app-text/llpp/llpp-22.ebuild
similarity index 75%
copy from app-text/llpp/llpp-9999.ebuild
copy to app-text/llpp/llpp-22.ebuild
index 6ae222a..5043975 100644
--- a/app-text/llpp/llpp-9999.ebuild
+++ b/app-text/llpp/llpp-22.ebuild
@@ -4,16 +4,17 @@
 
 EAPI=5
 
-inherit eutils git-2 multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs vcs-snapshot
 
-DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)"
+DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
 HOMEPAGE="http://repo.or.cz/w/llpp.git"
-EGIT_REPO_URI="git://repo.or.cz/llpp.git"
+SRC_URI="http://repo.or.cz/w/llpp.git/snapshot/561dc5673cea431e930668b0d87b0c4b31a36b39.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="+ocamlopt static"
+#IUSE="egl +ocamlopt static"
 
 LIB_DEPEND=">=app-text/mupdf-1.7a:0=[static-libs]
 	media-libs/openjpeg:2[static-libs]
@@ -23,6 +24,7 @@ LIB_DEPEND=">=app-text/mupdf-1.7a:0=[static-libs]
 	sys-libs/zlib[static-libs]
 	virtual/jpeg:0[static-libs]
 	x11-libs/libX11[static-libs]"
+# egl? ( media-libs/mesa[static-libs] )
 RDEPEND="x11-misc/xsel
 	!static? ( ${LIB_DEPEND//\[static-libs]} )"
 DEPEND="${RDEPEND}
@@ -46,11 +48,15 @@ src_compile() {
 	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 egl ; then
+	#	ccopt+=" -DUSE_EGL $(pkg-config --cflags egl)"
+	#	local egl="egl"
+	#fi
 	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 fontconfig) -ljpeg -ljbig2dec ; do
+		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"
@@ -62,14 +68,13 @@ src_compile() {
 			esac
 		done
 	else
-		local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 fontconfig) -lpthread"
+		local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 ${egl} fontconfig) -lpthread"
 	fi
 
 	verbose() { echo "$@" >&2 ; "$@" || die ; }
-	verbose ocaml str.cma keystoml.ml < KEYS > help.ml
+	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 bo.${cmo} le/bo.ml
 	verbose ${ocaml} -c -o help.${cmo} help.ml
 	verbose ${ocaml} -c -o utils.${cmo} utils.ml
 	verbose ${ocaml} -c -o wsi.cmi wsi.mli
@@ -80,7 +85,7 @@ src_compile() {
 	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
 		str.${cma} unix.${cma} lablgl.${cma} link.o \
 	    -cclib "${cclib}" \
-		bo.${cmo} help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
+		help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
 }
 
 src_install() {

diff --git a/app-text/llpp/llpp-9999.ebuild b/app-text/llpp/llpp-9999.ebuild
index 6ae222a..fc2df01 100644
--- a/app-text/llpp/llpp-9999.ebuild
+++ b/app-text/llpp/llpp-9999.ebuild
@@ -49,8 +49,8 @@ src_compile() {
 	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 fontconfig) -ljpeg -ljbig2dec ; do
+		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"
@@ -62,14 +62,13 @@ src_compile() {
 			esac
 		done
 	else
-		local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 fontconfig) -lpthread"
+		local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 ${egl} fontconfig) -lpthread"
 	fi
 
 	verbose() { echo "$@" >&2 ; "$@" || die ; }
-	verbose ocaml str.cma keystoml.ml < KEYS > help.ml
+	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 bo.${cmo} le/bo.ml
 	verbose ${ocaml} -c -o help.${cmo} help.ml
 	verbose ${ocaml} -c -o utils.${cmo} utils.ml
 	verbose ${ocaml} -c -o wsi.cmi wsi.mli
@@ -80,7 +79,7 @@ src_compile() {
 	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
 		str.${cma} unix.${cma} lablgl.${cma} link.o \
 	    -cclib "${cclib}" \
-		bo.${cmo} help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
+		help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/

[Michael Weber]

commit:     7a7c4bb85380f33d1585bd2109045fe24595c98f
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 10:05:32 2015 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 10:05:32 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a7c4bb8

pp-text/mupdf: x86 stable (bug 528680).

Package-Manager: portage-2.2.20

 app-text/llpp/llpp-20_p20140818.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/llpp/llpp-20_p20140818.ebuild b/app-text/llpp/llpp-20_p20140818.ebuild
index 6b8c6b9..28ba8ac 100644
--- a/app-text/llpp/llpp-20_p20140818.ebuild
+++ b/app-text/llpp/llpp-20_p20140818.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://repo.or.cz/w/llpp.git/snapshot/4fc967506989680faf64fb6c1dd0e0d13
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="+ocamlopt static"
 #IUSE="egl +ocamlopt static"