Allow to use udisks-2 (#439628), drop old

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 12 insertions, 92 deletions

diff --git a/app-misc/emelfm2/ChangeLog b/app-misc/emelfm2/ChangeLog
index 773adeb407b6..7dff285446b7 100644
--- a/app-misc/emelfm2/ChangeLog
+++ b/app-misc/emelfm2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/emelfm2
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/ChangeLog,v 1.58 2014/07/24 11:55:53 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/ChangeLog,v 1.59 2015/07/04 16:46:39 pacho Exp $
+
+*emelfm2-0.9.1-r1 (04 Jul 2015)
+
+  04 Jul 2015; Pacho Ramos <pacho@gentoo.org> +emelfm2-0.9.1-r1.ebuild,
+  -emelfm2-0.8.2.ebuild, -emelfm2-0.9.0.ebuild:
+  Allow to use udisks-2 (#439628), drop old
 
   24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> emelfm2-0.8.1.ebuild,
   emelfm2-0.8.2.ebuild, emelfm2-0.9.0.ebuild, emelfm2-0.9.1.ebuild:
diff --git a/app-misc/emelfm2/emelfm2-0.8.2.ebuild b/app-misc/emelfm2/emelfm2-0.8.2.ebuild
deleted file mode 100644
index 41e9d48b76e6..000000000000
--- a/app-misc/emelfm2/emelfm2-0.8.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/emelfm2-0.8.2.ebuild,v 1.3 2014/07/24 11:55:53 ssuominen Exp $
-
-EAPI=5
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A file manager that implements the popular two-pane design"
-HOMEPAGE="http://emelfm2.net/"
-SRC_URI="http://emelfm2.net/rel/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl ansi gimp kernel_linux nls policykit spell udisks"
-
-EMELFM2_LINGUAS=( de fr ja pl ru zh_CN )
-IUSE+=" ${EMELFM2_LINGUAS[@]/#/linguas_}"
-
-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.0.14:2 )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( sys-fs/udisks:0 )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-RESTRICT="test"
-
-src_prepare() {
-	sed -i \
-		-e 's:dbus-glib-1::' \
-		-e 's:@$(CC):$(CC):g' \
-		-e 's:@$(BIN_MSGFMT):$(BIN_MSGFMT):g' \
-		Makefile || die
-
-	local lingua
-	for lingua in ${EMELFM2_LINGUAS[@]}; do
-		use linguas_${lingua} || mv po/${lingua}.po{,.unwanted}
-	done
-}
-
-src_configure() {
-	emel_use() {
-		use ${1} && echo "${2}=1" || echo "${2}=0"
-	}
-
-	#363813
-	myemelconf=(
-		$(emel_use acl WITH_ACL)
-		$(emel_use ansi WITH_OUTPUTSTYLES)
-		$(emel_use gimp WITH_THUMBS)
-		$(emel_use kernel_linux WITH_KERNELFAM)
-		$(emel_use nls I18N)
-		$(emel_use policykit WITH_POLKIT)
-		$(emel_use spell EDITOR_SPELLCHECK)
-		$(emel_use udisks WITH_DEVKIT)
-		DOCS_VERSION=1
-		GTK3=0
-		STRIP=0
-		WITH_TRANSPARENCY=1
-	)
-}
-
-src_compile() {
-	tc-export CC
-	emake \
-		LIB_DIR="/usr/$(get_libdir)" \
-		PREFIX="/usr" \
-		${myemelconf[@]}
-}
-
-src_install() {
-	emake \
-		LIB_DIR="${D}/usr/$(get_libdir)" \
-		PREFIX="${D}/usr" \
-		${myemelconf[@]} \
-		$( use nls && echo install_i18n ) \
-		install
-
-	newicon icons/${PN}_48.png ${PN}.png
-}
diff --git a/app-misc/emelfm2/emelfm2-0.9.0.ebuild b/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild
index 91171ed62455..6b6ba4bd6d1f 100644
--- a/app-misc/emelfm2/emelfm2-0.9.0.ebuild
+++ b/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/emelfm2-0.9.0.ebuild,v 1.3 2014/07/24 11:55:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild,v 1.1 2015/07/04 16:46:39 pacho Exp $
 
 EAPI=5
 inherit eutils multilib toolchain-funcs
@@ -28,7 +28,7 @@ COMMON_DEPEND="
 "
 RDEPEND="
 	${COMMON_DEPEND}
-	udisks? ( sys-fs/udisks:0 )
+	udisks? ( sys-fs/udisks:2 )
 "
 DEPEND="
 	${COMMON_DEPEND}
@@ -61,7 +61,7 @@ src_configure() {
 		$(usex nls I18N=1 I18N=0)
 		$(usex policykit WITH_POLKIT=1 WITH_POLKIT=0)
 		$(usex spell EDITOR_SPELLCHECK=1 EDITOR_SPELLCHECK=0)
-		$(usex udisks WITH_DEVKIT=1 WITH_DEVKIT=0)
+		$(usex udisks WITH_UDISKS=1 WITH_UDISKS=0)
 		DOCS_VERSION=1
 		STRIP=0
 		WITH_TRANSPARENCY=1