fix for bug 509658

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

4 files changed, 170 insertions, 10 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 9c8aeb404938..c8a39689fb29 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,12 @@
 # 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.162 2014/04/18 17:41:39 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.163 2014/08/25 03:32:27 prometheanfire Exp $
+
+*awesome-3.5.5-r1 (25 Aug 2014)
+
+  25 Aug 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +awesome-3.5.5-r1.ebuild, +files/awesome-3.5.5-cflag-cleanup.patch:
+  fix for bug 509658
 
 *awesome-3.5.5 (18 Apr 2014)
 
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index ac1950206041..4bed76333ce8 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX awesome-3.4.11-convert-path.patch 520 SHA256 195edd642759579a7b14b99cc9146b7a1724ee45ac5e65aeb499cb41234f7e86 SHA512 dee58a540eadb1e985183fb87c63aa697d1132525877e1a062c7fe229c0656a3f4a74088981054d3ee7a849b3ba342645538fd740f5c12b3f242cfb870979a15 WHIRLPOOL caf013d0f287cabab83b0f45d91d70e6e03acc10c8309d7cd22a1782e3cf0ddbcdaf7c6f3f4f68a426354d4deab72e1f1e31b31e69422fe25f23791f419f83e4
 AUX awesome-3.4.2-backtrace.patch 713 SHA256 5738944681ce666fab1621c0abbb444356456fcea3ea2119f732c54ef4bf3f26 SHA512 e919bb73a59ff4dc0842a74fc01a3da2de2b43af00f37909809c4a75afbd1edacf753c6e71a6622a06fdb99cded9ea8d2e52a94160289cecc358d4ec391dda4b WHIRLPOOL 11ed4ff22afc016732d11f90fa36ff182da969164190418e09e4f824178f15d505cdf2ab577f5be06b90a8fb283df2302391c866c01dcff4181fee39d39d1371
 AUX awesome-3.5.4-imagebox.patch 1138 SHA256 f058c654490f3ae1c15fa6a27a5878c052999c5ad8d1008acd6ff6b6c9164e45 SHA512 5e91b33711527697a7cc224287adadc44ff91fbd1ee5fb3a58794e59d663174e71da1c25f65a65d11cd90f7ef43bf62061c418838b6c2dec1347dc4fb0b44318 WHIRLPOOL 5755ecde857394f0d30b360ecb5d775af71d4b0788fb4eadc41410162a05e71e46b477faa2148d7fe38f36582813453ddbb2b6a2661a5fa80e69f1a5bf2e95bd
+AUX awesome-3.5.5-cflag-cleanup.patch 660 SHA256 5f5c87b343cb989e2cd9db45e89589aca6ef84d5180cf21b2675c79d9b6811f3 SHA512 5711e328839ce32789fe213c2c1d6b56e476d7ba09303d52dc5c307a97b35bbdc1c9c0d673a51b5859a2c0f035002152c762e3cd725c4231bc811dfac5dad79f WHIRLPOOL 3c486db45933634d74e9076d7a4d7d8cc90e65d627718b6a2a27c7b2fe5454c4a1b7b265140c07637a9238957d3eb3c5c283874eb7e56040725b97f23b3417ee
 AUX awesome-3.5.5-util.lua-xdg-icons-fix.patch 1756 SHA256 47491b76393565996f2df29387bd368700e376f08e36cd618129b204567078eb SHA512 8348b51a90ac9f0423de1e5ae81aeee6dc8da8e249bcee09a0ddf89c582b34f1f420ef579d58c717078bbf7eedb6cbe36782bf9cfddbe2bd27e96c726bd493d6 WHIRLPOOL b86b1d93c454e2bd291d86f896f8249df07b3224659e8f373368cf0b500a2eb10a1a66ef459ee29537c028b66198c2e82b0b37a24237a7be26c66a4b73868145
 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
@@ -25,17 +26,24 @@ EBUILD awesome-3.5.2-r1.ebuild 3186 SHA256 3df12a869fafe20a445862bdec5f9416786b5
 EBUILD awesome-3.5.2.ebuild 3158 SHA256 e60491cb5ee7096ee111b1f3fc6150e5e0b328cd34bde70dd5aa7614efbe919a SHA512 934b74e4240470481483114185b0c936dabe5ce199f5535b812c06602f2fb91a87f5480022d1fcbb48c926d624822df859d90f700bc95ccf5e3d45fe423761ff WHIRLPOOL 890529ebacc3560fa3982b1f287ec80d22add56da692e0fbc5c98fbe89521c5a0cc2eb3f48fe6c856531331bc58e1392a26d1b5432134e495554b1cfea64cbc5
 EBUILD awesome-3.5.3.ebuild 3229 SHA256 2a23819435d5a09af9b51eca40efe2c3c2494838bcc49b11e4dec11d07e92b76 SHA512 105019975cb5632afbda755ff4531fe40d87265cc9f3fc5c10714392affe6e4bf1be723db4291e5702e8bda09a0ab1043114d6f1d372d0bda368e8fda566b9be WHIRLPOOL 16d2c59f241f6e123c0aaa6874254cf31fcf266d9e67fafa498a78bba4ee199fe6a547fd4f673d3fa5626b7e0f57154407e23a52b6e92dce7f5f7c053b82db56
 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 25204 SHA256 5ba3067217baf17451f48b072e488409ed9dc76042f49d158a11f68d3b200292 SHA512 e2595917bde6ada8ac3426d03b3ecdd9b32abfca4e5b46d2be0a75383c8459f13cd569ca2a7b0520f47becc5ba1ae9cacd095dba5bf5041040436f23046c1c36 WHIRLPOOL 807e3686653576c468c471301e16a76bd6a5ae827d0da447889f1c0080a0384db45dcefe008fb292e48c3f8c24233f98a74f0f2650e47c9cb5f86344a74bcd6b
+MISC ChangeLog 25391 SHA256 0cac8a1f7f39d22870981a5729f1c67a798d8e8c79a02a9b7868c42274ee1de1 SHA512 ca8c8213700ec3a4c091a1ba7197a8295b8ad04eb1dd27da072f3e7d6a422b562906f95c17cb23d82146fd0de10bd4276333e163b72cbc10b40634ee13f48b4b WHIRLPOOL ce77d70d5538858fa8b3cac62efa98b955fa83842d607c14a9fd6d8898e96b4b151965cf0ca60e3e8d2bb34bc0c61129b456e72251d800b0b75b5015a55e62c7
 MISC metadata.xml 478 SHA256 d2ac170007be9cb6094bf67258148a85208ea7304d290d6859d006074e01389b SHA512 3a0d55b153f3c4a18717ab34d11b81331fb954c43becbe6003227ca1164628af6fa03295a9f029beede2e99f12f97b80094b1deb9c2bf2628cb9db11d297b50d WHIRLPOOL 016dfedc74bde0a925e22018f9ed96cd4bf850d908e345df3459f51bb839155d5bca44e95f83cb6869129962443b9cde46e810328bb1ffe439fa358a74262015
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTUWPNAAoJEAmJmMX429rewAIH+wXwegDjkTjpKoVb1X/6pSJU
-Da9S/Ps0IVCzplhgd2c5f0BEitqosjyHFvtwvHKtUlqbyXQQ2DnRDNGIpYxlkFT2
-PUg0bb4N4RfqFY2aKFIyRBZiYMS0rTNUoHYaLticXEP+OsKJZXiOYBAdLAKbdbAn
-CiQuEo+JhcYKw7YIvm6TWw9tpR4a6BYYrHEmilwcuF9C9qCPixwcTmT+rSGhZVGJ
-QOdec/nVeCVa5bh3cDB3OqS/f/ZY8WwzMxtxVCJXO2pQGk8Coy497lSt+/fR8SYC
-5f6VE637m5dxBYnRboF8zjLth3Emh00PzmmMG4EjVGNM4DpAhTqqRbNKdXQLQgU=
-=N6eH
+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
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/awesome/awesome-3.5.5-r1.ebuild b/x11-wm/awesome/awesome-3.5.5-r1.ebuild
new file mode 100644
index 000000000000..caf41618bcc3
--- /dev/null
+++ b/x11-wm/awesome/awesome-3.5.5-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.5.5-r1.ebuild,v 1.1 2014/08/25 03:32:27 prometheanfire 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}/${P}-util.lua-xdg-icons-fix.patch"
+	# bug #509658
+	epatch "${FILESDIR}/${P}-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
+}
diff --git a/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch b/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch
new file mode 100644
index 000000000000..3cfeaba2df36
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch
@@ -0,0 +1,12 @@
+diff -u awesome-3.5.5/awesomeConfig.cmake awesome-3.5.5.new/awesomeConfig.cmake
+--- awesome-3.5.5/awesomeConfig.cmake   2014-08-24 23:28:04.178646000 -0400
++++ awesome-3.5.5.new/awesomeConfig.cmake   2014-08-24 23:28:44.204646000 -0400
+@@ -16,7 +16,7 @@
+ option(GENERATE_DOC "generate API documentation" ON)
+ 
+ # {{{ CFLAGS
+-add_definitions(-O1 -std=gnu99 -ggdb3 -rdynamic -fno-strict-aliasing -Wall -Wextra
++add_definitions(-std=gnu99 -fno-strict-aliasing -Wall -Wextra
+     -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings
+     -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized -Winit-self
+     -Wpointer-arith -Wformat-nonliteral