Version bump.

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

4 files changed, 73 insertions, 6 deletions

diff --git a/media-gfx/feh/ChangeLog b/media-gfx/feh/ChangeLog
index d23b45048314..1db8d4f9c6a2 100644
--- a/media-gfx/feh/ChangeLog
+++ b/media-gfx/feh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/feh
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.40 2010/03/27 15:01:50 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.41 2010/04/03 03:36:12 ssuominen Exp $
+
+*feh-1.4.2 (03 Apr 2010)
+
+  03 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> +feh-1.4.2.ebuild:
+  Version bump.
 
   27 Mar 2010; Richard Freeman <rich0@gentoo.org> feh-1.4.1.ebuild:
   amd64 stable - 310673
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index d3efab3c28ff..2602a0134b9e 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -2,7 +2,9 @@ AUX feh-1.3.4-headers.patch 321 RMD160 80f5a6a37e05d73627a176bd516d3fd06428830d
 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
-EBUILD feh-1.3.4.ebuild 1287 RMD160 4ed2ad2bd46a811b2147378ed809a1e366577b6c SHA1 0c9f7c8c7c30d53ef687b812c1874c5f0b2695fc SHA256 0f8b6f1d81627faee9dd52e54252dc08b52b0071942cfb2f891eaa78ab3b9422
+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
-MISC ChangeLog 4893 RMD160 4b613b21a5d751141ea1a55ef6f32fe19c2d1d45 SHA1 61733917f2233db543441423ddf2f8c92d3b8620 SHA256 4bae4b31c2c427ae8e30aa4e8248766c480732f39e445d86720198feb22d6174
+EBUILD feh-1.4.2.ebuild 1322 RMD160 0e0266af0ceba82c166e05a307bde347147098a1 SHA1 66487e5f34691d1af2f64ad31f02b934ac555bf1 SHA256 485c9c0dbb71b306e5c7910d69cdb15b12bbaca71d16c505a9546a110e53a5be
+MISC ChangeLog 5013 RMD160 3eab9d5f17fd892be028b04808873840a3ff3cb2 SHA1 b0321a576ab505435f7194b9c2627e0d33e87f70 SHA256 60d2dc091e5be4316192936d5a4f756c97873848eed519a4d2afdbfe754bfd53
 MISC metadata.xml 264 RMD160 ea7162513d37cd633ba9ebf1c162de4cc708ba13 SHA1 ff7da2e986f49904ca02ce36ff96ae29204a341d SHA256 da9c51808676fe2ddfb7534289878496a7c4d921d88fcdd1931dfdbbe6549141
diff --git a/media-gfx/feh/feh-1.3.4.ebuild b/media-gfx/feh/feh-1.3.4.ebuild
index ac3a3b9144bd..a81efa201536 100644
--- a/media-gfx/feh/feh-1.3.4.ebuild
+++ b/media-gfx/feh/feh-1.3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.13 2008/08/09 12:34:17 maekke Exp $
+# $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
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="alpha sparc x86"
 IUSE="xinerama"
 
 RDEPEND="!<sci-astronomy/xephem-3.7.3
diff --git a/media-gfx/feh/feh-1.4.2.ebuild b/media-gfx/feh/feh-1.4.2.ebuild
new file mode 100644
index 000000000000..9cf22e91a8fa
--- /dev/null
+++ b/media-gfx/feh/feh-1.4.2.ebuild
@@ -0,0 +1,60 @@
+# 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.4.2.ebuild,v 1.1 2010/04/03 03:36:12 ssuominen Exp $
+
+EAPI=2
+inherit toolchain-funcs
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="https://derf.homelinux.org/~derf/projects/feh/"
+SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="xinerama"
+
+COMMON_DEPEND=">=media-libs/giblib-1.2.4
+	media-libs/imlib2
+	media-libs/libpng
+	x11-libs/libXext
+	x11-libs/libX11
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/jpeg-8a"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libXt
+	x11-proto/xproto"
+
+pkg_setup() {
+	fehopts="DESTDIR=${D}
+		doc_dir=${D}/usr/share/doc/${PF}
+		PREFIX=/usr"
+}
+
+src_prepare() {
+	if ! use xinerama; then 
+		sed -i -e '/^xinerama/d' config.mk || die
+	fi
+
+	sed -i -e 's:LDFLAGS +=:LDLIBS =:' config.mk || die
+
+	sed -i \
+		-e 's:${LDFLAGS}:${LDLIBS}:' \
+		-e 's:${CC} ${CFLAGS}:${CC} ${LDFLAGS} ${CFLAGS}:' \
+		src/Makefile || die
+
+	sed -i \
+		-e 's:${doc_dir}/feh:${doc_dir}:g' \
+		Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+	emake ${fehopts} || die
+}
+
+src_install() {
+	emake ${fehopts} install || die
+	prepalldocs
+}