3 files changed, 17 insertions, 109 deletions
diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 5c9d8f1d344c..dff274bb5303 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/awesome
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.102 2010/05/23 20:16:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.103 2010/07/20 23:16:48 matsuu Exp $
+
+*awesome-3.4.6 (20 Jul 2010)
+
+  20 Jul 2010; MATSUU Takuto <matsuu@gentoo.org> -awesome-3.3.4.ebuild,
+  -awesome-3.4.3.ebuild, +awesome-3.4.6.ebuild:
+  Version bumped, bug #328931. Removed old versions.
 
   23 May 2010; Pacho Ramos <pacho@gentoo.org> awesome-3.4.4.ebuild:
   stable amd64, bug 313617
diff --git a/x11-wm/awesome/awesome-3.3.4.ebuild b/x11-wm/awesome/awesome-3.3.4.ebuild
deleted file mode 100644
index d12a9bff251e..000000000000
--- a/x11-wm/awesome/awesome-3.3.4.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.3.4.ebuild,v 1.6 2009/12/31 17:43:32 ranger 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[deprecated]
-	dev-libs/libev
-	>=dev-libs/libxdg-basedir-1
-	dev-util/gperf
-	media-libs/imlib2[png]
-	x11-libs/cairo[xcb]
-	x11-libs/libX11[xcb]
-	>=x11-libs/libxcb-1.4
-	>=x11-libs/pango-1.19.3
-	>=x11-libs/startup-notification-0.10
-	>=x11-libs/xcb-util-0.3.6
-	dbus? ( >=sys-apps/dbus-1 )"
-
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	>=dev-util/cmake-2.6
-	dev-util/pkgconfig
-	media-gfx/imagemagick
-	>=x11-proto/xcb-proto-1.5
-	>=x11-proto/xproto-7.0.15
-	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
-		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"
-
-mycmakeargs="-DPREFIX=/usr
-	-DSYSCONFDIR=/etc
-	$(cmake-utils_use_with dbus DBUS)
-	$(cmake-utils_use doc GENERATE_LUADOC)"
-
-src_compile() {
-	local myargs="all"
-
-	if use doc ; then
-		myargs="${myargs} doc"
-	fi
-	cmake-utils_src_make ${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.4.3.ebuild b/x11-wm/awesome/awesome-3.4.6.ebuild
index 0f66b59c5e92..182d9d4d98b5 100644
--- a/x11-wm/awesome/awesome-3.4.3.ebuild
+++ b/x11-wm/awesome/awesome-3.4.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.3.ebuild,v 1.4 2010/03/02 11:56:12 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.6.ebuild,v 1.1 2010/07/20 23:16:48 matsuu Exp $
 
-EAPI="2"
+EAPI="3"
 inherit cmake-utils eutils
 
 DESCRIPTION="A dynamic floating and tiling window manager"
@@ -11,9 +11,8 @@ 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 elibc_FreeBSD bash-completion"
-IUSE="dbus doc elibc_FreeBSD"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dbus doc elibc_FreeBSD bash-completion"
 
 RDEPEND=">=dev-lang/lua-5.1[deprecated]
 	dev-libs/libev
@@ -29,7 +28,7 @@ RDEPEND=">=dev-lang/lua-5.1[deprecated]
 	elibc_FreeBSD? ( dev-libs/libexecinfo )"
 
 DEPEND="${RDEPEND}
-	app-text/asciidoc
+	>=app-text/asciidoc-8.4.5
 	app-text/xmlto
 	>=dev-util/cmake-2.6
 	dev-util/gperf
@@ -45,16 +44,16 @@ DEPEND="${RDEPEND}
 
 RDEPEND="${RDEPEND}
 	app-shells/bash
+	bash-completion? ( app-shells/bash-completion )
 	|| (
 		x11-misc/gxmessage
 		x11-apps/xmessage
 	)"
-#	bash-completion? ( app-shells/bash-completion )
 
 DOCS="AUTHORS BUGS PATCHES README STYLE"
 
-mycmakeargs="-DPREFIX=/usr
-	-DSYSCONFDIR=/etc
+mycmakeargs="-DPREFIX=${EPREFIX}/usr
+	-DSYSCONFDIR=${EPREFIX}/etc
 	$(cmake-utils_use_with dbus DBUS)
 	$(cmake-utils_use doc GENERATE_LUADOC)"
 
@@ -80,9 +79,9 @@ src_install() {
 			mv html doxygen
 			dohtml -r doxygen || die
 		)
-		mv "${D}"/usr/share/doc/${PN}/luadoc "${D}"/usr/share/doc/${PF}/html/luadoc || die
+		mv "${ED}"/usr/share/doc/${PN}/luadoc "${ED}"/usr/share/doc/${PF}/html/luadoc || die
 	fi
-	rm -rf "${D}"/usr/share/doc/${PN} || die
+	rm -rf "${ED}"/usr/share/doc/${PN} || die
 
 	exeinto /etc/X11/Sessions
 	newexe "${FILESDIR}"/${PN}-session ${PN} || die