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

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xEB9B4AFA

3 files changed, 59 insertions, 47 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/Manifest b/x11-wm/awesome/Manifest
index 2463596c314c..55addec4dce3 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -18,13 +18,23 @@ DIST awesome-3.5.tar.xz 712616 SHA256 f451abbf1c814fd7206ec1e1adf9dfb3f7a2c7870d
 EBUILD awesome-3.4.11.ebuild 2737 SHA256 60430be3a096f2ce547fa0e79c40559b743dfeeee5a9681976138dafb0908240 SHA512 ae4576c8cabf0a3fbdae7c6cf717d94fb680f774be63a77f87d0b168ae102f9695d9f2510c0d9a132313cf50818ba4c8ea3420f38d85be4ad293a367d0a7d80a WHIRLPOOL cadd6d805c40d9f037923cf94c8fe4ca36f6edfc75a2c91cf8181177687cf3f43a56d712a072c3fa74a21076ba91eb161431c3fe2b3bd8fd27a96bcca046ee54
 EBUILD awesome-3.4.13.ebuild 3075 SHA256 19bd33a25f18147bfbee24d833eef5bcf5d9278f8cdb4f6d8a97f457d5df7246 SHA512 469c5f4dc904201b8afbde394f9bb6492cb3596dcff3241256247da4ef8d5e9ee434096bffb9488ac9082442fb006f78ac0183bb9f4c874892e63ac86acadf1e WHIRLPOOL ed9cb365529127a914171f4fefa19aa5dd421c396b20cdbf5e71f6f21658ef6a70691a3dd3a34da9469eab07111c7be08e914fdc3bfc4511a1352876b57fae38
 EBUILD awesome-3.4.14.ebuild 3078 SHA256 265c0fb6d0fb755a2c8cc415130d00e4498f58b83842ad2253a012c8dd18f380 SHA512 3ccb20e2d184c4efbb1cef3d8221276cc2847dcd1ab2175ccee91d14c846ad42731bf6a2cf7b36da434e253e0c65403ddcd3fff5e8f7c57f7606028425e848e2 WHIRLPOOL 883a099b791d990a7d2ec2d43ed68781a9e4092f5e9afbdd1c5c77b5e35b629ff47191453e86da08c43634ff2effa383b3c967a951ee6f8b05d90fd8d7673d72
-EBUILD awesome-3.5.ebuild 3226 SHA256 ea5227234c27864ab865a65913c56d811268817c76dddcf49fda20008ac2680a SHA512 b54f84efff4ebac3311e35ef53351fa469e8fc9c63281b0b45affe5280943a1aa23c42a6187ffe872390f3a50d08821e6a04d0c8beb0044a280951a5cf167172 WHIRLPOOL 3cc29cedec840c18fdc6b9f6f9db171747bd1acb08b033078ce3d51ddf12254d77c22ad737711b4ad8cffe2b71ceac68045e3227076e05dd052e516af17c3e17
-MISC ChangeLog 21994 SHA256 6599300a7aeac79e037f543d118286d30ae783ce294c1e73b28042c49b2666a3 SHA512 cc3e5308fc651bbe2aa3f139ff8b25d8404e3cc43d3364385fe72f8131a7d401bbe8659095a1c6227319d0f3ba7d6d63e6f8f1d1f44380d9fc21265dbdde7498 WHIRLPOOL 95c3cb243a91d391bb831476f679df9c575a08abfafc92c316e2bd39c964dbf42a8c1201644db006560882632a060b0d6e3af02da1223b6fbaa311949e12f002
+EBUILD awesome-3.5-r1.ebuild 3167 SHA256 004a99e646ac9c21f7442afd2bbc7c1f618e3b41c8c2019155e66b6e2e814881 SHA512 6b0effb240dd94a219ecb872e00ee85424ef0a5a933ed5a95a6701ef76829e0633ba7e44112186abafec1f5a133175d981ebb0a9eef2254e2b9392f94b32b6d3 WHIRLPOOL a196598994113ca399fd1817ae65bbd26bacb1ada0366a923d2af1f3c84990bad23e54400d15915da15cc708e079f3384314ecab578f7984c24aebb9b111f25c
+MISC ChangeLog 22216 SHA256 39943211ab6229082a896f620cd7aaa71b9a8ee34db847466bb27601fcb762e7 SHA512 655b6eb92cb9e2e28d7b58736f394b4429968c1f22044f86657f4a30f5d67e361ccabadbb0e339ca66917d00d7226a8d48f06221478a8b208a184fc6678289b7 WHIRLPOOL 20fba16e84961728520355f973d56f63732d26f3a777f7fd2f807f8685206f6ab170dcccc1afa3387852dd69871d26c381f81fbc8735fab2568b3a80ed699105
 MISC metadata.xml 233 SHA256 92985e7420490f46c4097d856f48cc9879772c28204c676d4d6e29926b059df5 SHA512 b0c1765cb97aebadd6f556225e5534f3521d0885d447733e72587f0747fd6a8719e70dcb9b92c5299b8bd9e2aaf5fa8c99a425baea9d3c5f02ca1fdb79b92e97 WHIRLPOOL 4df495a62c328cd563b06ff6eba86140e5541412abaea9d346d696a64c0f791d25d3397683f603e52cd31bcd4a210b8e08f58c64a288cc289c53f60c45c8ab4c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEOXFAACgkQCaWpQKGI+9Sr3wCfUFz+Kv42AHoCDu7M13Td/ft6
-RuYAnR48+vqk/8kRceArWOQE5QdQQeoG
-=gyPd
+iQIcBAEBCAAGBQJREY/gAAoJEDZF8K7rm0r6lDYP/0ZdMVlXzMz1dRXxdrc6Qump
+KZbQmfxrReL739ulzLuQf30V20/bBHZEXLhFDSnopqs6+Umh0ytMkg9zNnR3B3Vd
+zZ3pgvF5SfEleTXgCexxCWBqABnNUJ9IzSiFGqOs/Eyi5wQQKAn4ea5POmaW/fI7
+IKE7Yq9d+PsdY84dwHyRDatzopemLRNKPG7gVPe38BgE4mxhPSIWilgsa3J+gg+4
+emXBHcyLsymSM/xIrbRc5JWqlAz5EJn0eOz2iemdrrMDAJwg9fNEe+rgxtX1cc0f
+7zFq3jxYln+fknJIBjdPkXYxm4HCLvUX8szklARnHVHL4zBeHnCdhVTEIBk6BE7U
+v4Cr0jiQA48oV6H3EiToYu2JdcjZaA7MZNLr5Ak6NNUjy/3PKgf77NTBy+kUi7ME
+6RuC7PY51zTnRLvHj3VtpJ0z1980XcDGIDkVglS3A3pBigL3wVmZqn2R6OjbeoHW
+9UF8zFu/huRfECmPnnmKwaKt2qtBLsX7lcizAKVwm6kh3zHEV+QQIzCUYoe1sVwQ
+FGnIetg1GZ+Y0y2tJgeYzwhDhLQPVddb+38pONT47xcMkhpCvlZYdf/ejXaU7WU1
+i8wMJkeghYWhvsNC6gWKUVl7kzmJqV1OCguUAHs4Brel7nhOebRILss7B+Xy/hJ5
+o+bLMusInwrAtvbyvalv
+=loqw
 -----END PGP SIGNATURE-----
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
+}