Fixed DEPEND, bug #266944.

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

10 files changed, 11 insertions, 498 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index fc6780df1905..f7822e53320b 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.66 2009/04/19 16:08:06 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.67 2009/04/21 23:23:41 matsuu Exp $
+
+  21 Apr 2009; MATSUU Takuto <matsuu@gentoo.org>
+  -files/awesome-3.0-gentoo.patch, -files/awesome-3.2-x11.patch,
+  -awesome-2.3.5.ebuild, -awesome-3.0-r1.ebuild, -awesome-3.1.2.ebuild,
+  -awesome-3.2.1.ebuild, -awesome-3.2.1-r1.ebuild, awesome-3.2.1-r2:
+  Fixed DEPEND, bug #266944. Removed old versions.
 
 *awesome-2.3.6 (19 Apr 2009)
 
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 2f7cf031b507..40593791d60c 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -1,20 +1,10 @@
-AUX awesome-3.0-gentoo.patch 355 RMD160 787050e5f1dc8d8ff16477e77496763318db1fe9 SHA1 d004b93c608afffbaee0cccea17e8cd02592580d SHA256 f76c7cad9cf92c7a0d205b0c8f4b0b9debff98944ee618abbb8fb5eda14a74bf
-AUX awesome-3.2-x11.patch 360 RMD160 b2fb167ccda0b5f04913ab566db07ceace1ed5c4 SHA1 dc5bd97cc05cee3a32f020dd114e988f63bc22cd SHA256 76590ef8537d2fd133935f92b972eab44495a36844e693be1f2966a29597e499
 AUX awesome-session 33 RMD160 68a828295285a5232603df6574fdffa2527fb183 SHA1 c30cf121e89f0fc7320b79ca3452c33ec516f38d SHA256 a76cca201d3f815658acfb54a9ff3737d263cae1f6cc3527a59b0f22aa01df1b
 AUX awesome.desktop 150 RMD160 a50c71cfbcb9ee4b86da8cca19cbd876b3a7f9b0 SHA1 8314ccbed775ecb0af5107cec56632dbec1fe3cf SHA256 433f5cf4adea408e38d464af8b6259efd39a909735679f4625c0cb7fcab3337b
 DIST awesome-2.3.4.tar.gz 230800 RMD160 dca3ae76d91d3fd370d7fc51438896dfd472803d SHA1 d7ec69bf5d2a2caa4d14b4afc68d444a5bf580df SHA256 a73236c31557981746f3e96a6bdc8437455040f33ac0fa9365b2efe8d2889c3a
-DIST awesome-2.3.5.tar.gz 230884 RMD160 a59df028c26f0d42e46240ffc81371585d35e3ff SHA1 52b142646af872f206d8178cd55afec1af2bff73 SHA256 50e107ae67a4eb0bbdb3e9975a6bd43e3435db4d8c2493031479930bfcc329cb
 DIST awesome-2.3.6.tar.gz 232212 RMD160 c4a097026bff49a6a0ac65af13818958c3365bde SHA1 ccc70f810617b6fecc256296f1a3d75a59c5de61 SHA256 14a38b6482d50f75a796a24a47e04089ae51b4046de622ce323783637bb61b50
-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
 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-2.3.6.ebuild 1314 RMD160 146b6e6e947c3fbd4f7532b4dab4773109515e39 SHA1 71d687ce6bd3c202e8dbc2943e993f1220ad1944 SHA256 ea8313dc1cbe8c10fd1b02c67be30f624b54b1d69cd8c974057826db6e26d032
-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.1-r1.ebuild 2168 RMD160 e205e9403fda44300b5819970c421fe40acf146e SHA1 2f79230922b6cba8ceb5f5e9e78b4722310c3238 SHA256 a8b50de7d211b66288e787c840531b9b30354db99ae50ba66116ebd6202cd94c
-EBUILD awesome-3.2.1-r2.ebuild 2190 RMD160 21617b6df01a58b3f017494108c5a34a026f433e SHA1 c3b83c783020d1c25c39b1db1167df326817a552 SHA256 4d818d0583109f6f1a9b212a5a19657c6236a3b82ca1f5604221d9fd3ebb5a53
-EBUILD awesome-3.2.1.ebuild 2147 RMD160 6eb215348397ed053af04d30d9c617d8119e7612 SHA1 e4e0df6726d20e59e11fbc8f95487811a140e684 SHA256 fdf507dd75b3e9272012b9d5927f1ca89f128aec67fb0e51aa88de0ebbde18e6
-MISC ChangeLog 9544 RMD160 e24b5078654f0885898aaa3c36b821c2c1e1754f SHA1 f1b2dc0c87e26847d724672999bfe0e08d22dc7d SHA256 7e4cbbe2f708eadadde8d8ab1930ef42ee62f1b3b3d5a56ca3a910c487eec6d3
+EBUILD awesome-3.2.1-r2.ebuild 2189 RMD160 3c5527ad3bfabbd21c341a3d38e2b39b5c7ff4bb SHA1 1e5746edcb46d57bb5e4a198211ab96b4b9d5b19 SHA256 eac0febd98d24d2c4e59b36d1966d14d8e34e73659a6615d9dd6d876bf92614f
+MISC ChangeLog 9851 RMD160 cff8224cb0e0a1e629de7323131c3c91577df7d3 SHA1 bf2857fc7a12707205d1eb59fd0eee8bc41c7031 SHA256 7d5b46c6d1498fa5663948d28eac1b97c072a802f9ea22c2a4d1ceeda3bf2d50
 MISC metadata.xml 248 RMD160 ade4235c4b35539d6cccd6005afba23a7c9d2afd SHA1 e6af7cb4622744522ecc176d800015b77cd75d81 SHA256 5d0b7e035a2cb76eeb00ece66b18b59060068ea76dd196e6cd4f4524c92cde17
diff --git a/x11-wm/awesome/awesome-2.3.5.ebuild b/x11-wm/awesome/awesome-2.3.5.ebuild
deleted file mode 100644
index 182ec4a72718..000000000000
--- a/x11-wm/awesome/awesome-2.3.5.ebuild
+++ /dev/null
@@ -1,67 +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-2.3.5.ebuild,v 1.3 2009/03/08 19:38:18 gentoofan23 Exp $
-
-EAPI="2"
-inherit toolchain-funcs eutils
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc gtk"
-
-RDEPEND=">=dev-libs/confuse-2.6
-	x11-libs/cairo[X]
-	x11-libs/pango
-	x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libXinerama
-	gtk? ( x11-libs/gtk+ )
-	!gtk? ( media-libs/imlib2 )"
-
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	dev-util/pkgconfig
-	x11-proto/xineramaproto
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)"
-
-src_configure() {
-	econf \
-		$(use_with gtk) \
-		--docdir="/usr/share/doc/${PF}"
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake doc || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN}
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/${PN}.desktop
-
-	insinto /usr/share/awesome/icons
-	doins -r icons/*
-
-	if use doc; then
-		dohtml doc/html/*
-	fi
-
-	prepalldocs
-}
diff --git a/x11-wm/awesome/awesome-3.0-r1.ebuild b/x11-wm/awesome/awesome-3.0-r1.ebuild
deleted file mode 100644
index 8e154a5105e0..000000000000
--- a/x11-wm/awesome/awesome-3.0-r1.ebuild
+++ /dev/null
@@ -1,100 +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.0-r1.ebuild,v 1.2 2009/03/08 19:38:18 gentoofan23 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 +imlib bash-completion"
-IUSE="dbus doc +imlib"
-
-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
-	dbus? ( >=sys-apps/dbus-1 )
-	imlib? ( media-libs/imlib2 )
-	!imlib? ( >=x11-libs/gtk+-2.2 )"
-
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	>=dev-util/cmake-2.6
-	dev-util/pkgconfig
-	x11-proto/xcb-proto
-	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-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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_configure() {
-	local myargs="all"
-
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with imlib IMLIB2)
-		$(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_configure ${myargs}
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc ; then
-		dohtml -r "${WORKDIR}"/${PN}_build/doc/html/* || 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.1.2.ebuild b/x11-wm/awesome/awesome-3.1.2.ebuild
deleted file mode 100644
index 8abc498e61af..000000000000
--- a/x11-wm/awesome/awesome-3.1.2.ebuild
+++ /dev/null
@@ -1,97 +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.1.2.ebuild,v 1.1 2009/02/05 17:10:23 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
-	<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_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-r1.ebuild b/x11-wm/awesome/awesome-3.2.1-r1.ebuild
deleted file mode 100644
index a579c292e845..000000000000
--- a/x11-wm/awesome/awesome-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,99 +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.1-r1.ebuild,v 1.1 2009/04/12 04:32:13 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[png]
-	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_compile() {
-	local myargs="all"
-
-	mycmakeargs="${mycmakeargs}
-		SYSCONFDIR=/etc
-		$(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
-			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.2.1-r2.ebuild b/x11-wm/awesome/awesome-3.2.1-r2.ebuild
index 6f757fffae05..b35b4477cb4e 100644
--- a/x11-wm/awesome/awesome-3.2.1-r2.ebuild
+++ b/x11-wm/awesome/awesome-3.2.1-r2.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-r2.ebuild,v 1.1 2009/04/16 16:45:15 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.2.1-r2.ebuild,v 1.2 2009/04/21 23:23:41 matsuu Exp $
 
 EAPI="2"
 inherit cmake-utils eutils
@@ -25,7 +25,7 @@ RDEPEND=">=dev-lang/lua-5.1
 	x11-libs/libX11[xcb]
 	>=x11-libs/libxcb-1.1
 	>=x11-libs/pango-1.19.3
-	>=x11-libs/xcb-util-0.3.3
+	~x11-libs/xcb-util-0.3.3
 	dbus? ( >=sys-apps/dbus-1 )"
 
 DEPEND="${RDEPEND}
diff --git a/x11-wm/awesome/awesome-3.2.1.ebuild b/x11-wm/awesome/awesome-3.2.1.ebuild
deleted file mode 100644
index da1c993bd028..000000000000
--- a/x11-wm/awesome/awesome-3.2.1.ebuild
+++ /dev/null
@@ -1,98 +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.1.ebuild,v 1.2 2009/04/11 00:10:01 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[png]
-	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_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
-			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/files/awesome-3.0-gentoo.patch b/x11-wm/awesome/files/awesome-3.0-gentoo.patch
deleted file mode 100644
index 202b2248c20d..000000000000
--- a/x11-wm/awesome/files/awesome-3.0-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur awesome-3.0.orig/awesomeConfig.cmake awesome-3.0/awesomeConfig.cmake
---- awesome-3.0.orig/awesomeConfig.cmake	2008-09-18 23:12:42.000000000 +0900
-+++ awesome-3.0/awesomeConfig.cmake	2008-10-14 01:43:22.000000000 +0900
-@@ -135,6 +135,7 @@
-     cairo
-     pango
-     pangocairo
-+    x11-xcb
-     xcb-randr
-     xcb-xinerama
-     xcb-event>=0.3.0
diff --git a/x11-wm/awesome/files/awesome-3.2-x11.patch b/x11-wm/awesome/files/awesome-3.2-x11.patch
deleted file mode 100644
index 6591a67562bd..000000000000
--- a/x11-wm/awesome/files/awesome-3.2-x11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur awesome-3.2.orig/awesomeConfig.cmake awesome-3.2/awesomeConfig.cmake
---- awesome-3.2.orig/awesomeConfig.cmake	2009-03-12 19:49:54.000000000 +0900
-+++ awesome-3.2/awesomeConfig.cmake	2009-04-03 00:16:18.000000000 +0900
-@@ -134,6 +134,7 @@
-     cairo
-     pango>=1.19.3
-     pangocairo>=1.19.3
-+    x11
-     xcb-randr
-     xcb-xtest
-     xcb-xinerama