summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-06-11 15:09:55 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-06-11 15:09:55 +0000
commit1fb4d51ae015e86049df124261c887d1af16c561 (patch)
tree93ad5fdb494b9e56789c69e6d2dffe58ea925255 /media-gfx
parentVersion bump, remove old. (diff)
downloadgentoo-2-1fb4d51ae015e86049df124261c887d1af16c561.tar.gz
gentoo-2-1fb4d51ae015e86049df124261c887d1af16c561.tar.bz2
gentoo-2-1fb4d51ae015e86049df124261c887d1af16c561.zip
Version bump.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/feh/ChangeLog7
-rw-r--r--media-gfx/feh/feh-1.7.ebuild (renamed from media-gfx/feh/feh-1.4.3.ebuild)21
2 files changed, 15 insertions, 13 deletions
diff --git a/media-gfx/feh/ChangeLog b/media-gfx/feh/ChangeLog
index 0d7724cb8261..0f7b44a53829 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.44 2010/04/25 12:58:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.45 2010/06/11 15:09:55 ssuominen Exp $
+
+*feh-1.7 (11 Jun 2010)
+
+ 11 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> +feh-1.7.ebuild:
+ Version bump.
*feh-1.4.3 (25 Apr 2010)
diff --git a/media-gfx/feh/feh-1.4.3.ebuild b/media-gfx/feh/feh-1.7.ebuild
index 3bc5277a7bf9..27ae3a52ba0f 100644
--- a/media-gfx/feh/feh-1.4.3.ebuild
+++ b/media-gfx/feh/feh-1.7.ebuild
@@ -1,13 +1,13 @@
# 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.3.ebuild,v 1.1 2010/04/25 12:58:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-1.7.ebuild,v 1.1 2010/06/11 15:09:55 ssuominen Exp $
EAPI=2
inherit toolchain-funcs
DESCRIPTION="A fast, lightweight imageviewer using imlib2"
HOMEPAGE="https://derf.homelinux.org/~derf/projects/feh/"
-SRC_URI="mirror://debian/pool/main/f/${PN}/${PN}_${PV}.orig.tar.bz2"
+SRC_URI="http://www.chaosdorf.de/~derf/feh/${P}.tar.bz2"
LICENSE="as-is"
SLOT="0"
@@ -17,7 +17,6 @@ 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}
@@ -27,9 +26,11 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xproto"
pkg_setup() {
- fehopts="DESTDIR=${D}
- doc_dir=${D}/usr/share/doc/${PF}
- PREFIX=/usr"
+ fehopts=(
+ "DESTDIR=${D}"
+ "doc_dir=${D}/usr/share/doc/${PF}"
+ "PREFIX=/usr"
+ )
}
src_prepare() {
@@ -43,18 +44,14 @@ src_prepare() {
-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
+ emake "${fehopts[@]}" || die
}
src_install() {
- emake ${fehopts} install || die
+ emake "${fehopts[@]}" install || die
prepalldocs
}