Version bumped.

Package-Manager: portage-2.1.5_rc6

5 files changed, 34 insertions, 128 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 79b1c3533776..60a46ff59d26 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.19 2008/05/06 13:47:36 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.20 2008/06/03 00:04:47 matsuu Exp $
+
+*awesome-2.3.1 (03 Jun 2008)
+
+  03 Jun 2008; MATSUU Takuto <matsuu@gentoo.org> -awesome-2.0.ebuild,
+  -awesome-2.1.ebuild, -awesome-2.2.ebuild, +awesome-2.3.1.ebuild:
+  Version bumped. Removed old versions.
 
 *awesome-2.3 (06 May 2008)
 
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 14eac2329d03..39ba8996cbb8 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -1,12 +1,8 @@
 AUX awesome-session 33 RMD160 68a828295285a5232603df6574fdffa2527fb183 SHA1 c30cf121e89f0fc7320b79ca3452c33ec516f38d SHA256 a76cca201d3f815658acfb54a9ff3737d263cae1f6cc3527a59b0f22aa01df1b
 AUX awesome.desktop 150 RMD160 a50c71cfbcb9ee4b86da8cca19cbd876b3a7f9b0 SHA1 8314ccbed775ecb0af5107cec56632dbec1fe3cf SHA256 433f5cf4adea408e38d464af8b6259efd39a909735679f4625c0cb7fcab3337b
-DIST awesome-2.0.tar.gz 48600 RMD160 3a3a7014a11915f316bfce9ce5a2a606a057363a SHA1 7a3257e7a76f9d77bd59558aa8393f2bed50057f SHA256 933ce7f5f4339963a5f6229caf82c9f0fb8eb69e69293f72246737e13ffaa079
-DIST awesome-2.1.tar.gz 164080 RMD160 2655d2a37b75251a61a3607c41a6025fdc887508 SHA1 76d794fa4216db50100494dfb2c772d29eec9737 SHA256 9a804ec4af52d051d1f242cef32e7b77684f9f377d7536d85d474dfe910b5415
-DIST awesome-2.2.tar.gz 208012 RMD160 c873c6bc8b983538d2427f4cd83838797df6bfe8 SHA1 d96f4a7b51bc7b4a9765de329d95d4904c831532 SHA256 388878f17c3cdd0379474396b95f26eb3af10ec295e89a9b833865d9e0a12aed
+DIST awesome-2.3.1.tar.gz 230891 RMD160 94a1bbbe6f0919f843b87d8dee9d220167fc7885 SHA1 791843a8a7f1fa931377ec33f4a54e8e525b4ac6 SHA256 ed433ec8448e02c1372c888421e226ff13c08d0586fab57d8021800b881efdec
 DIST awesome-2.3.tar.gz 230809 RMD160 0ea6d935a0afc3942d921180cf0c793fd1b26e5f SHA1 07c2679bb8777a1db29f7d0279e35e71028ffcc1 SHA256 620fd6163102084f615091bab11c4fd7213911b031a49107174d7eb2957f9e84
-EBUILD awesome-2.0.ebuild 1293 RMD160 417e12fcaab8eb22b1dcba2ea2b46f9e8b184c68 SHA1 52706dd3535b603633471c4c19dd1a8be0be006a SHA256 a9ce975d51ff139421f1684077b2da54c055020a7a0746b414b8450228be0f35
-EBUILD awesome-2.1.ebuild 1133 RMD160 43bcf64564be5aab7694edef6cc27965deb1f10e SHA1 dd165222586b6181a5d097bf6074d616d114dad4 SHA256 7b454e0f8b642a5be2c167d640a27306d860481b36933f0b8e1c8bbd460bd380
-EBUILD awesome-2.2.ebuild 1180 RMD160 35e8a4666c4b4e6701b7150a46c7f2f4f45d12d0 SHA1 6d7e107517901abd1e4ab080a59f7cf29a9971bb SHA256 a055b56f05ac4cc4fac8e195829bae177589c7487a7fa11a9b5fd4b8bf1034f0
+EBUILD awesome-2.3.1.ebuild 1289 RMD160 eac37b8c735db540a0e4ab6816ede6a831f56b96 SHA1 0b3c2610627e9c7d25e42cd9d66e6a2d7f24496b SHA256 3adc663967e5ebe3276d54f60f5a949ff9100e3b61ef5b8c1868dd38bd72c8c1
 EBUILD awesome-2.3.ebuild 1287 RMD160 fcd2093d8081a6b3712d1ebf66a8f7b95f6081eb SHA1 f2c8635ebf5ca110b52e77be92f039119482d54e SHA256 bc7108d340b9fb82935a8ee4e17601bf18c05b0d697592f136c0d689cb2dafc3
-MISC ChangeLog 2782 RMD160 472d09ce1ff3c471ce40d96d1250356beee1a599 SHA1 dddce1f360f329b6a247b9e7605bba5b89cd1cb7 SHA256 092181372870bd8f2a2c91daf793a16d082a6266baa21b4e2a887f0b64762fb7
+MISC ChangeLog 2990 RMD160 1910f1cc189ab4b77209ab67b5fbdce3c7b43e3e SHA1 ca5ec7319e0972dd983c71125e176f2e4fdb7534 SHA256 d4517c5c62512b8ad623216e67718a40ff5d9c5b52868309427da647125776e0
 MISC metadata.xml 248 RMD160 ade4235c4b35539d6cccd6005afba23a7c9d2afd SHA1 e6af7cb4622744522ecc176d800015b77cd75d81 SHA256 5d0b7e035a2cb76eeb00ece66b18b59060068ea76dd196e6cd4f4524c92cde17
diff --git a/x11-wm/awesome/awesome-2.0.ebuild b/x11-wm/awesome/awesome-2.0.ebuild
deleted file mode 100644
index a6cc7b819a9c..000000000000
--- a/x11-wm/awesome/awesome-2.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-2.0.ebuild,v 1.2 2007/12/22 18:08:04 nixnut Exp $
-
-inherit toolchain-funcs
-
-MY_P="${P/_/-}"
-DESCRIPTION="awesome is a window manager initialy based on a dwm code rewriting"
-HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/confuse
-	x11-libs/cairo
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrandr
-	x11-libs/libXinerama"
-
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	dev-util/pkgconfig
-	x11-proto/xineramaproto"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	sed -i \
-		-e "/^CFLAGS/s:=.*-O3:= ${CFLAGS}:" \
-		-e "/LDFLAGS/s:-ggdb3:${LDFLAGS}:" \
-		-e "/^CC/s:cc:$(tc-getCC):" \
-		-e "s:/usr/lib:/usr/$(get_libdir):" \
-		-e "s:/usr/local:/usr:" \
-		config.mk || die "sed failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-unstrip || die "emake install failed"
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN}
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/${PN}.desktop
-
-	dodoc AUTHORS README awesomerc
-}
diff --git a/x11-wm/awesome/awesome-2.2.ebuild b/x11-wm/awesome/awesome-2.2.ebuild
deleted file mode 100644
index c770cbe11398..000000000000
--- a/x11-wm/awesome/awesome-2.2.ebuild
+++ /dev/null
@@ -1,52 +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.2.ebuild,v 1.1 2008/03/24 17:15:15 matsuu Exp $
-
-inherit toolchain-funcs eutils
-
-MY_P="${P/_rc/-rc}"
-DESCRIPTION="awesome is a window manager initialy based on a dwm code rewriting"
-HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/confuse-2.6
-	x11-libs/cairo
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrandr
-	x11-libs/libXinerama"
-
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	app-doc/doxygen
-	dev-util/pkgconfig
-	x11-proto/xineramaproto"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf --docdir="/usr/share/doc/${PF}" || die
-	emake || die
-}
-
-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/layouts
-	doins icons/layouts/*
-
-	prepalldocs
-}
diff --git a/x11-wm/awesome/awesome-2.1.ebuild b/x11-wm/awesome/awesome-2.3.1.ebuild
index 5c6cf1f4a5a5..ea04751b9bb4 100644
--- a/x11-wm/awesome/awesome-2.1.ebuild
+++ b/x11-wm/awesome/awesome-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.2 2008/01/25 18:14:01 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-2.3.1.ebuild,v 1.1 2008/06/03 00:04:47 matsuu Exp $
 
 inherit toolchain-funcs eutils
 
@@ -11,26 +11,35 @@ SRC_URI="http://awesome.naquadah.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
+IUSE="doc gtk"
 
 RDEPEND=">=dev-libs/confuse-2.6
-	x11-libs/cairo
+	x11-libs/pango
 	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
 	x11-libs/libXrandr
-	x11-libs/libXinerama"
+	x11-libs/libXinerama
+	gtk? ( x11-libs/gtk+ )
+	!gtk? ( media-libs/imlib2 )"
 
 DEPEND="${RDEPEND}
 	app-text/asciidoc
 	app-text/xmlto
-	app-doc/doxygen
 	dev-util/pkgconfig
-	x11-proto/xineramaproto"
+	x11-proto/xineramaproto
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)"
 
 src_compile() {
-	econf --docdir="/usr/share/doc/${PF}" || die
+	econf \
+		$(use_with gtk) \
+		--docdir="/usr/share/doc/${PF}" || die
 	emake || die
+
+	if use doc; then
+		emake doc || die
+	fi
 }
 
 src_install() {
@@ -42,8 +51,12 @@ src_install() {
 	insinto /usr/share/xsessions
 	doins "${FILESDIR}"/${PN}.desktop
 
-	insinto /usr/share/awesome/icons/layouts
-	doins icons/layouts/*
+	insinto /usr/share/awesome/icons
+	doins -r icons/*
+
+	if use doc; then
+		dohtml doc/html/*
+	fi
 
 	prepalldocs
 }