commit: 76f276365ea30c336368b8c0951079ba4075cac6
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 11:38:48 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 11:39:02 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76f27636
media-gfx/fbida: Replace USE=pdf with USE=ghostscript
- Currently fbpdf is not optional, so make all its dependencies unconditional
- fbgs is optional, so make that RDEPEND on app-text/ghostscript-gpl again
when USE=ghostscript
Package-Manager: portage-2.3.0
media-gfx/fbida/fbida-2.12.ebuild | 40 +++++++++++++++++++++++----------------
media-gfx/fbida/fbida-9999.ebuild | 40 +++++++++++++++++++++++----------------
media-gfx/fbida/metadata.xml | 1 +
3 files changed, 49 insertions(+), 32 deletions(-)
diff --git a/media-gfx/fbida/fbida-2.12.ebuild
b/media-gfx/fbida/fbida-2.12.ebuild
index 74df0b9..cd0ddb0 100644
--- a/media-gfx/fbida/fbida-2.12.ebuild
+++ b/media-gfx/fbida/fbida-2.12.ebuild
@@ -14,31 +14,29 @@ SRC_URI="
LICENSE="GPL-2 IJG"
SLOT="0"
KEYWORDS="alpha ~amd64 arm hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="curl fbcon +gif lirc pdf +png scanner +tiff X +webp"
+IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
REQUIRED_USE="
- pdf? ( tiff )
+ ghostscript? ( tiff )
"
-RDEPEND="
+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 )
- pdf? (
- app-text/poppler
- media-libs/libepoxy
- media-libs/mesa
- x11-libs/cairo[opengl]
- x11-libs/libdrm
- )
png? ( media-libs/libpng:* )
scanner? ( media-gfx/sane-backends )
tiff? ( media-libs/tiff:* )
- virtual/jpeg:*
- virtual/ttf-fonts
webp? ( media-libs/libwebp )
X? (
>=x11-libs/motif-2.3:0
@@ -49,10 +47,17 @@ RDEPEND="
"
DEPEND="
- ${RDEPEND}
+ ${CDEPEND}
X? ( x11-proto/xextproto x11-proto/xproto )
"
+RDEPEND="
+ ${CDEPEND}
+ ghostscript? (
+ app-text/ghostscript-gpl
+ )
+"
+
src_prepare() {
epatch \
"${FILESDIR}"/ida-desktop.patch \
@@ -87,7 +92,7 @@ src_configure() {
gentoo_fbida fbcon LINUX_FB_H
gentoo_fbida gif LIBUNGIF
gentoo_fbida lirc LIBLIRC
- gentoo_fbida pdf LIBTIFF
+ gentoo_fbida ghostscript LIBTIFF
gentoo_fbida png LIBPNG
gentoo_fbida scanner LIBSANE
gentoo_fbida tiff LIBTIFF
@@ -107,8 +112,11 @@ src_install() {
dodoc README
- if use fbcon && ! use pdf; then
- rm "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1 || die
+ if use fbcon && ! use ghostscript; then
+ rm \
+ "${D}"/usr/bin/fbgs \
+ "${D}"/usr/share/man/man1/fbgs.1 \
+ || die
fi
if use X ; then
diff --git a/media-gfx/fbida/fbida-9999.ebuild
b/media-gfx/fbida/fbida-9999.ebuild
index e49f8a0..32266e7 100644
--- a/media-gfx/fbida/fbida-9999.ebuild
+++ b/media-gfx/fbida/fbida-9999.ebuild
@@ -16,31 +16,29 @@ SRC_URI="
LICENSE="GPL-2 IJG"
SLOT="0"
KEYWORDS=""
-IUSE="curl fbcon +gif lirc pdf +png scanner +tiff X +webp"
+IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
REQUIRED_USE="
- pdf? ( tiff )
+ ghostscript? ( tiff )
"
-RDEPEND="
+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 )
- pdf? (
- app-text/poppler
- media-libs/libepoxy
- media-libs/mesa
- x11-libs/cairo[opengl]
- x11-libs/libdrm
- )
png? ( media-libs/libpng:* )
scanner? ( media-gfx/sane-backends )
tiff? ( media-libs/tiff:* )
- virtual/jpeg:*
- virtual/ttf-fonts
webp? ( media-libs/libwebp )
X? (
>=x11-libs/motif-2.3:0
@@ -51,10 +49,17 @@ RDEPEND="
"
DEPEND="
- ${RDEPEND}
+ ${CDEPEND}
X? ( x11-proto/xextproto x11-proto/xproto )
"
+RDEPEND="
+ ${CDEPEND}
+ ghostscript? (
+ app-text/ghostscript-gpl
+ )
+"
+
src_unpack() {
unpack ${A}
git-r3_src_unpack
@@ -96,7 +101,7 @@ src_configure() {
gentoo_fbida fbcon LINUX_FB_H
gentoo_fbida gif LIBUNGIF
gentoo_fbida lirc LIBLIRC
- gentoo_fbida pdf LIBTIFF
+ gentoo_fbida ghostscript LIBTIFF
gentoo_fbida png LIBPNG
gentoo_fbida scanner LIBSANE
gentoo_fbida tiff LIBTIFF
@@ -116,8 +121,11 @@ src_install() {
dodoc README
- if use fbcon && ! use pdf; then
- rm "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1 || die
+ if use fbcon && ! use ghostscript; then
+ rm \
+ "${D}"/usr/bin/fbgs \
+ "${D}"/usr/share/man/man1/fbgs.1 \
+ || die
fi
if use X ; then
diff --git a/media-gfx/fbida/metadata.xml b/media-gfx/fbida/metadata.xml
index 251f63c..32d2983 100644
--- a/media-gfx/fbida/metadata.xml
+++ b/media-gfx/fbida/metadata.xml
@@ -6,6 +6,7 @@
</maintainer>
<use>
<flag name="fbcon">Install the framebuffer image viewer "fbi"</flag>
+<flag name="ghostscript">Install the framebuffer ghostscript viewer
"fbgs"</flag>
<flag name="X">Install the Motif based image viewer "ida"</flag>
<flag name="webp">Enable support for the WebP image format</flag>
</use>
