No fbgs to remove when USE=-fbcon (bug #532354 by Maxim Britov).

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A792A613)

5 files changed, 8 insertions, 202 deletions

diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog
index 485d2de0d35a..f0ff6ccea6ec 100644
--- a/media-gfx/fbida/ChangeLog
+++ b/media-gfx/fbida/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/fbida
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.115 2014/11/27 01:53:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.116 2014/12/12 11:09:14 jer Exp $
+
+  12 Dec 2014; Jeroen Roovers <jer@gentoo.org> -fbida-2.09-r3.ebuild,
+  fbida-2.09-r4.ebuild, -files/fbida-2.09-giflib-4.2.patch,
+  -files/fbida-2.09-giflib-5.patch:
+  No fbgs to remove when USE=-fbcon (bug #532354 by Maxim Britov).
 
 *fbida-2.09-r4 (27 Nov 2014)
 
diff --git a/media-gfx/fbida/fbida-2.09-r3.ebuild b/media-gfx/fbida/fbida-2.09-r3.ebuild
deleted file mode 100644
index af8f04640114..000000000000
--- a/media-gfx/fbida/fbida-2.09-r3.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.09-r3.ebuild,v 1.1 2014/09/25 10:09:28 jer Exp $
-
-EAPI=5
-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
-	http://dev.gentoo.org/~jer/${P}-jpeg-9a.patch.bz2
-	mirror://gentoo/ida.png.bz2
-"
-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"
-REQUIRED_USE="
-	pdf? ( tiff )
-"
-
-RDEPEND="
-	!media-gfx/fbi
-	>=media-libs/fontconfig-2.2
-	>=media-libs/freetype-2.0
-	media-libs/libexif
-	curl? ( net-misc/curl )
-	gif? ( >media-libs/giflib-4.2 )
-	lirc? ( app-misc/lirc )
-	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
-		x11-libs/libX11
-		x11-libs/libXpm
-		x11-libs/libXt
-	)
-"
-
-DEPEND="
-	${RDEPEND}
-	X? ( x11-proto/xextproto x11-proto/xproto )
-	pdf? ( app-text/ghostscript-gpl )
-"
-
-src_prepare() {
-	sed -e 's:DGifOpenFileName,ungif:DGifOpenFileName,gif:' \
-		-e 's:-lungif:-lgif:' -i "${S}/GNUmakefile"
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		sed	-e 's:-Wno-pointer-sign::' -i "${S}/GNUmakefile" || die
-	fi
-
-	epatch "${FILESDIR}"/ida-desktop.patch
-	epatch "${FILESDIR}"/${PN}-2.09-make.patch
-	epatch "${FILESDIR}"/${P}-giflib-4.2.patch
-	epatch "${FILESDIR}"/${P}-giflib-5.patch
-
-	pushd jpeg/ >/dev/null
-	epatch -p2 "${WORKDIR}"/${P}-jpeg-9a.patch
-	popd >/dev/null
-
-	tc-export CC CPP
-}
-
-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 pdf 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="${D}" \
-		STRIP="" \
-		prefix=/usr \
-		install
-
-	dodoc README
-
-	use pdf || \
-		rm -f "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1
-
-	if use X ; then
-		doicon "${WORKDIR}"/ida.png
-		domenu desktop/ida.desktop
-	fi
-}
diff --git a/media-gfx/fbida/fbida-2.09-r4.ebuild b/media-gfx/fbida/fbida-2.09-r4.ebuild
index 4fd7bd7062b5..136f26491765 100644
--- a/media-gfx/fbida/fbida-2.09-r4.ebuild
+++ b/media-gfx/fbida/fbida-2.09-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.09-r4.ebuild,v 1.1 2014/11/27 01:53:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.09-r4.ebuild,v 1.2 2014/12/12 11:09:14 jer Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -111,7 +111,7 @@ src_install() {
 
 	dodoc README
 
-	if ! use pdf; then
+	if use fbcon && ! use pdf; then
 		rm "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1 || die
 	fi
 
diff --git a/media-gfx/fbida/files/fbida-2.09-giflib-4.2.patch b/media-gfx/fbida/files/fbida-2.09-giflib-4.2.patch
deleted file mode 100644
index c3685c31e97b..000000000000
--- a/media-gfx/fbida/files/fbida-2.09-giflib-4.2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/rd/read-gif.c
-+++ b/rd/read-gif.c
-@@ -25,7 +25,7 @@
- 	if (GIF_ERROR == DGifGetRecordType(h->gif,&RecordType)) {
- 	    if (debug)
- 		fprintf(stderr,"gif: DGifGetRecordType failed\n");
--	    PrintGifError();
-+	    GifErrorString();
- 	    return -1;
- 	}
- 	switch (RecordType) {
-@@ -42,7 +42,7 @@
- 		if (rc == GIF_ERROR) {
- 		    if (debug)
- 			fprintf(stderr,"gif: DGifGetExtension failed\n");
--		    PrintGifError();
-+		    GifErrorString();
- 		    return -1;
- 		}
- 		if (debug) {
-@@ -108,7 +108,7 @@
- 	    if (GIF_ERROR == DGifGetImageDesc(h->gif)) {
- 		if (debug)
- 		    fprintf(stderr,"gif: DGifGetImageDesc failed\n");
--		PrintGifError();
-+		GifErrorString();
- 	    }
- 	    if (NULL == h->gif->SColorMap &&
- 		NULL == h->gif->Image.ColorMap) {
diff --git a/media-gfx/fbida/files/fbida-2.09-giflib-5.patch b/media-gfx/fbida/files/fbida-2.09-giflib-5.patch
deleted file mode 100644
index 449954b0f104..000000000000
--- a/media-gfx/fbida/files/fbida-2.09-giflib-5.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/rd/read-gif.c
-+++ b/rd/read-gif.c
-@@ -25,7 +25,11 @@
- 	if (GIF_ERROR == DGifGetRecordType(h->gif,&RecordType)) {
- 	    if (debug)
- 		fprintf(stderr,"gif: DGifGetRecordType failed\n");
-+#if GIFLIB_MAJOR >= 5
-+	    GifErrorString((NULL));
-+#else
- 	    GifErrorString();
-+#endif
- 	    return -1;
- 	}
- 	switch (RecordType) {
-@@ -42,7 +46,11 @@
- 		if (rc == GIF_ERROR) {
- 		    if (debug)
- 			fprintf(stderr,"gif: DGifGetExtension failed\n");
-+#if GIFLIB_MAJOR >= 5
-+		    GifErrorString((NULL));
-+#else
- 		    GifErrorString();
-+#endif
- 		    return -1;
- 		}
- 		if (debug) {
-@@ -98,7 +106,11 @@
-     memset(h,0,sizeof(*h));
- 
-     h->infile = fp;
-+#if GIFLIB_MAJOR >= 5
-+    h->gif = DGifOpenFileHandle(fileno(fp),NULL);
-+#else
-     h->gif = DGifOpenFileHandle(fileno(fp));
-+#endif
-     h->row = malloc(h->gif->SWidth * sizeof(GifPixelType));
- 
-     while (0 == image) {
-@@ -108,7 +120,11 @@
- 	    if (GIF_ERROR == DGifGetImageDesc(h->gif)) {
- 		if (debug)
- 		    fprintf(stderr,"gif: DGifGetImageDesc failed\n");
-+#if GIFLIB_MAJOR >= 5
-+		GifErrorString((NULL));
-+#else
- 		GifErrorString();
-+#endif
- 	    }
- 	    if (NULL == h->gif->SColorMap &&
- 		NULL == h->gif->Image.ColorMap) {