diff options
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/feh/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/feh/feh-1.14.1.ebuild (renamed from media-gfx/feh/feh-1.14.ebuild) | 22 |
2 files changed, 21 insertions, 9 deletions
diff --git a/media-gfx/feh/ChangeLog b/media-gfx/feh/ChangeLog index 7ac46a28f2db..88819775b013 100644 --- a/media-gfx/feh/ChangeLog +++ b/media-gfx/feh/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/feh # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.80 2011/05/18 08:54:05 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/ChangeLog,v 1.81 2011/05/21 17:55:32 hwoarang Exp $ + +*feh-1.14.1 (21 May 2011) + + 21 May 2011; Markos Chandras <hwoarang@gentoo.org> -feh-1.14.ebuild, + +feh-1.14.1.ebuild: + Version bump. Remove broken ebuild. Refactor build system *feh-1.14 (18 May 2011) diff --git a/media-gfx/feh/feh-1.14.ebuild b/media-gfx/feh/feh-1.14.1.ebuild index 19f85e294688..0f7eddec1ddf 100644 --- a/media-gfx/feh/feh-1.14.ebuild +++ b/media-gfx/feh/feh-1.14.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-1.14.ebuild,v 1.1 2011/05/18 08:54:05 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-1.14.1.ebuild,v 1.1 2011/05/21 17:55:32 hwoarang Exp $ EAPI=4 inherit toolchain-funcs @@ -12,12 +12,13 @@ SRC_URI="http://feh.finalrewind.org/${P}.tar.bz2" LICENSE="as-is" SLOT="0" KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="test xinerama" +IUSE="debug curl test xinerama" COMMON_DEPEND=">=media-libs/giblib-1.2.4 media-libs/imlib2 >=media-libs/libpng-1.4 x11-libs/libX11 + curl? ( net-misc/curl ) xinerama? ( x11-libs/libXinerama )" RDEPEND="${COMMON_DEPEND} virtual/jpeg" @@ -27,21 +28,26 @@ DEPEND="${COMMON_DEPEND} test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command )" +feh_use() { + if use ${1}; then + echo 1 + else + echo 0 + fi +} + pkg_setup() { fehopts=( DESTDIR="${D}" PREFIX=/usr doc_dir='${main_dir}'/share/doc/${PF} example_dir='${main_dir}'/share/doc/${PF}/examples + debug=$(feh_use debug) + curl=$(feh_use curl) + xinerama=$(feh_use xinerama) ) } -src_prepare() { - if ! use xinerama; then - sed -i -e '/^xinerama/d' config.mk || die - fi -} - src_compile() { tc-export CC emake "${fehopts[@]}" |