5 files changed, 52 insertions, 37 deletions
diff --git a/www-apache/mod_backtrace/ChangeLog b/www-apache/mod_backtrace/ChangeLog
index 568b9c299675..7737563e61a3 100644
--- a/www-apache/mod_backtrace/ChangeLog
+++ b/www-apache/mod_backtrace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_backtrace
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_backtrace/ChangeLog,v 1.6 2012/11/27 19:09:27 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_backtrace/ChangeLog,v 1.7 2014/12/23 13:15:45 mjo Exp $
+
+*mod_backtrace-2.01 (23 Dec 2014)
+
+  23 Dec 2014; Michael Orlitzky <mjo@gentoo.org> +mod_backtrace-2.01.ebuild,
+  -mod_backtrace-0.0.1-r1.ebuild, files/10_mod_backtrace.conf, metadata.xml:
+  Version bump partially addressing bug #532808.
 
   27 Nov 2012; Pacho Ramos <pacho@gentoo.org> -mod_backtrace-0.0.1.ebuild,
   metadata.xml:
diff --git a/www-apache/mod_backtrace/files/10_mod_backtrace.conf b/www-apache/mod_backtrace/files/10_mod_backtrace.conf
index 8f38ab2e8f86..822efd2667fb 100644
--- a/www-apache/mod_backtrace/files/10_mod_backtrace.conf
+++ b/www-apache/mod_backtrace/files/10_mod_backtrace.conf
@@ -1,8 +1,4 @@
 <IfDefine BACKTRACE>
-LoadModule backtrace_module modules/mod_backtrace.so
-
-EnableExceptionHook On
-BacktraceLog /var/log/apache2/backtrace_log
+  LoadModule backtrace_module modules/mod_backtrace.so
+  EnableExceptionHook On
 </IfDefine>
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_backtrace/metadata.xml b/www-apache/mod_backtrace/metadata.xml
index 4538a68724a6..e4ed96ad54c9 100644
--- a/www-apache/mod_backtrace/metadata.xml
+++ b/www-apache/mod_backtrace/metadata.xml
@@ -2,4 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+<use>
+  <flag name="unwind">
+    Use <pkg>sys-libs/libunwind</pkg> to provide better resolution of
+    function names.
+  </flag>
+</use>
 </pkgmetadata>
diff --git a/www-apache/mod_backtrace/mod_backtrace-0.0.1-r1.ebuild b/www-apache/mod_backtrace/mod_backtrace-0.0.1-r1.ebuild
deleted file mode 100644
index 2a8081e58572..000000000000
--- a/www-apache/mod_backtrace/mod_backtrace-0.0.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_backtrace/mod_backtrace-0.0.1-r1.ebuild,v 1.1 2012/10/16 07:19:01 patrick Exp $
-
-EAPI="4"
-
-inherit apache-module eutils confutils
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Apache2 modules to debug segmentation faults in threads"
-HOMEPAGE="http://people.apache.org/~trawick/exception_hook.html"
-SRC_URI="mirror://gentoo/${P}.c"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="www-servers/apache[debug]"
-RDEPEND=""
-
-APACHE2_MOD_CONF="10_${PN}"
-APACHE2_MOD_DEFINE="BACKTRACE"
-
-need_apache2
-
-src_unpack() {
-	mkdir -p "${S}" || die "mkdir S failed"
-	cp -f "${DISTDIR}/${P}.c" "${S}/${PN}.c" || die "source copy failed"
-}
diff --git a/www-apache/mod_backtrace/mod_backtrace-2.01.ebuild b/www-apache/mod_backtrace/mod_backtrace-2.01.ebuild
new file mode 100644
index 000000000000..31fd71df89d2
--- /dev/null
+++ b/www-apache/mod_backtrace/mod_backtrace-2.01.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_backtrace/mod_backtrace-2.01.ebuild,v 1.1 2014/12/23 13:15:45 mjo Exp $
+
+EAPI=5
+
+inherit apache-module depend.apache
+
+DESCRIPTION="Debug segmentation faults in Apache threads"
+HOMEPAGE="http://emptyhammock.com/projects/httpd/diag/"
+SRC_URI="http://emptyhammock.com/downloads/wku_bt-${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="unwind"
+
+RDEPEND="=www-servers/apache-2*[debug]
+	unwind? ( sys-libs/libunwind )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="BACKTRACE"
+
+need_apache2
+
+S="${WORKDIR}/wku_bt-${PV}"
+
+src_compile() {
+	APXS2_ARGS="-c ${PN}.c diag.c -ldl"
+	if use unwind; then
+		APXS2_ARGS+=" -lunwind -DDIAG_HAVE_LIBUNWIND_BACKTRACE=1"
+	fi
+	apache-module_src_compile
+}