Version bump.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 69 insertions, 4 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/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
+}