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

(Portage version: 2.1.7.4/cvs/Linux x86_64)

5 files changed, 100 insertions, 7 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/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() {