Version bumped.

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27-gentoo x86_64

4 files changed, 41 insertions, 98 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 820eac461992..a4a8486964bd 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,12 @@
 # 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.42 2008/10/16 20:29:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.43 2008/11/07 15:36:23 matsuu Exp $
+
+*awesome-3.1_rc1 (07 Nov 2008)
+
+  07 Nov 2008; MATSUU Takuto <matsuu@gentoo.org> -awesome-2.3.2.ebuild,
+  -awesome-3.0.ebuild, +awesome-3.1_rc1.ebuild:
+  Version bumped. Removed old versions.
 
   16 Oct 2008; Markus Meier <maekke@gentoo.org> awesome-2.3.4.ebuild:
   amd64/x86 stable, bug #241858
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index b5ef06a7ec70..68c71484d400 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -1,22 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX awesome-3.0-gentoo.patch 355 RMD160 787050e5f1dc8d8ff16477e77496763318db1fe9 SHA1 d004b93c608afffbaee0cccea17e8cd02592580d SHA256 f76c7cad9cf92c7a0d205b0c8f4b0b9debff98944ee618abbb8fb5eda14a74bf
 AUX awesome-session 33 RMD160 68a828295285a5232603df6574fdffa2527fb183 SHA1 c30cf121e89f0fc7320b79ca3452c33ec516f38d SHA256 a76cca201d3f815658acfb54a9ff3737d263cae1f6cc3527a59b0f22aa01df1b
 AUX awesome.desktop 150 RMD160 a50c71cfbcb9ee4b86da8cca19cbd876b3a7f9b0 SHA1 8314ccbed775ecb0af5107cec56632dbec1fe3cf SHA256 433f5cf4adea408e38d464af8b6259efd39a909735679f4625c0cb7fcab3337b
-DIST awesome-2.3.2.tar.gz 230593 RMD160 02bfaf317d849991a52e0d8a1bcdfd415798ae1d SHA1 d49ceec58c456fff696432d2226f4eb10d2f605b SHA256 5d2079e6c9add9bfcd2a598a6dfe6e544b0f5bbe9c96731a18c132a70a3af348
 DIST awesome-2.3.4.tar.gz 230800 RMD160 dca3ae76d91d3fd370d7fc51438896dfd472803d SHA1 d7ec69bf5d2a2caa4d14b4afc68d444a5bf580df SHA256 a73236c31557981746f3e96a6bdc8437455040f33ac0fa9365b2efe8d2889c3a
 DIST awesome-3.0.tar.bz2 142225 RMD160 a2e602e70f93600e57e100d8aa71766fe8786c64 SHA1 237a05f931a3889bfbcc9e31aaf4c56e55b3272a SHA256 9a4fa26f069223714d584b6b19f017f67808f83aa5788e6ae25c1f71001b9d4c
-EBUILD awesome-2.3.2.ebuild 1271 RMD160 82a731b5442abe3eda49c47056c2953d2b59c87b SHA1 e1f48a408f5a962dc716c0e404e04bb734ec1b4b SHA256 8f8e04baf39b2eb54ecdd8254b36b43912fad5995fa4dd75595319526c831525
+DIST awesome-3.1-rc1.tar.bz2 162003 RMD160 54584cb069af5685e04a8191b453fc3e641315e4 SHA1 adf699468460f3b554bd5c5ebfc6c92165b3150d SHA256 09d873d3f77320105ce1c0634319c2a2c8a53f9224340b84a13d68dd85367ec9
 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.0.ebuild 2112 RMD160 ecb502716ce1aae706cb9a04d174aeede9eeac39 SHA1 6cf1520e3c338cf4e169b49c87149d6c90522554 SHA256 c4c78adb1b72c1c9e39d338d43849f928b673d206f9fc44bd7f636738fd724cd
-MISC ChangeLog 5854 RMD160 79eb8121f8c988993c18b40769cd7de5e75ab2ff SHA1 a59ae72d9d5ea448d83ec94019daa00716745137 SHA256 56f37e337ab6eb067fa5929eef0bee51280969f891cebcf07cbec36fa0f092ac
+EBUILD awesome-3.1_rc1.ebuild 2123 RMD160 b49cb663ac825724be1198a126e1047295c94e84 SHA1 1c499e615ba8ad94d493e1558b31b8fe518aebef SHA256 cdde6efc677b381474923abfe770408fa37b17ed9595f9faca260ed649cb5796
+MISC ChangeLog 6047 RMD160 601e3a616267d2fc7375858e07d7353930983248 SHA1 2a400825283f6398a5a8eefdda29af16a3760ac3 SHA256 8668c280fcc0ec9907cf09363a3e05028dae06ab0103d8d621227cdb02880442
 MISC metadata.xml 248 RMD160 ade4235c4b35539d6cccd6005afba23a7c9d2afd SHA1 e6af7cb4622744522ecc176d800015b77cd75d81 SHA256 5d0b7e035a2cb76eeb00ece66b18b59060068ea76dd196e6cd4f4524c92cde17
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkj3pH4ACgkQkKaRLQcq0GIamgCfZWpDNTH/ZsNL9YwZ3rG1U0JY
-HuIAnRKw8Hbm4EbWfXFEdHIGejpkSlj8
-=kQEa
------END PGP SIGNATURE-----
diff --git a/x11-wm/awesome/awesome-2.3.2.ebuild b/x11-wm/awesome/awesome-2.3.2.ebuild
deleted file mode 100644
index 4ced1b51aeab..000000000000
--- a/x11-wm/awesome/awesome-2.3.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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-2.3.2.ebuild,v 1.7 2008/08/05 12:44:24 tove Exp $
-
-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/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_compile() {
-	econf \
-		$(use_with gtk) \
-		--docdir="/usr/share/doc/${PF}" || die
-	emake || die
-
-	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.ebuild b/x11-wm/awesome/awesome-3.1_rc1.ebuild
index 44a83242dc5f..5ff248d4a2eb 100644
--- a/x11-wm/awesome/awesome-3.0.ebuild
+++ b/x11-wm/awesome/awesome-3.1_rc1.ebuild
@@ -1,34 +1,34 @@
 # 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.0.ebuild,v 1.2 2008/09/23 07:17:20 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.1_rc1.ebuild,v 1.1 2008/11/07 15:36:23 matsuu Exp $
 
-EAPI=1
+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/${P}.tar.bz2"
+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 +imlib bash-completion"
-IUSE="dbus doc +imlib"
+#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
-	x11-libs/libX11
+	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 )"
+	media-libs/imlib2
+	dbus? ( >=sys-apps/dbus-1 )"
 
 DEPEND="${RDEPEND}
 	app-text/asciidoc
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND}
 	>=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
@@ -43,25 +44,34 @@ DEPEND="${RDEPEND}
 	)"
 
 RDEPEND="${RDEPEND}
-	app-shells/bash"
+	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"
+S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	if ! built_with_use --missing false x11-libs/cairo xcb; then
-		eerror "This package you need the useflag xcb enabled on x11-libs/cairo."
-		eerror "Please emerge x11-libs/cairo again with the xcb useflag"
-		eerror "enabled."
-		die "Missing xcb useflag on x11-libs/cairo."
-	fi
-}
+DOCS="AUTHORS BUGS PATCHES README STYLE"
 
 src_compile() {
 	local myargs="all"
 
 	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with imlib IMLIB2)
 		$(cmake-utils_use_with dbus DBUS)"
 
 	if use doc ; then