Version bump wrt #276470, thanks to Tobias Jakobi for reporting.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 69 insertions, 86 deletions

diff --git a/app-misc/emelfm2/ChangeLog b/app-misc/emelfm2/ChangeLog
index a0fbb5d365fc..fdf0f6b3e193 100644
--- a/app-misc/emelfm2/ChangeLog
+++ b/app-misc/emelfm2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/emelfm2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/ChangeLog,v 1.27 2009/04/20 20:34:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/ChangeLog,v 1.28 2009/07/21 08:55:26 ssuominen Exp $
+
+*emelfm2-0.6.2 (21 Jul 2009)
+
+  21 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> +emelfm2-0.6.2.ebuild:
+  Version bump wrt #276470, thanks to Tobias Jakobi for reporting.
 
   20 Apr 2009; Markus Meier <maekke@gentoo.org> emelfm2-0.4.1:
   amd64 stable, bug #259212
diff --git a/app-misc/emelfm2/Manifest b/app-misc/emelfm2/Manifest
index 24e9babdc946..d247bf1f3d62 100644
--- a/app-misc/emelfm2/Manifest
+++ b/app-misc/emelfm2/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST emelfm2-0.4.1.tar.gz 1149166 RMD160 52dd0e167c93a455dc4e20fd591df6668f4c08d2 SHA1 e06a70905a3110f99d4cfddf605f65b4a7b59ccf SHA256 074b5003ea0d71699716c7b0a3d16e37f96c77e8df284957ca1112e4d1b455eb
-DIST emelfm2-0.5.1.tar.bz2 1002588 RMD160 2518672cbc1592fb79948a0d55984cee48bf511a SHA1 f722e87042a11dafe2ab1e83ce53083f95d041e6 SHA256 c1f94b1a9682a2526ce12275e9828fb7461a7b2e3609c1a29adf0ea9328900a2
+DIST emelfm2-0.6.2.tar.bz2 1032280 RMD160 daf8ca21fd53a88799bdce2893e85bda766c9495 SHA1 f3af350411c9edb4b83b80816706ddd4e7309605 SHA256 ccdccc32913a25ac398760f815705c0d8a058e4bb2df03cb7dc7aa1e83339e17
 EBUILD emelfm2-0.4.1.ebuild 1666 RMD160 8e79a1b97c448bd4a9ad9676ce3f3d34514fe5a6 SHA1 ec8c7d72e9ead8af029b94f04640ad6e6c0cdd12 SHA256 2ee1e657bb4b17edcbf5f05075af4b264da6bd9154093c56aeccefe617b5c4f9
-EBUILD emelfm2-0.5.1.ebuild 1672 RMD160 dfe54de119e3b678f15c017e179a41801495db58 SHA1 ff3a3a7f53089d2e9900418a09d69eb173e246f9 SHA256 ad078cba1a72e5c611481398826e7c79061b84f8af3c1efb729d87b02631f30f
-MISC ChangeLog 2067 RMD160 21c50c6db1ed38d6b6ba72db5f92070db56e0d82 SHA1 3d4b5c9c80455b7ffa4c2e058adf2ef5f990003a SHA256 411913fdb8d59fb071d11acb5bc31d15a780862e370994807b30bb8e3606badc
-MISC metadata.xml 167 RMD160 6f174fdd5033945a3da1b7bbea9796fe17ba2bf8 SHA1 26b8b030985c93a71d6d34f25249320a30b22f36 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkns3HsACgkQkKaRLQcq0GKQhACfZUD7+z5w3Xer4ob6+bbPRu2b
-5IQAn0puqhQ9HPwXOJ9ZWssjFszlcw5C
-=7nuK
------END PGP SIGNATURE-----
+EBUILD emelfm2-0.6.2.ebuild 1645 RMD160 cdec40e339f1853fceee36aa1b8d02e9f75a36ba SHA1 53d39bf010b426f6cefae33ddec86bbf6a334143 SHA256 7d5d56b6a0043ba1ec96a439155ed3734dc2989acfbaa35bf5eefa36800ee4bd
+MISC ChangeLog 2245 RMD160 f9034737f1ee6677633eeeefa583bf9d654c9994 SHA1 61b55d86738dde021ae234b5e46b029bf2e4fa21 SHA256 6004f1ed4d6f59c77670bd96526a9491fdba12a63dc1cf6960cb8bff8097492e
+MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
diff --git a/app-misc/emelfm2/emelfm2-0.5.1.ebuild b/app-misc/emelfm2/emelfm2-0.5.1.ebuild
deleted file mode 100644
index 157126c2ab55..000000000000
--- a/app-misc/emelfm2/emelfm2-0.5.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/emelfm2-0.5.1.ebuild,v 1.1 2009/02/21 20:21:55 yngwin Exp $
-
-inherit eutils toolchain-funcs multilib
-
-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-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl fam hal unicode"
-
-RESTRICT="test"
-
-RDEPEND=">=x11-libs/gtk+-2.12
-	fam? ( virtual/fam )
-	acl? ( sys-apps/acl )
-	hal? ( sys-apps/hal
-		sys-apps/dbus
-		dev-libs/dbus-glib )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "s:${PN}/${PN}_48.png:${PN}:" \
-		docs/desktop_environment/${PN}.desktop || die "sed failed."
-	sed -e "s:(PREFIX)/lib:(PREFIX)/$(get_libdir):" -e "s:strip:true:g" \
-		-i Makefile || die "sed failed."
-}
-
-src_compile() {
-	# These options need >=x11-libs/gtk-2.12 which we depend upon
-	local myconf="USE_LATEST=1 WITH_TRANSPARENCY=1 PREFIX=/usr"
-
-	if use acl; then
-		myconf="${myconf} WITH_ACL=1"
-	fi
-
-	if use unicode; then
-		myconf="${myconf} FILES_UTF8ONLY=1"
-	fi
-
-	if use fam; then
-		if has_version "app-admin/gamin"; then
-			myconf="${myconf} USE_GAMIN=1"
-		else
-			myconf="${myconf} USE_FAM=1"
-		fi
-	else
-		myconf="${myconf} USE_FAM=0"
-	fi
-
-	if use hal; then
-		myconf="${myconf} WITH_HAL=1"
-	fi
-
-	tc-export CC
-	emake ICON_DIR="/usr/share/pixmaps/${PN}" ${myconf} || die "emake failed."
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" install || die "emake install failed."
-	newicon icons/${PN}_48.png ${PN}.png
-	prepalldocs
-}
diff --git a/app-misc/emelfm2/emelfm2-0.6.2.ebuild b/app-misc/emelfm2/emelfm2-0.6.2.ebuild
new file mode 100644
index 000000000000..7ca793b2a156
--- /dev/null
+++ b/app-misc/emelfm2/emelfm2-0.6.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/emelfm2-0.6.2.ebuild,v 1.1 2009/07/21 08:55:26 ssuominen 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 hal kernel_linux nls spell"
+
+RDEPEND=">=x11-libs/gtk+-2.12:2
+	acl? ( sys-apps/acl )
+	!kernel_linux? ( fam? ( virtual/fam ) )
+	gimp? ( media-gfx/gimp )
+	hal? ( sys-apps/hal
+		dev-libs/dbus-glib )
+	spell? ( app-text/gtkspell )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	myconf="DOCS_VERSION=1 WITH_TRANSPARENCY=1 USE_LATEST=1 STRIP=0"
+
+	use hal && myconf="${myconf} WITH_HAL=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"
+
+	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 "emake failed"
+}
+
+src_install() {
+	emake LIB_DIR="${D}/usr/$(get_libdir)" PREFIX="${D}/usr" \
+		${myconf} install || die "emake install failed"
+	newicon icons/${PN}_48.png ${PN}.png
+	prepalldocs
+}
diff --git a/app-misc/emelfm2/metadata.xml b/app-misc/emelfm2/metadata.xml
index 540f810e069d..731225048652 100644
--- a/app-misc/emelfm2/metadata.xml
+++ b/app-misc/emelfm2/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+	<herd>desktop-misc</herd>
 </pkgmetadata>