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

[Craig Andrews]

commit:     db7098b0d5db839dbf33362a29925d6d90bf43bc
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 28 14:23:30 2021 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Tue Sep 28 14:23:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db7098b0

www-apache/mod_h2: 2.0.0_rc2 version bump

Package-Manager: Portage-3.0.24, Repoman-3.0.3
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 www-apache/mod_h2/Manifest                                        | 1 +
 www-apache/mod_h2/{mod_h2-9999.ebuild => mod_h2-2.0.0_rc2.ebuild} | 6 +++---
 www-apache/mod_h2/mod_h2-9999.ebuild                              | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index f830dfc1092..2a0db9d0cb2 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1 +1,2 @@
 DIST mod_h2-1.15.24.tar.gz 664134 BLAKE2B 
37795ee308d62f74583d7e37c262fca2ba235f025aa96314b1edb66e9900fef61f225d4143460e0bb29d46251c6aae8540ac667deb7eef8febc5fcc92c954b82
 SHA512 
3988e75b4b0ddb9361b559971a0e2c4c3af225d16bde6bf17ece33993487e6b4b6d66c874fede3cca97f40e9a83b500cf356546f7e83391fb81d5ec649a53fd0
+DIST mod_h2-2.0.0-rc2.tar.gz 655944 BLAKE2B 
d96d9196359bd7f6fb593a148a08a974e82a5e296c893526501c3e6c60f36581bc89548098e5ff6e42428d400cd8b7b44787ea97f7d0dbcd7d4da1db19c25ac8
 SHA512 
2c41fbe3d780452507d15b88fafe62c3386de023cc22181b7f077dd72e9c7738b6671494ba6e9c59f09df740ec4ec76dc42a9188e294b7900c97f1975038c0e2

diff --git a/www-apache/mod_h2/mod_h2-9999.ebuild 
b/www-apache/mod_h2/mod_h2-2.0.0_rc2.ebuild
similarity index 85%
copy from www-apache/mod_h2/mod_h2-9999.ebuild
copy to www-apache/mod_h2/mod_h2-2.0.0_rc2.ebuild
index 5b9dbe99207..352e2e78dea 100644
--- a/www-apache/mod_h2/mod_h2-9999.ebuild
+++ b/www-apache/mod_h2/mod_h2-2.0.0_rc2.ebuild
@@ -11,8 +11,10 @@ if [[ ${PV} == 9999 ]] ; then
        EGIT_REPO_URI="https://github.com/icing/mod_h2.git";
        inherit git-r3
 else
+       MY_PV="${PV/_rc/-rc}"
+       MY_P="${PN}-${MY_PV}"
        S="${WORKDIR}/${MY_P}"
-       SRC_URI="https://github.com/icing/mod_h2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+       SRC_URI="https://github.com/icing/mod_h2/archive/v${MY_PV}.tar.gz -> 
${MY_P}.tar.gz"
        KEYWORDS="~amd64 ~x86"
 fi
 
@@ -27,8 +29,6 @@ RDEPEND=">=net-libs/nghttp2-1.0
        >=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?]"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${P}"
-
 need_apache2_4
 
 src_prepare() {

diff --git a/www-apache/mod_h2/mod_h2-9999.ebuild 
b/www-apache/mod_h2/mod_h2-9999.ebuild
index 5b9dbe99207..352e2e78dea 100644
--- a/www-apache/mod_h2/mod_h2-9999.ebuild
+++ b/www-apache/mod_h2/mod_h2-9999.ebuild
@@ -11,8 +11,10 @@ if [[ ${PV} == 9999 ]] ; then
        EGIT_REPO_URI="https://github.com/icing/mod_h2.git";
        inherit git-r3
 else
+       MY_PV="${PV/_rc/-rc}"
+       MY_P="${PN}-${MY_PV}"
        S="${WORKDIR}/${MY_P}"
-       SRC_URI="https://github.com/icing/mod_h2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+       SRC_URI="https://github.com/icing/mod_h2/archive/v${MY_PV}.tar.gz -> 
${MY_P}.tar.gz"
        KEYWORDS="~amd64 ~x86"
 fi
 
@@ -27,8 +29,6 @@ RDEPEND=">=net-libs/nghttp2-1.0
        >=www-servers/apache-2.4.48[-apache2_modules_http2,ssl?]"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${P}"
-
 need_apache2_4
 
 src_prepare() {