summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-05-21 14:58:34 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-05-21 14:58:34 +0000
commit2c96e107f14fa20cb8823f0ede13c7e2c852cd4e (patch)
treed2e2a2cfbd1f38ddc4b2bb8d655343341a06347d /app-misc/emelfm2
parentx86 stable per bug 364215 (diff)
downloadgentoo-2-2c96e107f14fa20cb8823f0ede13c7e2c852cd4e.tar.gz
gentoo-2-2c96e107f14fa20cb8823f0ede13c7e2c852cd4e.tar.bz2
gentoo-2-2c96e107f14fa20cb8823f0ede13c7e2c852cd4e.zip
Fix building with x11-libs/gtk+:3 present wrt #363813. Use x11-libs/gtk+:2 for now.
(Portage version: 2.2.0_alpha33/cvs/Linux x86_64)
Diffstat (limited to 'app-misc/emelfm2')
-rw-r--r--app-misc/emelfm2/ChangeLog6
-rw-r--r--app-misc/emelfm2/emelfm2-0.7.5.ebuild11
2 files changed, 11 insertions, 6 deletions
diff --git a/app-misc/emelfm2/ChangeLog b/app-misc/emelfm2/ChangeLog
index 350a6ce5a557..2d8a77a0c341 100644
--- a/app-misc/emelfm2/ChangeLog
+++ b/app-misc/emelfm2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/emelfm2
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/ChangeLog,v 1.42 2011/02/13 13:12:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/ChangeLog,v 1.43 2011/05/21 14:58:34 ssuominen Exp $
+
+ 21 May 2011; Samuli Suominen <ssuominen@gentoo.org> emelfm2-0.7.5.ebuild:
+ Fix building with x11-libs/gtk+:3 present wrt #363813. Use x11-libs/gtk+:2
+ for now.
*emelfm2-0.7.5 (13 Feb 2011)
diff --git a/app-misc/emelfm2/emelfm2-0.7.5.ebuild b/app-misc/emelfm2/emelfm2-0.7.5.ebuild
index f016a4867bdf..b4623311da2f 100644
--- a/app-misc/emelfm2/emelfm2-0.7.5.ebuild
+++ b/app-misc/emelfm2/emelfm2-0.7.5.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/emelfm2-0.7.5.ebuild,v 1.1 2011/02/13 13:12:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/emelfm2-0.7.5.ebuild,v 1.2 2011/05/21 14:58:34 ssuominen Exp $
-EAPI=2
+EAPI=4
inherit eutils multilib toolchain-funcs
DESCRIPTION="A file manager that implements the popular two-pane design"
@@ -33,7 +33,9 @@ pkg_setup() {
use ${1} && echo "${2}=1" || echo "${2}=0"
}
+ #363813
myemelconf=(
+ GTK3=0
DOCS_VERSION=1
$(emel_use nls I18N)
WITH_TRANSPARENCY=1
@@ -54,12 +56,11 @@ src_prepare() {
src_compile() {
tc-export CC
emake LIB_DIR="/usr/$(get_libdir)" PREFIX="/usr" \
- ${myemelconf[@]} || die
+ ${myemelconf[@]}
}
src_install() {
emake LIB_DIR="${D}/usr/$(get_libdir)" PREFIX="${D}/usr" \
- ${myemelconf[@]} install || die
+ ${myemelconf[@]} install
newicon icons/${PN}_48.png ${PN}.png
- prepalldocs
}