1 |
commit: 76f276365ea30c336368b8c0951079ba4075cac6 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 31 11:38:48 2016 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 31 11:39:02 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76f27636 |
7 |
|
8 |
media-gfx/fbida: Replace USE=pdf with USE=ghostscript |
9 |
|
10 |
- Currently fbpdf is not optional, so make all its dependencies unconditional |
11 |
- fbgs is optional, so make that RDEPEND on app-text/ghostscript-gpl again |
12 |
when USE=ghostscript |
13 |
|
14 |
Package-Manager: portage-2.3.0 |
15 |
|
16 |
media-gfx/fbida/fbida-2.12.ebuild | 40 +++++++++++++++++++++++---------------- |
17 |
media-gfx/fbida/fbida-9999.ebuild | 40 +++++++++++++++++++++++---------------- |
18 |
media-gfx/fbida/metadata.xml | 1 + |
19 |
3 files changed, 49 insertions(+), 32 deletions(-) |
20 |
|
21 |
diff --git a/media-gfx/fbida/fbida-2.12.ebuild b/media-gfx/fbida/fbida-2.12.ebuild |
22 |
index 74df0b9..cd0ddb0 100644 |
23 |
--- a/media-gfx/fbida/fbida-2.12.ebuild |
24 |
+++ b/media-gfx/fbida/fbida-2.12.ebuild |
25 |
@@ -14,31 +14,29 @@ SRC_URI=" |
26 |
LICENSE="GPL-2 IJG" |
27 |
SLOT="0" |
28 |
KEYWORDS="alpha ~amd64 arm hppa ~ppc ~ppc64 ~sh ~sparc ~x86" |
29 |
-IUSE="curl fbcon +gif lirc pdf +png scanner +tiff X +webp" |
30 |
+IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp" |
31 |
REQUIRED_USE=" |
32 |
- pdf? ( tiff ) |
33 |
+ ghostscript? ( tiff ) |
34 |
" |
35 |
|
36 |
-RDEPEND=" |
37 |
+CDEPEND=" |
38 |
!media-gfx/fbi |
39 |
+ app-text/poppler |
40 |
>=media-libs/fontconfig-2.2 |
41 |
>=media-libs/freetype-2.0 |
42 |
+ media-libs/libepoxy |
43 |
media-libs/libexif |
44 |
+ media-libs/mesa |
45 |
+ virtual/jpeg:* |
46 |
+ virtual/ttf-fonts |
47 |
+ x11-libs/cairo[opengl] |
48 |
+ x11-libs/libdrm |
49 |
curl? ( net-misc/curl ) |
50 |
gif? ( media-libs/giflib:= ) |
51 |
lirc? ( app-misc/lirc ) |
52 |
- pdf? ( |
53 |
- app-text/poppler |
54 |
- media-libs/libepoxy |
55 |
- media-libs/mesa |
56 |
- x11-libs/cairo[opengl] |
57 |
- x11-libs/libdrm |
58 |
- ) |
59 |
png? ( media-libs/libpng:* ) |
60 |
scanner? ( media-gfx/sane-backends ) |
61 |
tiff? ( media-libs/tiff:* ) |
62 |
- virtual/jpeg:* |
63 |
- virtual/ttf-fonts |
64 |
webp? ( media-libs/libwebp ) |
65 |
X? ( |
66 |
>=x11-libs/motif-2.3:0 |
67 |
@@ -49,10 +47,17 @@ RDEPEND=" |
68 |
" |
69 |
|
70 |
DEPEND=" |
71 |
- ${RDEPEND} |
72 |
+ ${CDEPEND} |
73 |
X? ( x11-proto/xextproto x11-proto/xproto ) |
74 |
" |
75 |
|
76 |
+RDEPEND=" |
77 |
+ ${CDEPEND} |
78 |
+ ghostscript? ( |
79 |
+ app-text/ghostscript-gpl |
80 |
+ ) |
81 |
+" |
82 |
+ |
83 |
src_prepare() { |
84 |
epatch \ |
85 |
"${FILESDIR}"/ida-desktop.patch \ |
86 |
@@ -87,7 +92,7 @@ src_configure() { |
87 |
gentoo_fbida fbcon LINUX_FB_H |
88 |
gentoo_fbida gif LIBUNGIF |
89 |
gentoo_fbida lirc LIBLIRC |
90 |
- gentoo_fbida pdf LIBTIFF |
91 |
+ gentoo_fbida ghostscript LIBTIFF |
92 |
gentoo_fbida png LIBPNG |
93 |
gentoo_fbida scanner LIBSANE |
94 |
gentoo_fbida tiff LIBTIFF |
95 |
@@ -107,8 +112,11 @@ src_install() { |
96 |
|
97 |
dodoc README |
98 |
|
99 |
- if use fbcon && ! use pdf; then |
100 |
- rm "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1 || die |
101 |
+ if use fbcon && ! use ghostscript; then |
102 |
+ rm \ |
103 |
+ "${D}"/usr/bin/fbgs \ |
104 |
+ "${D}"/usr/share/man/man1/fbgs.1 \ |
105 |
+ || die |
106 |
fi |
107 |
|
108 |
if use X ; then |
109 |
|
110 |
diff --git a/media-gfx/fbida/fbida-9999.ebuild b/media-gfx/fbida/fbida-9999.ebuild |
111 |
index e49f8a0..32266e7 100644 |
112 |
--- a/media-gfx/fbida/fbida-9999.ebuild |
113 |
+++ b/media-gfx/fbida/fbida-9999.ebuild |
114 |
@@ -16,31 +16,29 @@ SRC_URI=" |
115 |
LICENSE="GPL-2 IJG" |
116 |
SLOT="0" |
117 |
KEYWORDS="" |
118 |
-IUSE="curl fbcon +gif lirc pdf +png scanner +tiff X +webp" |
119 |
+IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp" |
120 |
REQUIRED_USE=" |
121 |
- pdf? ( tiff ) |
122 |
+ ghostscript? ( tiff ) |
123 |
" |
124 |
|
125 |
-RDEPEND=" |
126 |
+CDEPEND=" |
127 |
!media-gfx/fbi |
128 |
+ app-text/poppler |
129 |
>=media-libs/fontconfig-2.2 |
130 |
>=media-libs/freetype-2.0 |
131 |
+ media-libs/libepoxy |
132 |
media-libs/libexif |
133 |
+ media-libs/mesa |
134 |
+ virtual/jpeg:* |
135 |
+ virtual/ttf-fonts |
136 |
+ x11-libs/cairo[opengl] |
137 |
+ x11-libs/libdrm |
138 |
curl? ( net-misc/curl ) |
139 |
gif? ( media-libs/giflib:= ) |
140 |
lirc? ( app-misc/lirc ) |
141 |
- pdf? ( |
142 |
- app-text/poppler |
143 |
- media-libs/libepoxy |
144 |
- media-libs/mesa |
145 |
- x11-libs/cairo[opengl] |
146 |
- x11-libs/libdrm |
147 |
- ) |
148 |
png? ( media-libs/libpng:* ) |
149 |
scanner? ( media-gfx/sane-backends ) |
150 |
tiff? ( media-libs/tiff:* ) |
151 |
- virtual/jpeg:* |
152 |
- virtual/ttf-fonts |
153 |
webp? ( media-libs/libwebp ) |
154 |
X? ( |
155 |
>=x11-libs/motif-2.3:0 |
156 |
@@ -51,10 +49,17 @@ RDEPEND=" |
157 |
" |
158 |
|
159 |
DEPEND=" |
160 |
- ${RDEPEND} |
161 |
+ ${CDEPEND} |
162 |
X? ( x11-proto/xextproto x11-proto/xproto ) |
163 |
" |
164 |
|
165 |
+RDEPEND=" |
166 |
+ ${CDEPEND} |
167 |
+ ghostscript? ( |
168 |
+ app-text/ghostscript-gpl |
169 |
+ ) |
170 |
+" |
171 |
+ |
172 |
src_unpack() { |
173 |
unpack ${A} |
174 |
git-r3_src_unpack |
175 |
@@ -96,7 +101,7 @@ src_configure() { |
176 |
gentoo_fbida fbcon LINUX_FB_H |
177 |
gentoo_fbida gif LIBUNGIF |
178 |
gentoo_fbida lirc LIBLIRC |
179 |
- gentoo_fbida pdf LIBTIFF |
180 |
+ gentoo_fbida ghostscript LIBTIFF |
181 |
gentoo_fbida png LIBPNG |
182 |
gentoo_fbida scanner LIBSANE |
183 |
gentoo_fbida tiff LIBTIFF |
184 |
@@ -116,8 +121,11 @@ src_install() { |
185 |
|
186 |
dodoc README |
187 |
|
188 |
- if use fbcon && ! use pdf; then |
189 |
- rm "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1 || die |
190 |
+ if use fbcon && ! use ghostscript; then |
191 |
+ rm \ |
192 |
+ "${D}"/usr/bin/fbgs \ |
193 |
+ "${D}"/usr/share/man/man1/fbgs.1 \ |
194 |
+ || die |
195 |
fi |
196 |
|
197 |
if use X ; then |
198 |
|
199 |
diff --git a/media-gfx/fbida/metadata.xml b/media-gfx/fbida/metadata.xml |
200 |
index 251f63c..32d2983 100644 |
201 |
--- a/media-gfx/fbida/metadata.xml |
202 |
+++ b/media-gfx/fbida/metadata.xml |
203 |
@@ -6,6 +6,7 @@ |
204 |
</maintainer> |
205 |
<use> |
206 |
<flag name="fbcon">Install the framebuffer image viewer "fbi"</flag> |
207 |
+<flag name="ghostscript">Install the framebuffer ghostscript viewer "fbgs"</flag> |
208 |
<flag name="X">Install the Motif based image viewer "ida"</flag> |
209 |
<flag name="webp">Enable support for the WebP image format</flag> |
210 |
</use> |