[gentoo-commits] repo/gentoo:master commit in: media-gfx/fbida/

["Jeroen Roovers" <jer@gentoo.org>]

commit:     40dfd32f2ed6cec8b0cddc845ad52791da2b2bf0
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 24 18:33:03 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 18:34:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40dfd32f

media-gfx/fbida: Update live ebuild

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 media-gfx/fbida/fbida-9999.ebuild | 111 +++++++++-----------------------------
 1 file changed, 24 insertions(+), 87 deletions(-)

diff --git a/media-gfx/fbida/fbida-9999.ebuild b/media-gfx/fbida/fbida-9999.ebuild
index d2f3b8d0b08..b1a1c6b1f62 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
 }