Version bumped, bug #294782. Added backtrace patch for FreeBSD, bug #293609.

Package-Manager: portage-2.1.7.6/cvs/Linux x86_64

4 files changed, 40 insertions, 25 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/Manifest b/x11-wm/awesome/Manifest
index 7fe8a8e2b8b6..6d36320ccb49 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -1,3 +1,4 @@
+AUX awesome-3.4.2-backtrace.patch 713 RMD160 b60e09f17c1452588020738df6657768080f4dcc SHA1 2845c4529f9189bf41ecd1c2df7eae36fbec329a SHA256 5738944681ce666fab1621c0abbb444356456fcea3ea2119f732c54ef4bf3f26
 AUX awesome-session 33 RMD160 68a828295285a5232603df6574fdffa2527fb183 SHA1 c30cf121e89f0fc7320b79ca3452c33ec516f38d SHA256 a76cca201d3f815658acfb54a9ff3737d263cae1f6cc3527a59b0f22aa01df1b
 AUX awesome.desktop 150 RMD160 a50c71cfbcb9ee4b86da8cca19cbd876b3a7f9b0 SHA1 8314ccbed775ecb0af5107cec56632dbec1fe3cf SHA256 433f5cf4adea408e38d464af8b6259efd39a909735679f4625c0cb7fcab3337b
 DIST awesome-2.3.4.tar.gz 230800 RMD160 dca3ae76d91d3fd370d7fc51438896dfd472803d SHA1 d7ec69bf5d2a2caa4d14b4afc68d444a5bf580df SHA256 a73236c31557981746f3e96a6bdc8437455040f33ac0fa9365b2efe8d2889c3a
@@ -5,12 +6,12 @@ DIST awesome-2.3.6.tar.gz 232212 RMD160 c4a097026bff49a6a0ac65af13818958c3365bde
 DIST awesome-3.2.1.tar.bz2 241372 RMD160 dddb0b2f8a9d1d6a108158700815ef943d0d2689 SHA1 f316e98fccca694d0d577830969c3a99bda4fe7b SHA256 c8eb3dfdb92b4bf9eb989f8c40d04cb134bd0d1fef532ec41a5d6fa1370073e7
 DIST awesome-3.3.4.tar.bz2 252231 RMD160 5891ec98d213ab2a8fef167d58bfb611f8bae61c SHA1 d97875d23eebe7c03839d37af3bb4597abdb4aa8 SHA256 f13628643c01eba26ae28b37be5abbfab1a3578eec8ff9031ed2d3ca170b8b18
 DIST awesome-3.4.1.tar.bz2 275832 RMD160 98a2d2e6389431dfc5412c9eccf66a3322b00b7b SHA1 57f90af3b36a49828f3c14d9a4a4e6d824b322a7 SHA256 8bf0ffd430ef8384f75869c7cd2b62c1085a501db76f2bc24023c5ae0ffb2cfa
-DIST awesome-3.4.tar.bz2 275596 RMD160 6b077f1f577f68bec524307503750877cc298c9d SHA1 77d50d0cc34b3a3594ce6dbe14af5b6aa34594b9 SHA256 75d6eb2809215a2a1bb49957c7955eddfbebffd5e9ef7f66ee11eeb949589e8e
+DIST awesome-3.4.2.tar.bz2 275897 RMD160 7bee7a4f9b548a136d089bbaa7eef3553aa8c5b3 SHA1 02210cdd67d73f0e6594814ff187b80688b1c67f SHA256 498ea96d64c7c3ff8eaf257222052e183b6df5acda4712ece52dc22fde8d6581
 EBUILD awesome-2.3.4.ebuild 1315 RMD160 c82754a217e2256643bdeec17f6981024d735be2 SHA1 5febd4178487c9212c9a200f107eff85f55810ce SHA256 f1a2f7ed655836d5d878a4bbe9c139c907543226eb250dabf8ce12c4b04e033d
 EBUILD awesome-2.3.6.ebuild 1314 RMD160 146b6e6e947c3fbd4f7532b4dab4773109515e39 SHA1 71d687ce6bd3c202e8dbc2943e993f1220ad1944 SHA256 ea8313dc1cbe8c10fd1b02c67be30f624b54b1d69cd8c974057826db6e26d032
 EBUILD awesome-3.2.1-r3.ebuild 2068 RMD160 cda414391155626d57820c2db50b036a20d1d316 SHA1 e3ba6077e665d1ccfc10d6b85ac791656f0eae43 SHA256 2e5e48688114f7c0f95d798da608d8668f6c19278716e62f2c34e378d7f026cb
 EBUILD awesome-3.3.4.ebuild 2137 RMD160 9afa91fca6e991c7dad98bcddbb447f275eee8ce SHA1 7b5ce49dcb3fd22103ee9634f20964e3ff774e96 SHA256 114d32ddc467a0aec43dd9b8b9cbae2ec30b0f8de2332caed373ab4764f473df
 EBUILD awesome-3.4.1.ebuild 1919 RMD160 1b56b8023b9f8defbb5790a668a896d21c80d64d SHA1 34d73da5b14abd878cfa816ed2f40b4cc5e05b3d SHA256 c2eedf504fdade8e08e510e45a93b7fdbbce2e90ae4979d61a2df85e3543e18f
-EBUILD awesome-3.4.ebuild 2186 RMD160 8f3d36410a408f479355f0882cee8d250f92a8c7 SHA1 30c601866ff963ad5a933a98f61e43da2e9fbc61 SHA256 011f8b82d2f8f39b1eba043af89132135e05a0a3e2a36f1172235702c3b7aa3b
-MISC ChangeLog 13063 RMD160 546775275df87ddc50f52bc3a1639c06c37a6490 SHA1 4f04f1973cf28fe986187e80ac396f3106c13fca SHA256 9f1de64fce4c92661b4077864a2403b198f0fd6748aa4a48511cff0f713b7c8d
+EBUILD awesome-3.4.2.ebuild 2007 RMD160 fa828a423e24aec5933836321bf87efb71154778 SHA1 f76a376ed3405dfef1a0c75eb7aed955a145a55d SHA256 f5b99dbc231b9ac4d82fdffed2a1f5bd77184da8a7001e4e9db4f03ba05115fc
+MISC ChangeLog 13308 RMD160 4aa067cddf24d32d84d8e14bc33748e13f51fca8 SHA1 ac4fda86dfc854c8ce1d74b6ce902f1eb5a9b8d2 SHA256 4c5f150de405e18d523e3c4028b1eca5afcf1752153e30979f3e090a2ed848bc
 MISC metadata.xml 248 RMD160 ade4235c4b35539d6cccd6005afba23a7c9d2afd SHA1 e6af7cb4622744522ecc176d800015b77cd75d81 SHA256 5d0b7e035a2cb76eeb00ece66b18b59060068ea76dd196e6cd4f4524c92cde17
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")