Version bump for new upstream major version, acked by wired. You must update your configurations per the wiki guide! http://awesome.naquadah.org/wiki/Awesome_3.4_to_3.5.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 174 insertions, 2 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index d905f69b6610..367ba969911a 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-wm/awesome
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.138 2012/09/30 14:23:20 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.139 2012/11/24 21:28:03 robbat2 Exp $
+
+*awesome-3.5_rc1 (24 Nov 2012)
+
+  24 Nov 2012; Robin H. Johnson <robbat2@gentoo.org> +awesome-3.5_rc1.ebuild,
+  +files/awesome-3.5_rc1-convert-path.patch,
+  +files/awesome-3.5_rc1-luadoc-fix-patch:
+  Version bump for new upstream major version, acked by wired. You must update
+  your configurations per the wiki guide!
+  http://awesome.naquadah.org/wiki/Awesome_3.4_to_3.5.
 
   30 Sep 2012; MATSUU Takuto <matsuu@gentoo.org>
   -files/3.4-0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch,
@@ -630,4 +639,3 @@
   27 Sep 2007; MATSUU Takuto <matsuu@gentoo.org> +files/awesome.desktop,
   +files/awesome-session, +metadata.xml, +awesome-1.2.ebuild:
   Initial import.
-
diff --git a/x11-wm/awesome/awesome-3.5_rc1.ebuild b/x11-wm/awesome/awesome-3.5_rc1.ebuild
new file mode 100644
index 000000000000..48a448153e52
--- /dev/null
+++ b/x11-wm/awesome/awesome-3.5_rc1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.5_rc1.ebuild,v 1.1 2012/11/24 21:28:03 robbat2 Exp $
+
+EAPI="3"
+CMAKE_MIN_VERSION="2.8"
+inherit cmake-utils eutils
+
+DESCRIPTION="A dynamic floating and tiling window manager"
+HOMEPAGE="http://awesome.naquadah.org/"
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="http://awesome.naquadah.org/download/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dbus doc elibc_FreeBSD gnome"
+
+COMMON_DEPEND=">=dev-lang/lua-5.1
+	dev-libs/libev
+	>=dev-libs/libxdg-basedir-1
+	media-libs/imlib2[png]
+	x11-libs/cairo[xcb]
+	|| ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
+	>=x11-libs/libxcb-1.6
+	>=x11-libs/pango-1.19.3
+	>=x11-libs/startup-notification-0.10_p20110426
+	>=x11-libs/xcb-util-0.3.8
+	dbus? ( >=sys-apps/dbus-1 )
+	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+
+# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+DEPEND="${COMMON_DEPEND}
+	>=app-text/asciidoc-8.4.5
+	app-text/xmlto
+	dev-util/gperf
+	virtual/pkgconfig
+	media-gfx/imagemagick[png]
+	>=x11-proto/xcb-proto-1.5
+	>=x11-proto/xproto-7.0.15
+	doc? (
+		app-doc/doxygen
+		dev-lua/luadoc
+		media-gfx/graphviz
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		x11-misc/gxmessage
+		x11-apps/xmessage
+	)"
+
+# bug #321433: Need one of these to for awsetbg.
+# imagemagick provides 'display' and is further down the default list, but
+# listed here for completeness.  'display' however is only usable with
+# x11-apps/xwininfo also present.
+RDEPEND="${RDEPEND}
+	|| (
+	( x11-apps/xwininfo
+	  || ( media-gfx/imagemagick[X] media-gfx/graphicsmagick[imagemagick,X] )
+	)
+	x11-misc/habak
+	media-gfx/feh
+	x11-misc/hsetroot
+	media-gfx/qiv
+	media-gfx/xv
+	x11-misc/xsri
+	media-gfx/xli
+	x11-apps/xsetroot
+	)"
+
+DOCS="AUTHORS BUGS PATCHES README STYLE"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Upstreamed
+	#epatch \
+	#	"${FILESDIR}/${PN}-3.4.2-backtrace.patch"
+
+	# bug  #408025
+	epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
+
+	# Fix luadoc build
+	epatch "${FILESDIR}/${PN}-3.5_rc1-luadoc-fix-patch"
+
+	# Fix name of luadoc binary
+	sed -i \
+		-e '/^a_find_program/{ /LDOC_EXECUTABLE/{ s/ldoc.lua/luadoc/; } }' \
+		"${S}"/awesomeConfig.cmake || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DPREFIX="${EPREFIX}"/usr
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		$(cmake-utils_use_with dbus DBUS)
+		$(cmake-utils_use doc GENERATE_LUADOC)
+		)
+
+	cmake-utils_src_configure
+}
+
+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 "${ED}"/usr/share/doc/${PN}/doc/html "${ED}"/usr/share/doc/${PF}/html/luadoc || die
+	fi
+	rm -rf "${ED}"/usr/share/doc/${PN} || die
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN} || die
+
+	# GNOME-based awesome
+	if use gnome ; then
+		# GNOME session
+		insinto /usr/share/gnome-session/sessions
+		doins "${FILESDIR}/${PN}-gnome.session" || die
+		# Application launcher
+		insinto /usr/share/applications
+		doins "${FILESDIR}/${PN}-gnome.desktop" || die
+		# X Session
+		insinto /usr/share/xsessions/
+		doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
+	fi
+}
diff --git a/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch b/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch
new file mode 100644
index 000000000000..e6c37b0f9c76
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch
@@ -0,0 +1,12 @@
+diff -Nuar --exclude '*.orig' awesome-3.5-rc1.orig/awesomeConfig.cmake awesome-3.5-rc1/awesomeConfig.cmake
+--- awesome-3.5-rc1.orig/awesomeConfig.cmake	2012-11-24 13:51:33.000000000 +0000
++++ awesome-3.5-rc1/awesomeConfig.cmake	2012-11-24 20:42:23.743412441 +0000
+@@ -56,7 +56,7 @@
+ a_find_program(LUA_EXECUTABLE lua FALSE)
+ a_find_program(LDOC_EXECUTABLE ldoc.lua FALSE)
+ # theme graphics
+-a_find_program(CONVERT_EXECUTABLE convert TRUE)
++a_find_program(CONVERT_EXECUTABLE bin/convert TRUE)
+ # doxygen
+ include(FindDoxygen)
+ # pkg-config
diff --git a/x11-wm/awesome/files/awesome-3.5_rc1-luadoc-fix-patch b/x11-wm/awesome/files/awesome-3.5_rc1-luadoc-fix-patch
new file mode 100644
index 000000000000..e67eeb04e0f5
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.5_rc1-luadoc-fix-patch
@@ -0,0 +1,10 @@
+--- ../awesome-3.5-rc1/lib/naughty.lua.in.orig	2012-11-24 05:51:33.000000000 -0800
++++ ../awesome-3.5_rc1/lib/naughty.lua.in	2012-11-24 13:17:14.025201211 -0800
+@@ -55,7 +55,6 @@
+ -- @field low The preset for notifications with low urgency level
+ -- @field normal The default preset for every notification without a preset that will also be used for normal urgency level
+ -- @field critical The preset for notifications with a critical urgency level
+--- @class table
+ naughty.config.presets = {
+     normal = {},
+     low = {