commit:     e3dc6fe682929331ea6bccd5a7b983bad218774d
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 10 21:12:56 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Sep 10 21:18:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3dc6fe6

media-gfx/fbida: Version bump.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 media-gfx/fbida/Manifest                        |   1 +
 media-gfx/fbida/fbida-2.14.ebuild               | 120 ++++++++++++++++++++++++
 media-gfx/fbida/files/fbida-2.14-Autoconf.patch |  11 +++
 3 files changed, 132 insertions(+)

diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index 8dd1304765a..e3df9a864b2 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -1,3 +1,4 @@
 DIST fbida-2.12.tar.gz 294842 SHA256 
d33193105cce77057c919761728cee9bbe8ec8ec4f12a770a600cab33611822f SHA512 
383eb766a98137f7252cd981d0e8c9a7382223705a43332f50990ea26763d4882ed1585e72fe9199528502d7f8f9de2e90718dbce71ee08d2181c74aa3e7e515
 WHIRLPOOL 
7ea067497eee03623fe8f07afbb77c354973187edd09f40b94d73d1b2d7c823db846c277005473c169cd1ad923e378d22d3c065f3522667e544d25917cd6495a
 DIST fbida-2.13.tar.gz 296020 SHA256 
a887195dcd189055ee9b787eb03c8b7954df3aec540a1f90d8e92f873126db07 SHA512 
a316776f381fac6ec6a5d085ece7a42e8e34b2c0f5ae1cc58ad5b5736dc83d8f2e7776779716abfc0ae9c51baacdf911df6a0be610d2b7b2e3ce6d0c81e1fdc3
 WHIRLPOOL 
d94273ff9b631902d38fc1d65155fe18f50bca5055659bdc8bd945e68b913d1e65da4aa5b13358f9f4f662cee7199c92b244abdc9f89c127a74fce8e5beefabc
+DIST fbida-2.14.tar.gz 296826 SHA256 
95b7c01556cb6ef9819f358b314ddfeb8a4cbe862b521a3ed62f03d163154438 SHA512 
8f3596ad8a22497880ac698d3b324e038ac5ccae7481fe4a902fc6e8bf43ba1bb3a96af8c7a3347bea86c1988f35674e2647901ac256bd4e8261d467a6a343ec
 WHIRLPOOL 
b545390ac42122d6cabeaef2d365c0519e695c715bf50f8ade64a53a5655f2845ba8931dc64462fe318bb9df5e0d0e6bf93f173f63d92044b90ffe265c910ab1
 DIST ida.png.bz2 11928 SHA256 
ce90c13f8da8d2ced4cf0e55d2f960bc236355f6e5dd60ea6c56fbe51e6cabae SHA512 
cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3
 WHIRLPOOL 
1b5e7835aa8a555a231ca58da8e249974639b29b1e15586c2d2d5a33e96908df1a3782fbe61d0c51dc888b7304c9f7541a96af4ca2b956b393909feb534ab5be

diff --git a/media-gfx/fbida/fbida-2.14.ebuild 
b/media-gfx/fbida/fbida-2.14.ebuild
new file mode 100644
index 00000000000..482c92a8d70
--- /dev/null
+++ b/media-gfx/fbida/fbida-2.14.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)"
+HOMEPAGE="http://www.kraxel.org/blog/linux/fbida/";
+SRC_URI="
+       http://www.kraxel.org/releases/${PN}/${P}.tar.gz
+       mirror://gentoo/ida.png.bz2
+"
+LICENSE="GPL-2 IJG"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+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
+       media-libs/libepoxy
+       media-libs/libexif
+       media-libs/mesa
+       virtual/jpeg:*
+       virtual/ttf-fonts
+       x11-libs/cairo[opengl]
+       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-proto/xextproto x11-proto/xproto )
+"
+
+RDEPEND="
+       ${CDEPEND}
+       ghostscript? (
+               app-text/ghostscript-gpl
+       )
+"
+PATCHES=(
+       "${FILESDIR}"/ida-desktop.patch
+       "${FILESDIR}"/${PN}-2.10-giflib-4.2.patch
+       "${FILESDIR}"/${PN}-2.14-Autoconf.patch
+)
+
+src_configure() {
+       tc-export CC CPP
+
+       # 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
+}
+
+src_install() {
+       emake \
+               DESTDIR="${ED}" \
+               STRIP="" \
+               prefix=/usr \
+               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
+}

diff --git a/media-gfx/fbida/files/fbida-2.14-Autoconf.patch 
b/media-gfx/fbida/files/fbida-2.14-Autoconf.patch
new file mode 100644
index 00000000000..9aefdcd2fe6
--- /dev/null
+++ b/media-gfx/fbida/files/fbida-2.14-Autoconf.patch
@@ -0,0 +1,11 @@
+--- a/mk/Autoconf.mk
++++ b/mk/Autoconf.mk
+@@ -162,7 +162,7 @@
+       @true
+ 
+ Make.config: $(srcdir)/GNUmakefile
+-      @/bin/echo -e "$(make-config-q)" > $@
++      @printf "$(make-config-q)" > $@
+       @echo
+       @echo "Make.config written, edit if needed"
+       @echo

Reply via email to