Bump to 3.5.6, bug #536304.

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

3 files changed, 151 insertions, 16 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index c8a39689fb29..6b637c72197b 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/awesome
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.163 2014/08/25 03:32:27 prometheanfire Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.164 2015/01/11 19:28:57 maksbotan Exp $
+
+*awesome-3.5.6 (11 Jan 2015)
+
+  11 Jan 2015; Maxim Koltsov <maksbotan@gentoo.org> +awesome-3.5.6.ebuild:
+  Bump to 3.5.6, bug #536304.
 
 *awesome-3.5.5-r1 (25 Aug 2014)
 
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 4bed76333ce8..208040ebc610 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -21,6 +21,7 @@ DIST awesome-3.5.2.tar.xz 715164 SHA256 188d65b02a8ef905be43f126e2591b0d3caf84e0
 DIST awesome-3.5.3.tar.xz 718872 SHA256 544eb343a4a059ebe405ae907bda205e7c63a550417c8ee49f9eeee6870c9253 SHA512 7d3e75ddf72a28a29b3031419485072719fe552508e450faee9e58a365827187c6de50dd11b5a8f0b41a3330456b46a7e6f67018b52891e22d4455e999137d2e WHIRLPOOL ac1a3e1555ff81b7e32f673755514f747d05eb245089094381f46e3abc4ce46e70b35c19512ef589a0e3338e5d71760a1f3b879ceb86fdc8f68d48fbdee2e2c9
 DIST awesome-3.5.4.tar.xz 718916 SHA256 b48bce31e14345f260075d528263385564eaeb204c4b673c893f77e884a24ea8 SHA512 afc221931759e56c24f89bdbf6aab9eb9059a44acaea6345567f3f77eb4663354ca7a266e9395f0b6a3068cd7f15e824a6c938987eac915ddba420050c265235 WHIRLPOOL 0a92be54433a0e91fd52aa31c95d72c3d4b8dd35f4e36094ac94726fbb6ba33f6a7b4ac42e3f81f9b94ab419671ded42d0c769e95ca90e53228147a6f3d3a1bd
 DIST awesome-3.5.5.tar.xz 719080 SHA256 bf30dbd7c4621742b2565919404f009588ea482574ddb85aaa5301bce5258d47 SHA512 2ca9af95afb8d07369da89c18f34889158dc387c570ac5f591ee05c1867d6a88197e02c29fae6666d3b684ed9a783d5bcfae995c98cbf0a5e29237f317d2870f WHIRLPOOL 94d5a5908d5b671389db5a44392ca051841e5b42e962e2420218595636897d1c7e5a5972b9e790799ba31a6c897fc02e3bd601302debd39bb4627acb4e83d779
+DIST awesome-3.5.6.tar.xz 720112 SHA256 37f49de187825425cb3096fc870959d5fec9302b22ffd0f2874d8a18e85046d7 SHA512 8d89bf46956276a8bcf106bb255c051e8382b08617e17691134a8f3e5db3ec9f7773581c02ce62d23e72499f7b1e60fe4322c211e41219b5bffd1897a96f6cf6 WHIRLPOOL 8ec944f1113f7b7b7c6857c02a6c657aec05ddf23674c75a7cf571d4a65720ed4f5f1d28b0fdac032c12ea5e9a54f655d080c6af4e1d314b8c00bf2b9e806d01
 EBUILD awesome-3.4.15.ebuild 3125 SHA256 6ca619fe4943121c54975041f5cd25eddbfe2cca58fdff8f83f5c910b7052b16 SHA512 8a615e0b9bbc56e2b856266b6078a47c72d3de49752362cdc9103a232c7610ec0e7b32a9b6e67280d2c11d9a7d1efce3d62e7e384be1203b46f687f6109fa1eb WHIRLPOOL 82e706aa6c736d2eba62da75088bd1641b4064fefe4fd70561447e2325fb9d27102171cf3baa542d5041f65b63a0bb97a809d3994223a51984efc94330514e74
 EBUILD awesome-3.5.2-r1.ebuild 3186 SHA256 3df12a869fafe20a445862bdec5f9416786b5d702fd9ed81a1e2c0bf670b6bfc SHA512 4c863f0dd4dd646d5848d19de6c60b4b00580a53a27549aaac85cb3fdadb961d9aa51f6a365a02f57220ba63d684743af1dbee76b853bf13ea98aa9fba18a49b WHIRLPOOL 9af9d4bbb6227e386a9c340f542e2753d969ee43bcc0bdafba7776902011dd2d74ec31be858d724dce1eaf2584eec561c7763f613425f6bb9dad835b4e158040
 EBUILD awesome-3.5.2.ebuild 3158 SHA256 e60491cb5ee7096ee111b1f3fc6150e5e0b328cd34bde70dd5aa7614efbe919a SHA512 934b74e4240470481483114185b0c936dabe5ce199f5535b812c06602f2fb91a87f5480022d1fcbb48c926d624822df859d90f700bc95ccf5e3d45fe423761ff WHIRLPOOL 890529ebacc3560fa3982b1f287ec80d22add56da692e0fbc5c98fbe89521c5a0cc2eb3f48fe6c856531331bc58e1392a26d1b5432134e495554b1cfea64cbc5
@@ -28,22 +29,17 @@ EBUILD awesome-3.5.3.ebuild 3229 SHA256 2a23819435d5a09af9b51eca40efe2c3c2494838
 EBUILD awesome-3.5.4.ebuild 3287 SHA256 67361b9aeecb12f263f34afdec8bb70f229c672214e2f08c4f06256741123600 SHA512 a9625f47a7077cbbe79977c480b8e3197b7f7ae540160640d618eacad41b2f22a312b9d7897e050a9c0f5fb75595dcca462b76c5af631854ca9647db4de1ddd5 WHIRLPOOL 12f3493e597680e0bd7060756c16d5beb5059635bc9bec90a7cd6bdbfe132436c6ce27272c8ae99c90010da8167ac62bb2df5fb1415160e757d91b77b21d797f
 EBUILD awesome-3.5.5-r1.ebuild 3371 SHA256 fdd8644d3c0b787bcae17faee2e836c0ca8d04d141b9927870e3b3bab5271893 SHA512 c5ee03fd0f1f61f9fd74545fcb89934298b2dbf3fb5facf5630ff9ae365b67b6c83db21d221eeb51f01dbfb242798fa54909ee338490eb954e99c5efa4b5d4d4 WHIRLPOOL c8a7bc82167733d527f98be585a7d4cc7031f6ab0603c578aafd401f14b17cc1b6436600d4a6fe6feebbe790214becadc6184ba48c5cf97e669042d1a9f0d95a
 EBUILD awesome-3.5.5.ebuild 3301 SHA256 f010c935f1eddfc500d000f8a2966cf6fa4e828647fb1bf32607217c9a249bf6 SHA512 2c066bc9c627898e19040b12d38e5f5d3dc9844b8df4cdf51edd6b07291bdcbf2e4069588feb92f8d4cdfc22417e5fdc86db56bc2a6a8f75591ec0d94ce0d603 WHIRLPOOL 5a5f7bb0db709ab077c418a3c5cea3b7a999e2faa82ffd4b2b7e5a489fe0fc3e81169abf85b03179b8d88eeace219193eebdae352ff85021ebd1ed4e0c3373ce
-MISC ChangeLog 25391 SHA256 0cac8a1f7f39d22870981a5729f1c67a798d8e8c79a02a9b7868c42274ee1de1 SHA512 ca8c8213700ec3a4c091a1ba7197a8295b8ad04eb1dd27da072f3e7d6a422b562906f95c17cb23d82146fd0de10bd4276333e163b72cbc10b40634ee13f48b4b WHIRLPOOL ce77d70d5538858fa8b3cac62efa98b955fa83842d607c14a9fd6d8898e96b4b151965cf0ca60e3e8d2bb34bc0c61129b456e72251d800b0b75b5015a55e62c7
+EBUILD awesome-3.5.6.ebuild 3377 SHA256 a2167bcaaa2dc6170d6f9a9f7ae6b22c57cd524ac3a42ee2152a8383b9c956c7 SHA512 06395584b7c07cafde957362909dfaccf837457fa4f5c3a1d74f49f1a0dbee8aa9634d15ed4c24b0b1b22386d6644cf1a453a9ca00e105b0ee27d39185810537 WHIRLPOOL ea2049573ffb7780138fddb49b0f99a3081f8fdf1d314811e1294bb3b17c79a358f569892afd501cc8fe2117a8a97fad2d3d30fde8980521730dc0c54b40bd93
+MISC ChangeLog 25522 SHA256 82ce70dde4e8dc56d6a6746cbbd362f0c2b2b150b9116653ecbc9a2d1c75ac4d SHA512 739bfc5f068aa84f80458574a981893d8bdea3e156a7f8d8529a9adbfbb2b2fc9b84587a74159c29b5be15716884b29ac10aa55cc173276a4c0bcf66f9411fa7 WHIRLPOOL 08a6d8ca92d01111c10520f669d4f32ad9d14f1e9ec19543922e0f8ffe051c50b6777548ae789d6541394ea94843bc6f2c7246207c15f6cdfde855f2639050f1
 MISC metadata.xml 478 SHA256 d2ac170007be9cb6094bf67258148a85208ea7304d290d6859d006074e01389b SHA512 3a0d55b153f3c4a18717ab34d11b81331fb954c43becbe6003227ca1164628af6fa03295a9f029beede2e99f12f97b80094b1deb9c2bf2628cb9db11d297b50d WHIRLPOOL 016dfedc74bde0a925e22018f9ed96cd4bf850d908e345df3459f51bb839155d5bca44e95f83cb6869129962443b9cde46e810328bb1ffe439fa358a74262015
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT+q5XAAoJECRx6z5ArFrDBLAP/iltjzYFewYRYyCf/sLSEC2k
-puTCcgwNjcD6opzUU42GTVPBDgl4SA8airzTJI+m9a5nAgpAMGdkcxjJNAR0khyu
-HNL2E4zrtVwQ9x7gs7vi0scrK5Tq2Rd8T0HosfyMbcR8cyg/kUgkK0H3qTdrIWo/
-9w8wX7eBXTqwx+SBGp7r2yNJ/DGP5dw4JVD0SObfboWI8+rXfvChtsG8IOGsTUWZ
-jd3zLDoYWimGzHfMCydP2jMhuotHwtINt3a4NUL0G+a3uVs5Wulxcld9x+qbPdpC
-QzQuBYvnmoHneIeWDaaCwA1YP2jQulanz7Bk4XM4GXDRLv7iy48Xq0diHqK9GEhe
-LsXZbRGU4OVMJUSuaQ4PzmihNn0zKfcw7iLLpUMumHTPpKwKa3Y1ReYMUjdhQtOk
-3w/Jrp8BghMAb9diAgx0L3MM6+P1HPQeEL/PR3jxJvI93wDktZH1MJmP7AEQZXbJ
-r/qWfQmqBgFvRbWUPd42OEHFIkPEp7wZTXPUNB9sPFla55G+Jl4YAutAfLJTlkKw
-tWRD0optSqRU+DdCkVCwFvaQzMIF6fsKYiorMS4gJj7lLke2gXFEHX1GduH59R8K
-AOCKSYLA2h33/YBrrZDXPgdU1S3EP/7gOK1tPHPwVBn6ndtIB3adkgHnmQO1MML3
-WnWLQVmN6j/Ywu7RQ85U
-=T2uC
+iQEcBAEBCAAGBQJUss71AAoJEAmJmMX429reLOkH/1Lmf/WhUVqaJttvyPT90N0F
+9V9i30lubHc/q7Kuj/Am6EALR7lTakgp8JUn/jE1OpnNRBuPO8NZnN5qiqsfmOlv
+/DJTwQe2eMd+7OJ+lAIxvTVCioHQmuAhH3yyotvfHZ5W6038LuWRJLDQ84oG84TG
++9gAOP3dGNMmjrfl7E1KgsomT5O2aHvDMEwNVIuDDanWO2iiKU5JS2bGWvxjB2z8
+waN5Hho4oulF73Pb/EoIZbIygJP9KqZtTKP2NHE15K+BPGL7UaQqgfbBmx25uQHe
+fWXDv4N7F5UhTh0YLX7ySW5Ew0mQVuVrExFufcluOolEiN4EHCDbAERQBHrRAaI=
+=2eNr
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/awesome/awesome-3.5.6.ebuild b/x11-wm/awesome/awesome-3.5.6.ebuild
new file mode 100644
index 000000000000..74fbdb17dffd
--- /dev/null
+++ b/x11-wm/awesome/awesome-3.5.6.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.5.6.ebuild,v 1.1 2015/01/11 19:28:57 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.7
+	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"
+	epatch "${FILESDIR}/${PN}-xsession.patch"
+
+	# bug #507604
+	epatch "${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch"
+	# bug #509658
+	epatch "${FILESDIR}/${PN}-3.5.5-cflag-cleanup.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
+		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
+}