Mark stable everywhere to promote security fixes to stable tree. Remove old

(Portage version: 2.1.11.9/cvs/Linux x86_64)

3 files changed, 7 insertions, 68 deletions

diff --git a/x11-libs/libfm/ChangeLog b/x11-libs/libfm/ChangeLog
index e66b7fefc8c3..5fe82017f465 100644
--- a/x11-libs/libfm/ChangeLog
+++ b/x11-libs/libfm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libfm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.71 2012/08/05 18:33:29 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.72 2012/08/08 21:20:57 hwoarang Exp $
+
+  08 Aug 2012; Markos Chandras <hwoarang@gentoo.org> -libfm-0.1.17.ebuild,
+  libfm-0.1.17-r1.ebuild:
+  Mark stable everywhere to promote security fixes to stable tree. Remove old
 
 *libfm-0.1.17-r1 (05 Aug 2012)
 
diff --git a/x11-libs/libfm/libfm-0.1.17-r1.ebuild b/x11-libs/libfm/libfm-0.1.17-r1.ebuild
index e6703d02293c..a51b7c41f6cb 100644
--- a/x11-libs/libfm/libfm-0.1.17-r1.ebuild
+++ b/x11-libs/libfm/libfm-0.1.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-0.1.17-r1.ebuild,v 1.1 2012/08/05 18:33:29 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-0.1.17-r1.ebuild,v 1.2 2012/08/08 21:20:57 hwoarang Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ DESCRIPTION="A library for file management"
 HOMEPAGE="http://pcmanfm.sourceforge.net/"
 SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ppc x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug examples udev"
diff --git a/x11-libs/libfm/libfm-0.1.17.ebuild b/x11-libs/libfm/libfm-0.1.17.ebuild
deleted file mode 100644
index b4f80ac3835b..000000000000
--- a/x11-libs/libfm/libfm-0.1.17.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-0.1.17.ebuild,v 1.10 2012/06/18 19:28:29 hwoarang Exp $
-
-EAPI=4
-
-inherit autotools fdo-mime
-
-DESCRIPTION="A library for file management"
-HOMEPAGE="http://pcmanfm.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug examples udev"
-
-COMMON_DEPEND=">=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.16:2
-	udev? ( dev-libs/dbus-glib )
-	>=lxde-base/menu-cache-0.3.2"
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/shared-mime-info
-	udev? ( sys-fs/udisks:0 )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	sed -ie '/SUBDIRS=/s#docs##' "${S}"/Makefile.am || die "sed failed"
-	sed -i -e '/^[[:space:]]*docs/d' -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
-		configure.ac || die "sed failed"
-	#Remove -Werror for automake-1.12. Bug #421101
-	sed -i "s:-Werror::" configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir="${EPREFIX}/etc" \
-		--disable-dependency-tracking \
-		--disable-static \
-		$(use_enable udev udisks) \
-		$(use_enable examples demo) \
-		$(use_enable debug) \
-		# Documentation fails to build at the moment
-		# $(use_enable doc gtk-doc) \
-		# $(use_enable doc gtk-doc-html) \
-		--with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-}