From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 28 Apr 2019 09:54:45 +0100 Subject: gentoo resync : 28.04.2019 --- media-gfx/fbida/Manifest | 2 +- media-gfx/fbida/fbida-9999.ebuild | 111 +++++++++----------------------------- 2 files changed, 25 insertions(+), 88 deletions(-) (limited to 'media-gfx/fbida') diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest index 41d7b630376e..4eb9d5111ef0 100644 --- a/media-gfx/fbida/Manifest +++ b/media-gfx/fbida/Manifest @@ -10,5 +10,5 @@ DIST ida.png.bz2 11928 BLAKE2B 8a1c89fc5adfb16c69f9591a299beb62c84d66960b586fbc8 EBUILD fbida-2.12.ebuild 2413 BLAKE2B a13d6907d2363749e807b1d18a07ddb43bd0f0fe58f44226bb33a6a0b5fbbcb8fdd3508e49714043ae95d02c7e52ac9a5a93d3403aadcd50aaaae69f3674ecaf SHA512 a90449e66ffb678b4eee8013dc634db4e3cb1a933405aa6c6ba0dbe1ff5cbe4df49ebab421ce3e175160fe2f9617a2dc6a7ec3f5f213f38082f9727e47fa53e0 EBUILD fbida-2.13-r1.ebuild 2396 BLAKE2B 426cfd4ba38a58edb391a4985f37d4e58d018e575b0a128c3506cc7835e5f2a7ca967482e53a9c71139d929ba80bc5d407c55d5ab3f2cd221e489ec3555dfb08 SHA512 163007a96ada9fbbc6937e82a53de1c7dc7d07b20faf68e3b2bfd94baef32541ecf6fa4deb8dc213200e767823950f0625da03c0c058a282e31246481b9ed71c EBUILD fbida-2.14.ebuild 2349 BLAKE2B be5d3538f93d23fd806f9a6488e13156907341cb93dad8a180d02bedf1986d6093d76ec55d4fc7a06fe0e60cb14f0638941b893edc592e2d7680f27c537d7e1e SHA512 18228be236b992885dbf5b9d04289cc36a2d8b348319b24735f9868cb0038cafeee508d87fa5a50c33c433a8c3b8c68ac1ebf28b0a8727336ec023762a38cd18 -EBUILD fbida-9999.ebuild 2438 BLAKE2B 4d7d861cb734cc18a4e14c4fa20c57ce423f014e787fed9c3a64af1414bfead1f574650c2f081d675bd9fe34bf8e35b9af37101a457182fec894c77ba2997c9d SHA512 79f044737d5f3f3b1214dab5a8c142cc4138a421bdd9a3d68167469a03f4401c582923309400bb3690551b0d580fb878bca9d8d6233c813ab9234fc341d172ac +EBUILD fbida-9999.ebuild 1233 BLAKE2B 56c7622721eee293c0ae8a87339ddc82bd4481ebaa7e79fb5801f4b5d1c0d7e097e6a66b7579495ceba6c771c81abcb01bb198d55cc5d5dce8aa08fb23254d6f SHA512 599f6af792c45c9f819d319f5d13232c4e9a793fa0d770742e1750c2a091c0e2a6054ff802c0d2640c7279e79be243139f1df4137662f5fad8fab0a723e96d7b MISC metadata.xml 439 BLAKE2B 66a897b749b63e389153a97d84be2d4cf7e9c06c0b967ae715bd8202e038005ee724110d7d62ff99ef6ba21c8a365634f9350fc43e7dce44c81717cdeee85c54 SHA512 078e39413b3d63c3324c1f98e83b1b9747f2653108e34986dfc869cc3b65452d1b85ecefdaab17c0c53bd50cdb879f68c8b55a9da7d0cdee47ca329af10eec58 diff --git a/media-gfx/fbida/fbida-9999.ebuild b/media-gfx/fbida/fbida-9999.ebuild index d2f3b8d0b085..b1a1c6b1f620 100644 --- a/media-gfx/fbida/fbida-9999.ebuild +++ b/media-gfx/fbida/fbida-9999.ebuild @@ -1,63 +1,51 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils git-r3 toolchain-funcs +EAPI=7 +inherit desktop git-r3 meson toolchain-funcs DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)" HOMEPAGE="https://www.kraxel.org/blog/linux/fbida/" -EGIT_REPO_URI=" - git://git.kraxel.org/fbida -" +EGIT_REPO_URI="https://git.kraxel.org/cgit/fbida" SRC_URI=" mirror://gentoo/ida.png.bz2 " LICENSE="GPL-2 IJG" SLOT="0" KEYWORDS="" -IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp" -REQUIRED_USE=" - ghostscript? ( tiff ) -" - CDEPEND=" !media-gfx/fbi - app-text/poppler >=media-libs/fontconfig-2.2 >=media-libs/freetype-2.0 + >=x11-libs/motif-2.3:0 + app-text/poppler + media-libs/giflib:= media-libs/libepoxy media-libs/libexif + media-libs/libpng:* + media-libs/libwebp media-libs/mesa + media-libs/tiff:* + net-misc/curl virtual/jpeg:* virtual/ttf-fonts x11-libs/cairo[opengl] + x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXt x11-libs/libdrm - curl? ( net-misc/curl ) - gif? ( media-libs/giflib:= ) - lirc? ( app-misc/lirc ) - png? ( media-libs/libpng:* ) - scanner? ( media-gfx/sane-backends ) - tiff? ( media-libs/tiff:* ) - webp? ( media-libs/libwebp ) - X? ( - >=x11-libs/motif-2.3:0 - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXt - ) " - DEPEND=" ${CDEPEND} - X? ( x11-base/xorg-proto ) + x11-base/xorg-proto " - RDEPEND=" ${CDEPEND} - ghostscript? ( - app-text/ghostscript-gpl - ) " +PATCHES=( + "${FILESDIR}"/ida-desktop.patch + "${FILESDIR}"/${PN}-2.10-giflib-4.2.patch +) src_unpack() { unpack ${A} @@ -65,70 +53,19 @@ src_unpack() { } src_prepare() { - eapply \ - "${FILESDIR}"/ida-desktop.patch \ - "${FILESDIR}"/${PN}-2.10-giflib-4.2.patch \ - "${FILESDIR}"/${PN}-2.10-fprintf-format.patch - - eapply_user - - tc-export CC CPP + default # upstream omission? echo ${PV} > VERSION -} - -src_configure() { - # Let autoconf do its job and then fix things to build fbida - # according to our specifications - emake Make.config - - gentoo_fbida() { - local useflag=${1} - local config=${2} - - local option="no" - use ${useflag} && option="yes" - - sed -i \ - -e "s|HAVE_${config}.*|HAVE_${config} := ${option}|" \ - "${S}/Make.config" || die - } - gentoo_fbida X MOTIF - gentoo_fbida curl LIBCURL - gentoo_fbida fbcon LINUX_FB_H - gentoo_fbida gif LIBUNGIF - gentoo_fbida lirc LIBLIRC - gentoo_fbida ghostscript LIBTIFF - gentoo_fbida png LIBPNG - gentoo_fbida scanner LIBSANE - gentoo_fbida tiff LIBTIFF - gentoo_fbida webp LIBWEBP -} - -src_compile() { - emake verbose=yes + tc-export CC CPP } src_install() { - emake \ - DESTDIR="${ED}" \ - STRIP="" \ - prefix=/usr \ - install + meson_src_install dodoc README - if use fbcon && ! use ghostscript; then - rm \ - "${ED}"/usr/bin/fbgs \ - "${ED}"/usr/share/man/man1/fbgs.1 \ - || die - fi - - if use X ; then - doicon "${WORKDIR}"/ida.png - domenu desktop/ida.desktop - fi + doicon "${WORKDIR}"/ida.png + domenu desktop/ida.desktop } -- cgit v1.2.3