Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/fbida/files/, media-gfx/fbida/
Date: Fri, 24 Feb 2017 15:06:41
Message-Id: 1487948776.4f6936aae06513a55417f2f8683f8dfdbeb8d5d0.jer@gentoo
1 commit: 4f6936aae06513a55417f2f8683f8dfdbeb8d5d0
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 24 15:06:16 2017 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 24 15:06:16 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f6936aa
7
8 media-gfx/fbida: Version bump.
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 media-gfx/fbida/Manifest | 1 +
13 media-gfx/fbida/fbida-2.13.ebuild | 122 ++++++++++++++++++++++++
14 media-gfx/fbida/files/fbida-2.13-Autoconf.patch | 11 +++
15 3 files changed, 134 insertions(+)
16
17 diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
18 index eecae916b3..8dd1304765 100644
19 --- a/media-gfx/fbida/Manifest
20 +++ b/media-gfx/fbida/Manifest
21 @@ -1,2 +1,3 @@
22 DIST fbida-2.12.tar.gz 294842 SHA256 d33193105cce77057c919761728cee9bbe8ec8ec4f12a770a600cab33611822f SHA512 383eb766a98137f7252cd981d0e8c9a7382223705a43332f50990ea26763d4882ed1585e72fe9199528502d7f8f9de2e90718dbce71ee08d2181c74aa3e7e515 WHIRLPOOL 7ea067497eee03623fe8f07afbb77c354973187edd09f40b94d73d1b2d7c823db846c277005473c169cd1ad923e378d22d3c065f3522667e544d25917cd6495a
23 +DIST fbida-2.13.tar.gz 296020 SHA256 a887195dcd189055ee9b787eb03c8b7954df3aec540a1f90d8e92f873126db07 SHA512 a316776f381fac6ec6a5d085ece7a42e8e34b2c0f5ae1cc58ad5b5736dc83d8f2e7776779716abfc0ae9c51baacdf911df6a0be610d2b7b2e3ce6d0c81e1fdc3 WHIRLPOOL d94273ff9b631902d38fc1d65155fe18f50bca5055659bdc8bd945e68b913d1e65da4aa5b13358f9f4f662cee7199c92b244abdc9f89c127a74fce8e5beefabc
24 DIST ida.png.bz2 11928 SHA256 ce90c13f8da8d2ced4cf0e55d2f960bc236355f6e5dd60ea6c56fbe51e6cabae SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3 WHIRLPOOL 1b5e7835aa8a555a231ca58da8e249974639b29b1e15586c2d2d5a33e96908df1a3782fbe61d0c51dc888b7304c9f7541a96af4ca2b956b393909feb534ab5be
25
26 diff --git a/media-gfx/fbida/fbida-2.13.ebuild b/media-gfx/fbida/fbida-2.13.ebuild
27 new file mode 100644
28 index 0000000000..4de73bcf29
29 --- /dev/null
30 +++ b/media-gfx/fbida/fbida-2.13.ebuild
31 @@ -0,0 +1,122 @@
32 +# Copyright 1999-2017 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +# $Id$
35 +
36 +EAPI=6
37 +inherit eutils toolchain-funcs
38 +
39 +DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)"
40 +HOMEPAGE="http://www.kraxel.org/blog/linux/fbida/"
41 +SRC_URI="
42 + http://www.kraxel.org/releases/${PN}/${P}.tar.gz
43 + mirror://gentoo/ida.png.bz2
44 +"
45 +LICENSE="GPL-2 IJG"
46 +SLOT="0"
47 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
48 +IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
49 +REQUIRED_USE="
50 + ghostscript? ( tiff )
51 +"
52 +
53 +CDEPEND="
54 + !media-gfx/fbi
55 + app-text/poppler
56 + >=media-libs/fontconfig-2.2
57 + >=media-libs/freetype-2.0
58 + media-libs/libepoxy
59 + media-libs/libexif
60 + media-libs/mesa
61 + virtual/jpeg:*
62 + virtual/ttf-fonts
63 + x11-libs/cairo[opengl]
64 + x11-libs/libdrm
65 + curl? ( net-misc/curl )
66 + gif? ( media-libs/giflib:= )
67 + lirc? ( app-misc/lirc )
68 + png? ( media-libs/libpng:* )
69 + scanner? ( media-gfx/sane-backends )
70 + tiff? ( media-libs/tiff:* )
71 + webp? ( media-libs/libwebp )
72 + X? (
73 + >=x11-libs/motif-2.3:0
74 + x11-libs/libX11
75 + x11-libs/libXpm
76 + x11-libs/libXt
77 + )
78 +"
79 +
80 +DEPEND="
81 + ${CDEPEND}
82 + X? ( x11-proto/xextproto x11-proto/xproto )
83 +"
84 +
85 +RDEPEND="
86 + ${CDEPEND}
87 + ghostscript? (
88 + app-text/ghostscript-gpl
89 + )
90 +"
91 +PATCHES=(
92 + "${FILESDIR}"/ida-desktop.patch
93 + "${FILESDIR}"/${PN}-2.10-giflib-4.2.patch
94 + "${FILESDIR}"/${PN}-2.10-fprintf-format.patch
95 + "${FILESDIR}"/${PN}-2.13-Autoconf.patch
96 +)
97 +
98 +src_configure() {
99 + tc-export CC CPP
100 +
101 + # Let autoconf do its job and then fix things to build fbida
102 + # according to our specifications
103 + emake Make.config
104 +
105 + gentoo_fbida() {
106 + local useflag=${1}
107 + local config=${2}
108 +
109 + local option="no"
110 + use ${useflag} && option="yes"
111 +
112 + sed -i \
113 + -e "s|HAVE_${config}.*|HAVE_${config} := ${option}|" \
114 + "${S}/Make.config" || die
115 + }
116 +
117 + gentoo_fbida X MOTIF
118 + gentoo_fbida curl LIBCURL
119 + gentoo_fbida fbcon LINUX_FB_H
120 + gentoo_fbida gif LIBUNGIF
121 + gentoo_fbida lirc LIBLIRC
122 + gentoo_fbida ghostscript LIBTIFF
123 + gentoo_fbida png LIBPNG
124 + gentoo_fbida scanner LIBSANE
125 + gentoo_fbida tiff LIBTIFF
126 + gentoo_fbida webp LIBWEBP
127 +}
128 +
129 +src_compile() {
130 + emake verbose=yes
131 +}
132 +
133 +src_install() {
134 + emake \
135 + DESTDIR="${D}" \
136 + STRIP="" \
137 + prefix=/usr \
138 + install
139 +
140 + dodoc README
141 +
142 + if use fbcon && ! use ghostscript; then
143 + rm \
144 + "${D}"/usr/bin/fbgs \
145 + "${D}"/usr/share/man/man1/fbgs.1 \
146 + || die
147 + fi
148 +
149 + if use X ; then
150 + doicon "${WORKDIR}"/ida.png
151 + domenu desktop/ida.desktop
152 + fi
153 +}
154
155 diff --git a/media-gfx/fbida/files/fbida-2.13-Autoconf.patch b/media-gfx/fbida/files/fbida-2.13-Autoconf.patch
156 new file mode 100644
157 index 0000000000..41c4e2f7d9
158 --- /dev/null
159 +++ b/media-gfx/fbida/files/fbida-2.13-Autoconf.patch
160 @@ -0,0 +1,11 @@
161 +--- a/mk/Autoconf.mk
162 ++++ b/mk/Autoconf.mk
163 +@@ -162,7 +162,7 @@
164 + @true
165 +
166 + Make.config: $(srcdir)/GNUmakefile
167 +- @echo -e "$(make-config-q)" > $@
168 ++ @printf "$(make-config-q)" > $@
169 + @echo
170 + @echo "Make.config written, edit if needed"
171 + @echo