Fix desktop file issue, bug #465288. Remove old versions.

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

4 files changed, 18 insertions, 141 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index fa6a516501ce..e57cd351db5c 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/awesome
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.153 2013/04/01 14:49:46 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.154 2013/04/10 19:33:28 maksbotan Exp $
+
+  10 Apr 2013; Maxim Koltsov <maksbotan@gentoo.org> -awesome-3.5-r1.ebuild,
+  awesome-3.4.15.ebuild:
+  Fix desktop file issue, bug #465288. Remove old versions.
 
 *awesome-3.5.1 (01 Apr 2013)
 
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 50f1dc16332a..fadc6cab4594 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -14,21 +14,19 @@ AUX awesome.desktop 150 SHA256 433f5cf4adea408e38d464af8b6259efd39a909735679f462
 DIST awesome-3.4.11.tar.bz2 758495 SHA256 83fc42d4ea71914d1b456023ce53b546e22e8ccc11a73c4a39a1152d2f30b628 SHA512 7fb241d513d99a6e54653d2e57788b1052b4a4df97b1e8b4565ce2d67d06e04ce5ff9e93b4402045273ee63d387efee6b193bab9168949b6da4e6a0bf8d90d00 WHIRLPOOL e01308fc1b306164d9394ebb86fa0883c977b929275d01b2bc63504e7d4e699d63f43a2f80b658924c937fbe2ff3c5165e14ff9c1e84f8829d1f4eb74a56d208
 DIST awesome-3.4.15.tar.bz2 762323 SHA256 4207f5cbed25d0e7ab35157165d923c2ccf04fded5b3d5fc130134ce9ed5ddfd SHA512 18bb2659e1e7c18a8917f606d635e968daa31a5be4c6d93a109603aace9b5d8b5fd0b8ac1d13ba3d6f2c5c42661204ce80c5ea322088cd358ec5e164b760c339 WHIRLPOOL 74da6197f2e4e5f3d99a11e99c26563f6a145181bab5c017b7ee330041864527551a230ce6dc6109bb5510621fe874921c7caa72c095fa2be6fbdb69e02da1dd
 DIST awesome-3.5.1.tar.xz 714320 SHA256 71cd67ccf8b9c50f0142d6ab618172a01518ca3add2a0f6c245169baf9713218 SHA512 ca4bb133a20498dd01092bf6cc3b1e06c70f7ea047822cd88eba0b8c1999dfa6f94c2fd791527c15b2e6d96dc7651672ca9cf66a4eb68786142eedd4686c6198 WHIRLPOOL 72144bba0d7053210fc1fb18361178c921d1287774b8017b857d4a5b8f0337dbda56b5808122e0deb77aede2cde4cede934039e0abfb368d45fa7cead31219b6
-DIST awesome-3.5.tar.xz 712616 SHA256 f451abbf1c814fd7206ec1e1adf9dfb3f7a2c7870d4fccc51e988fb979afa47e SHA512 6ba6676bf2037fb5e276d1791fbdb6e2ff7caea19b590028c685764c95d775756688fec4500925b47a850396d05f89eca771b7b8e398ae441f4f4840eb5c9ff5 WHIRLPOOL 036395546c6dd2e31274e7c6f70b88a41eb6f0a4305739ef94115b1db3ba212803aa98287d468caaede8065a16f01c5971d752e825b8db76274de31b95724597
 EBUILD awesome-3.4.11.ebuild 2737 SHA256 60430be3a096f2ce547fa0e79c40559b743dfeeee5a9681976138dafb0908240 SHA512 ae4576c8cabf0a3fbdae7c6cf717d94fb680f774be63a77f87d0b168ae102f9695d9f2510c0d9a132313cf50818ba4c8ea3420f38d85be4ad293a367d0a7d80a WHIRLPOOL cadd6d805c40d9f037923cf94c8fe4ca36f6edfc75a2c91cf8181177687cf3f43a56d712a072c3fa74a21076ba91eb161431c3fe2b3bd8fd27a96bcca046ee54
-EBUILD awesome-3.4.15.ebuild 3067 SHA256 512609fae0bea4e4fb5b3dfdc6c97ffedbf307f590d549b1468a4edcfe9e9131 SHA512 85d65132fbc41a7045cd777df1de65ac6e73087e4a7f988e0c849e10aac67326ba15c77660b6c218c72af58f25d1846178765bd51736d429416ed34e101194a0 WHIRLPOOL 16cb3ed03453d149493030dd3d98e0ce67972603ff69db8777ad69b1fe929e4e40e7be7c71e20cba52d4e1de87e2f9b0ae32963971c1ae05f5d197640c0b7b3a
-EBUILD awesome-3.5-r1.ebuild 3167 SHA256 004a99e646ac9c21f7442afd2bbc7c1f618e3b41c8c2019155e66b6e2e814881 SHA512 6b0effb240dd94a219ecb872e00ee85424ef0a5a933ed5a95a6701ef76829e0633ba7e44112186abafec1f5a133175d981ebb0a9eef2254e2b9392f94b32b6d3 WHIRLPOOL a196598994113ca399fd1817ae65bbd26bacb1ada0366a923d2af1f3c84990bad23e54400d15915da15cc708e079f3384314ecab578f7984c24aebb9b111f25c
+EBUILD awesome-3.4.15.ebuild 3137 SHA256 92882f903b98af1cf94160522624060bd95469a5f8d70ee5cd317a2bddd37a72 SHA512 edc9fbf5d1c330cfe5b32ff00e5013fc1b616b4494ea744e8c72aeb3f1d6954869c3bc96e64e10c78114b9669a1bfe236edfb6ebbf8bf77c3970246617194d75 WHIRLPOOL b4b43071bb460efaafe35357a2ae92a3cdad2ccb6f6aa62ec301e6a90bb57e048f789bc3137387227997b68dc32748842ed07ef5b845cf870dd64de1d7ead986
 EBUILD awesome-3.5.1.ebuild 3170 SHA256 d2ec3bd126244fd475089e20efcd3bb4328f0e10d7eb9a96069c47a81cc4d7fc SHA512 2694dc8441fb4879d1a1bd9bc15b8fbae41bc6b84c761048451dea79838d5e495b2e619a68716dd0daebfe61de495bc499a2d345f9d431820eb915a2cd845cc3 WHIRLPOOL 01660ce8b584d344820f408ddd880faf60a8fb0bcfb220da97dff0544a1dbb5b1405012b80f62e82ccbe6962c800af2a7f85f7924f33117ae01100f6f5ed1d0d
-MISC ChangeLog 23345 SHA256 344c1fe419fda4f0d7e505181d2efd4781b5aff67792a05a16d51bb52248570f SHA512 d99aa25fa5d80c5ff06e509f154886d4aae51471e08025864aaaa111a0eb6a766b7c5bc3c65d7bcfe935d3feea626bf58ee63397c99193462bbd90cfd7144135 WHIRLPOOL d5bc6119bddbe11fece4f1346f462ee4e027a01156ad1064e2b7fa735e3c29748b19ec0722727545d9a9cb110a67cfdc4a15d2c03aaa57a852f1504cb7f9d021
+MISC ChangeLog 23507 SHA256 44393452e5917eb622b2402d34b1e91d13b6e253ea15c98d90c006446d7bba92 SHA512 7aeb0dc372bb73f803c2acd3e7f1f58bf08a141159afa97d72845fe56e9650399af4e0a9e092384ddfbda9f9e50dd1536104bd87127b162870d11a693525fd42 WHIRLPOOL ad1fd8bc181e5a5cbfed98f29125d620a8d15d6845eaf27663261460b83381835f5c4ca506f735d30e13c9692d3540023c5265d72180d9a5214cb1776ef901e1
 MISC metadata.xml 460 SHA256 e4608a7ac735a47fae70d1c46328bcae1e90320e07b7c8f84afa307186b07cef SHA512 6b07732fd787e009faa6f112e0e2f61655c99890304baa1f3246ed0293d51620f84b961372abc00a600275dab0d63a9952ed40a46d54b6d549bf23520ce6d031 WHIRLPOOL ac58565a9b5c381c38b80ea5b487f8166ecccd041d8e8d30a3c6c0c87a8cc8e4a268c0fd29abf7c621bc271bed54072aea1816c933addf9a49b273a03571fb5a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRWZ7AAAoJEAmJmMX429reXYoIAIY5Zb8t+Vj4y4hGL9CmNPS9
-KrCJdQJ2oLpcI6H8MgftGJTU0xocju0Fy/zPRoGl5Vu3TZm7ljR3HI1s1xUsOEW6
-15LE/rs+Z73dNmuWqVW1P66aJcLsL/QNq40ZX/0aebXnKgN06600nZcBJzsEENku
-w+Z/rEqqqahssZd72DJoxDD4ijmC5Sg/3N2dYkjhaSnnv57f2SmGe8V/uAcVSCqK
-BOLo9oygMdHhe+qk67PIuJ3bVJgON4NcUk4Nwj8MBCNa5Xx8n82ndIOo4WKWGka8
-N79BLvzI8y72nuDVoqnPwYM7ZHU8W4HQ+6hmqDGQOeEFQRFX3ipa6NCs+RYQRKI=
-=LjvU
+iQEcBAEBCAAGBQJRZb67AAoJEAmJmMX429refToH/iF8yVUqtjYBqjLnLY04ZJXQ
+cCxeAa9WsnIoXRCupXwzpP7YI8dmGMmsblsWZG1/ntAcL6rWwHIe6dQESaVeXU/J
+nN6Pt1gt4lDeUwHsLl2qQGbltpBS5ZpeuiDlIY6ktUQQwlRttAMZLrim1nSph17R
+xw3azO44eTAitWI+4uIiktFclCSUE4SnWYOjNQWm550Z0Tmofa/TgyTdSOtPSsW/
+nE4qdOrvaEgDyR9dCEC00oTNWQuTQVuxIaDLvx5HLzQtO8dY2GDQ9irnp6bK7cl/
+AJ9Iki/i6e2ayxk5c/sfoBnMmKXXTYcnSpzUcEPucrz5DG3XaJN27a8h2JW1VFE=
+=B/yA
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/awesome/awesome-3.4.15.ebuild b/x11-wm/awesome/awesome-3.4.15.ebuild
index bcd93c807295..2f8d6736aaa5 100644
--- a/x11-wm/awesome/awesome-3.4.15.ebuild
+++ b/x11-wm/awesome/awesome-3.4.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.15.ebuild,v 1.6 2013/03/14 07:14:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.15.ebuild,v 1.7 2013/04/10 19:33:28 maksbotan Exp $
 
 EAPI="3"
 CMAKE_MIN_VERSION="2.8"
@@ -76,6 +76,9 @@ src_prepare() {
 
 	# bug  #408025
 	epatch "${FILESDIR}/${PN}-3.4.11-convert-path.patch"
+
+	#bug #465288
+	sed -e '/NoDisplay/d' -i awesome.desktop || die
 }
 
 src_configure() {
diff --git a/x11-wm/awesome/awesome-3.5-r1.ebuild b/x11-wm/awesome/awesome-3.5-r1.ebuild
deleted file mode 100644
index 09967ab5303e..000000000000
--- a/x11-wm/awesome/awesome-3.5-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.5-r1.ebuild,v 1.1 2013/02/05 23:02:52 wired Exp $
-
-EAPI="5"
-CMAKE_MIN_VERSION="2.8"
-inherit cmake-utils eutils
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus doc elibc_FreeBSD gnome"
-
-COMMON_DEPEND="
-	>=dev-lang/lua-5.1
-	dev-libs/glib:2
-	>=dev-libs/libxdg-basedir-1
-	>=dev-lua/lgi-0.6.1
-	x11-libs/cairo[xcb]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libxcb-1.6
-	>=x11-libs/pango-1.19.3[introspection]
-	>=x11-libs/startup-notification-0.10_p20110426
-	>=x11-libs/xcb-util-0.3.8
-	x11-libs/libXcursor
-	|| ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
-	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-DEPEND="${COMMON_DEPEND}
-	>=app-text/asciidoc-8.4.5
-	app-text/xmlto
-	dev-util/gperf
-	virtual/pkgconfig
-	media-gfx/imagemagick[png]
-	>=x11-proto/xcb-proto-1.5
-	>=x11-proto/xproto-7.0.15
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DOCS="AUTHORS BUGS PATCHES README STYLE"
-
-src_prepare() {
-	# bug #408025
-	epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DPREFIX="${EPREFIX}"/usr
-		-DSYSCONFDIR="${EPREFIX}"/etc
-		$(cmake-utils_use_with dbus DBUS)
-		$(cmake-utils_use doc GENERATE_DOC)
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	local myargs="all"
-
-	if use doc ; then
-		myargs="${myargs} doc"
-	fi
-	cmake-utils_src_make ${myargs}
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc ; then
-		(
-			cd "${CMAKE_BUILD_DIR}"/doc
-			mv html doxygen
-			dohtml -r doxygen || die
-		)
-	fi
-	rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed"
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN} || die
-
-	# GNOME-based awesome
-	if use gnome ; then
-		# GNOME session
-		insinto /usr/share/gnome-session/sessions
-		doins "${FILESDIR}/${PN}-gnome.session" || die
-		# Application launcher
-		insinto /usr/share/applications
-		doins "${FILESDIR}/${PN}-gnome.desktop" || die
-		# X Session
-		insinto /usr/share/xsessions/
-		doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
-	fi
-}
-
-pkg_postinst() {
-	# bug #447308
-	if use gnome; then
-		elog
-		elog "You have enabled the gnome USE flag."
-		elog "Please note that quitting awesome won't kill your gnome session."
-		elog "To really quit the session, you should bind your quit key"
-		elog "to the following command:"
-		elog "  gnome-session-quit --logout"
-		elog "For more info visit"
-		elog "  https://bugs.gentoo.org/show_bug.cgi?id=447308"
-	fi
-
-	# bug #440724
-	elog
-	elog "If you are having issues with Java application windows being"
-	elog "completely blank, try installing"
-	elog "  x11-misc/wmname"
-	elog "and setting the WM name to LG3D."
-	elog "For more info visit"
-	elog "  https://bugs.gentoo.org/show_bug.cgi?id=440724"
-	elog
-}