| 1 |
commit: 4edd88f5877644b95f538aa1be9a0c74019f0518 |
| 2 |
Author: Craig Andrews <candrews <AT> integralblue <DOT> com> |
| 3 |
AuthorDate: Fri Aug 4 13:26:03 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 7 17:12:11 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4edd88f5 |
| 7 |
|
| 8 |
www-apache/mod_h2: version 1.10.10, use EAPI=6 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/5296 |
| 12 |
|
| 13 |
www-apache/mod_h2/Manifest | 1 + |
| 14 |
.../mod_h2/{mod_h2-9999.ebuild => mod_h2-1.10.10.ebuild} | 16 +++++++--------- |
| 15 |
www-apache/mod_h2/mod_h2-9999.ebuild | 16 +++++++--------- |
| 16 |
3 files changed, 15 insertions(+), 18 deletions(-) |
| 17 |
|
| 18 |
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest |
| 19 |
index 92a0c89b1e9..3a26e01798e 100644 |
| 20 |
--- a/www-apache/mod_h2/Manifest |
| 21 |
+++ b/www-apache/mod_h2/Manifest |
| 22 |
@@ -1,2 +1,3 @@ |
| 23 |
+DIST mod_http2-1.10.10.tar.gz 528560 SHA256 9fa881c7f2cdc955b790406bebf6e0542d35b91aeb2a400e21c244e853971ee8 SHA512 b4b9e734ed35ca63fa114462f1adb358bb73e4cbd8df95ab28c4518b8f7db40233f4ba13bc2194847eb9c1adbc3eb86fc63cbb56389fc0867767658d4d8ba77b WHIRLPOOL ee319ff6ba21832de525efa15ff1a2cd2bfef7ba80e60713342af63edf2a76d4c60c76f6b63ca172fcd33b45e728711f12646f08cc8f932f2a0802771dd95ca2 |
| 24 |
DIST mod_http2-1.4.7.tar.gz 476716 SHA256 0d51a019917aa6bf7866cf23bf837626592ad0e74408eb341d070982cb88380a SHA512 6d91d8f73de4a571dc9ac24328b2f7214afcc9a3a00cbf93a74954533a45b647480f96f0cb1c85d767e980080b21561891a55b16943b0369a0fe2573bba1b54f WHIRLPOOL 0b81b8baf871ff043e972c65c685ae9f18737c0909bff65528a6ea3dd56735a2230c9dda67879a5684e867681fc6487f483ef006611397061b367bc275793ad6 |
| 25 |
DIST mod_http2-1.5.6.tar.gz 502108 SHA256 73c11780e82e65c11e71e5a44685c22a7d8f07203d55dca094ea61d7a5bbaffc SHA512 8cc8894d56e32489f8e3064145cb527a415723131bdefd99583b6678af5fc50e3d4ebbf59f4734640bef0381ac0f808c780dafb9a3fe6bb45e7af4d595470716 WHIRLPOOL a2f3efb9e7ecf657be61d46a832a1b438cdaab0e44114e8ec717d9b77e8500308e7c904248c195bb55157410a103cffff8714e0378e2d2099ecb7aa7d679a4a7 |
| 26 |
|
| 27 |
diff --git a/www-apache/mod_h2/mod_h2-9999.ebuild b/www-apache/mod_h2/mod_h2-1.10.10.ebuild |
| 28 |
similarity index 81% |
| 29 |
copy from www-apache/mod_h2/mod_h2-9999.ebuild |
| 30 |
copy to www-apache/mod_h2/mod_h2-1.10.10.ebuild |
| 31 |
index 48f0e8ef370..eaf87ecaf6b 100644 |
| 32 |
--- a/www-apache/mod_h2/mod_h2-9999.ebuild |
| 33 |
+++ b/www-apache/mod_h2/mod_h2-1.10.10.ebuild |
| 34 |
@@ -1,7 +1,7 @@ |
| 35 |
-# Copyright 1999-2016 Gentoo Foundation |
| 36 |
+# Copyright 1999-2017 Gentoo Foundation |
| 37 |
# Distributed under the terms of the GNU General Public License v2 |
| 38 |
|
| 39 |
-EAPI="5" |
| 40 |
+EAPI="6" |
| 41 |
|
| 42 |
inherit apache-module |
| 43 |
|
| 44 |
@@ -9,8 +9,9 @@ MY_P="${PN/h2/http2}-${PV}" |
| 45 |
|
| 46 |
if [[ ${PV} == 9999 ]] ; then |
| 47 |
EGIT_REPO_URI="https://github.com/icing/mod_h2.git" |
| 48 |
- inherit git-2 |
| 49 |
+ inherit autotools git-r3 |
| 50 |
else |
| 51 |
+ S="${WORKDIR}/${MY_P}" |
| 52 |
SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz" |
| 53 |
KEYWORDS="~amd64 ~x86" |
| 54 |
fi |
| 55 |
@@ -26,14 +27,11 @@ RDEPEND=">=net-libs/nghttp2-1.0 |
| 56 |
>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]" |
| 57 |
DEPEND="${RDEPEND}" |
| 58 |
|
| 59 |
-S="${WORKDIR}/${MY_P}" |
| 60 |
- |
| 61 |
need_apache2_4 |
| 62 |
|
| 63 |
-src_configure() { |
| 64 |
- econf \ |
| 65 |
- --docdir='$(datarootdir)'/doc/${PF} \ |
| 66 |
- --disable-werror |
| 67 |
+src_prepare() { |
| 68 |
+ default |
| 69 |
+ [[ ${PV} = 9999 ]] && eautoreconf |
| 70 |
} |
| 71 |
|
| 72 |
src_compile() { |
| 73 |
|
| 74 |
diff --git a/www-apache/mod_h2/mod_h2-9999.ebuild b/www-apache/mod_h2/mod_h2-9999.ebuild |
| 75 |
index 48f0e8ef370..eaf87ecaf6b 100644 |
| 76 |
--- a/www-apache/mod_h2/mod_h2-9999.ebuild |
| 77 |
+++ b/www-apache/mod_h2/mod_h2-9999.ebuild |
| 78 |
@@ -1,7 +1,7 @@ |
| 79 |
-# Copyright 1999-2016 Gentoo Foundation |
| 80 |
+# Copyright 1999-2017 Gentoo Foundation |
| 81 |
# Distributed under the terms of the GNU General Public License v2 |
| 82 |
|
| 83 |
-EAPI="5" |
| 84 |
+EAPI="6" |
| 85 |
|
| 86 |
inherit apache-module |
| 87 |
|
| 88 |
@@ -9,8 +9,9 @@ MY_P="${PN/h2/http2}-${PV}" |
| 89 |
|
| 90 |
if [[ ${PV} == 9999 ]] ; then |
| 91 |
EGIT_REPO_URI="https://github.com/icing/mod_h2.git" |
| 92 |
- inherit git-2 |
| 93 |
+ inherit autotools git-r3 |
| 94 |
else |
| 95 |
+ S="${WORKDIR}/${MY_P}" |
| 96 |
SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz" |
| 97 |
KEYWORDS="~amd64 ~x86" |
| 98 |
fi |
| 99 |
@@ -26,14 +27,11 @@ RDEPEND=">=net-libs/nghttp2-1.0 |
| 100 |
>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]" |
| 101 |
DEPEND="${RDEPEND}" |
| 102 |
|
| 103 |
-S="${WORKDIR}/${MY_P}" |
| 104 |
- |
| 105 |
need_apache2_4 |
| 106 |
|
| 107 |
-src_configure() { |
| 108 |
- econf \ |
| 109 |
- --docdir='$(datarootdir)'/doc/${PF} \ |
| 110 |
- --disable-werror |
| 111 |
+src_prepare() { |
| 112 |
+ default |
| 113 |
+ [[ ${PV} = 9999 ]] && eautoreconf |
| 114 |
} |
| 115 |
|
| 116 |
src_compile() { |
Archives