Fixed USE=doc issue, bug #266797.

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

3 files changed, 105 insertions, 2 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index f7822e53320b..cba1c52caf40 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,11 @@
 # 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.67 2009/04/21 23:23:41 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.68 2009/04/22 16:34:50 matsuu Exp $
+
+*awesome-3.2.1-r3 (22 Apr 2009)
+
+  22 Apr 2009; MATSUU Takuto <matsuu@gentoo.org> +awesome-3.2.1-r3.ebuild:
+  Fixed USE=doc issue, bug #266797.
 
   21 Apr 2009; MATSUU Takuto <matsuu@gentoo.org>
   -files/awesome-3.0-gentoo.patch, -files/awesome-3.2-x11.patch,
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 40593791d60c..40be2437618c 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -6,5 +6,6 @@ DIST awesome-3.2.1.tar.bz2 241372 RMD160 dddb0b2f8a9d1d6a108158700815ef943d0d268
 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-r2.ebuild 2189 RMD160 3c5527ad3bfabbd21c341a3d38e2b39b5c7ff4bb SHA1 1e5746edcb46d57bb5e4a198211ab96b4b9d5b19 SHA256 eac0febd98d24d2c4e59b36d1966d14d8e34e73659a6615d9dd6d876bf92614f
-MISC ChangeLog 9851 RMD160 cff8224cb0e0a1e629de7323131c3c91577df7d3 SHA1 bf2857fc7a12707205d1eb59fd0eee8bc41c7031 SHA256 7d5b46c6d1498fa5663948d28eac1b97c072a802f9ea22c2a4d1ceeda3bf2d50
+EBUILD awesome-3.2.1-r3.ebuild 2094 RMD160 871dcbece00a53a007a0361d149f9151374a317b SHA1 c33cf5c863513a1f51a700d625c89ac7ed31e082 SHA256 c35d2a138dcd7a5c136aa60a7b18879d90d90545031ae39a95a364efbb9c0b40
+MISC ChangeLog 9996 RMD160 e69648adc1c42fa21b5008452e1ed98305b964fb SHA1 4f3114334a1d7f334ca59216fc8b3287d1f841d8 SHA256 ec0ea0bfe293084a059fa68dd253258a1bc762abe7efb6df2c2f9b9b22eca9bd
 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
new file mode 100644
index 000000000000..870444ebf1ec
--- /dev/null
+++ b/x11-wm/awesome/awesome-3.2.1-r3.ebuild
@@ -0,0 +1,97 @@
+# 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.1 2009/04/22 16:34:50 matsuu Exp $
+
+EAPI="2"
+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 bash-completion"
+IUSE="dbus doc"
+
+RDEPEND=">=dev-lang/lua-5.1
+	>=dev-libs/glib-2
+	dev-libs/libev
+	dev-util/gperf
+	media-libs/imlib2[png]
+	sys-libs/ncurses
+	x11-libs/cairo[xcb]
+	x11-libs/libX11[xcb]
+	>=x11-libs/libxcb-1.1
+	>=x11-libs/pango-1.19.3
+	~x11-libs/xcb-util-0.3.3
+	dbus? ( >=sys-apps/dbus-1 )"
+
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	>=dev-util/cmake-2.6
+	dev-util/pkgconfig
+	x11-proto/xcb-proto
+	>=x11-proto/xproto-7.0.11
+	doc? (
+		app-doc/doxygen
+		dev-util/luadoc
+		media-gfx/graphviz
+	)"
+
+RDEPEND="${RDEPEND}
+	app-shells/bash
+	|| (
+		x11-misc/gxmessage
+		x11-apps/xmessage
+	)
+	|| (
+		x11-terms/eterm
+		x11-misc/habak
+		x11-wm/windowmaker
+		media-gfx/feh
+		x11-misc/hsetroot
+		( media-gfx/imagemagick x11-apps/xwininfo )
+		media-gfx/xv
+		x11-misc/xsri
+		media-gfx/xli
+		x11-apps/xsetroot
+	)"
+#		media-gfx/qiv (media-gfx/pqiv doesn't work)
+#		x11-misc/chbg #68116
+#	bash-completion? ( app-shells/bash-completion )
+
+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_compile ${myargs}
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc ; then
+		(
+			cd "${WORKDIR}"/${PN}_build/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
+}