3 files changed, 23 insertions, 73 deletions
diff --git a/app-misc/emelfm2/ChangeLog b/app-misc/emelfm2/ChangeLog
index 874025bd351a..eb15a7624650 100644
--- a/app-misc/emelfm2/ChangeLog
+++ b/app-misc/emelfm2/ChangeLog
@@ -1,6 +1,13 @@
 # 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.46 2011/10/27 05:53:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/ChangeLog,v 1.47 2011/12/29 20:10:20 jer Exp $
+
+*emelfm2-0.8.0 (29 Dec 2011)
+
+  29 Dec 2011; Jeroen Roovers <jer@gentoo.org> -emelfm2-0.7.2-r1.ebuild,
+  -emelfm2-0.7.4.ebuild, +emelfm2-0.8.0.ebuild:
+  Version bump by teidakankan (bug #377621). Install translations by dragongrot
+  (bug #369709).
 
   27 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   emelfm2-0.7.2-r1.ebuild, emelfm2-0.7.4.ebuild, emelfm2-0.7.5.ebuild:
diff --git a/app-misc/emelfm2/emelfm2-0.7.2-r1.ebuild b/app-misc/emelfm2/emelfm2-0.7.2-r1.ebuild
deleted file mode 100644
index d3e9c56b3dc4..000000000000
--- a/app-misc/emelfm2/emelfm2-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.2-r1.ebuild,v 1.10 2011/10/27 05:53:51 tetromino Exp $
-
-EAPI=2
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A file manager that implements the popular two-pane design"
-HOMEPAGE="http://emelfm2.net/"
-SRC_URI="http://${PN}.net/rel/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE="acl fam gimp kernel_linux nls policykit spell udev"
-
-RDEPEND=">=x11-libs/gtk+-2.12:2
-	acl? ( sys-apps/acl )
-	!kernel_linux? ( fam? ( virtual/fam ) )
-	gimp? ( media-gfx/gimp )
-	policykit? ( sys-auth/polkit )
-	spell? ( app-text/gtkspell:2 )
-	udev? ( sys-fs/udisks
-		dev-libs/dbus-glib )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-RESTRICT="test"
-
-pkg_setup() {
-	myconf="DOCS_VERSION=1 WITH_TRANSPARENCY=1 STRIP=0"
-
-	use udev && myconf="${myconf} WITH_DEVKIT=1"
-	use gimp && myconf="${myconf} WITH_THUMBS=1"
-	use acl && myconf="${myconf} WITH_ACL=1"
-	use kernel_linux && myconf="${myconf} WITH_KERNELFAM=1 USE_INOTIFY=1"
-	use spell && myconf="${myconf} EDITOR_SPELLCHECK=1"
-	use nls || myconf="${myconf} I18N=0"
-	use policykit && myconf="${myconf} WITH_POLKIT=1"
-
-	if ! use kernel_linux && use fam; then
-		if has_version "app-admin/gamin"; then
-			myconf="${myconf} USE_GAMIN=1"
-		else
-			myconf="${myconf} USE_FAM=1"
-		fi
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	emake LIB_DIR="/usr/$(get_libdir)" PREFIX="/usr" \
-		${myconf} || die
-}
-
-src_install() {
-	emake LIB_DIR="${D}/usr/$(get_libdir)" PREFIX="${D}/usr" \
-		${myconf} install || die
-	newicon icons/${PN}_48.png ${PN}.png
-	prepalldocs
-}
diff --git a/app-misc/emelfm2/emelfm2-0.7.4.ebuild b/app-misc/emelfm2/emelfm2-0.8.0.ebuild
index ae85b4903c7b..123c2cfb626d 100644
--- a/app-misc/emelfm2/emelfm2-0.7.4.ebuild
+++ b/app-misc/emelfm2/emelfm2-0.8.0.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.4.ebuild,v 1.3 2011/10/27 05:53:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/emelfm2-0.8.0.ebuild,v 1.1 2011/12/29 20:10:20 jer Exp $
 
-EAPI=2
+EAPI=4
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="A file manager that implements the popular two-pane design"
@@ -14,15 +14,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl fam gimp kernel_linux nls policykit spell udev"
 
-RDEPEND=">=dev-libs/glib-2.22:2
+COMMON_DEPEND=">=dev-libs/glib-2.26:2
 	>=x11-libs/gtk+-2.12:2
 	acl? ( sys-apps/acl )
 	gimp? ( media-gfx/gimp )
 	policykit? ( sys-auth/polkit )
-	spell? ( app-text/gtkspell:2 )
-	udev? ( sys-fs/udisks
-		dev-libs/dbus-glib )"
-DEPEND="${RDEPEND}
+	spell? ( >=app-text/gtkspell-2.0.14:2 )"
+RDEPEND="${COMMON_DEPEND}
+	udev? ( sys-fs/udisks )"
+DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
@@ -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
@@ -47,15 +49,18 @@ pkg_setup() {
 		)
 }
 
+src_prepare() {
+	sed -i Makefile -e 's:dbus-glib-1::' || die
+}
+
 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 $( use nls && echo install_i18n )
 	newicon icons/${PN}_48.png ${PN}.png
-	prepalldocs
 }