Fixed dodoc issue, bug #265632.

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

4 files changed, 12 insertions, 109 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/Manifest b/x11-wm/awesome/Manifest
index f3030f2751bd..e0f56ec46ba6 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -7,12 +7,10 @@ DIST awesome-2.3.5.tar.gz 230884 RMD160 a59df028c26f0d42e46240ffc81371585d35e3ff
 DIST awesome-3.0.tar.bz2 142225 RMD160 a2e602e70f93600e57e100d8aa71766fe8786c64 SHA1 237a05f931a3889bfbcc9e31aaf4c56e55b3272a SHA256 9a4fa26f069223714d584b6b19f017f67808f83aa5788e6ae25c1f71001b9d4c
 DIST awesome-3.1.2.tar.bz2 238441 RMD160 8ebdc8b13a1b5eeaa1415bcf6e01b1e32494f32e SHA1 f83f57be25a0ad86141350579e04ae87ba25df08 SHA256 f52224cfb7a2e79c3f536f846c0806bcf685345a110b3a281dfd016ce40e4f61
 DIST awesome-3.2.1.tar.bz2 241372 RMD160 dddb0b2f8a9d1d6a108158700815ef943d0d2689 SHA1 f316e98fccca694d0d577830969c3a99bda4fe7b SHA256 c8eb3dfdb92b4bf9eb989f8c40d04cb134bd0d1fef532ec41a5d6fa1370073e7
-DIST awesome-3.2.tar.bz2 241401 RMD160 3ded2f5d6cceba1f6e08bdaaeb3446b9aa9ec524 SHA1 8d19c16ac530c4b131a7ee464b974fca2e050390 SHA256 04d9e368801ad9e2eee85d31e3a40e4a9576bb5e4572cb404e0469e040b85efc
 EBUILD awesome-2.3.4.ebuild 1315 RMD160 c82754a217e2256643bdeec17f6981024d735be2 SHA1 5febd4178487c9212c9a200f107eff85f55810ce SHA256 f1a2f7ed655836d5d878a4bbe9c139c907543226eb250dabf8ce12c4b04e033d
 EBUILD awesome-2.3.5.ebuild 1319 RMD160 d7d068d43048f3a63c91d5f7834c9f056e93caad SHA1 21e39d452171fb00a4db5fc097a741d2a0c55e47 SHA256 5e3e3f0871c8d1a7bdb8b758247650286649a021137af2940f49221bee1c81f0
 EBUILD awesome-3.0-r1.ebuild 2241 RMD160 7661c37c5ea45b541b304ed32e67875708e66802 SHA1 92ef577096ca1270f0d7105d918795d80c5b3917 SHA256 79c7b469ab47480f32cf49900a21968ab0b7806f8bf597ba1a38af104961c82a
 EBUILD awesome-3.1.2.ebuild 2146 RMD160 df47209432e456d5a7d9f3f79eda26ee16287e8b SHA1 8935de684b33c1e7d66184b7a8048b1d5ecf04cd SHA256 2af4b110aaf15558d98b4235fc897952babac0077833d861c1b858f34b9c99d5
-EBUILD awesome-3.2-r1.ebuild 2196 RMD160 258e4acafe4c1c05254d160c1ce4f84dfbb7cfc2 SHA1 a41acc18fa296b5aad533ca21fbb9b41f9729dcb SHA256 1ac4349b4679308d1a84531939fbebac50762c41acd5a433507a86892227f1cd
-EBUILD awesome-3.2.1.ebuild 2129 RMD160 9833a64c184e2d70e94c99adcc576e2b2cc12e34 SHA1 adcece5ebb2e3b5eb41556965c1c07fb6cf0a8f6 SHA256 138c8399519dc05b3691cfb46e73db980cf10bab92337bf7bc394233ee37fc65
-MISC ChangeLog 9006 RMD160 8f3347f14c1fe4fe4cee71811b8ef9846b04ca3a SHA1 f46d5ff4f1b65bb339a2e979f1c4c48f9b82b048 SHA256 b93b4bb8ca4311e4e30128f09d336971782007bb980a2f67dd6d9c7c6cfbec78
+EBUILD awesome-3.2.1.ebuild 2147 RMD160 6eb215348397ed053af04d30d9c617d8119e7612 SHA1 e4e0df6726d20e59e11fbc8f95487811a140e684 SHA256 fdf507dd75b3e9272012b9d5927f1ca89f128aec67fb0e51aa88de0ebbde18e6
+MISC ChangeLog 9138 RMD160 f292340fca35e626e0ddb77538b2b207e8ba8caa SHA1 b576025184ad65b35959d4e3702fabe53c5f8499 SHA256 b85953527d193af02f1082f5e55dcf1891a62810d04be8ad82c378bdf76f21e7
 MISC metadata.xml 248 RMD160 ade4235c4b35539d6cccd6005afba23a7c9d2afd SHA1 e6af7cb4622744522ecc176d800015b77cd75d81 SHA256 5d0b7e035a2cb76eeb00ece66b18b59060068ea76dd196e6cd4f4524c92cde17
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