old

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

5 files changed, 6 insertions, 203 deletions

diff --git a/media-gfx/feh/ChangeLog b/media-gfx/feh/ChangeLog
index 57d48decd829..66bb65cfe0ba 100644
--- a/media-gfx/feh/ChangeLog
+++ b/media-gfx/feh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/feh
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.96 2012/01/19 08:01:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.97 2012/01/19 08:03:00 ssuominen Exp $
+
+  19 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -files/feh-1.11.2-libpng15.patch, -feh-1.12.ebuild, -feh-2.0.ebuild,
+  -feh-2.1.ebuild:
+  old
 
   19 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> feh-1.16.2.ebuild:
   ppc/ppc64 stable wrt #388471
diff --git a/media-gfx/feh/feh-1.12.ebuild b/media-gfx/feh/feh-1.12.ebuild
deleted file mode 100644
index bbc7488863cb..000000000000
--- a/media-gfx/feh/feh-1.12.ebuild
+++ /dev/null
@@ -1,61 +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/feh/feh-1.12.ebuild,v 1.8 2011/04/11 16:25:13 xarthisius Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="https://derf.homelinux.org/~derf/projects/feh/"
-SRC_URI="http://www.chaosdorf.de/~derf/feh/${P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="test xinerama"
-
-COMMON_DEPEND=">=media-libs/giblib-1.2.4
-	media-libs/imlib2
-	>=media-libs/libpng-1.4
-	x11-libs/libX11
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/jpeg"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libXt
-	x11-proto/xproto
-	test? ( >=dev-lang/perl-5.10
-		dev-perl/Test-Command )"
-
-pkg_setup() {
-	fehopts=(
-		DESTDIR="${D}"
-		PREFIX=/usr
-		doc_dir='${main_dir}'/share/doc/${PF}
-		)
-}
-
-src_prepare() {
-	if ! use xinerama; then
-		sed -i -e '/^xinerama/d' config.mk || die
-		sed -i -e 's/curl\ xinerama/curl/' test/feh.t || die
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	emake "${fehopts[@]}" || die
-}
-
-src_install() {
-	emake "${fehopts[@]}" install || die
-	prepalldocs
-}
-
-pkg_postinst(){
-	elog
-	elog "Default configuration path was moved to:"
-	elog "/home/<user>/.config/feh/themes. Please "
-	elog "update your configuration"
-	elog
-}
diff --git a/media-gfx/feh/feh-2.0.ebuild b/media-gfx/feh/feh-2.0.ebuild
deleted file mode 100644
index ba9564f8dd7b..000000000000
--- a/media-gfx/feh/feh-2.0.ebuild
+++ /dev/null
@@ -1,58 +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/feh/feh-2.0.ebuild,v 1.1 2011/10/10 23:33:46 radhermit Exp $
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="http://feh.finalrewind.org/"
-SRC_URI="http://feh.finalrewind.org/${P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug curl test xinerama"
-
-COMMON_DEPEND=">=media-libs/giblib-1.2.4
-	media-libs/imlib2
-	>=media-libs/libpng-1.4
-	x11-libs/libX11
-	curl? ( net-misc/curl )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/jpeg"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libXt
-	x11-proto/xproto
-	test? ( >=dev-lang/perl-5.10
-		dev-perl/Test-Command )"
-
-feh_use() {
-	if use ${1}; then
-		echo 1
-	else
-		echo 0
-	fi
-}
-
-pkg_setup() {
-	fehopts=(
-		DESTDIR="${D}"
-		PREFIX=/usr
-		doc_dir='${main_dir}'/share/doc/${PF}
-		example_dir='${main_dir}'/share/doc/${PF}/examples
-		debug=$(feh_use debug)
-		curl=$(feh_use curl)
-		xinerama=$(feh_use xinerama)
-		)
-}
-
-src_compile() {
-	tc-export CC
-	emake "${fehopts[@]}"
-}
-
-src_install() {
-	emake "${fehopts[@]}" install
-}
diff --git a/media-gfx/feh/feh-2.1.ebuild b/media-gfx/feh/feh-2.1.ebuild
deleted file mode 100644
index b7f0f5e27495..000000000000
--- a/media-gfx/feh/feh-2.1.ebuild
+++ /dev/null
@@ -1,58 +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/feh/feh-2.1.ebuild,v 1.1 2011/11/03 03:31:50 radhermit Exp $
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="http://feh.finalrewind.org/"
-SRC_URI="http://feh.finalrewind.org/${P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug curl test xinerama"
-
-COMMON_DEPEND=">=media-libs/giblib-1.2.4
-	media-libs/imlib2
-	>=media-libs/libpng-1.4
-	x11-libs/libX11
-	curl? ( net-misc/curl )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/jpeg"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libXt
-	x11-proto/xproto
-	test? ( >=dev-lang/perl-5.10
-		dev-perl/Test-Command )"
-
-feh_use() {
-	if use ${1}; then
-		echo 1
-	else
-		echo 0
-	fi
-}
-
-pkg_setup() {
-	fehopts=(
-		DESTDIR="${D}"
-		PREFIX=/usr
-		doc_dir='${main_dir}'/share/doc/${PF}
-		example_dir='${main_dir}'/share/doc/${PF}/examples
-		debug=$(feh_use debug)
-		curl=$(feh_use curl)
-		xinerama=$(feh_use xinerama)
-		)
-}
-
-src_compile() {
-	tc-export CC
-	emake "${fehopts[@]}"
-}
-
-src_install() {
-	emake "${fehopts[@]}" install
-}
diff --git a/media-gfx/feh/files/feh-1.11.2-libpng15.patch b/media-gfx/feh/files/feh-1.11.2-libpng15.patch
deleted file mode 100644
index d04027b72bca..000000000000
--- a/media-gfx/feh/files/feh-1.11.2-libpng15.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Fix compilation against libpng-1.5
-https://github.com/derf/feh/commit/bbc68473129227511e1fb1f9876e3cb68bc7fa26#diff-1
-
-diff --git a/src/feh_png.c b/src/feh_png.c
-index cefd4c8..f02aecb 100644
---- a/src/feh_png.c
-+++ b/src/feh_png.c
-@@ -66,7 +66,7 @@ gib_hash *feh_png_read_comments(char *file)
- 		return hash;
- 	}
- 
--	if (setjmp(png_ptr->jmpbuf)) {
-+	if (setjmp(png_jmpbuf(png_ptr))) {
- 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- 		fclose(fp);
- 		return hash;
-@@ -124,7 +124,7 @@ int feh_png_write_png(Imlib_Image image, char *file, ...)
- 		return 0;
- 	}
- 
--	if (setjmp(png_ptr->jmpbuf)) {
-+	if (setjmp(png_jmpbuf(png_ptr))) {
- 		fclose(fp);
- 		png_destroy_write_struct(&png_ptr, &info_ptr);
- 		png_destroy_info_struct(png_ptr, &info_ptr);