Revision bump with gnome-3 specific session file, bug 478218.

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

4 files changed, 149 insertions, 9 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 3ef975dcdcd7..c2bc65d88174 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.155 2013/10/27 11:56:08 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.156 2013/10/27 19:10:53 maksbotan Exp $
+
+*awesome-3.5.2-r1 (27 Oct 2013)
+
+  27 Oct 2013; Maxim Koltsov <maksbotan@gentoo.org> +awesome-3.5.2-r1.ebuild,
+  +files/awesome-gnome-3.session, files/awesome-gnome.session:
+  Revision bump with gnome-3 specific session file, bug 478218.
 
 *awesome-3.5.2 (27 Oct 2013)
 
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 51ed386083b3..13fd461cfad4 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -6,6 +6,7 @@ AUX awesome-3.4.2-backtrace.patch 713 SHA256 5738944681ce666fab1621c0abbb4443564
 AUX awesome-3.5_rc1-convert-path.patch 539 SHA256 955aaa96dc9a1e779fa62f14d91358dc852b8101577c9b2e029cca9f68e07c96 SHA512 b5b8f42ddd21bf851e13fe0a0d844b055795979ae701a418780a2e0282cedd1ae745f00c13e5a0f5b9ac48a70c2ffbf7d9b7dd2856783a4b0434b09683947150 WHIRLPOOL a4dc65d2625e34999b2eea828d3d6889fdea4c8c661713569e298f5500d775205a0df3a6c652d8418f1b7f6baa313db4e09685f2fb88a012bdf822ec135a92c1
 AUX awesome-3.5_rc1-luadoc-fix-patch 526 SHA256 bb41476f35e655cb6849ab08c416a6cb7b34c2081b48c1a84635121ba8873649 SHA512 f03fcd34281b1c31c5fdba86ea89c30db06aef145cd858e436a9c5d12dd7798d636e18d17b8941ffc842f3a8859fc764cc737a329bbe003fe5d1d7b35c5eca67 WHIRLPOOL 33621687951f893dc26187acf29635ffd20ba17d9f8bb51961d8a68feef21b8deb781c6a962b18d609db313ec9a66e6587ad46f248c8567922a286ba69e3a848
 AUX awesome-glib-fix.patch 206 SHA256 04b6fa47de20677c198a2be5357774c473867cd1a91518b7ed9de3398abd32e6 SHA512 975cbbdc4c870326dfef643f77bc14f654c5d3634cc446fc683a6ccdc649d4c5aad2a3275041656d728793d0f5f330aeb78235a2f5e6bbf49c288e1cc3c60656 WHIRLPOOL 965a4bb0b3f01b3d0ecb255234071e76de6059fe4057acbce967ff31841cef3222dc7426d9e876f7cad5d3dafb0761893d83053df4f53a6980caf7618c00591a
+AUX awesome-gnome-3.session 93 SHA256 66d568b7d0d5f53d62be3f329e955daa863548d56ef9bb9d13df25bfce65fbfd SHA512 0530d7c1f5239cad9cd32bbb37bab449fe79fe6d658037a31d4ab29936dc119a41f8de66bb321a3fbd5fd300b378930466073624d7a30f089dda9c0ad3897829 WHIRLPOOL 4fc3d144f5f8e46016de7ac65afb8cd748c0b47d25b3e0b7e49d39a2a15f32c72923bcdeea7f0496de6f923b97ec548a780bfdba2b712fee85423c4924664250
 AUX awesome-gnome-xsession.desktop 192 SHA256 77f6cab573724a9c8b204dbfa21ffb6a88b97c9bb8877506d480c02d0ce6fd3c SHA512 772954a6938b85775b77317660f3ce6b8bf68104159d6935b128cff9782b7b1f0820468e061f145f6486ddf66e11c06e9f08621f0c18955023e1ce5fc1637f81 WHIRLPOOL 84e9930424a19ad592c0f5e69c6bfa9948ddd75f8a10ee9afd12a091deb049d7d11ea0ffd7b09651752233999b1870edccd55649d7ca106d7b8c007c08b0237c
 AUX awesome-gnome.desktop 117 SHA256 133eca4c330eb5b5ee40dae31bbbd98cb92c49d5d7e60cd3a91857ce0bb158f4 SHA512 0cfeb1a2ae61cb3f766a2a176abe188b9e2fefa4dc76db426c0f33041746f9ae12bda462e0b35c1269837dc4483f70c2dd9d9deb0b43229216f973384bf78dff WHIRLPOOL bd9cf0d21b2c7c884418217eaa761a609b527dd7c584dcdf6a5f09be6fffbe711f69e3e55ff56aa7c7cbc957bc4343372516ebd09830e253cccc911bce32fd90
 AUX awesome-gnome.session 220 SHA256 e17e3a7e97f569d36f7e35b5e20f5292a2ff56b3036738ee4b1c0b706e2b627a SHA512 86246ddd9db41007c23735d0773b5c6d37eeda33318d9e3e33f57fb46befdd32380aaf9fb6bf539a9080e5f2400ccf5d7de55842c420c458b8e8d62a5edae09b WHIRLPOOL 7b1ed26bca8819863b53d59103dd68a0bdf6f0e0e5e4c8ee0c1aa8ca9d0ad38b9ba15afaa50b8f30e85f33c727462071217eab671168b9fe073dad75124d2139
@@ -18,17 +19,18 @@ DIST awesome-3.5.2.tar.xz 715164 SHA256 188d65b02a8ef905be43f126e2591b0d3caf84e0
 EBUILD awesome-3.4.11.ebuild 2737 SHA256 60430be3a096f2ce547fa0e79c40559b743dfeeee5a9681976138dafb0908240 SHA512 ae4576c8cabf0a3fbdae7c6cf717d94fb680f774be63a77f87d0b168ae102f9695d9f2510c0d9a132313cf50818ba4c8ea3420f38d85be4ad293a367d0a7d80a WHIRLPOOL cadd6d805c40d9f037923cf94c8fe4ca36f6edfc75a2c91cf8181177687cf3f43a56d712a072c3fa74a21076ba91eb161431c3fe2b3bd8fd27a96bcca046ee54
 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
+EBUILD awesome-3.5.2-r1.ebuild 3224 SHA256 9de42444916abcac4617e7fbc305ac7004fe3d960c57192ef4786d833a5d0994 SHA512 e6d42a43e1e3380e7b7c6dddd4f0e89fc60d887590b93895c9f67a073045f2a3c37c37770f353ad73ad28e67a0ab679b80574a7fc9b3e6234fa640f52f70dfda WHIRLPOOL 2df6a0ce9f196aeb9052f5c57dbe703953259bb88e399ef8129c851877ced1a62cd2487499a7fda9362e8c5bd1708fecb8754dbfff76e5fae02cef0aa8b31589
 EBUILD awesome-3.5.2.ebuild 3196 SHA256 c742b87fa2a2729ee4816925571a440e460b283667c521dac9997292b0357d7b SHA512 e38349effdc3755b64510b4adb0fe564a70d5e0cf1531751159ba8caf09a6a2ea8f844e6b82bce1b670f445da65165b7f5891581d7f79e6403043077744efef5 WHIRLPOOL 12860cb7dbe527ed2409833d6440fbefae8f3e8f62fb26033e031b9ad2e6ee11dcb20b576f2ada583d4159449223605a666578cd531e88e5cf1c7bb7935195c2
-MISC ChangeLog 23643 SHA256 19f64e9616aec7d52650bded742b1c09f5825712bfa5e2dd01f36581cc7c058d SHA512 e781bc513f612fb935f27d4cdad5b0350fac1e339111856a803f57c8d7be3425c25e5abe8bf74902317c0beaed2188c4be4050ed79adbcea41134e9eee0820f6 WHIRLPOOL 341d37505488d9f231d668ccd90720bc34a903238468d9da22af6265fe590436b6b71746013750d2f0c3f164d8d0e4b7587340bcbaa42f351908beea0b112600
+MISC ChangeLog 23882 SHA256 06344194057c64609aa41d0b33cd7ae08ec111323bc04d2218da2c63401b121c SHA512 83c600966f25074c83ea7c6c27481b08b087dc6f378312efa08520cfe7c831bcda46b3705aa23f8ec0a79ba0c86160b45d59c45bb3ac3f61b417883e7085047d WHIRLPOOL a4dc6fbe1e7bd4f3b6da74078f1eb6cf0cd11944e11ddf6c0cc20e9bc47bf0d53f0951700513bb8d5132426c91add8616b15404e499f252f3a5c3b9afb16302c
 MISC metadata.xml 460 SHA256 e4608a7ac735a47fae70d1c46328bcae1e90320e07b7c8f84afa307186b07cef SHA512 6b07732fd787e009faa6f112e0e2f61655c99890304baa1f3246ed0293d51620f84b961372abc00a600275dab0d63a9952ed40a46d54b6d549bf23520ce6d031 WHIRLPOOL ac58565a9b5c381c38b80ea5b487f8166ecccd041d8e8d30a3c6c0c87a8cc8e4a268c0fd29abf7c621bc271bed54072aea1816c933addf9a49b273a03571fb5a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSbP7aAAoJEAmJmMX429remJEH/ROzKzhR9OfD52UXHXdyOXy3
-pcnPpTjXHVZEWNnRMordeRG/EsSI30/M1Cnlz+pwGsqULSXhzds03met8RcUIiRN
-Kq+Osr6tICbb5z1XTiTkkEo7tEG1Tg9/WOIdbgPD9+4otcxAzficbwG9v83s1o2/
-fQjY9Vs0qxNZpGfpChVB9H+M4qfAt1qeYFk8vVrTS3f9smZthiXWhKsgT8eY0zOc
-VXvsNEsugWm1WUihQ8Acn7Ckbk/yLhEsWkQVwW/I621jTFPqoQuXC0glNf4XAR5o
-xjS24rPCYVcephZCGcREQPQd1LHeQVKJcYMuR/jVPovJw+y/qTqWum16ctLhDFY=
-=1UJg
+iQEcBAEBCAAGBQJSbWS+AAoJEAmJmMX429rez4oIAKM8wZ2sK1N0L2BR9bUvhLwp
+8SPqg2mDSHhlu8DPfjBXTXkN4avz3frkFLX2r2qfTIiBQ0YExnjwtopVnki4lDHu
+PMZs2UxQ21M7UI/LmfNPi4cFYN891jjFogMdmQ9KGO1ea3y7ZgSmgjAsnMy/rNgV
+gRHKofKpr90T+I6+cgfh/q3NKRCKTrgU6cWL3Vrdy8NyvOE/bnByYlj7Ja99/FNq
+ma70C2dE8zXppV8V45zAlMF6aF1UTu8t2Q5T/VeKj8k1v5OHWaHaa974lheNKHTC
+cBTDePQLLBJiShcDW59hdotkVlW0+Wgw8yNldfz13HuuSFnuvTmoYWKeCcnmNBs=
+=XHQC
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/awesome/awesome-3.5.2-r1.ebuild b/x11-wm/awesome/awesome-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..153b077ce5dd
--- /dev/null
+++ b/x11-wm/awesome/awesome-3.5.2-r1.ebuild
@@ -0,0 +1,129 @@
+# 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.2-r1.ebuild,v 1.1 2013/10/27 19:10:53 maksbotan 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/xcb-util-cursor
+	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
+		newins "${FILESDIR}/${PN}-gnome-3.session" "${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
+}
diff --git a/x11-wm/awesome/files/awesome-gnome-3.session b/x11-wm/awesome/files/awesome-gnome-3.session
new file mode 100644
index 000000000000..d1bd6fa9f9f6
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-gnome-3.session
@@ -0,0 +1,3 @@
+[GNOME Session]
+Name=Awesome session
+RequiredComponents=gnome-settings-daemon;awesome-gnome;