Version bumped.

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64)

4 files changed, 69 insertions, 176 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 5e0023612be2..6afc0153f0bb 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.32 2008/08/24 11:33:12 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.33 2008/08/24 16:41:14 matsuu Exp $
+
+*awesome-2.3.4 (24 Aug 2008)
+
+  24 Aug 2008; MATSUU Takuto <matsuu@gentoo.org> +awesome-2.3.4.ebuild,
+  -awesome-3.0_rc2.ebuild, -awesome-3.0_rc3.ebuild:
+  Version bumped.
 
   24 Aug 2008; Markus Rothe <corsair@gentoo.org> awesome-3.0_rc4.ebuild:
   Added ~ppc64; bug #234421
diff --git a/x11-wm/awesome/awesome-2.3.4.ebuild b/x11-wm/awesome/awesome-2.3.4.ebuild
new file mode 100644
index 000000000000..4dcd9653b840
--- /dev/null
+++ b/x11-wm/awesome/awesome-2.3.4.ebuild
@@ -0,0 +1,62 @@
+# 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.4.ebuild,v 1.1 2008/08/24 16:41:14 matsuu 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_rc2.ebuild b/x11-wm/awesome/awesome-3.0_rc2.ebuild
deleted file mode 100644
index 1061b3016f39..000000000000
--- a/x11-wm/awesome/awesome-3.0_rc2.ebuild
+++ /dev/null
@@ -1,88 +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-3.0_rc2.ebuild,v 1.2 2008/08/14 07:39:45 aballier Exp $
-
-inherit cmake-utils eutils
-
-MY_P="${P/_rc/-rc}"
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="dbus doc imlib"
-
-RDEPEND=">=x11-libs/libxcb-1.1
-	>=x11-libs/xcb-util-0.2.1
-	x11-libs/cairo
-	>=dev-libs/glib-2
-	dev-libs/libev
-	>=dev-lang/lua-5.1
-	x11-libs/pango
-	>=x11-libs/gtk+-2.2
-	dbus? ( >=sys-apps/dbus-1 )
-	imlib? ( media-libs/imlib2 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-proto/xcb-proto
-	>=dev-util/cmake-2.4.7
-	app-text/asciidoc
-	app-text/xmlto
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-		dev-util/luadoc
-	)"
-
-RDEPEND="${RDEPEND}
-	app-shells/bash"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS BUGS README"
-
-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
-}
-
-src_compile() {
-	local myargs="all"
-
-	mycmakeargs="${mycmakeargs}
-		-DSYSCONFDIR=/etc
-		$(cmake-utils_use_with imlib IMLIB2)
-		$(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_compile ${myargs}
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc ; then
-		dohtml -r "${WORKDIR}"/${PN}_build/doc/html/* || 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
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/${PN}.desktop || die
-}
diff --git a/x11-wm/awesome/awesome-3.0_rc3.ebuild b/x11-wm/awesome/awesome-3.0_rc3.ebuild
deleted file mode 100644
index 87b136aa4364..000000000000
--- a/x11-wm/awesome/awesome-3.0_rc3.ebuild
+++ /dev/null
@@ -1,87 +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-3.0_rc3.ebuild,v 1.1 2008/08/15 23:48:19 matsuu Exp $
-
-inherit cmake-utils eutils
-
-MY_P="${P/_rc/-rc}"
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="dbus doc imlib"
-
-RDEPEND=">=dev-lang/lua-5.1
-	>=dev-libs/glib-2
-	dev-libs/libev
-	x11-libs/cairo
-	x11-libs/libX11
-	>=x11-libs/libxcb-1.1
-	x11-libs/pango
-	>=x11-libs/xcb-util-0.2.1
-	dbus? ( >=sys-apps/dbus-1 )
-	imlib? ( media-libs/imlib2 )
-	!imlib? ( >=x11-libs/gtk+-2.2 )"
-
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	>=dev-util/cmake-2.6
-	dev-util/pkgconfig
-	x11-proto/xcb-proto
-	doc? (
-		app-doc/doxygen
-		dev-util/luadoc
-		media-gfx/graphviz
-	)"
-
-RDEPEND="${RDEPEND}
-	app-shells/bash"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS BUGS README"
-
-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
-}
-
-src_compile() {
-	local myargs="all"
-
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with imlib IMLIB2)
-		$(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_compile ${myargs}
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc ; then
-		dohtml -r "${WORKDIR}"/${PN}_build/doc/html/* || 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
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/${PN}.desktop || die
-}