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

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 22 insertions, 84 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/Manifest b/x11-libs/libfm/Manifest
index 2319974d826c..d71648642e5a 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -6,26 +6,25 @@ DIST libfm-0.1.12.tar.gz 607593 SHA256 9746ce0c1771c7156214058f6972f6e3594d9612c
 DIST libfm-0.1.17.tar.gz 874556 SHA256 1740681cff4cd4c5a2eaa9805d8898269cfb6a49a0bda0acb242def15bc7131b SHA512 83d62e78c68f5a212dc464774f4ac9a965f58741b9cc31bf6599c7304e0fde668edd99e33a2f9d19d2c342483d92ed36031c388c92c858c55217e47b5c8ba044 WHIRLPOOL c55471431e4130cf96412cf4943e993954139c319dd5434f1d718d9c0609a12bde3dbb8e43b889bb4cefd300e5073b59b4b8fe6eeb732d87d52d8a9d536733b4
 DIST libfm-1.0rc1.tar.gz 985089 SHA256 5e6d48224806d0b5bbb747ca1edabb23f6b0624509af738aa8950e0777d32b86 SHA512 12af732321a99320ea05e2692877c9d9631a83394ceecf559ab84874599f6d7646d353595288e2260ae0af83ae6faa1f5f33247e3eba80da6185e8168102629a WHIRLPOOL 4daf465390a7b8b2f8cee723c61b4fb2d7ed33a5d54b33a4391a1a1593b6ebfe661e5bd4b9a115cc1278c6bae3f9b78675e892f9ef2dbc6608b9ba3381e2ad89
 EBUILD libfm-0.1.12.ebuild 969 SHA256 8c5ce87baa0d208421a814da39c8dec70ab3ec7a491c4ad80e88da9bb1eca269 SHA512 10707a598a0475b557e2f2b25c1b03b962a38477a52dff21e1d5f3b3525117c826947001b748e090de88c983aec209498c598d4914cef6399cc46dbda6acbafc WHIRLPOOL 681a54e044bda97c56a655e2705546d3aa911b11f71d90a04b6303056b0402a68011e93c45a15bf1087669efab60fe8106b0a2abf1b8c2bc6e26a83a17391040
-EBUILD libfm-0.1.17-r1.ebuild 1748 SHA256 e5540d44a5918710d1151e43f0e78b63c74e96420e592810280f24336297d3d6 SHA512 9696a2fd9cb4d3d7f1f7e518a7a3f118ff085b13c82f9278f44cdb420dc62cd09fe5850cb5f1f359f56cc0b0ec4c046fe45cc574d9b8c25a503532612f2cfcc8 WHIRLPOOL 2a2badc663770c94df37f2934dac9e1cf945312c23ac10954f51fc151d7ece611fe2a1bd45609bef487c69a6cd79be670a350bf8923823f6fe7984913d43ccd7
-EBUILD libfm-0.1.17.ebuild 1680 SHA256 4f09a6a35e4d3aeb1f5d5922215dcc87b3f1c9a20334ea44cf20adb94efc10b4 SHA512 cbace0c7c50af116ccf6fffe2f64b26d17d1f146c6f49f0be514f091351622e74ee100745a7cd148b013039e4e2620953c1ff2902c57fcdb00121d3d968e02a0 WHIRLPOOL f079e0765a11a27c530b3daf289e08f1b93948bbf7e210ce88affbaf6530db7e0b21b86a1e30c8eb8b024218281cf0ac10d5f693268e35c61ddd5b9951d85ff4
+EBUILD libfm-0.1.17-r1.ebuild 1744 SHA256 f95b9a221f951124a89b7e067b2534bc8cb98131e3112781e5f0de2106ca5588 SHA512 60400b6633ce414d29b6797904d1a3eacfb3d372e89cc765a822e92a2ba6f26294401d6989d0dd3a939b01572fcf5f89eedd6416ea15cfb2e8eed7cf45b99f90 WHIRLPOOL 05c0eb3b9813ccd33fa352e5904928e6f8fbd48a325832765a294a394de951bfa5fb2113cf3be7d786c743cddf8ad75b291bc9a5915d5a0de6083f7499f7b519
 EBUILD libfm-1.0_rc1.ebuild 1749 SHA256 0f7dba52d37428bb0f8e7488e4bb742e0eb3ae80b3961f9270f186b90371b43f SHA512 de86913c086383e90922c4230cf47f17383bd2ffc272466bf818ba551c72ce08a3987c9a036ba024fc4e43817b50981c020c9dff6e35d6315d38bcbb2955ed8a WHIRLPOOL c3becb0394feb366c00768a86ba13e2d232559bf9438ed3b83b1234a09ce09f96968f841afc0a29e08062581fe9238c0b4cbb25b04c40cc1559114f672031737
 EBUILD libfm-9999.ebuild 2270 SHA256 24d76db7371cd53e0ee3542636b6b4575eea31c3a7e42e4c5b0fb23f2e3a343a SHA512 86a0460b7faf22a30eaa448793e9eb9ee69485ce04b741df6130af5a3fecc6a8d0cd40e00ce580150c4c524d874a13aa5656d4a5468c9f67c08cf3fb6177b0d7 WHIRLPOOL 8768eaf303bc6c5d2ff29aea14089c9515a9de65b4baafcc4b426e41239fc8316e9d26ff90d1e7333bdc4689e0ebf7f721240a631b97717247ffb6eec997cc41
-MISC ChangeLog 10240 SHA256 bbe27360ba8928a0b2bd60a3895d6d5681979b03289cf58203d80764ff0ae64e SHA512 35edfd3abb66414187bc44b8b402fa4084c9bd231a439ff5f3cbd1d7edd3e88264a0e68d6f6a252228d29dbd5249e8b3f404fc160d8210a8546f5e736372948f WHIRLPOOL 6134b7ae770a25df7877df0361d30d8f6a695268680077036485991a814d818bc4b261637b629fc472d15281e871f3dc6c847998ae4fc80897562529652a9986
+MISC ChangeLog 10420 SHA256 5dbb7bfe7ca9b66de07efaeefd8ff301392cb2cc435c098cb554aa6a3aeea2bc SHA512 12af762609dd0c0d8556864bece1a7f461681823fb6dd5cc319cb45122762556b5540bc6b0613626424e1173dbf4bc8b4c6d6e6807e7c306f74eb1c7e5850625 WHIRLPOOL 802c69ac8a0a65c8a665a68325081ae9117b7a788acd5d41a16ae60e6573f32f050c3c9207990b5c9bbf9f3033d5a15a130cf7d4f2ec18f5a56c171dcb862647
 MISC metadata.xml 315 SHA256 1fc7172db4f825aa57aad8210f32c984d470b65c608f2e3cb6bda786c5902cef SHA512 5eeebacbba6bcd6d7439a18ae040794e3279ff55abb5f7a912e6d9f4503aa40db93493439b7d2d38dc7d0cef0c4fbe5c506a012f3f769545958a61c9e238548a WHIRLPOOL 2c483612c6f66e0d45fe04ec9b5ddd46c5a6f4e0c8b303cce2fcf78be365f79323cf3ed0d47b50d8c5d0e9673dce9776ce558cf6de0cc42f81006cb7e22c1787
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQHrx+AAoJEPqDWhW0r/LCalsP/A4DdcePktVm+h6cksrgMbdf
-b3dAnQPjA2Ndq0ypKbTkrnFUiPMtvc0F1/8VLIeo6WiccQ56X9RdpOETNKN/Dcgs
-az9twE5Az4V8votaIvLxTXPuIV23+UA0PjRSN0wbUxSGh5GG3uVRXVgvbuxI3bA7
-ufmEbaC8De8eq1yOz0tQ5f0wrLTpYjP1DC+ilkRbmDOcYhxAtew5UdjaLJ2dmOm2
-DUqBfAC1wDtgrQAZXBTr8l4ZtmEBvSfKZJbaSM3R2pCH5GzoJFyw26hniY5UO+XX
-iKsefXFG5pJ8sG747enJ7055kpvM2kZYaT00ZAjXBZKECDxTP55La3fyMfehBeCz
-sydSSSC9/C6N7JcFWfLAAFAgWozwD02IrsoIXa9JWJDs1olsPOSLCt5xNhkBehxy
-r9djeRR1X7tmArp9yoyxN2dXXfGR+gkOocjmwoxs18KC1dhzj3hgtF+MNmMWosXs
-QsmFqFl6QJyA0Fwl5eZ4XMC4H0gvQSJspXaKrolroDhcPnpYtDFQ7JX7sZqIf3Bz
-0uzpEt2Hdop70lHOhRr4hoGRzWkm/SBukib0wSGYIBWwZnQXLLxElK/feDwvu1xa
-9lUGYDTQ0nG+Rl+/IYaK+kNV3rSfqEqC/F9R5RYQ4ede4xKaZZYelm6ITPIaEQvJ
-KA5Y1GkDzVlEXazIIoxW
-=L11Y
+iQIcBAEBCAAGBQJQItg+AAoJEPqDWhW0r/LCi/MQAMI8jeF+AOMuIcRktDOTr11e
+tu3JtsiaN1ZUgfUXcDbWX+h+IRpQ0LEyuw0RDPMc9mjOy8sGKkpTIVuVl+6zAYng
+pB4JAekexF8StQcBiB4PzXXyK4ErWvRuwmgI9S9hvtbv/C3xFlLHFEAJ1BiQPlpg
+rZzubOm0bnZQaunVUKStJCCG+OFss0vwcuITOAk/3o/zD9+/iVpROzEilLDhno3Z
+VfIjbviotfjc66tFWk/WG+qnk7W2UN1HAMpU+T+YBBbYB8jP2YECrfn+wN3k3bSR
+K9EOvHYlX5FmcBKAAChoTF2Ap2FHUZZRqCLksEKQTUF5zqLyEYlbtmfnekM4vTr3
+/IVYAa3A30aUFQk26xPT/Sv3ahKn2zLg9IfDjrTIrMhiW3XoWc3zhM66eneyS5yT
+JqOVuG7PT6Q6BLuYzmLt0SOdV95Y5s8tfnnePcadHoj6H/PkivbS8lcrypwAbA9/
+CpDuE1AcaH6qoJSJqitqrQZjPBwzOMq8exkUImD5T70AXf/cVbtPKg33fg8HOFZJ
+vHvYf2nqIDqsAb85vMRXKEsrzFGaVIDno8hzoC0nNB+iJ9sUeCzRcA0pRrR3B/Ne
+i6JNSDENmvKleev+aMkPzX5aNsARAuHLIQCeZNmqSMbCwkgPtnc6owdjRPwxSCyB
+2gF3J0v7e5jm6pu4pb1B
+=wHdU
 -----END PGP SIGNATURE-----
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
-}