diff options
Diffstat (limited to 'media-gfx/feh')
-rw-r--r-- | media-gfx/feh/ChangeLog | 7 | ||||
-rw-r--r-- | media-gfx/feh/feh-1.8.ebuild (renamed from media-gfx/feh/feh-1.7.ebuild) | 13 |
2 files changed, 9 insertions, 11 deletions
diff --git a/media-gfx/feh/ChangeLog b/media-gfx/feh/ChangeLog index 0f7b44a53829..d3c8d2fc4578 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.45 2010/06/11 15:09:55 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.46 2010/06/25 17:18:08 ssuominen Exp $ + +*feh-1.8 (25 Jun 2010) + + 25 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> +feh-1.8.ebuild: + Version bump. *feh-1.7 (11 Jun 2010) diff --git a/media-gfx/feh/feh-1.7.ebuild b/media-gfx/feh/feh-1.8.ebuild index 27ae3a52ba0f..7fc605819cc2 100644 --- a/media-gfx/feh/feh-1.7.ebuild +++ b/media-gfx/feh/feh-1.8.ebuild @@ -1,6 +1,6 @@ # 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.7.ebuild,v 1.1 2010/06/11 15:09:55 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-1.8.ebuild,v 1.1 2010/06/25 17:18:08 ssuominen Exp $ EAPI=2 inherit toolchain-funcs @@ -16,7 +16,7 @@ IUSE="xinerama" COMMON_DEPEND=">=media-libs/giblib-1.2.4 media-libs/imlib2 - media-libs/libpng + >=media-libs/libpng-1.2.43 x11-libs/libX11 xinerama? ( x11-libs/libXinerama )" RDEPEND="${COMMON_DEPEND} @@ -28,8 +28,8 @@ DEPEND="${COMMON_DEPEND} pkg_setup() { fehopts=( "DESTDIR=${D}" - "doc_dir=${D}/usr/share/doc/${PF}" "PREFIX=/usr" + "doc_dir=${D}/usr/share/doc/${PF}" ) } @@ -37,13 +37,6 @@ 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 } src_compile() { |