Fixed dependency, bug #271098.

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

4 files changed, 9 insertions, 106 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 89d63a6d4b51..48fe0c18a56a 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.70 2009/05/24 00:18:31 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.71 2009/05/25 23:27:42 matsuu Exp $
+
+  25 May 2009; MATSUU Takuto <matsuu@gentoo.org> -awesome-3.2.1-r2.ebuild,
+  awesome-3.3_rc3.ebuild:
+  Fixed dependency, bug #271098. Removed old version.
 
 *awesome-3.3_rc3 (24 May 2009)
 
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index bccaa728e120..8ecaebcf3af9 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -6,8 +6,7 @@ DIST awesome-3.2.1.tar.bz2 241372 RMD160 dddb0b2f8a9d1d6a108158700815ef943d0d268
 DIST awesome-3.3-rc3.tar.bz2 251630 RMD160 549f7e56c9690366cbab0e8b7f815bb26cb0fc34 SHA1 472739032feafef20913b0bdabde9a64292ce40e SHA256 b7b5bc6a178a24916e33926d278e1d843d802538f66c735e4a42db60a7a178a7
 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 2187 RMD160 5b18b3ce04e562d9ef85031ed0b5fadad46e8a4a SHA1 0a0d8c9cb96f01a102b59ad5dd6845e43d9e0404 SHA256 ed4d2618c2714da7fe58cbc685740946a1566ead9baf0aeb760c6a0f5f60d70d
 EBUILD awesome-3.2.1-r3.ebuild 2092 RMD160 29d4f77f0e701e2f497a0c77d9aa7ef4e5df46f0 SHA1 64e5c450146f2a3128ccaee408d36f6f812b5ea7 SHA256 f52b8f071a06cee8047f96c78672c4d6e738076f765af09bfd55471717416cd5
-EBUILD awesome-3.3_rc3.ebuild 2181 RMD160 dcf4f66605ac86f0d654ae9e4eb5e4451858411b SHA1 f9a356174083cd0aaba2c855383c77684dea562d SHA256 451bc50e7f1150e99e5e08647e666f0a87e4977da2d08ef02120f34a0b5f02c8
-MISC ChangeLog 10338 RMD160 acf88686f595654b85afb26a9fcbc758830d2d6a SHA1 dc51e837661394b8469714cd131e76630910d4b6 SHA256 4068ad93189c89f67724075ca93f0d8d334436a18149678ef442b6f4490f66dc
+EBUILD awesome-3.3_rc3.ebuild 2193 RMD160 2b20db0f6c68aa0383e279e15dc7530d5fc8fd25 SHA1 db955e540ebe84b4b181695e87c8e0b54ef49ab2 SHA256 5397e9ddec3de688474781469f58960abbb6a4dce343f6c7d971e79d64105453
+MISC ChangeLog 10494 RMD160 b5eb380592f54f7a775745537867c2bed7aa52e4 SHA1 ee31f18e17a15fd4c7ec531e980c30ba0cca2bf8 SHA256 d598b611cdda20241338cfe520da8bfcaacde3a23404008955fbf167fbfd272d
 MISC metadata.xml 248 RMD160 ade4235c4b35539d6cccd6005afba23a7c9d2afd SHA1 e6af7cb4622744522ecc176d800015b77cd75d81 SHA256 5d0b7e035a2cb76eeb00ece66b18b59060068ea76dd196e6cd4f4524c92cde17
diff --git a/x11-wm/awesome/awesome-3.2.1-r2.ebuild b/x11-wm/awesome/awesome-3.2.1-r2.ebuild
deleted file mode 100644
index d40d431d4d03..000000000000
--- a/x11-wm/awesome/awesome-3.2.1-r2.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.2.1-r2.ebuild,v 1.3 2009/05/13 20:24:23 loki_val 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"
-
-src_configure() {
-	local myargs="all"
-
-	mycmakeargs="${mycmakeargs}
-		-DPREFIX=/usr
-		-DSYSCONFDIR=/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_configure ${myargs}
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc ; then
-		(
-			cd "${CMAKE_BUILD_DIR}"/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.3_rc3.ebuild b/x11-wm/awesome/awesome-3.3_rc3.ebuild
index d58bb94ca69a..37e7fa320c74 100644
--- a/x11-wm/awesome/awesome-3.3_rc3.ebuild
+++ b/x11-wm/awesome/awesome-3.3_rc3.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.3_rc3.ebuild,v 1.1 2009/05/24 00:18:31 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.3_rc3.ebuild,v 1.2 2009/05/25 23:27:42 matsuu Exp $
 
 EAPI="2"
 inherit cmake-utils eutils
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 #IUSE="dbus doc bash-completion"
 IUSE="dbus doc"
 
-RDEPEND=">=dev-lang/lua-5.1
+RDEPEND=">=dev-lang/lua-5.1[deprecated]
 	dev-libs/libev
 	>=dev-libs/libxdg-basedir-1
 	dev-util/gperf