gentoo resync : 21.12.2017

5 files changed, 2 insertions, 106 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 6bcc6b0bf532..9e465008bd90 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index f92cdd081879..12ca77b972bc 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,9 +1,5 @@
 AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5
 DIST mod_http2-1.10.10.tar.gz 528560 BLAKE2B 7389441b1d30d0448bb17fc02a73957cf20365020796ce7260c1d63d1468537ecdeab83db12d1b245af1e760236da8e8d0ccf9ffb222d2dec1e55491ac77dc11 SHA512 b4b9e734ed35ca63fa114462f1adb358bb73e4cbd8df95ab28c4518b8f7db40233f4ba13bc2194847eb9c1adbc3eb86fc63cbb56389fc0867767658d4d8ba77b
-DIST mod_http2-1.4.7.tar.gz 476716 BLAKE2B c3e0dbee8d6dbb795e845bbaafc89150d0cd8a7c486be5ccaca2b35c6c5bc54bcf756d1f42dff06c7c77bf58de62d5a24cc3db371b2ace2a34f8690df4d74c94 SHA512 6d91d8f73de4a571dc9ac24328b2f7214afcc9a3a00cbf93a74954533a45b647480f96f0cb1c85d767e980080b21561891a55b16943b0369a0fe2573bba1b54f
-DIST mod_http2-1.5.6.tar.gz 502108 BLAKE2B bbd43667e6be639538c0189b84eebe0743c38364e578dd5c5a5febadfb1739bd752cfe7843967239ca73a523d44c9a286cdfb605f8c5363a14cd7cb837afac0b SHA512 8cc8894d56e32489f8e3064145cb527a415723131bdefd99583b6678af5fc50e3d4ebbf59f4734640bef0381ac0f808c780dafb9a3fe6bb45e7af4d595470716
 EBUILD mod_h2-1.10.10.ebuild 913 BLAKE2B 8efef07e602ac6dfd6db30f8b36ad91c5675c949b65848e6ec6948abd4e031aa86170406186d3e8a1294f2a6276618bc0cf98d868e56a938dc435836579bc614 SHA512 08f4d81ba78e40b322cb378d737eaec7bbc2f9cb41a68615e115f09bccc04d6c512caf79ef2cc0bb1e763edf79dfea97ad3c58c0e1f90961d256077e83c59f25
-EBUILD mod_h2-1.4.7.ebuild 928 BLAKE2B 01ec83b369ece269d8d6bc87f1a5ce8848ddab64fcb77d34151df53fda3dd27c0bd60902bcb4947796f8b95a8af718c75c289bb24bfefae052312daad74401f3 SHA512 d787d18963a026c82ad6c59e665d1262b0a47e812f61a553cca35e9b19ab52d215c643b19d3927713f6ab6f46f78c5d88e7aca8d76f7770cd41b90f15cd68c59
-EBUILD mod_h2-1.5.6.ebuild 928 BLAKE2B 01ec83b369ece269d8d6bc87f1a5ce8848ddab64fcb77d34151df53fda3dd27c0bd60902bcb4947796f8b95a8af718c75c289bb24bfefae052312daad74401f3 SHA512 d787d18963a026c82ad6c59e665d1262b0a47e812f61a553cca35e9b19ab52d215c643b19d3927713f6ab6f46f78c5d88e7aca8d76f7770cd41b90f15cd68c59
 EBUILD mod_h2-9999.ebuild 913 BLAKE2B 8efef07e602ac6dfd6db30f8b36ad91c5675c949b65848e6ec6948abd4e031aa86170406186d3e8a1294f2a6276618bc0cf98d868e56a938dc435836579bc614 SHA512 08f4d81ba78e40b322cb378d737eaec7bbc2f9cb41a68615e115f09bccc04d6c512caf79ef2cc0bb1e763edf79dfea97ad3c58c0e1f90961d256077e83c59f25
-MISC metadata.xml 294 BLAKE2B eab2ce01f7f1023814605c4c720c2e0fe670e5df1e0ed411a6fb26618ef80de86d89a235efbcaec011111577e6a858f8139594efc76c0ef0da5dd352bbc155a1 SHA512 304e42bd6856bbd80b3cda9de6b98aedda238a8499f8d93d7be5bfe04b2a704345c3bf2a6337166bdfa390f91da6130f7b52ec61c6b07be1d9823edadfb54b5a
+MISC metadata.xml 244 BLAKE2B 8d77ec488a1873fece64c647739c050cd3fbc933824576c2f35205a20fb47cdbb2be17cdc278ebbae566d29aaeda094098b5a6e9505036ca3977b3fba2123858 SHA512 e024554a3ed54f32c7d2adddf91a72743ee6da18f02d4955126bc4286e545944bddddcb09bc6bb8520a2dad285b9616c38735f25d7ff7e0b5c8875e1d08fd04b
diff --git a/www-apache/mod_h2/metadata.xml b/www-apache/mod_h2/metadata.xml
index fc78d93eca53..4c053d99d6a4 100644
--- a/www-apache/mod_h2/metadata.xml
+++ b/www-apache/mod_h2/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">icing/mod_h2</remote-id>
 	</upstream>
diff --git a/www-apache/mod_h2/mod_h2-1.4.7.ebuild b/www-apache/mod_h2/mod_h2-1.4.7.ebuild
deleted file mode 100644
index 48f0e8ef3707..000000000000
--- a/www-apache/mod_h2/mod_h2-1.4.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit apache-module
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit git-2
-else
-	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="HTTP/2 module for Apache"
-HOMEPAGE="https://github.com/icing/mod_h2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-need_apache2_4
-
-src_configure() {
-	econf \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--disable-werror
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	APACHE2_MOD_DEFINE="HTTP2"
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
-}
diff --git a/www-apache/mod_h2/mod_h2-1.5.6.ebuild b/www-apache/mod_h2/mod_h2-1.5.6.ebuild
deleted file mode 100644
index 48f0e8ef3707..000000000000
--- a/www-apache/mod_h2/mod_h2-1.5.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit apache-module
-
-MY_P="${PN/h2/http2}-${PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
-	inherit git-2
-else
-	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="HTTP/2 module for Apache"
-HOMEPAGE="https://github.com/icing/mod_h2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ssl"
-
-RDEPEND=">=net-libs/nghttp2-1.0
-	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-need_apache2_4
-
-src_configure() {
-	econf \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--disable-werror
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	default
-
-	APACHE2_MOD_DEFINE="HTTP2"
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
-}