[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_backtrace/

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_backtrace/

[Michael Palimaka]

commit:     dfd790e2d67702b25c4732b46fa4aa36b2d83bfd
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 12 08:20:13 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jun 12 08:21:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfd790e2

www-apache/mod_backtrace: use HTTPS

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 www-apache/mod_backtrace/mod_backtrace-2.01.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www-apache/mod_backtrace/mod_backtrace-2.01.ebuild b/www-apache/mod_backtrace/mod_backtrace-2.01.ebuild
index f4e14d1d27c..04115faa887 100644
--- a/www-apache/mod_backtrace/mod_backtrace-2.01.ebuild
+++ b/www-apache/mod_backtrace/mod_backtrace-2.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ 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"
+HOMEPAGE="https://emptyhammock.com/projects/httpd/diag/"
+SRC_URI="https://emptyhammock.com/downloads/wku_bt-${PV}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_backtrace/

[Marek Szuba]

commit:     6df055303cf11f984d11db6fe9caf36104784d77
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 27 12:53:42 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Nov 27 13:04:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df05530

www-apache/mod_backtrace: update EAPI 5 -> 7

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 ...acktrace-2.01.ebuild => mod_backtrace-2.01-r1.ebuild} | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/www-apache/mod_backtrace/mod_backtrace-2.01.ebuild b/www-apache/mod_backtrace/mod_backtrace-2.01-r1.ebuild
similarity index 72%
rename from www-apache/mod_backtrace/mod_backtrace-2.01.ebuild
rename to www-apache/mod_backtrace/mod_backtrace-2.01-r1.ebuild
index 04115faa8877..a9e764270295 100644
--- a/www-apache/mod_backtrace/mod_backtrace-2.01.ebuild
+++ b/www-apache/mod_backtrace/mod_backtrace-2.01-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit apache-module depend.apache
 
 DESCRIPTION="Debug segmentation faults in Apache threads"
 HOMEPAGE="https://emptyhammock.com/projects/httpd/diag/"
-SRC_URI="https://emptyhammock.com/downloads/wku_bt-${PV}.zip"
+SRC_URI="https://emptyhammock.com/media/downloads/wku_bt-${PV}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -16,8 +16,8 @@ IUSE="unwind"
 
 RDEPEND="=www-servers/apache-2*[debug]
 	unwind? ( sys-libs/libunwind )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
 APACHE2_MOD_CONF="10_${PN}"
 APACHE2_MOD_DEFINE="BACKTRACE"
@@ -26,6 +26,12 @@ need_apache2
 
 S="${WORKDIR}/wku_bt-${PV}"
 
+# Work around Bug #616612
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
+
 src_compile() {
 	APXS2_ARGS="-c ${PN}.c diag.c -ldl"
 	if use unwind; then

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_backtrace/

[Sam James]

commit:     20d362fcb2d6b9aaa734d460962b281d19497163
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 27 14:17:33 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 27 14:17:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20d362fc

www-apache/mod_backtrace: use pkg-config for libunwind

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...backtrace-2.01-r1.ebuild => mod_backtrace-2.01-r2.ebuild} | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/www-apache/mod_backtrace/mod_backtrace-2.01-r1.ebuild b/www-apache/mod_backtrace/mod_backtrace-2.01-r2.ebuild
similarity index 75%
rename from www-apache/mod_backtrace/mod_backtrace-2.01-r1.ebuild
rename to www-apache/mod_backtrace/mod_backtrace-2.01-r2.ebuild
index a9e764270295..84a65ffa352c 100644
--- a/www-apache/mod_backtrace/mod_backtrace-2.01-r1.ebuild
+++ b/www-apache/mod_backtrace/mod_backtrace-2.01-r2.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=7
 
-inherit apache-module depend.apache
+inherit apache-module depend.apache toolchain-funcs
 
 DESCRIPTION="Debug segmentation faults in Apache threads"
 HOMEPAGE="https://emptyhammock.com/projects/httpd/diag/"
 SRC_URI="https://emptyhammock.com/media/downloads/wku_bt-${PV}.zip"
+S="${WORKDIR}/wku_bt-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -15,17 +16,16 @@ KEYWORDS="~amd64 ~x86"
 IUSE="unwind"
 
 RDEPEND="=www-servers/apache-2*[debug]
-	unwind? ( sys-libs/libunwind )"
+	unwind? ( sys-libs/libunwind:= )"
 DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip
+	unwind? ( virtual/pkgconfig )"
 
 APACHE2_MOD_CONF="10_${PN}"
 APACHE2_MOD_DEFINE="BACKTRACE"
 
 need_apache2
 
-S="${WORKDIR}/wku_bt-${PV}"
-
 # Work around Bug #616612
 pkg_setup() {
 	_init_apache2
@@ -35,7 +35,7 @@ pkg_setup() {
 src_compile() {
 	APXS2_ARGS="-c ${PN}.c diag.c -ldl"
 	if use unwind; then
-		APXS2_ARGS+=" -lunwind -DDIAG_HAVE_LIBUNWIND_BACKTRACE=1"
+		APXS2_ARGS+=" $($(tc-getPKG_CONFIG) --libs libunwind) -DDIAG_HAVE_LIBUNWIND_BACKTRACE=1"
 	fi
 	apache-module_src_compile
 }