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

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

[Marek Szuba]

commit:     f83111f8ca9ba399c7e7b1479c41aa3c8d489fa3
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 27 12:49:57 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Nov 27 13:04:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f83111f8

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

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

 ...2.1.0-r1.ebuild => mod_auth_tkt-2.1.0-r2.ebuild} | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r1.ebuild b/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r2.ebuild
similarity index 84%
rename from www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r1.ebuild
rename to www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r2.ebuild
index e7ec743532d2..a20ae2253536 100644
--- a/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r1.ebuild
+++ b/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit apache-module epatch
+EAPI=7
+
+inherit apache-module depend.apache
 
 DESCRIPTION="Apache module for cookie based authentication"
 HOMEPAGE="http://www.openfusion.com.au/labs/mod_auth_tkt/"
@@ -11,10 +12,8 @@ SRC_URI="http://www.openfusion.com.au/labs/dist/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="dev-lang/perl"
-RDEPEND=""
 
 APACHE2_MOD_CONF="10_${PN}"
 APACHE2_MOD_DEFINE="AUTH_TKT"
@@ -24,20 +23,22 @@ DOCFILES="README"
 # test suite is completely broken
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-apache-2.4.patch
+)
+
 need_apache2
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-apache-2.4.patch
+# Work around Bug #616612
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
 }
 
 src_configure() {
 	./configure --apachever=2.2 --apxs=${APXS}
 }
 
-src_compile() {
-	emake
-}
-
 src_install() {
 	apache-module_src_install
 	pod2man --section=5 --release=${PV} doc/${PN}.{pod,5}

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

[Marek Szuba]

commit:     838db2f69a29a305a28e7afc33f3b90627441344
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 27 13:54:10 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Nov 27 14:08:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=838db2f6

www-apache/mod_auth_tkt: restore custom src_compile()

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

 www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r2.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r2.ebuild b/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r2.ebuild
index a20ae2253536..776d3a822186 100644
--- a/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r2.ebuild
+++ b/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r2.ebuild
@@ -39,6 +39,10 @@ src_configure() {
 	./configure --apachever=2.2 --apxs=${APXS}
 }
 
+src_compile() {
+	emake
+}
+
 src_install() {
 	apache-module_src_install
 	pod2man --section=5 --release=${PV} doc/${PN}.{pod,5}

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

[Sam James]

commit:     c8c2c1671c6801a6693fda30f90aa1b61872e748
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 27 14:15:49 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 27 14:15:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8c2c167

www-apache/mod_auth_tkt: add missing dies, use BDEPEND for Perl

We use BDEPEND for Perl's pod2man.

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

 www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r2.ebuild | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r2.ebuild b/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r2.ebuild
index 776d3a822186..787f1c49d693 100644
--- a/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r2.ebuild
+++ b/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r2.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-lang/perl"
+BDEPEND="dev-lang/perl"
 
 APACHE2_MOD_CONF="10_${PN}"
 APACHE2_MOD_DEFINE="AUTH_TKT"
@@ -36,7 +36,7 @@ pkg_setup() {
 }
 
 src_configure() {
-	./configure --apachever=2.2 --apxs=${APXS}
+	./configure --apachever=2.2 --apxs=${APXS} || die
 }
 
 src_compile() {
@@ -45,7 +45,8 @@ src_compile() {
 
 src_install() {
 	apache-module_src_install
-	pod2man --section=5 --release=${PV} doc/${PN}.{pod,5}
+
+	pod2man --section=5 --release=${PV} doc/${PN}.{pod,5} || die
 	doman doc/${PN}.5
 }