Fixed dodoc issue, bug #251274.

Package-Manager: portage-2.1.6/cvs/Linux 2.6.27-gentoo-r4 x86_64

3 files changed, 108 insertions, 2 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 47a9acbf41e4..934dc26455bf 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/awesome
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.48 2008/12/13 03:17:59 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.49 2008/12/21 23:53:01 matsuu Exp $
+
+*awesome-3.1-r1 (21 Dec 2008)
+
+  21 Dec 2008; MATSUU Takuto <matsuu@gentoo.org> +awesome-3.1-r1.ebuild:
+  Fixed dodoc issue, bug #251274.
 
 *awesome-3.1 (13 Dec 2008)
 
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 8bfc83bf928f..e9cf389c2357 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -6,6 +6,7 @@ DIST awesome-3.0.tar.bz2 142225 RMD160 a2e602e70f93600e57e100d8aa71766fe8786c64
 DIST awesome-3.1.tar.bz2 238280 RMD160 493213e1551ab9f7a633af07db0af7692bcb8d8b SHA1 ddb1733f6fea1b0f875e4d6ae3aad54d97fa148d SHA256 95767eeeb9526c468ab9cb85edea74f19dde57da899244ffc7570ca4466fa1ff
 EBUILD awesome-2.3.4.ebuild 1273 RMD160 25882c7c747f63fb73988bd41791d23646c60168 SHA1 00f6d5a826cbcc9df477d07941578ed30a1f5ccb SHA256 363ecafafc99023015704dedf621ec712636bc59f69e179d93f5b016b0f95c5d
 EBUILD awesome-3.0-r1.ebuild 3040 RMD160 ecb3391d332757b6a3dcb1b9a42f981474baf96e SHA1 d9890b2e7e5cd015fb2f9fab54d5e724580fd525 SHA256 9676e83ab0b0bb69604eba9969331a23841dc98193537cd056f8934c38c2b05b
+EBUILD awesome-3.1-r1.ebuild 2156 RMD160 c46cc9f1b192ad0077e09c83b3d750b1c5cc6264 SHA1 5f871fdef996afbe4280e73abbb90079cfb6a034 SHA256 27e24efb218b29944afc09abb599e38578810847d4adf04661d1832dffba5790
 EBUILD awesome-3.1.ebuild 2136 RMD160 76935207c2b4f1e7fa12cb8e488133ca5879ba60 SHA1 8f3ef30bf85220b79ddfa80deb3bf3ba0a77194f SHA256 0091666cfc5358fd1089a7e9d1cfad0131ec2da55b256bb46dc50061bd56bea4
-MISC ChangeLog 6897 RMD160 9b365b7566f35059bc5ba8e5b774dc6266608d91 SHA1 8a712d1d0257c6a09b41e4ede75d9baea0fe1a66 SHA256 dab840c2c00234bcd3ae77ed3aa55cccdcff5a0a2c1ce2919b727f536313f226
+MISC ChangeLog 7036 RMD160 45e7f69b4788c44cb1ed3b78ab453f0cc03ec764 SHA1 2a8483592edd1ee3c6fec7bef0c138094a0ad5fa SHA256 429b95023e4021a0c0608df92f421ea70ad9927c8878f39c8aa9e688d4a6628a
 MISC metadata.xml 248 RMD160 ade4235c4b35539d6cccd6005afba23a7c9d2afd SHA1 e6af7cb4622744522ecc176d800015b77cd75d81 SHA256 5d0b7e035a2cb76eeb00ece66b18b59060068ea76dd196e6cd4f4524c92cde17
diff --git a/x11-wm/awesome/awesome-3.1-r1.ebuild b/x11-wm/awesome/awesome-3.1-r1.ebuild
new file mode 100644
index 000000000000..2d8983e25d08
--- /dev/null
+++ b/x11-wm/awesome/awesome-3.1-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.1-r1.ebuild,v 1.1 2008/12/21 23:53:01 matsuu Exp $
+
+EAPI=2
+MY_P="${P/_/-}"
+
+inherit cmake-utils eutils
+
+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
+	>=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
+	>=x11-libs/xcb-util-0.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 )
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="AUTHORS BUGS PATCHES README STYLE"
+
+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
+}