Version bumped, bug #328931.

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

4 files changed, 34 insertions, 118 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/Manifest b/x11-wm/awesome/Manifest
index 741ed7777fe1..f58b096bd070 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -5,21 +5,29 @@ AUX awesome-3.4.2-backtrace.patch 713 RMD160 b60e09f17c1452588020738df6657768080
 AUX awesome-session 1999 RMD160 2a92c71209f81ecaa302e03974b2f44e380abf38 SHA1 8d86595e00759508a5f20f54dab46d2c143c5033 SHA256 bee150a5b32a118c905ffe26df3f776f40a2db19230f6600cc2966b6c727838a
 AUX awesome.desktop 150 RMD160 a50c71cfbcb9ee4b86da8cca19cbd876b3a7f9b0 SHA1 8314ccbed775ecb0af5107cec56632dbec1fe3cf SHA256 433f5cf4adea408e38d464af8b6259efd39a909735679f4625c0cb7fcab3337b
 DIST awesome-2.3.6.tar.gz 232212 RMD160 c4a097026bff49a6a0ac65af13818958c3365bde SHA1 ccc70f810617b6fecc256296f1a3d75a59c5de61 SHA256 14a38b6482d50f75a796a24a47e04089ae51b4046de622ce323783637bb61b50
-DIST awesome-3.3.4.tar.bz2 252231 RMD160 5891ec98d213ab2a8fef167d58bfb611f8bae61c SHA1 d97875d23eebe7c03839d37af3bb4597abdb4aa8 SHA256 f13628643c01eba26ae28b37be5abbfab1a3578eec8ff9031ed2d3ca170b8b18
-DIST awesome-3.4.3.tar.bz2 271355 RMD160 b91c8e1a7aac4342547496a993d5d6338811e8a0 SHA1 d32c2cc722f970e09552bcd11a58789866c29094 SHA256 7d760b8a75f69e385ac7a54bcc72b19225a7095a99609f0e22755724bdf0bb96
 DIST awesome-3.4.4.tar.bz2 271404 RMD160 7ff57a27ef69b35104dd2c753aaf65166e1087a0 SHA1 923355b2e34320c4265fba4906a5b923869b88a6 SHA256 1fe4346d91eb606456293f5bd7239ce66b8c5c2232848600fffaf264f3b699f3
 DIST awesome-3.4.5.tar.bz2 738222 RMD160 0d18054249973f9eaf243c2661f300f88d45429b SHA1 b069bc1cb865da1404999c0f3aa4fc6ff9e179e4 SHA256 d577a8189bd5a07c811f05f9b5ac03d95b5016e44edabc41b64245b76ab0225e
+DIST awesome-3.4.6.tar.bz2 736156 RMD160 ae38716a756372b39a2b0b5d5a2d1c14f21d6e74 SHA1 48b40e23b56de7a7d51f815353aa4eb2ee5dab08 SHA256 edbbf33d794f772c59f9afe04945b0effbb1165d081e11b54761767f6a7b5d12
 EBUILD awesome-2.3.6.ebuild 1314 RMD160 146b6e6e947c3fbd4f7532b4dab4773109515e39 SHA1 71d687ce6bd3c202e8dbc2943e993f1220ad1944 SHA256 ea8313dc1cbe8c10fd1b02c67be30f624b54b1d69cd8c974057826db6e26d032
-EBUILD awesome-3.3.4.ebuild 2136 RMD160 2cba0039c60b580a472a1ad057120fe160553fd0 SHA1 81a8d5be0d5aac25438803b4a4abab6ccfebaec7 SHA256 dd9e7ca2d793dbea3fb559013bd2c0e0a6dcb50e44e63547bb89512763aa8169
-EBUILD awesome-3.4.3.ebuild 2014 RMD160 a3748863e5de73115f3a325bfc2181008458d949 SHA1 ee2e7829536ab059481be98945a451a491226656 SHA256 cebf045e1e9a59deef6251ff1607db674985c0ae9b29bb9463d75ae2e7aff50d
 EBUILD awesome-3.4.4.ebuild 2009 RMD160 3247d4dc8c8790a49f346b5fa2818f3f0c948f33 SHA1 fbfbbf5d956deb3b0df7fa3275421a97aa3cf8fa SHA256 31cdd8d2eef5eee8888a25aca88765897968dc2bd74a4da9c0e840c1e5d9444c
 EBUILD awesome-3.4.5.ebuild 1990 RMD160 a91a7f878c3302d22210c5bad9881ff496bc34da SHA1 99eca19b7160cf7975c66522808b2e695ac7b254 SHA256 f3fcb98f5689654a16fffbb4720381fc77e1fdf76d61ff93f94aa29b4e9e7c73
-MISC ChangeLog 14791 RMD160 6542d4bc8c8f6e48b28ff23ea56cdcde3e0288d1 SHA1 84b8f169ff57f3ee74e37b0eaa79debef84ceb30 SHA256 d4eefc05061de46f175155d3f164f962ea30a6f6de0ba8451329133add1f1ab2
+EBUILD awesome-3.4.6.ebuild 2013 RMD160 e84e3002353b33951ef4c83383727b1e6315fcce SHA1 f51aabc077b9fd8f6d17aa586f82d727e09177b8 SHA256 576d191a2a88847350000d7baea5092d1457433b36614b80d96331244dc071ee
+MISC ChangeLog 14996 RMD160 02c93a9971d62f5eff259e3fe69b9ea4250b0166 SHA1 a594a3b8da7dbf9c510afd216d77b941293a19c0 SHA256 3b6ded50e6baac4e8a067abf843d4e1245e9e1b4d6a0184960d12ca11a81760b
 MISC metadata.xml 248 RMD160 ade4235c4b35539d6cccd6005afba23a7c9d2afd SHA1 e6af7cb4622744522ecc176d800015b77cd75d81 SHA256 5d0b7e035a2cb76eeb00ece66b18b59060068ea76dd196e6cd4f4524c92cde17
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv5jT0ACgkQCaWpQKGI+9Qu0QCeKFZxVVoO801wwy41tYuc//h7
-OhcAoIFfflvCouSvRZFcjsv8NjHKE1G7
-=56k/
+iQIcBAEBAgAGBQJMRi5uAAoJECaGw+YFKA1pvMgP/0H0MWvxcLGlX9BTT+YAFJPA
+BoIHFwXFckkrqX5OejLKlA18dDidiBpjQVFx7/ZQ/678Lx9AL6LuWgYOjakIpV6p
+4q8h3I1kqQhH3VNBIHbyjXVdlr6g+hyP2oyykGOsVVDcv1DEJCeHDFaIzLbWf/qh
+3EfzUvuHhxPpTOTALCQBmbnk+jBTM86YLOsNYK04BmGmlwNgOmiMJPVtGcQgqGV+
+R3xRvFFE+GsetHl+YmNKMllzvfLN6Vxqy/BzzVIDlBp3sL/mf2r66mFpoEhsAzJm
+VUI98P1/tGjZDa9zJKWuo7IUqeWYBDCIpJgHbtFqG8Uc5qBu5mxDXbt+FRdve4Bl
+sWU9TQXQktL1bG9KBAjHC0mMZngbYF8DNdRazXgGLKr8Ck21UVegI2XI+VT8glOK
+McytWJVlA/8zoUxRJtg2ZUw4QGRhSp7y1ekYMq+0Y7SeaNjyT2jDxtI8B3jNhLDk
+6F2J7RgVHlDD7WYuf/5wZK/N4K383pwlRuCeVWcxpMdQsryM6j86Wlsl+wQN/eBK
+0L3MN6FsTqR+m8bcMDvS+YmAXEc/RPoXU088Lbe/fiQhE5yhfJ6nBobC84Deu9r0
+6IedJGxWf22yAlTxgJFyCD8w1TbXT23RQ5rbIlcl7/Na5c7H9toK7Eg5vKLLnUMW
+sGqvBOb7O7IXPdSrO8nv
+=eqgp
 -----END PGP SIGNATURE-----
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