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 -}
