3 files changed, 36 insertions, 22 deletions
diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index 9751ef07c814..c753c896abea 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/awesome
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.88 2009/11/09 23:12:02 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.89 2009/11/27 17:07:01 matsuu Exp $
+
+*awesome-3.4.2 (27 Nov 2009)
+
+  27 Nov 2009; MATSUU Takuto <matsuu@gentoo.org> -awesome-3.4.ebuild,
+  +awesome-3.4.2.ebuild, +files/awesome-3.4.2-backtrace.patch:
+  Version bumped, bug #294782. Added backtrace patch for FreeBSD, bug
+  #293609.
 
 *awesome-3.4.1 (09 Nov 2009)
 
diff --git a/x11-wm/awesome/awesome-3.4.ebuild b/x11-wm/awesome/awesome-3.4.2.ebuild
index ceef162150fb..10a679a7c381 100644
--- a/x11-wm/awesome/awesome-3.4.ebuild
+++ b/x11-wm/awesome/awesome-3.4.2.ebuild
@@ -1,20 +1,19 @@
 # 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.4.ebuild,v 1.2 2009/11/09 23:12:02 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.2.ebuild,v 1.1 2009/11/27 17:07:01 matsuu Exp $
 
 EAPI="2"
 inherit cmake-utils eutils
 
-MY_P="${P/_/-}"
 DESCRIPTION="A dynamic floating and tiling window manager"
 HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${MY_P}.tar.bz2"
+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"
+#IUSE="dbus doc elibc_FreeBSD bash-completion"
+IUSE="dbus doc elibc_FreeBSD"
 
 RDEPEND=">=dev-lang/lua-5.1[deprecated]
 	dev-libs/libev
@@ -26,7 +25,8 @@ RDEPEND=">=dev-lang/lua-5.1[deprecated]
 	>=x11-libs/pango-1.19.3
 	>=x11-libs/startup-notification-0.10
 	>=x11-libs/xcb-util-0.3.6
-	dbus? ( >=sys-apps/dbus-1 )"
+	dbus? ( >=sys-apps/dbus-1 )
+	elibc_FreeBSD? ( dev-libs/libexecinfo )"
 
 DEPEND="${RDEPEND}
 	app-text/asciidoc
@@ -48,24 +48,9 @@ RDEPEND="${RDEPEND}
 	|| (
 		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 )
 
-S="${WORKDIR}/${MY_P}"
-
 DOCS="AUTHORS BUGS PATCHES README STYLE"
 
 mycmakeargs="-DPREFIX=/usr
@@ -73,6 +58,10 @@ mycmakeargs="-DPREFIX=/usr
 	$(cmake-utils_use_with dbus DBUS)
 	$(cmake-utils_use doc GENERATE_LUADOC)"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-backtrace.patch"
+}
+
 src_compile() {
 	local myargs="all"
 
diff --git a/x11-wm/awesome/files/awesome-3.4.2-backtrace.patch b/x11-wm/awesome/files/awesome-3.4.2-backtrace.patch
new file mode 100644
index 000000000000..4d481ea130ac
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.4.2-backtrace.patch
@@ -0,0 +1,18 @@
+diff -Naur awesome-3.4.2.orig/awesomeConfig.cmake awesome-3.4.2/awesomeConfig.cmake
+--- awesome-3.4.2.orig/awesomeConfig.cmake	2009-11-27 04:03:25.000000000 +0900
++++ awesome-3.4.2/awesomeConfig.cmake	2009-11-28 01:17:01.639797168 +0900
+@@ -167,6 +167,14 @@
+ # Check for libev
+ a_find_library(LIB_EV ev)
+ 
++# Check for backtrace
++include(CheckFunctionExists)
++CHECK_FUNCTION_EXISTS(backtrace HAVE_BACKTRACE)
++if(NOT HAVE_BACKTRACE)
++    a_find_library(LIB_EXECINFO execinfo)
++    set(AWESOME_REQUIRED_LIBRARIES ${AWESOME_REQUIRED_LIBRARIES} ${LIB_EXECINFO})
++endif()
++
+ # Error check
+ if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug
+     message(FATAL_ERROR "lua library not found")