Bump to 3.5.5, bug #507604. Add upstream patch to fix xdg icons search.

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

4 files changed, 196 insertions, 9 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 6be7f1195ccd..9c8aeb404938 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.161 2014/04/03 19:16:52 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.162 2014/04/18 17:41:39 maksbotan Exp $
+
+*awesome-3.5.5 (18 Apr 2014)
+
+  18 Apr 2014; Maxim Koltsov <maksbotan@gentoo.org> +awesome-3.5.5.ebuild,
+  +files/awesome-3.5.5-util.lua-xdg-icons-fix.patch:
+  Bump to 3.5.5, bug #507604. Add upstream patch to fix xdg icons search.
 
 *awesome-3.5.4 (03 Apr 2014)
 
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index d13b39b1c14b..ac1950206041 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-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
 AUX awesome-glib-fix.patch 206 SHA256 04b6fa47de20677c198a2be5357774c473867cd1a91518b7ed9de3398abd32e6 SHA512 975cbbdc4c870326dfef643f77bc14f654c5d3634cc446fc683a6ccdc649d4c5aad2a3275041656d728793d0f5f330aeb78235a2f5e6bbf49c288e1cc3c60656 WHIRLPOOL 965a4bb0b3f01b3d0ecb255234071e76de6059fe4057acbce967ff31841cef3222dc7426d9e876f7cad5d3dafb0761893d83053df4f53a6980caf7618c00591a
@@ -18,21 +19,23 @@ DIST awesome-3.4.15.tar.bz2 762323 SHA256 4207f5cbed25d0e7ab35157165d923c2ccf04f
 DIST awesome-3.5.2.tar.xz 715164 SHA256 188d65b02a8ef905be43f126e2591b0d3caf84e094fb6af5501ae5ef07503e86 SHA512 e1c661dfa64e1747a15c149c445877f36380f30f20a4a39ccf1a02df95b1dc5b38337567dd7e401592b2906627716e72673772fe131189c763dc846978bafd48 WHIRLPOOL caec16cc014bd9ed93c4feec8cca40989cc4a66fd2a6816db65654b66e861c6cc2554a7c5e0e587124f4a96d34ddcd6c2e2845f5ddd2a725048d442361c81407
 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
 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
 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
-MISC ChangeLog 24971 SHA256 273d24770c0af22e33b3951647966de1899e3a2fd1e7d5ccee0baba70db9f65a SHA512 a068dab974dee442f2bce9f516700d4e35d1d9caddbeb6457f0aaf1c361981c163a966bd1a2676caeb1fa5ec6db993765b8aaac8aa75e591698a6b5753d190a6 WHIRLPOOL 958dad0372cafcf7cec0e15b7567af8d02a4f0b5a49dc6b175e4beab972c95ed8353843715ca7ce2997bf810baa0ef77144314af13942bc88b55323b89f68dde
+EBUILD awesome-3.5.5.ebuild 3301 SHA256 f010c935f1eddfc500d000f8a2966cf6fa4e828647fb1bf32607217c9a249bf6 SHA512 2c066bc9c627898e19040b12d38e5f5d3dc9844b8df4cdf51edd6b07291bdcbf2e4069588feb92f8d4cdfc22417e5fdc86db56bc2a6a8f75591ec0d94ce0d603 WHIRLPOOL 5a5f7bb0db709ab077c418a3c5cea3b7a999e2faa82ffd4b2b7e5a489fe0fc3e81169abf85b03179b8d88eeace219193eebdae352ff85021ebd1ed4e0c3373ce
+MISC ChangeLog 25204 SHA256 5ba3067217baf17451f48b072e488409ed9dc76042f49d158a11f68d3b200292 SHA512 e2595917bde6ada8ac3426d03b3ecdd9b32abfca4e5b46d2be0a75383c8459f13cd569ca2a7b0520f47becc5ba1ae9cacd095dba5bf5041040436f23046c1c36 WHIRLPOOL 807e3686653576c468c471301e16a76bd6a5ae827d0da447889f1c0080a0384db45dcefe008fb292e48c3f8c24233f98a74f0f2650e47c9cb5f86344a74bcd6b
 MISC metadata.xml 478 SHA256 d2ac170007be9cb6094bf67258148a85208ea7304d290d6859d006074e01389b SHA512 3a0d55b153f3c4a18717ab34d11b81331fb954c43becbe6003227ca1164628af6fa03295a9f029beede2e99f12f97b80094b1deb9c2bf2628cb9db11d297b50d WHIRLPOOL 016dfedc74bde0a925e22018f9ed96cd4bf850d908e345df3459f51bb839155d5bca44e95f83cb6869129962443b9cde46e810328bb1ffe439fa358a74262015
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTPbOjAAoJEAmJmMX429res3QH/3c3sqh6I0LI5P3xOHtDUwu1
-eL+6Ymz0uAThhM3muXYKPci+r8uL0P/Lo2kJGgqRzBCzye8DcFDhw2zspthDmQNU
-n/t5mm8Dnyh3+Wi0uRb5+4fcQePhw1tGYs4cE9TTfC0S7qrJh3utc7TW84Gjxk3M
-YHwPGHvmM0BA9IScxqSLgvaQjxJshlnsy1AnV1FmDUfo55IQ+jM4zGP14QG+qORY
-K+z1YVnewmwYKyBipvv7oA06HvHA/R+7I2kw9KpD0XBxsTFFs1nHxel6Hge5WYEs
-5AyygbGm+6eYqoaBeyLPXZjfNh+s8P4wSUC8KqZrX0tbcHtHA/IWLD/FL2Z/uho=
-=nqwc
+iQEcBAEBCAAGBQJTUWPNAAoJEAmJmMX429rewAIH+wXwegDjkTjpKoVb1X/6pSJU
+Da9S/Ps0IVCzplhgd2c5f0BEitqosjyHFvtwvHKtUlqbyXQQ2DnRDNGIpYxlkFT2
+PUg0bb4N4RfqFY2aKFIyRBZiYMS0rTNUoHYaLticXEP+OsKJZXiOYBAdLAKbdbAn
+CiQuEo+JhcYKw7YIvm6TWw9tpR4a6BYYrHEmilwcuF9C9qCPixwcTmT+rSGhZVGJ
+QOdec/nVeCVa5bh3cDB3OqS/f/ZY8WwzMxtxVCJXO2pQGk8Coy497lSt+/fR8SYC
+5f6VE637m5dxBYnRboF8zjLth3Emh00PzmmMG4EjVGNM4DpAhTqqRbNKdXQLQgU=
+=N6eH
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/awesome/awesome-3.5.5.ebuild b/x11-wm/awesome/awesome-3.5.5.ebuild
new file mode 100644
index 000000000000..29343893cfc7
--- /dev/null
+++ b/x11-wm/awesome/awesome-3.5.5.ebuild
@@ -0,0 +1,132 @@
+# 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.ebuild,v 1.1 2014/04/18 17:41:39 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}/${P}-util.lua-xdg-icons-fix.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-util.lua-xdg-icons-fix.patch b/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch
new file mode 100644
index 000000000000..588f9ab9ec52
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch
@@ -0,0 +1,46 @@
+From: Uli Schlachter <psychon@znc.in>
+Date: Sat, 12 Apr 2014 14:15:11 +0000 (+0200)
+Subject: Merge git://github.com/Teknocrat/awesome
+X-Git-Url: http://git.naquadah.org/?p=awesome.git;a=commitdiff_plain;h=d76d3e0b6a00b8b289b3801ba197e0dae732a92d;hp=1090719d677c86e90a1394a34f0effb418728493
+
+Merge git://github.com/Teknocrat/awesome
+---
+
+diff --git a/lib/awful/util.lua.in b/lib/awful/util.lua.in
+index 1d35f2f..123c4a6 100644
+--- a/lib/awful/util.lua.in
++++ b/lib/awful/util.lua.in
+@@ -185,21 +185,24 @@ end
+ --             of the dirs are searched first
+ function util.geticonpath(iconname, exts, dirs, size)
+     exts = exts or { 'png', 'gif' }
+-    dirs = dirs or { '/usr/share/pixmaps/' }
++    dirs = dirs or { '/usr/share/pixmaps/', '/usr/share/icons/hicolor/' }
++    icontypes = { 'apps', 'actions',  'categories',  'emblems',
++    'mimetypes',  'status', 'devices', 'extras', 'places', 'stock' }
+     for _, d in pairs(dirs) do
++        local icon
+         for _, e in pairs(exts) do
+-            local icon
+-            if size then
+-                icon = string.format("%s%ux%u/%s.%s",
+-                       d, size, size, iconname, e)
+-                if util.file_readable(icon) then
+-                    return icon
+-                end
+-            end
+             icon = d .. iconname .. '.' .. e
+             if util.file_readable(icon) then
+                 return icon
+             end
++            if size then
++                for _, t in pairs(icontypes) do
++                    icon = string.format("%s%ux%u/%s/%s.%s", d, size, size, t, iconname, e)
++                    if util.file_readable(icon) then
++                        return icon
++                    end
++                end
++            end
+         end
+     end
+ end