improved dependencies, removed obsolete code, added elogs for bug #440724 and bug #447308

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key EB9B4AFA)

2 files changed, 44 insertions, 42 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 7560a054e623..bb49ea2b3c22 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,13 @@
 # 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.143 2013/02/03 12:47:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.144 2013/02/05 23:02:52 wired Exp $
+
+*awesome-3.5-r1 (05 Feb 2013)
+
+  05 Feb 2013; Alex Alexander <wired@gentoo.org> -awesome-3.5.ebuild,
+  +awesome-3.5-r1.ebuild:
+  improved dependencies, removed obsolete code, added elogs for bug #440724 and
+  bug #447308
 
   03 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due #22900
diff --git a/x11-wm/awesome/awesome-3.5.ebuild b/x11-wm/awesome/awesome-3.5-r1.ebuild
index f6c21097ec8b..09967ab5303e 100644
--- a/x11-wm/awesome/awesome-3.5.ebuild
+++ b/x11-wm/awesome/awesome-3.5-r1.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.5.ebuild,v 1.1 2013/01/04 03:52:55 idl0r Exp $
+# $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"
@@ -15,19 +15,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="dbus doc elibc_FreeBSD gnome"
 
-COMMON_DEPEND=">=dev-lang/lua-5.1
+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/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
+	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/gdk-pixbuf:2
-	dev-libs/glib:2
+	|| ( <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 )
-	>=dev-lua/lgi-0.6.1"
+	elibc_FreeBSD? ( dev-libs/libexecinfo )"
 
 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
 DEPEND="${COMMON_DEPEND}
@@ -40,43 +42,15 @@ DEPEND="${COMMON_DEPEND}
 	>=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[X] media-gfx/graphicsmagick[imagemagick,X] )
-	)
-	x11-misc/habak
-	media-gfx/feh
-	x11-misc/hsetroot
-	media-gfx/qiv
-	media-gfx/xv
-	x11-misc/xsri
-	media-gfx/xli
-	x11-apps/xsetroot
-	)"
+RDEPEND="${COMMON_DEPEND}"
 
 DOCS="AUTHORS BUGS PATCHES README STYLE"
 
 src_prepare() {
-	# Upstreamed
-	#epatch \
-	#	"${FILESDIR}/${PN}-3.4.2-backtrace.patch"
-
-	# bug  #408025
+	# bug #408025
 	epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
 }
 
@@ -85,12 +59,9 @@ src_configure() {
 		-DPREFIX="${EPREFIX}"/usr
 		-DSYSCONFDIR="${EPREFIX}"/etc
 		$(cmake-utils_use_with dbus DBUS)
+		$(cmake-utils_use doc GENERATE_DOC)
 		)
 
-	# The lua docs now officially require ldoc.lua and NOT luadoc
-	# As the modules documentation has been updated to the Lua 5.2 style
-	has_version >=dev-lang/lua-5.2 && mycmakeargs+="$(cmake-utils_use doc GENERATE_DOC)"
-
 	cmake-utils_src_configure
 }
 
@@ -131,3 +102,27 @@ src_install() {
 		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
+}