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

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)

3 files changed, 9 insertions, 130 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/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
-}