Fixed dodoc issue, bug #265632.

(Portage version: 2.1.6.11/cvs/Linux x86_64)

3 files changed, 10 insertions, 105 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 156c2fce77b7..b499b6206a59 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,10 @@
 # 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.62 2009/04/05 03:55:44 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.63 2009/04/11 00:10:01 matsuu Exp $
+
+  11 Apr 2009; MATSUU Takuto <matsuu@gentoo.org> -awesome-3.2-r1.ebuild,
+  awesome-3.2.1.ebuild:
+  Fixed dodoc issue, bug #265632.
 
 *awesome-3.2.1 (05 Apr 2009)
 
diff --git a/x11-wm/awesome/awesome-3.2-r1.ebuild b/x11-wm/awesome/awesome-3.2-r1.ebuild
deleted file mode 100644
index 2c2f1c012691..000000000000
--- a/x11-wm/awesome/awesome-3.2-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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-r1.ebuild,v 1.1 2009/04/02 15:29:59 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
-	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
-	media-libs/imlib2
-	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"
-
-src_prepare() {
-	# bug #264224
-	epatch "${FILESDIR}/${P}-x11.patch"
-}
-
-src_compile() {
-	local myargs="all"
-
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with dbus DBUS)"
-
-	if use doc ; then
-		mycmakeargs="${mycmakeargs} -DGENERATE_LUADOC=ON"
-		myargs="${myargs} doc"
-	else
-		mycmakeargs="${mycmakeargs} -DGENERATE_LUADOC=OFF"
-	fi
-	cmake-utils_src_compile ${myargs}
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc ; then
-		(
-			cd "${WORKDIR}"/${PN}_build/doc/html/ && dohtml -r * || 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.2.1.ebuild b/x11-wm/awesome/awesome-3.2.1.ebuild
index 3485832fa46f..da1c993bd028 100644
--- a/x11-wm/awesome/awesome-3.2.1.ebuild
+++ b/x11-wm/awesome/awesome-3.2.1.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.ebuild,v 1.1 2009/04/05 03:55:44 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.2.1.ebuild,v 1.2 2009/04/11 00:10:01 matsuu Exp $
 
 EAPI="2"
 inherit cmake-utils eutils
@@ -85,9 +85,11 @@ src_install() {
 
 	if use doc ; then
 		(
-			cd "${WORKDIR}"/${PN}_build/doc/html/ && dohtml -r * || die
-			mv "${D}"/usr/share/doc/${PN}/luadoc "${D}"/usr/share/doc/${PF}/html/luadoc || die
+			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