From: Samuli Suominen <ssuominen@gentoo.org>
Date: Mon, 5 Apr 2010 18:17:17 +0000 (+0000)
Subject: old
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a673ab1c035ae19642f8e059159c486cf50eb57f;p=gentoo.git

old
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 3c5838fac323..f1497c0ccd70 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,9 +1,5 @@
-AUX feh-1.3.4-headers.patch 321 RMD160 80f5a6a37e05d73627a176bd516d3fd06428830d SHA1 7eb1698611968f92d7bc235234e19e9622c77e91 SHA256 58441ad19defbfff523ec296d715e726b82a0b2e44ccc92596c1b955614bbf16
-AUX feh-1.3.4-xinerama.patch 1325 RMD160 cec72da1d1615b137fcd0be6f866368f271fc060 SHA1 469dc6e439c715023449c5ec08fb955248d9966f SHA256 ffb99685611e6fb186dba59bfe17b266b1f9c49999c52c64b4eb3b1548baccf4
-DIST feh-1.3.4.tar.gz 409530 RMD160 7e27d31cf974b30fc321d4dbef2fd46fbd21d34c SHA1 cf02fd48325ba02467c7f791634a28e98edbe801 SHA256 81b9f2bbc15ffda4640958701753447b95cd2cbf11bc8e85dd00fdd2a2f83124
 DIST feh-1.4.1.tar.bz2 336291 RMD160 aa78613517effba492f7db665a9d91119a239e60 SHA1 cba03cd8bd6d2d16812ead5f0d14e6e11536369a SHA256 ee6ecb15bfd036682339902673d7a0379765673915d6260a35527a84217b268f
 DIST feh-1.4.2.tar.bz2 257278 RMD160 c3bf3f4b3a3dd2ca56bdd8d4b2f5862dc27e7d82 SHA1 fc324305ba1246425e254c3d9a565e830c036ac8 SHA256 5090f646c9508f8380ee6f5d7e6704abc548aaf79d81db7777d9a4b8ec95226e
-EBUILD feh-1.3.4.ebuild 1274 RMD160 1ace6badaac54ed7951b875cb18731d3ceb79d91 SHA1 c36a9b32bc788b5d60750330ee3a9bdc22b67b80 SHA256 dc72dd5483ee8fe6feb1ad62c5ece2d48478489013b96cd25f55259712d20a18
 EBUILD feh-1.4.1.ebuild 1030 RMD160 b5655edaa40cbe182d101f3be4568c738ef318d9 SHA1 6f66c85173c3835af4d30feecf0d461a9aa2850e SHA256 628220191605f50c53eefc277900b1510ede38e17a5ca10769bc97366b8db79c
 EBUILD feh-1.4.2.ebuild 1316 RMD160 0387e60b5fae5e9ad4364161d325d5aacbc9fcc8 SHA1 feba1d44a58039dbe7d0b7463306d442431b446c SHA256 411bf453ee037f3e787f783724722945d39addc3a9866ee0954c9d12fdfc8049
 MISC ChangeLog 5116 RMD160 ebd421b85cd4112724bdc7c604eee2e06c1d1ed5 SHA1 6a2b63b112278fe17b8f9d5cf6ff68b6e41b3425 SHA256 f6e659e82d4d79b2ac9f0da8545615d11602e4a20990baa216cb1a98b5c797c2
diff --git a/media-gfx/feh/feh-1.3.4.ebuild b/media-gfx/feh/feh-1.3.4.ebuild
deleted file mode 100644
index a81efa201536..000000000000
--- a/media-gfx/feh/feh-1.3.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-1.3.4.ebuild,v 1.14 2010/04/03 03:36:12 ssuominen Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="http://www.linuxbrit.co.uk/feh"
-SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha sparc x86"
-IUSE="xinerama"
-
-RDEPEND="!<sci-astronomy/xephem-3.7.3
-	>=media-libs/giblib-1.2.4
-	>=media-libs/imlib2-1.0.0
-	>=media-libs/jpeg-6b-r4
-	media-libs/libpng
-	x11-libs/libX11
-	x11-libs/libXext
-	xinerama? ( x11-libs/libXinerama )
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xineramaproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -f configure.ac
-	epatch "${FILESDIR}"/${P}-xinerama.patch
-	epatch "${FILESDIR}"/${P}-headers.patch
-	sed -i -e "/^docsdir =/s:doc/feh:share/doc/${PF}:" Makefile.am || die
-	# the bundled autotool code was generated with automake-1.4
-	# but there's no reason to restrict to that version #141427
-	eautoreconf
-}
-
-src_compile() {
-	econf $(use_enable xinerama) || die
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog README TODO
-}
diff --git a/media-gfx/feh/files/feh-1.3.4-headers.patch b/media-gfx/feh/files/feh-1.3.4-headers.patch
deleted file mode 100644
index 16070f770b04..000000000000
--- a/media-gfx/feh/files/feh-1.3.4-headers.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/md5.c
-+++ src/md5.c
-@@ -39,6 +39,7 @@
-  */
- 
- #include "md5.h"
-+#include <string.h>
- 
- #ifdef TEST
- /*
-@@ -46,7 +47,6 @@
-  * The test program should print out the same values as given in section
-  * A.5 of RFC 1321, reproduced below.
-  */
--#include <string.h>
- main()
- {
-     static const char *const test[7] = {
diff --git a/media-gfx/feh/files/feh-1.3.4-xinerama.patch b/media-gfx/feh/files/feh-1.3.4-xinerama.patch
deleted file mode 100644
index af435d02cf14..000000000000
--- a/media-gfx/feh/files/feh-1.3.4-xinerama.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- feh-1.3.4/configure.in
-+++ feh-1.3.4/configure.in
-@@ -41,11 +41,25 @@
- AC_SUBST(GIBLIB_CFLAGS)
- 
- dnl Check for Xinerama
--LIBS="-L/usr/X11R6/lib $LIBS -lm -ljpeg"
--AC_CHECK_LIB(Xext,XMissingExtension)
--AC_CHECK_LIB(Xinerama,XineramaQueryScreens)
--AC_SUBST(HAVE_XINERAMA)
--AC_SUBST(XINERAMA_LIBS)
-+AC_ARG_ENABLE(xinerama,
-+	AC_HELP_STRING([--disable-xinerama],[disable Xinerama multi screen support]),
-+	[
-+	if test x"$enableval" = xyes; then
-+		with_xinerama="yes"
-+	else
-+		with_xinerama="no"
-+	fi
-+	],
-+	[with_xinerama="detect"]
-+)
-+if test x"$with_xinerama" != xno; then
-+	AC_CHECK_LIB(Xext,XMissingExtension,[
-+		AC_CHECK_LIB(Xinerama,XineramaQueryScreens,[
-+			AC_DEFINE(HAVE_LIBXINERAMA, [], [Enable Xinerama support])
-+			LIBS="$LIBS -lXext -lXinerama"
-+		])
-+	])
-+fi
- AC_CHECK_LIB(jpeg, jpeg_destroy_decompress)
- 
- dnl AC_CHECK_FUNC(getopt_long,,[AC_LIBOBJ="$AC_LIBOBJ getopt.o getopt1.o"])
---- feh-1.3.4/src/Makefile.am
-+++ feh-1.3.4/src/Makefile.am
-@@ -1,7 +1,6 @@
- # A list of all the files in the current directory which can be regenerated
- MAINTAINERCLEANFILES = Makefile.in				
- 
--LDFLAGS           = -L/usr/X11R6/lib -L/usr/local/lib -lz -lpng
- INCLUDES          = -I/usr/X11R6/include $(X_CFLAGS) \
-                     -I$(prefix)/include -I$(includedir) \
-                     -I. -I$(top_srcdir)/src \