Add x11-libs/libXcursor dependency to 3.4 branch, bug #495058. Fix session file, bug #495072. Delete old.

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

6 files changed, 16 insertions, 254 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 7b4fe975ccb7..0810de0da23b 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,12 @@
 # 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.157 2013/12/12 07:40:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.158 2013/12/27 14:16:45 maksbotan Exp $
+
+  27 Dec 2013; Maxim Koltsov <maksbotan@gentoo.org> -awesome-3.4.11.ebuild,
+  -awesome-3.5.1.ebuild, awesome-3.4.15.ebuild, files/awesome-gnome.desktop,
+  files/awesome.desktop:
+  Add x11-libs/libXcursor dependency to 3.4 branch, bug #495058. Fix session
+  file, bug #495072. Delete old.
 
   12 Dec 2013; Justin Lecher <jlec@gentoo.org> awesome-3.4.15.ebuild,
   awesome-3.5.1.ebuild, awesome-3.5.2.ebuild, awesome-3.5.2-r1.ebuild,
diff --git a/x11-wm/awesome/awesome-3.4.11.ebuild b/x11-wm/awesome/awesome-3.4.11.ebuild
deleted file mode 100644
index 68da77445abe..000000000000
--- a/x11-wm/awesome/awesome-3.4.11.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.11.ebuild,v 1.10 2012/05/11 07:29:16 ago Exp $
-
-EAPI="3"
-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.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
-IUSE="dbus doc elibc_FreeBSD"
-
-COMMON_DEPEND=">=dev-lang/lua-5.1
-	dev-libs/libev
-	>=dev-libs/libxdg-basedir-1
-	media-libs/imlib2[png]
-	x11-libs/cairo[xcb]
-	|| ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
-	>=x11-libs/libxcb-1.6
-	>=x11-libs/pango-1.19.3
-	>=x11-libs/startup-notification-0.10_p20110426
-	>=x11-libs/xcb-util-0.3.8
-	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
-		dev-lua/luadoc
-		media-gfx/graphviz
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		x11-misc/gxmessage
-		x11-apps/xmessage
-	)"
-
-# bug #321433: Need one of these to for awsetbg.
-# imagemagick provides 'display' and is further down the default list, but
-# listed here for completeness.  'display' however is only usable with
-# x11-apps/xwininfo also present.
-RDEPEND="${RDEPEND}
-	|| (
-	( x11-apps/xwininfo
-	  || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
-	)
-	x11-misc/habak
-	media-gfx/feh
-	x11-misc/hsetroot
-	media-gfx/qiv
-	media-gfx/xv
-	x11-misc/xsri
-	media-gfx/xli
-	x11-apps/xsetroot
-	)"
-
-DOCS="AUTHORS BUGS PATCHES README STYLE"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-3.4.2-backtrace.patch"
-
-	# bug #396417
-	epatch "${FILESDIR}/${PN}-glib-fix.patch"
-
-	# bug  #408025
-	epatch "${FILESDIR}/${P}-convert-path.patch"
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DPREFIX="${EPREFIX}"/usr
-		-DSYSCONFDIR="${EPREFIX}"/etc
-		$(cmake-utils_use_with dbus DBUS)
-		$(cmake-utils_use doc GENERATE_LUADOC)
-		)
-
-	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
-		)
-		mv "${ED}"/usr/share/doc/${PN}/luadoc "${ED}"/usr/share/doc/${PF}/html/luadoc || die
-	fi
-	rm -rf "${ED}"/usr/share/doc/${PN} || die
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN} || die
-}
diff --git a/x11-wm/awesome/awesome-3.4.15.ebuild b/x11-wm/awesome/awesome-3.4.15.ebuild
index ff82274afe5c..b0787c1c7551 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.8 2013/12/12 07:40:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.15.ebuild,v 1.9 2013/12/27 14:16:45 maksbotan Exp $
 
 EAPI="3"
 CMAKE_MIN_VERSION="2.8"
@@ -22,6 +22,7 @@ COMMON_DEPEND=">=dev-lang/lua-5.1
 	x11-libs/cairo[xcb]
 	|| ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
 	>=x11-libs/libxcb-1.6
+	x11-libs/libXcursor
 	>=x11-libs/pango-1.19.3
 	>=x11-libs/startup-notification-0.10_p20110426
 	>=x11-libs/xcb-util-0.3.8
diff --git a/x11-wm/awesome/awesome-3.5.1.ebuild b/x11-wm/awesome/awesome-3.5.1.ebuild
deleted file mode 100644
index 3bd8b7785305..000000000000
--- a/x11-wm/awesome/awesome-3.5.1.ebuild
+++ /dev/null
@@ -1,127 +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.1.ebuild,v 1.2 2013/12/12 07:40:44 jlec 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
-		domenu "${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
-}
diff --git a/x11-wm/awesome/files/awesome-gnome.desktop b/x11-wm/awesome/files/awesome-gnome.desktop
index ec2f237f5b2e..8adf5fcc95e5 100644
--- a/x11-wm/awesome/files/awesome-gnome.desktop
+++ b/x11-wm/awesome/files/awesome-gnome.desktop
@@ -2,6 +2,7 @@
 Version=1.0
 Type=Application
 Name=Awesome
-Comment=The awesome launcher!
-TryExec=awesome
-Exec=awesome
+Comment=Highly configurable framework window manager
+NoDisplay=true
+TryExec=/etc/X11/Sessions/awesome
+Exec=/etc/X11/Sessions/awesome
diff --git a/x11-wm/awesome/files/awesome.desktop b/x11-wm/awesome/files/awesome.desktop
index 2341f8321a81..692dced847ec 100644
--- a/x11-wm/awesome/files/awesome.desktop
+++ b/x11-wm/awesome/files/awesome.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=awesome
-Comment=awesome the window manager 
+Comment=Highly configurable framework window manager
+NoDisplay=true
+TryExec=/etc/X11/Sessions/awesome
 Exec=/etc/X11/Sessions/awesome
-TryExec=awesome
-Icon=
 Type=Application