old

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 13 insertions, 131 deletions

diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog
index f090fc7ed768..4d2a347e4d1a 100644
--- a/media-gfx/fbida/ChangeLog
+++ b/media-gfx/fbida/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fbida
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.88 2012/01/31 14:48:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.89 2012/01/31 14:49:40 ssuominen Exp $
+
+  31 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> -fbida-2.07-r2.ebuild,
+  -files/fbida-2.07-libpng14.patch:
+  old
 
   31 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> fbida-2.08.ebuild:
   ppc/ppc64 stable wrt #388287
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index 8eda377dd43c..d198db28c623 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -1,25 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX fbida-2.07-libpng14.patch 403 RMD160 b14a55a93a9e2c8b846aa040dbe66b5685799be6 SHA1 b0536b0896c5ec87fb3b57e38631464f85936a95 SHA256 3495f5e3fc640e6f2fd41e6586c80cb958f1c56aeb4b3c4de9906d88ce4e5160
 AUX fbida-2.08-posix-make.patch 1495 RMD160 2683508bb7eaacafbca37c004aea777d7dd6ab44 SHA1 f7cc9168315778fe562786ec879f1822b8abf62f SHA256 7f8b0a7f46205efcb765133f287bfac7023e837f159364f8932ac146b4428c10
 AUX ida-desktop.patch 453 RMD160 389f2b32fc2154a7c120447a72793a3b748cb59b SHA1 d06b70f2d581a1a3e9e0909b5af7f3f71ed54717 SHA256 51dabac02c6326e7f2d28db304f0b481cbcef7371807eb93618b2b5eb0104907
-DIST fbida-2.07-libjpeg-8a.patch.bz2 16001 RMD160 2cbb3c588259b2e41e696ad65ce715034acce92d SHA1 42f36ab3a73dcbc8dc929e4addbf72c81118561c SHA256 51f86a08161b6db7b88000d7c34e3d77d856b07d7b6757cb78161492a11d4d04
-DIST fbida-2.07.tar.gz 213622 RMD160 edd9174468e7c7e43b70b0364ac72655415b0c83 SHA1 4758178299e09d5251b9cf20337a81cc20553d45 SHA256 6510dee7c4f45cb63094d540e66aa39d53215c59f46944b8bb050c26b71bdb44
 DIST fbida-2.08.tar.gz 241283 RMD160 2740f3bed9d3819eb30dbd48833ad75186ba2136 SHA1 597e0953c68112bf7c363b1ccaa94e72100b116a SHA256 298e7f3545e33596a5876f6b9c3da7ef475c2692e5fab0df824fbcd7a489cd80
 DIST ida.png.bz2 11928 RMD160 0e6abcc48e8557ca44d1a98d7df466198f75725b SHA1 c9783dd33430683fb604f243e6161de01d875a9b SHA256 ce90c13f8da8d2ced4cf0e55d2f960bc236355f6e5dd60ea6c56fbe51e6cabae
-EBUILD fbida-2.07-r2.ebuild 2575 RMD160 d8ce70e6d4079424357b4527c5a97aff194d7a6b SHA1 45d7589e5477ca7dbd847bf3dd8879b54b9a4ba3 SHA256 65b2d7743dc977c1a904c3c7ee13cf50bdf00b9e9d1c8999e6d945ed88a243f4
 EBUILD fbida-2.08.ebuild 2511 RMD160 f2e59844730adf0c0148f431ef7f436d690548c6 SHA1 dbc3b0e784cbb5d5b150f0ea7c0255d575eb82d8 SHA256 4f9153fc5b0db89c28e617eee964698995931850bb7d454b2d80d738535991d1
-MISC ChangeLog 11128 RMD160 bbe8b77c1377c8d21c2f16ae5d66daf3c0168f00 SHA1 a2f78823454c47198ea2495388b48a11dbe737dc SHA256 38b6dac03ced8994f1ab5f3adc01a10d3a57432198c214210263c8643ffb47ac
+MISC ChangeLog 11248 RMD160 95867428e7836b274c8f2527e2a20bade54459fa SHA1 642304267ae4cfd0081f49d57b973c0106faec5f SHA256 fc097aec867554b751a9d9f856e98557e186f023edd0e113cf806386d460e4bf
 MISC metadata.xml 200 RMD160 2de5283c98cd8874d712d6b6f9cfe1dd1f981d92 SHA1 2b2e0f332ea5a63f407c8b8cb5281613bff5f6dc SHA256 72d3475829cceaf086595829ee596f6bdfba2192aaab3b8bd2565c694cd0fb37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPJ/6jAAoJEEdUh39IaPFNQPQH/jvz0dxntzrMAlKv215XaxUD
-YEAOD0hECrxrdJ37h1SXszpvVPpkLh0m/KefJs+qiB/f9PV3oLTzOhoeuntS3VhZ
-4mW9CS3I/Ih9YLc+qI9gq7JxPcHEbXp6U6QMRYvE7FOyAYUzPNAMq8555nudIvBO
-kWLPTWMZV5goSTa4OxFR2o38vGgWWmLGdbywHTTaQK3EIQS9Qgw5iC8fYCfTDbXd
-ppVyz3wjCa0fjL+hxieDDtIXaMBFb8n+Ct0AedStLEY7sZ3YZEXWZp8mLlk8Yo4v
-lSwxA7guFO8vtUYJc07K79ZqFQ4J+IX4utUvsVadNwU3ecqEJpnhcKI5ODbtUKk=
-=RWNi
+iQEcBAEBAgAGBQJPJ/7tAAoJEEdUh39IaPFNZx4IAITNcPpxBXGj2AJzqN6FmYkD
+gsYbRvzZ1uor8cmm8Yh6ScAk6Per71lhfDG66yu+sOOy2JOkv9nemyOs1Z3T5h6W
+9xMvx5csawFOLRtJyKUHqN1vgiIyTox2AfEfc3U4CTSEyUJjq7hotHmldHtG1siJ
+0Ugtl+pwyXvlQETM2/6lS7k4CxFHxBLylXMzJWE097NB5+RMlSnjyiQIZMsZDYrx
+DhCaE8/acOiM3KZD9+qZiF0+ZAF5FyoNcPZCyfHNbj0PH7zsoMksoFa8ddMcPeuQ
+ymp+FHMyffzpOtFaNgLwXebPQ3BDwPegbiJNEkp3nvi4U6HQU4Pa5Bfl8880yh4=
+=tEYK
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/fbida/fbida-2.07-r2.ebuild b/media-gfx/fbida/fbida-2.07-r2.ebuild
deleted file mode 100644
index 291c21c7d86d..000000000000
--- a/media-gfx/fbida/fbida-2.07-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.07-r2.ebuild,v 1.13 2011/10/23 23:23:39 ssuominen Exp $
-
-EAPI=1
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)."
-HOMEPAGE="http://linux.bytesex.org/fbida/"
-SRC_URI="http://dl.bytesex.org/releases/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}-libjpeg-8a.patch.bz2
-	http://dev.gentoo.org/~ssuominen/ida.png.bz2" #370901
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sh sparc x86"
-IUSE="curl fbcon gif imagemagick lirc pdf png scanner tiff X"
-
-RDEPEND="png? ( media-libs/libpng )
-	gif? ( media-libs/giflib )
-	pdf? ( app-text/ghostscript-gpl media-libs/tiff )
-	tiff? ( media-libs/tiff )
-	curl? ( net-misc/curl )
-	lirc? ( app-misc/lirc )
-	imagemagick? ( media-gfx/imagemagick )
-	scanner? ( media-gfx/sane-backends )
-	X? ( x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXpm
-		>=x11-libs/openmotif-2.3:0
-	)
-	!media-gfx/fbi
-	virtual/jpeg
-	media-libs/libexif
-	>=media-libs/freetype-2.0
-	>=media-libs/fontconfig-2.2
-	virtual/ttf-fonts"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xextproto x11-proto/xproto )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	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"
-	fi
-
-	epatch "${FILESDIR}"/ida-desktop.patch \
-		"${FILESDIR}"/${P}-libpng14.patch \
-		"${WORKDIR}"/${P}-libjpeg-8a.patch
-}
-
-src_compile() {
-	# Let autoconf do its job and then fix things to build fbida
-	# according to our specifications
-	emake Make.config || die
-
-	set_feat() {
-		local useflag=${1}
-		local config=${2}
-
-		local option="yes"
-		if ! use ${useflag}; then
-			option="no"
-		fi
-
-		sed -e "s/${config}.*/${config} := ${option}/" -i "${S}/Make.config"
-	}
-
-	set_feat fbcon 	HAVE_LINUX_FB_H
-	set_feat X 		HAVE_MOTIF
-	set_feat tiff 	HAVE_LIBTIFF
-
-	# The 'pdf' flag forces the use of libtiff.
-	set_feat pdf	HAVE_LIBTIFF
-	set_feat png 	HAVE_LIBPNG
-	set_feat gif 	HAVE_LIBUNGIF
-	set_feat lirc 	HAVE_LIBLIRC
-	set_feat curl 	HAVE_LIBCURL
-	set_feat scanner HAVE_LIBSANE
-	set_feat imagemagick HAVE_LIBMAGICK
-
-	emake || die
-}
-
-src_install() {
-	make \
-		DESTDIR="${D}" \
-		STRIP="" \
-		prefix=/usr \
-		install || die
-	dodoc README
-
-	if ! use pdf; then
-		rm -f "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1
-	fi
-
-	if use X ; then
-		doicon "${WORKDIR}"/ida.png
-		domenu desktop/ida.desktop
-	fi
-}
diff --git a/media-gfx/fbida/files/fbida-2.07-libpng14.patch b/media-gfx/fbida/files/fbida-2.07-libpng14.patch
deleted file mode 100644
index 354dc6e98817..000000000000
--- a/media-gfx/fbida/files/fbida-2.07-libpng14.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rd/read-png.c
-+++ rd/read-png.c
-@@ -69,7 +69,7 @@
-     if (h->color_type == PNG_COLOR_TYPE_PALETTE)
- 	png_set_palette_to_rgb(h->png);
-     if (h->color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
--	png_set_gray_1_2_4_to_8(h->png);
-+	png_set_expand_gray_1_2_4_to_8(h->png);
- 
-     if (png_get_bKGD(h->png, h->info, &file_bg)) {
- 	png_set_background(h->png,file_bg,PNG_BACKGROUND_GAMMA_FILE,1,1.0);