Version bump. awesome-3.4.8-cmake-2.8.4.patch merged upstream.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

3 files changed, 123 insertions, 22 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 99729d97b6cc..a1c2aab2bd27 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/awesome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.120 2011/04/27 11:14:34 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.121 2011/05/16 21:05:05 robbat2 Exp $
+
+*awesome-3.4.10 (16 May 2011)
+
+  16 May 2011; Robin H. Johnson <robbat2@gentoo.org> +awesome-3.4.10.ebuild:
+  Version bump. awesome-3.4.8-cmake-2.8.4.patch merged upstream.
 
 *awesome-3.4.9-r1 (27 Apr 2011)
 
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index ee7adf39ed3f..8e30fcc68512 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -1,33 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 3.4-0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch 23023 RMD160 961a5046e4abc1135d70308c2571468b98a78be4 SHA1 b50ad1167c1cfeade882eba44afb6727540a5170 SHA256 58da405ee5fc1bfa0f57b6c228bc1a3ae7420c9d37acb956419661a4b0f3c7ef
 AUX awesome-3.4.2-backtrace.patch 713 RMD160 b60e09f17c1452588020738df6657768080f4dcc SHA1 2845c4529f9189bf41ecd1c2df7eae36fbec329a SHA256 5738944681ce666fab1621c0abbb444356456fcea3ea2119f732c54ef4bf3f26
 AUX awesome-3.4.4-cmake-2.8.4.patch 1581 RMD160 cefa281d597501ab162b14d526f8041f69969d66 SHA1 60789f332cdd9bf21de3caf91053170b85fc3214 SHA256 a7e9fe9dfd3b3cdcc67bdf563ff69c6d432fb038fd1b9c62164fa473751f97f1
 AUX awesome-3.4.8-cmake-2.8.4.patch 878 RMD160 1793b87bc558377e8d117f104cd830c7b38b95e2 SHA1 95a5b453d5c11dee3dff058b81f9500c7362eb92 SHA256 6f4f3fc953739d5437cd4258f664677aef882acf873894c5300f6b35feff708d
 AUX awesome-session 1999 RMD160 2a92c71209f81ecaa302e03974b2f44e380abf38 SHA1 8d86595e00759508a5f20f54dab46d2c143c5033 SHA256 bee150a5b32a118c905ffe26df3f776f40a2db19230f6600cc2966b6c727838a
 AUX awesome.desktop 150 RMD160 a50c71cfbcb9ee4b86da8cca19cbd876b3a7f9b0 SHA1 8314ccbed775ecb0af5107cec56632dbec1fe3cf SHA256 433f5cf4adea408e38d464af8b6259efd39a909735679f4625c0cb7fcab3337b
+DIST awesome-3.4.10.tar.bz2 747589 RMD160 f64298c9865effca1730650142d2efe9be690dd3 SHA1 f3fb824623197aa70708c28ea3aa0c0665617016 SHA256 3ed72cf9a63b93290d6ce4dcbbb56cff555cb172868aaac02a64dee995e0c3b0
 DIST awesome-3.4.8.tar.bz2 741506 RMD160 f97c31631e81c003b7fc90e582d7d8bcae40981f SHA1 23748bccd8bd4999107354a24173811cbdc85740 SHA256 457b639779053a28d39a0039cdc2d76e6b1ae358b2b0d34467a05a75e959ff66
 DIST awesome-3.4.9.tar.bz2 742902 RMD160 ab6cb81f9c44ca2d3ef863d37683930a21fb9c58 SHA1 8fba4bf2e272c21cf9d7f5f2269932a967fa733c SHA256 144cf9643ca47c2238981f9fe0a1c8ae379ef54a5fb853fd9ac3541a60fc738d
+EBUILD awesome-3.4.10.ebuild 2703 RMD160 694549917b9331e02a9f60b152651a5a60ed2a6e SHA1 1ac94b15c924942a96911ac2beed50cbaa6ab76b SHA256 400edd880a2036ef8b3da3f5ccc14cb4d8b8cb56ab1c0834dcb0365baff7d95a
 EBUILD awesome-3.4.8.ebuild 2701 RMD160 80ce9ea1890a6367ac8c7d1140baf96e71a5215c SHA1 bbd08a72710abb36ea850b2792fea7085a6fca60 SHA256 8463ed9f0dd20338561abab9f3042ecc374a64a84b3d797449d2a17fba6f6aef
 EBUILD awesome-3.4.9-r1.ebuild 2752 RMD160 55131719d55f5306eac9dc87910897da8e73160d SHA1 68bebd68ae6871b2165bc3e22c85a7469c9800ac SHA256 2d91cfd3e60afa31f3f5c2b68b6afe32ce69c33b8fb945599924a1dbc3821c54
 EBUILD awesome-3.4.9.ebuild 2634 RMD160 66722fd16f8fbc943757b7c2ab925bd38d0f057a SHA1 c5f7e3fe19e844dc2ba2c5bc43ac38b01139347a SHA256 e964d5b4525c8aa797994960babde9ebc716a9cd3889df5291429b9c36baffa8
-MISC ChangeLog 17936 RMD160 d86f337496f9104f9e160084cc066566427b5341 SHA1 5d5438c902fff2c13d9f990ccd42e8c02ee56edb SHA256 7960c0c9b7db5830b4787a69503be94f4708b0110cfa16e89e230dde08241ac3
+MISC ChangeLog 18111 RMD160 6719c202f949eaf8a0cadee7dd4e03ac57f62233 SHA1 b8860771c3e735bf162d962068c43ae21b8322e9 SHA256 bf3a2eea4cbf6efb91a22bc0192ebe4acd8ce2e0e27ae345e1ff2971e4b50573
 MISC metadata.xml 348 RMD160 2bd574146945458fea78196a64c095a2e69497cc SHA1 bb32e6f2133fa638e86b4d99db2775523add7a76 SHA256 226666804aaa3f062126f0168f3c58772f42f41fe7add1680177f5c8db84d8de
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBAgAGBQJNt/qkAAoJECaGw+YFKA1pSmoP/2I5S4IacLa/tJVyQeiUlaBu
-liNdw5bTp4/a9XP0LCpdHsA3hXHysrEHNGArkLDbbNO0gaikt2AZsdIAvKrUNaZ/
-0Pu29lpQtNGtwZh0/T7kLjKDmEnpDFtPV0jlv5MOmz5ZwMj8yE8Uf/W/Luf9zQa0
-2cFnAq5de1YO1HLU1KdIOWv7YcfeOgADKtO8LY0mRwINrR9SRuh0x8fAuPOyL7tT
-4HjrM+JJ2PQeRN6TmYeo+es0C01yhTNS6FamQwsaD6nIM3ZJOlViQImOHkn7H0YK
-t44Xnb/kOmQ2Py0F64ospTgWHGk4Ak2LLxrIBBkI+x8pVG/C4M5K/XPF1i77UYNk
-MQ6fxShQGLK25opBKemnd+j+4m1J+qEpkpRij6/7AFFGYGJebFHwQzINqQAa3yRb
-G1rfr6Gu6ZjfqZxyhJb8rsGIKzNhRofcyM4q13C8vnpqlF3hHKBMqMPJzr0zGmph
-vCDzDQYpWRrpBaee+l3fGSVFh2+eeME0TRloirceb1zYnEnESZIJr4wBsCMluMhu
-XeZc+HhiMoq/68m8rMr66MTee12Nx4xLet+adZXE5oBadohv7NFzc4WiKM8HEc/l
-KmtWHuKL/lT8RSwfKbsDipCVgshSp/YT0Zvo6JRnzysZZ5t+BoS3SH81ywO1to9y
-Uo0HXmc3E5tTG1MB0JOK
-=PD5t
------END PGP SIGNATURE-----
diff --git a/x11-wm/awesome/awesome-3.4.10.ebuild b/x11-wm/awesome/awesome-3.4.10.ebuild
new file mode 100644
index 000000000000..40bf249e6891
--- /dev/null
+++ b/x11-wm/awesome/awesome-3.4.10.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.10.ebuild,v 1.1 2011/05/16 21:05:05 robbat2 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 ~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
+	dev-util/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" \
+		"${FILESDIR}/3.4-0001-Update-the-code-following-release-of-xcb-util-0.3.8.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
+}