Remove obsolete versions. Add needed intltool dep.

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

5 files changed, 8 insertions, 74 deletions

diff --git a/x11-libs/libfm/ChangeLog b/x11-libs/libfm/ChangeLog
index 35923a181861..979a2ab1a03a 100644
--- a/x11-libs/libfm/ChangeLog
+++ b/x11-libs/libfm/ChangeLog
@@ -1,11 +1,12 @@
 # ChangeLog for x11-libs/libfm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.3 2010/03/13 16:19:18 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.4 2010/03/13 16:30:05 yngwin Exp $
 
 *libfm-0.1.5 (13 Mar 2010)
 
-  13 Mar 2010; Ben de Groot <yngwin@gentoo.org> +libfm-0.1.5.ebuild:
-  Version bump
+  13 Mar 2010; Ben de Groot <yngwin@gentoo.org> -libfm-0.1.ebuild,
+  -libfm-0.1.1.ebuild, +libfm-0.1.5.ebuild:
+  Remove obsolete versions. Version bump. Add needed intltool dep.
 
 *libfm-0.1.1 (07 Mar 2010)
 
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index 691eddcd29fb..6365b935e3a3 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -1,8 +1,4 @@
-DIST libfm-0.1.1.tar.gz 547023 RMD160 c804fa5ae79832e49f036a7b54efe6d7192497e3 SHA1 a6dadf795ceee2e64fec9cdfedacfd404ed2e3a4 SHA256 7e6fbbf7db7a2abe8b844f6cad56ddf242e273b6636c15397a6d07f850aa750e
 DIST libfm-0.1.5.tar.gz 554189 RMD160 48d076db119b98ae186d56e6fb57ef22417699ed SHA1 0d233563d4d58404123d04fac8a2262ae61d0d95 SHA256 cb9a9cb9fee534f9e9a4ccd89cb153c901076f8e8544c948425db64263dc18e3
-DIST libfm-0.1.tar.gz 543678 RMD160 0c906e5b3d93c23f96837bdba154ebc3b9d5fbf7 SHA1 3429f770c1a5d0e4038fa26b6d6aa2b14f6ebade SHA256 5856b8fa3ea4053885d08a15e0e07ed3a9af32e9340131b0aea17ccb274e2c34
-EBUILD libfm-0.1.1.ebuild 768 RMD160 bab76740ca24c4221be1ec6dbc0952d895dee418 SHA1 428e07165ebf383ec7990a572c48055068498498 SHA256 0face897b3d7769f25e0307bac0d73c885411864158a9fd51a401121929f5159
-EBUILD libfm-0.1.5.ebuild 768 RMD160 32c8f6b87ef2b66db4785cbbb2c7f6fb062db088 SHA1 0e75deb89d15f4a21709d18dfb05d42b51885fe3 SHA256 2b277af25146521fac29e8ac05cfe9feb875c205f9951a0d87d872cf927baddb
-EBUILD libfm-0.1.ebuild 732 RMD160 51fc8f4fac601b381683e2c4eaee59a36be749f4 SHA1 193091a3993e10b1e86e2e516d5a68c2ced3e5e4 SHA256 a8559977cfecd19fa91ade98af2ef34d4c8a669d91a91183cf0d4b9c6f4bb21a
-MISC ChangeLog 570 RMD160 87f37520543ffcea63ffaccb77559a1e209187d0 SHA1 138cb797a407f08b2f3598b3c710da6cc842cbed SHA256 dc8a774df8786ae65d3a33572024fe4f9200ea47d64a8413c9c2cb8647dfcf5e
+EBUILD libfm-0.1.5.ebuild 794 RMD160 b0f2702b0c0783e35efe65640072c1fc3f93f67a SHA1 1b890f0c1f706fa3e3eccf989a9125d70ead85bb SHA256 5bf5fd481e69817bb7ddf84bd574c19a47c8fad85b028f72a98f986c6b1e9321
+MISC ChangeLog 664 RMD160 062b21ab34fd937ac9aeb13d1e5a4aeab720b163 SHA1 e6b114d519b88790613fe5586415afe0b359046c SHA256 9f3bc2be43bfc20c46e0616e722ef9fb6253f73ef9683229a41e68bf2db89df7
 MISC metadata.xml 216 RMD160 2173960ec6a439958fdfd0e5e055c8c8a91f2ec2 SHA1 289966de7493fc589f417260a58b2412673748c2 SHA256 eb1bca5eb304d3a8dd405f40e178b8b9adabcb55931fe9e0b984a314adc1f83d
diff --git a/x11-libs/libfm/libfm-0.1.1.ebuild b/x11-libs/libfm/libfm-0.1.1.ebuild
deleted file mode 100644
index c180d2aebad6..000000000000
--- a/x11-libs/libfm/libfm-0.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-0.1.1.ebuild,v 1.1 2010/03/07 12:57:19 yngwin Exp $
-
-EAPI="2"
-inherit eutils
-
-DESCRIPTION="Library for file management"
-HOMEPAGE="http://pcmanfm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pcmanfm/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug demo"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	>=lxde-base/menu-cache-0.3.2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_configure() {
-	strip-linguas -i "${S}/po"
-	econf --sysconfdir=/etc $(use_enable debug) $(use_enable demo)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS TODO || die
-}
diff --git a/x11-libs/libfm/libfm-0.1.5.ebuild b/x11-libs/libfm/libfm-0.1.5.ebuild
index 87dd29858fa1..e130b266e68e 100644
--- a/x11-libs/libfm/libfm-0.1.5.ebuild
+++ b/x11-libs/libfm/libfm-0.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-0.1.5.ebuild,v 1.1 2010/03/13 16:19:18 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-0.1.5.ebuild,v 1.2 2010/03/13 16:30:05 yngwin Exp $
 
 EAPI="2"
 inherit eutils
@@ -18,6 +18,7 @@ RDEPEND="dev-libs/glib:2
 	x11-libs/gtk+:2
 	>=lxde-base/menu-cache-0.3.2"
 DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
 	dev-util/pkgconfig
 	sys-devel/gettext"
 
diff --git a/x11-libs/libfm/libfm-0.1.ebuild b/x11-libs/libfm/libfm-0.1.ebuild
deleted file mode 100644
index 97d09660f2b5..000000000000
--- a/x11-libs/libfm/libfm-0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-0.1.ebuild,v 1.1 2010/02/22 21:38:46 yngwin Exp $
-
-EAPI="2"
-inherit eutils
-
-DESCRIPTION="Library for file management"
-HOMEPAGE="http://pcmanfm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pcmanfm/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="demo"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	lxde-base/menu-cache"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_configure() {
-	strip-linguas -i "${S}/po"
-	econf --sysconfdir=/etc $(use_enable demo)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS TODO || die
-}