Add x11-libs/libXcursor dependency to 3.4 branch, bug #495058. Fix session file, bug #495072. Delete old.

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

7 files changed, 28 insertions, 276 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 7b4fe975ccb7..0810de0da23b 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.157 2013/12/12 07:40:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.158 2013/12/27 14:16:45 maksbotan Exp $
+
+  27 Dec 2013; Maxim Koltsov <maksbotan@gentoo.org> -awesome-3.4.11.ebuild,
+  -awesome-3.5.1.ebuild, awesome-3.4.15.ebuild, files/awesome-gnome.desktop,
+  files/awesome.desktop:
+  Add x11-libs/libXcursor dependency to 3.4 branch, bug #495058. Fix session
+  file, bug #495072. Delete old.
 
   12 Dec 2013; Justin Lecher <jlec@gentoo.org> awesome-3.4.15.ebuild,
   awesome-3.5.1.ebuild, awesome-3.5.2.ebuild, awesome-3.5.2-r1.ebuild,
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 1cabedd71a8a..7d8e03a97de1 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
@@ -8,35 +8,25 @@ AUX awesome-3.5_rc1-luadoc-fix-patch 526 SHA256 bb41476f35e655cb6849ab08c416a6cb
 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.desktop 191 SHA256 cd0b8cc4450127b5363a5e11cfa41245c31bd9ea6b0570da11466a55bbe85e97 SHA512 50570e0bd7c7ef3dc39bcf0dfdbc35d44b67316da7574aaea26dedb89726b40d04e4d509fb798b36c49930f247f0293fdeff2bdc32e6b3067e4f568b30f99fae WHIRLPOOL b4f25229841268cd3aa21956364ebab9476cdc27d45734d895352dc8f8db302d6405ee49a8696c6f9a5657ae292cd6d66ff8f4abdbe292eb7c33eb5b6496933c
 AUX awesome-gnome.session 220 SHA256 e17e3a7e97f569d36f7e35b5e20f5292a2ff56b3036738ee4b1c0b706e2b627a SHA512 86246ddd9db41007c23735d0773b5c6d37eeda33318d9e3e33f57fb46befdd32380aaf9fb6bf539a9080e5f2400ccf5d7de55842c420c458b8e8d62a5edae09b WHIRLPOOL 7b1ed26bca8819863b53d59103dd68a0bdf6f0e0e5e4c8ee0c1aa8ca9d0ad38b9ba15afaa50b8f30e85f33c727462071217eab671168b9fe073dad75124d2139
 AUX awesome-session 1999 SHA256 bee150a5b32a118c905ffe26df3f776f40a2db19230f6600cc2966b6c727838a SHA512 b6e7cc0813569b448b030cb8516d0272ebcf60b96f680b7de43dc4374e6e2d85b9bd841c6f1ab62caca52120c303332653e3de38eca0fe6a813b9bc5b68ac8b7 WHIRLPOOL 467116cc409accea0e2a083536d2933df80ad3b8bd27d02e98473dae9a45f5a7f21090c4244b52f9a1ac919af1d01da5ed6266de9fd8e232b899bc3602b93e2e
-AUX awesome.desktop 150 SHA256 433f5cf4adea408e38d464af8b6259efd39a909735679f4625c0cb7fcab3337b SHA512 9e6b5d1003a5e1f03fa43ca9d251221e93f82606c7f9b24726b9d1bc8a363c004d484eef77fa099230af13e4a125331ee656f58dc57903016d632679d6dd1c15 WHIRLPOOL 10a1049db2fbd0e3a1922fae7b9a9ce30ccd6803b5a8cac948ab0c86ec8874e9d0e67674642825bec7816c8e3403955c52b11bd0f51317f195ef0a23adbc3c44
-DIST awesome-3.4.11.tar.bz2 758495 SHA256 83fc42d4ea71914d1b456023ce53b546e22e8ccc11a73c4a39a1152d2f30b628 SHA512 7fb241d513d99a6e54653d2e57788b1052b4a4df97b1e8b4565ce2d67d06e04ce5ff9e93b4402045273ee63d387efee6b193bab9168949b6da4e6a0bf8d90d00 WHIRLPOOL e01308fc1b306164d9394ebb86fa0883c977b929275d01b2bc63504e7d4e699d63f43a2f80b658924c937fbe2ff3c5165e14ff9c1e84f8829d1f4eb74a56d208
+AUX awesome.desktop 194 SHA256 19d670c20bc3c59ec85486f27447dcf82dae1f04ff8abf3e987cbdaf9f5de6cf SHA512 11decd36a48be89bcab14c71cb58728329d2379044f73f5db971b7b7d54d37114f8a0436fe8e95ab30c0e2d9075aff3e59aa8cd1c6a9b259e536ab49dc902903 WHIRLPOOL ae28a5336e78cc77c252eba004d65e30e18cf9b440d6197b6863f254ad80f1fc482b0c822e1a0303b306e707c20dce3c13e647ff18e3e0947af2396eb95a8011
 DIST awesome-3.4.15.tar.bz2 762323 SHA256 4207f5cbed25d0e7ab35157165d923c2ccf04fded5b3d5fc130134ce9ed5ddfd SHA512 18bb2659e1e7c18a8917f606d635e968daa31a5be4c6d93a109603aace9b5d8b5fd0b8ac1d13ba3d6f2c5c42661204ce80c5ea322088cd358ec5e164b760c339 WHIRLPOOL 74da6197f2e4e5f3d99a11e99c26563f6a145181bab5c017b7ee330041864527551a230ce6dc6109bb5510621fe874921c7caa72c095fa2be6fbdb69e02da1dd
-DIST awesome-3.5.1.tar.xz 714320 SHA256 71cd67ccf8b9c50f0142d6ab618172a01518ca3add2a0f6c245169baf9713218 SHA512 ca4bb133a20498dd01092bf6cc3b1e06c70f7ea047822cd88eba0b8c1999dfa6f94c2fd791527c15b2e6d96dc7651672ca9cf66a4eb68786142eedd4686c6198 WHIRLPOOL 72144bba0d7053210fc1fb18361178c921d1287774b8017b857d4a5b8f0337dbda56b5808122e0deb77aede2cde4cede934039e0abfb368d45fa7cead31219b6
 DIST awesome-3.5.2.tar.xz 715164 SHA256 188d65b02a8ef905be43f126e2591b0d3caf84e094fb6af5501ae5ef07503e86 SHA512 e1c661dfa64e1747a15c149c445877f36380f30f20a4a39ccf1a02df95b1dc5b38337567dd7e401592b2906627716e72673772fe131189c763dc846978bafd48 WHIRLPOOL caec16cc014bd9ed93c4feec8cca40989cc4a66fd2a6816db65654b66e861c6cc2554a7c5e0e587124f4a96d34ddcd6c2e2845f5ddd2a725048d442361c81407
-EBUILD awesome-3.4.11.ebuild 2737 SHA256 60430be3a096f2ce547fa0e79c40559b743dfeeee5a9681976138dafb0908240 SHA512 ae4576c8cabf0a3fbdae7c6cf717d94fb680f774be63a77f87d0b168ae102f9695d9f2510c0d9a132313cf50818ba4c8ea3420f38d85be4ad293a367d0a7d80a WHIRLPOOL cadd6d805c40d9f037923cf94c8fe4ca36f6edfc75a2c91cf8181177687cf3f43a56d712a072c3fa74a21076ba91eb161431c3fe2b3bd8fd27a96bcca046ee54
-EBUILD awesome-3.4.15.ebuild 3099 SHA256 c6012e67fb405031d64254e99fc34f4a96819000a6032d427a13939369952d25 SHA512 6c6491b75c01644b577ce3ca5e7eaed104f2dce2437252ab14a281a3ce6db5cfa3363cfb70dd3633f039f4fd4734d398c08c682e5ccd25989fae97518e06dd3e WHIRLPOOL 50137c655f0005090a20fa75233db2b6b57107fca84358834ebc2cd5a7a64927fb00ed2b6a1ed9d34ed674ced928b3a5c3ac9b2e8358ec582c4150c59b834f5c
-EBUILD awesome-3.5.1.ebuild 3132 SHA256 53e640dce1c57444ae02e6f6709b8fcd26ef6ead42a8ed2d7b209da3fcbad694 SHA512 615c2eb34039d6391758897d304f06668fa62421cb73390cda20c245641c8525c5810f05a063c013b4a50ab62f72473bc87f8967129b159a39748b1fca5ce987 WHIRLPOOL 32376527d9f622aab840cc8999736e4ed1282750f2f08771159ca68013c2fd9e36d40ea990d0e035db4aa61b5d314d6ec4586404f52e0de99c4e6822999c77cf
+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
-MISC ChangeLog 24067 SHA256 f1cb1702c8597025527e1bf60ff0d572beabaed3888d917a551ffe06b67664f3 SHA512 e94471ce8667be4c49b1d445b7f12307d2918156c4bcf73988ab19a0045da886cc46a63473fdf963e1b62dba1564730375beb06a16ea5fd508acdfdac39e38a1 WHIRLPOOL 4503c01d218c53a19f71005d03db02522742634ee550f1e11b81f093b2b8206c9f809fbc589176b0ff3f3dfc6722f141eec2de78992e86bd7f2a78614486f24a
+MISC ChangeLog 24361 SHA256 ea24ba7f2201988574a6cea162bf121d6e5cf9d227b3e003eb955b63d37a53b4 SHA512 3b10a35441879c0e63c3f0ca2a7cb1b87d80ac5b0299b146f69d8eddd8a24d1e6a3f1854f39be29d8c282cd8f42f0940725315f13a80d0a367920fea8f3e0a96 WHIRLPOOL b4d4ce4a3c5ae3223a5138c549c1c67810c8a245ad11ee8e2bb1c0d822fa2a4b2c03ec0706746cee0600e3267b92b719c80a4e2b552806e0389da7a7cff999cd
 MISC metadata.xml 478 SHA256 9c745021154df3f9b264595787461559d037b4ff9fee3577d31474d8609d3022 SHA512 088395076f556851a76f00cb3d2f43672638c342e2846603499dd111e72e6d3c799366b5336e5662f458e5c907bf876494a95c405a962b8f97c1072eb157c793 WHIRLPOOL cfa5dd8da1e47f76ce347c8e24c637aa908baa0a51bfa8afd93e4c6d226e937ad7ba06efd2ae3abf4000c6787c47b3205c95f1c6ab7878a80e24e8c1cb9b39f9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSqWh9AAoJELnU8jG9FVirkIYQAJVKT2aT/M0swzCE/Po/IDtr
-gIkz0MF0PhYnUAZe1MacTend4B+mtMk5SBIUx6sLuqdeDZbe6DbuGIvcVzh0H60e
-NqSaSfKp1KOs4I7GqoCTJkxV/5I7iGs8w0+/D+nHMXFqCy9ZNS0aOitXRKiCu59p
-M756fnVVA5n+rcZlaykw40ae+G8hApgA7hjgsTd9+PqQUx0wwLG+Iybv/aIsnbQO
-jlSAQxA2iS6jO+29vi1XU0xAIFIjrNSx2YS8SlnAU0x7/8fXyjOONSK8R5sd1Kb1
-HWmQ2EKM6iuBgiMVHpgcrQPpdxz9AXEtXuzURiLwrmReUmvPDOyqhHqKQukmTmO6
-SaxR+YqZC5Of+LJ0Fb3iani1ibjIWA/2gkaTqDK6Tr3bpN+LwetjztwkXy73PPRx
-sTBMgxm7qzabMgQcqAvKu9QR7AMZIIC2rjEdhDClbUSsg4j7f4onjx1ObKIPVu41
-eZtGm5tVAHeK86+EgQ/plaz8V2c251MXHAP+W6szWt55W2xerxnq0yzxBsv2iPGV
-CxCGXCm++IexGvz/TJ5aKw1lWh1FKFt7Vo3d4KNOk9LAZGG0rRx2vQwph4nOsR1v
-aq0XREe+Aq52npRQy/9FJufc1hrR28swtqV0hxyfyIk8LbwZcQzM5ZRixuGUmqIO
-PjPGDQjB8y0x3S49rPS8
-=h6zq
+iQEcBAEBCAAGBQJSvYvGAAoJEAmJmMX429reA7kH/A2ixdIbcEPjyx0ktx3Ui8W3
+sHZvhG7d2M+joN96FdEFEnxhQrVI5IE71Agi2G0ZBoXcqX2StEFbHnDQRZ296j3a
+xjTZyxXQtXjNEoX5zCg8JhJOJPvFgrZU1rHDDz10I6y14KBBW4iqof+2PRh1OG4d
+SJesJZeDLhN48ijFPFfUN3Jg1luwe73LivLF2yTWz2RQafjxTE36XsJv5SOSaPuF
+CoP+CiczxWuv3zMyN2yzyjvb/OPEWGcgRfdMAb3A9YIrmt+QMGYY0D7cdu/gloR/
+xiqX6GSOtsHRWPI+eyW07GV885JKX/5B3gka4sLYo+1aHVsvoy0lMsqFRLy+ENY=
+=Ir1p
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/awesome/awesome-3.4.11.ebuild b/x11-wm/awesome/awesome-3.4.11.ebuild
deleted file mode 100644
index 68da77445abe..000000000000
--- a/x11-wm/awesome/awesome-3.4.11.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.11.ebuild,v 1.10 2012/05/11 07:29:16 ago Exp $
-
-EAPI="3"
-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.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
-IUSE="dbus doc elibc_FreeBSD"
-
-COMMON_DEPEND=">=dev-lang/lua-5.1
-	dev-libs/libev
-	>=dev-libs/libxdg-basedir-1
-	media-libs/imlib2[png]
-	x11-libs/cairo[xcb]
-	|| ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
-	>=x11-libs/libxcb-1.6
-	>=x11-libs/pango-1.19.3
-	>=x11-libs/startup-notification-0.10_p20110426
-	>=x11-libs/xcb-util-0.3.8
-	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
-		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 media-gfx/graphicsmagick[imagemagick] )
-	)
-	x11-misc/habak
-	media-gfx/feh
-	x11-misc/hsetroot
-	media-gfx/qiv
-	media-gfx/xv
-	x11-misc/xsri
-	media-gfx/xli
-	x11-apps/xsetroot
-	)"
-
-DOCS="AUTHORS BUGS PATCHES README STYLE"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-3.4.2-backtrace.patch"
-
-	# bug #396417
-	epatch "${FILESDIR}/${PN}-glib-fix.patch"
-
-	# bug  #408025
-	epatch "${FILESDIR}/${P}-convert-path.patch"
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DPREFIX="${EPREFIX}"/usr
-		-DSYSCONFDIR="${EPREFIX}"/etc
-		$(cmake-utils_use_with dbus DBUS)
-		$(cmake-utils_use doc GENERATE_LUADOC)
-		)
-
-	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
-		)
-		mv "${ED}"/usr/share/doc/${PN}/luadoc "${ED}"/usr/share/doc/${PF}/html/luadoc || die
-	fi
-	rm -rf "${ED}"/usr/share/doc/${PN} || die
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN} || die
-}
diff --git a/x11-wm/awesome/awesome-3.4.15.ebuild b/x11-wm/awesome/awesome-3.4.15.ebuild
index ff82274afe5c..b0787c1c7551 100644
--- a/x11-wm/awesome/awesome-3.4.15.ebuild
+++ b/x11-wm/awesome/awesome-3.4.15.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.4.15.ebuild,v 1.8 2013/12/12 07:40:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.15.ebuild,v 1.9 2013/12/27 14:16:45 maksbotan Exp $
 
 EAPI="3"
 CMAKE_MIN_VERSION="2.8"
@@ -22,6 +22,7 @@ COMMON_DEPEND=">=dev-lang/lua-5.1
 	x11-libs/cairo[xcb]
 	|| ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
 	>=x11-libs/libxcb-1.6
+	x11-libs/libXcursor
 	>=x11-libs/pango-1.19.3
 	>=x11-libs/startup-notification-0.10_p20110426
 	>=x11-libs/xcb-util-0.3.8
diff --git a/x11-wm/awesome/awesome-3.5.1.ebuild b/x11-wm/awesome/awesome-3.5.1.ebuild
deleted file mode 100644
index 3bd8b7785305..000000000000
--- a/x11-wm/awesome/awesome-3.5.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# 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.1.ebuild,v 1.2 2013/12/12 07:40:44 jlec 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/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
-		doins "${FILESDIR}/${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-gnome.desktop b/x11-wm/awesome/files/awesome-gnome.desktop
index ec2f237f5b2e..8adf5fcc95e5 100644
--- a/x11-wm/awesome/files/awesome-gnome.desktop
+++ b/x11-wm/awesome/files/awesome-gnome.desktop
@@ -2,6 +2,7 @@
 Version=1.0
 Type=Application
 Name=Awesome
-Comment=The awesome launcher!
-TryExec=awesome
-Exec=awesome
+Comment=Highly configurable framework window manager
+NoDisplay=true
+TryExec=/etc/X11/Sessions/awesome
+Exec=/etc/X11/Sessions/awesome
diff --git a/x11-wm/awesome/files/awesome.desktop b/x11-wm/awesome/files/awesome.desktop
index 2341f8321a81..692dced847ec 100644
--- a/x11-wm/awesome/files/awesome.desktop
+++ b/x11-wm/awesome/files/awesome.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=awesome
-Comment=awesome the window manager 
+Comment=Highly configurable framework window manager
+NoDisplay=true
+TryExec=/etc/X11/Sessions/awesome
 Exec=/etc/X11/Sessions/awesome
-TryExec=awesome
-Icon=
 Type=Application