Version bumped. Fixed doc USE flag issue, bug #292367.

Package-Manager: portage-2.1.7.4/cvs/Linux x86_64

6 files changed, 106 insertions, 11 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 43106118d5d6..9751ef07c814 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/awesome
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.87 2009/10/24 12:50:44 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.88 2009/11/09 23:12:02 matsuu Exp $
+
+*awesome-3.4.1 (09 Nov 2009)
+
+  09 Nov 2009; MATSUU Takuto <matsuu@gentoo.org> awesome-3.2.1-r3.ebuild,
+  awesome-3.3.4.ebuild, awesome-3.4.ebuild, +awesome-3.4.1.ebuild:
+  Version bumped. Fixed doc USE flag issue, bug #292367.
 
   24 Oct 2009; nixnut <nixnut@gentoo.org> awesome-3.3.4.ebuild:
   ppc stable #287208
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 6183990b80ce..7fe8a8e2b8b6 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -4,11 +4,13 @@ DIST awesome-2.3.4.tar.gz 230800 RMD160 dca3ae76d91d3fd370d7fc51438896dfd472803d
 DIST awesome-2.3.6.tar.gz 232212 RMD160 c4a097026bff49a6a0ac65af13818958c3365bde SHA1 ccc70f810617b6fecc256296f1a3d75a59c5de61 SHA256 14a38b6482d50f75a796a24a47e04089ae51b4046de622ce323783637bb61b50
 DIST awesome-3.2.1.tar.bz2 241372 RMD160 dddb0b2f8a9d1d6a108158700815ef943d0d2689 SHA1 f316e98fccca694d0d577830969c3a99bda4fe7b SHA256 c8eb3dfdb92b4bf9eb989f8c40d04cb134bd0d1fef532ec41a5d6fa1370073e7
 DIST awesome-3.3.4.tar.bz2 252231 RMD160 5891ec98d213ab2a8fef167d58bfb611f8bae61c SHA1 d97875d23eebe7c03839d37af3bb4597abdb4aa8 SHA256 f13628643c01eba26ae28b37be5abbfab1a3578eec8ff9031ed2d3ca170b8b18
+DIST awesome-3.4.1.tar.bz2 275832 RMD160 98a2d2e6389431dfc5412c9eccf66a3322b00b7b SHA1 57f90af3b36a49828f3c14d9a4a4e6d824b322a7 SHA256 8bf0ffd430ef8384f75869c7cd2b62c1085a501db76f2bc24023c5ae0ffb2cfa
 DIST awesome-3.4.tar.bz2 275596 RMD160 6b077f1f577f68bec524307503750877cc298c9d SHA1 77d50d0cc34b3a3594ce6dbe14af5b6aa34594b9 SHA256 75d6eb2809215a2a1bb49957c7955eddfbebffd5e9ef7f66ee11eeb949589e8e
 EBUILD awesome-2.3.4.ebuild 1315 RMD160 c82754a217e2256643bdeec17f6981024d735be2 SHA1 5febd4178487c9212c9a200f107eff85f55810ce SHA256 f1a2f7ed655836d5d878a4bbe9c139c907543226eb250dabf8ce12c4b04e033d
 EBUILD awesome-2.3.6.ebuild 1314 RMD160 146b6e6e947c3fbd4f7532b4dab4773109515e39 SHA1 71d687ce6bd3c202e8dbc2943e993f1220ad1944 SHA256 ea8313dc1cbe8c10fd1b02c67be30f624b54b1d69cd8c974057826db6e26d032
-EBUILD awesome-3.2.1-r3.ebuild 2071 RMD160 6ae8f822ce71857d9712fabf5a0e735e38b3e062 SHA1 c5f2b59cf552f9fb2a199c0912029da94bccfee5 SHA256 ca45c9b20297660e835442ea7fa8a393982be082532d54c75d75b961fa4a5fdb
-EBUILD awesome-3.3.4.ebuild 2140 RMD160 1be8a8874e479458d064c031712aa40b7980ede6 SHA1 8bf7798e879bc056549348de4045901d252429a4 SHA256 487eb637c1230618de5c7f27d64abb5cb959b09c98e3a9871ba337302fa8e7ca
-EBUILD awesome-3.4.ebuild 2189 RMD160 a6a1e9d920296933b837622f8cef61c999488045 SHA1 613b1ee6734139e1587251321e47e574711752cb SHA256 263958ddd5d2fd96d0121312678c81f6581a74b6ae3489ef88a1e37f41805ca3
-MISC ChangeLog 12834 RMD160 79230394c7adc6c0bda18a0d1ea25274ab8069d0 SHA1 727d0d201c3663b4299a9d671993c562baf9ae92 SHA256 2a47c6536c01e55f5f6631fd99f29727c2d5c8e055ab2763cbd91027e5c7e56f
+EBUILD awesome-3.2.1-r3.ebuild 2068 RMD160 cda414391155626d57820c2db50b036a20d1d316 SHA1 e3ba6077e665d1ccfc10d6b85ac791656f0eae43 SHA256 2e5e48688114f7c0f95d798da608d8668f6c19278716e62f2c34e378d7f026cb
+EBUILD awesome-3.3.4.ebuild 2137 RMD160 9afa91fca6e991c7dad98bcddbb447f275eee8ce SHA1 7b5ce49dcb3fd22103ee9634f20964e3ff774e96 SHA256 114d32ddc467a0aec43dd9b8b9cbae2ec30b0f8de2332caed373ab4764f473df
+EBUILD awesome-3.4.1.ebuild 1919 RMD160 1b56b8023b9f8defbb5790a668a896d21c80d64d SHA1 34d73da5b14abd878cfa816ed2f40b4cc5e05b3d SHA256 c2eedf504fdade8e08e510e45a93b7fdbbce2e90ae4979d61a2df85e3543e18f
+EBUILD awesome-3.4.ebuild 2186 RMD160 8f3d36410a408f479355f0882cee8d250f92a8c7 SHA1 30c601866ff963ad5a933a98f61e43da2e9fbc61 SHA256 011f8b82d2f8f39b1eba043af89132135e05a0a3e2a36f1172235702c3b7aa3b
+MISC ChangeLog 13063 RMD160 546775275df87ddc50f52bc3a1639c06c37a6490 SHA1 4f04f1973cf28fe986187e80ac396f3106c13fca SHA256 9f1de64fce4c92661b4077864a2403b198f0fd6748aa4a48511cff0f713b7c8d
 MISC metadata.xml 248 RMD160 ade4235c4b35539d6cccd6005afba23a7c9d2afd SHA1 e6af7cb4622744522ecc176d800015b77cd75d81 SHA256 5d0b7e035a2cb76eeb00ece66b18b59060068ea76dd196e6cd4f4524c92cde17
diff --git a/x11-wm/awesome/awesome-3.2.1-r3.ebuild b/x11-wm/awesome/awesome-3.2.1-r3.ebuild
index 728b0f780b60..8c3e1cb1906a 100644
--- a/x11-wm/awesome/awesome-3.2.1-r3.ebuild
+++ b/x11-wm/awesome/awesome-3.2.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.2.1-r3.ebuild,v 1.6 2009/09/07 17:14:58 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.2.1-r3.ebuild,v 1.7 2009/11/09 23:12:02 matsuu Exp $
 
 EAPI="2"
 inherit cmake-utils eutils
@@ -75,7 +75,7 @@ src_compile() {
 	if use doc ; then
 		myargs="${myargs} doc"
 	fi
-	cmake-utils_src_compile ${myargs}
+	cmake-utils_src_make ${myargs}
 }
 
 src_install() {
diff --git a/x11-wm/awesome/awesome-3.3.4.ebuild b/x11-wm/awesome/awesome-3.3.4.ebuild
index 697ede760eef..9e7eb190f814 100644
--- a/x11-wm/awesome/awesome-3.3.4.ebuild
+++ b/x11-wm/awesome/awesome-3.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.3.4.ebuild,v 1.4 2009/10/24 12:50:44 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.3.4.ebuild,v 1.5 2009/11/09 23:12:02 matsuu Exp $
 
 EAPI="2"
 inherit cmake-utils eutils
@@ -76,7 +76,7 @@ src_compile() {
 	if use doc ; then
 		myargs="${myargs} doc"
 	fi
-	cmake-utils_src_compile ${myargs}
+	cmake-utils_src_make ${myargs}
 }
 
 src_install() {
diff --git a/x11-wm/awesome/awesome-3.4.1.ebuild b/x11-wm/awesome/awesome-3.4.1.ebuild
new file mode 100644
index 000000000000..4c4ba829135e
--- /dev/null
+++ b/x11-wm/awesome/awesome-3.4.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.1.ebuild,v 1.1 2009/11/09 23:12:02 matsuu Exp $
+
+EAPI="2"
+inherit cmake-utils eutils
+
+MY_P="${P/_/-}"
+DESCRIPTION="A dynamic floating and tiling window manager"
+HOMEPAGE="http://awesome.naquadah.org/"
+SRC_URI="http://awesome.naquadah.org/download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+#IUSE="dbus doc bash-completion"
+IUSE="dbus doc"
+
+RDEPEND=">=dev-lang/lua-5.1[deprecated]
+	dev-libs/libev
+	>=dev-libs/libxdg-basedir-1
+	media-libs/imlib2[png]
+	x11-libs/cairo[xcb]
+	x11-libs/libX11[xcb]
+	>=x11-libs/libxcb-1.4
+	>=x11-libs/pango-1.19.3
+	>=x11-libs/startup-notification-0.10
+	>=x11-libs/xcb-util-0.3.6
+	dbus? ( >=sys-apps/dbus-1 )"
+
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	>=dev-util/cmake-2.6
+	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-util/luadoc
+		media-gfx/graphviz
+	)"
+
+RDEPEND="${RDEPEND}
+	app-shells/bash
+	|| (
+		x11-misc/gxmessage
+		x11-apps/xmessage
+	)"
+#	bash-completion? ( app-shells/bash-completion )
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="AUTHORS BUGS PATCHES README STYLE"
+
+mycmakeargs="-DPREFIX=/usr
+	-DSYSCONFDIR=/etc
+	$(cmake-utils_use_with dbus DBUS)
+	$(cmake-utils_use doc GENERATE_LUADOC)"
+
+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 "${D}"/usr/share/doc/${PN}/luadoc "${D}"/usr/share/doc/${PF}/html/luadoc || die
+	fi
+	rm -rf "${D}"/usr/share/doc/${PN} || die
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN} || die
+}
diff --git a/x11-wm/awesome/awesome-3.4.ebuild b/x11-wm/awesome/awesome-3.4.ebuild
index 4524d51fe049..ceef162150fb 100644
--- a/x11-wm/awesome/awesome-3.4.ebuild
+++ b/x11-wm/awesome/awesome-3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.ebuild,v 1.1 2009/10/21 14:49:48 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.ebuild,v 1.2 2009/11/09 23:12:02 matsuu Exp $
 
 EAPI="2"
 inherit cmake-utils eutils
@@ -79,7 +79,7 @@ src_compile() {
 	if use doc ; then
 		myargs="${myargs} doc"
 	fi
-	cmake-utils_src_compile ${myargs}
+	cmake-utils_src_make ${myargs}
 }
 
 src_install() {