gentoo resync : 14.05.2020

5 files changed, 62 insertions, 52 deletions

diff --git a/www-misc/awstats/Manifest b/www-misc/awstats/Manifest
index a8048b3d381e..95520644a7fa 100644
--- a/www-misc/awstats/Manifest
+++ b/www-misc/awstats/Manifest
@@ -1,9 +1,9 @@
 AUX awstats-7.1-gentoo.diff 795 BLAKE2B c3c02a9086dc8067cc739ed4b180865aa1c68d5f6786b9a1d850a3c0314bdcb8abb1e3841229ae90cef3e1f6ba24a8262895c44d0b92faffb3f4c4100021e065 SHA512 09e46f32b31389cd1d98465c8b2578c37d5d4d601baf58eb8ed6811875743c3b19819d6820977a9aaace8d8f8c97be8f798fcbaa10f7ed0cb950a2f7f843754c
+AUX awstats-7.8-mime.patch 479 BLAKE2B 320b201daae7613e532123946f073107bf6096d924caa227463817308bcb6824788d683010031dc9ac5ffaaf65d4c169d49f43dd4d9d30d14697a15975835e85 SHA512 38ff55c99fa01ac52dac492e4153bcc2851e79ce3e1d1319c34a7695e66de9f4fff74739ce06e545fcc8ea3902a0325ff370471d04e136b92a6bef1dbba3095d
 AUX awstats-perl-5.22.patch 1981 BLAKE2B 7198b110b2688a989aeecd8ddeb364ab485e615ed045b9fa836f5fd050e344224564300f089cc6f53624e7f36284c0cfdf92930c3e0a82cc52c2ecfce348699b SHA512 9b0b4768583e40a55635b5c81c608798ee3036779359747d91cf12d96757d62b79fc8abbe43dbf322f9958616fafcd99d122fcd5c8234f2e6b871173da769800
-DIST awstats-7.1_p20121017.tar.gz 1258135 BLAKE2B 0a43154d044346acdf4e71e96b05f9b8914d0df8a3812c6a20edb33a0b9d8b6f0aadc065466f1ee23c0469e41eda9622c380bd35c579b887a6547fd6749e9bd4 SHA512 171ff3118955c8b73c968a23983885d967632d2c6e95a45f71e5f6fea74afe34d869c9cc901e2e739419068babc96385d7d7df1e8ca10074be7388fbe5c51f53
 DIST awstats-7.4.tar.gz 2936102 BLAKE2B 2bc7f9619e4d6b13d3909869d642c347d6b9cddbbb3b49d58494ce108c8fe25d59b27198d5a42f8b81c06fdaf1a2e135c82883ec8604e53c6c5adbac07223b66 SHA512 5bce97c71aabeab35e4ff5e5168531e4955d7c1474322c7b4a47d1d06e06ebd0e74d1def73826498e6253f24aeca99309777617b7a914685c927bb6e1c020e1a
-DIST awstats-7.5.tar.gz 2936644 BLAKE2B 666e4d50e8011315351e1aff538ec56507c5bc8e4fb4890c29aee1f73985b8466f346982a6022ae1689e30d587b21ee0f2038f46783e4f25454dfa6e5fe39771 SHA512 d69a66b5ef94d8a7378ece0453a3617f71ad030d81c45cff926fae1319eacdcdcbe2e68513153cd7444d77cbb950827964b0157ce74c04be76781c071f016a35
-EBUILD awstats-7.1_p20121017.ebuild 3328 BLAKE2B 93261899da03ea1af0f9d66ed55319bbeb40603b6e4865faca8bff641ba4c59a9e9cd5da43e3935ebc1d7aec26ed0e58a98641d2009481aa1737408f377be694 SHA512 61e61c366423e23a3bf93082dd96dd8090b055d9656a68de4fcb01526c1d50c78184b525dda4beb17d29c635e00ea4446c3c702ddbbcfa57217000a36b120d44
-EBUILD awstats-7.4.ebuild 3371 BLAKE2B 8f63483d519115fd14848035cc031cea90e41b8b2ab860b4a248b9bc5f8e20677c6bc63c24aa5e4809c47c745a6caa9e89046ec63433ac1ae8f81afcdecc9c53 SHA512 ceec39ac5af01bd18d232b38a0074366199d8b815c4543c03b4baebb25f6c707227d6688d0a4da6c3967676d7fe6eb550f79d5621f75eba30e021e40d30b5c7f
-EBUILD awstats-7.5.ebuild 3361 BLAKE2B bf1461352c0ca0a3bad65c3783de83e37c0246ae07ad3ae93ca17af6863e0e37f445a73d242bcd45c158662758a05db3841d816b5dce67963f3caee5f9b766af SHA512 3831b265c5571c538e572840c4a8486840bb6ccb336737e33b6cfa69a96e57be3be5a87000237fa66f4ebb6ef084307be6220f995499ebec5d62cf9e3bc46a9b
+DIST awstats-7.8.tar.gz 2938739 BLAKE2B 57c692aa935a4191d1cc1f3b34dd1a70a40eef880a3672dcd17472fe6bf447dd7b85a7752d94666d6f1a8dbdcc2eac4959a7f6a83a8bd538d0909ffcaedfd385 SHA512 2fd78e8c7eefb5c9ed39d8ee830ee8ad00b622b812ae40a84cb01c4fa653b9ab7822d1592313d7a8c4b8503d04dcba48b1775d33a629f1ac1278d2300eef931d
+EBUILD awstats-7.4.ebuild 3369 BLAKE2B 6866cf202650d148525c9baccf5a0a5249dfdc51bb235f4bb44f9cb67d133be9a385b61fa43d4e3a6dbfd72fd9b94414b59e5514324acff109411ff28ddeba42 SHA512 7d732c580d6facadef850bc82ca5eaa70b44bbfcfba2b9717d325d81a154f44af15a0dc2c850d1d08807d854eae4fa14da2e163271a67d2d3d6da32de2f66b2f
+EBUILD awstats-7.8-r1.ebuild 3015 BLAKE2B b7f76d10a96968b28aa8a560183d413699405eeba6bb732478e25f1af448bc0e8cba0ab6c207981b282cad1b54efb7c0292d308dac84bb6a1b9967161c6ed1d4 SHA512 4c68225a8f766e6f91053ef53b9065dcb2424a9739f93ecb256a990326472a3cebdbb2bbb683136bb47672540da7faf5f13b4fe638ca97108534516d5dd1b87d
+EBUILD awstats-7.8.ebuild 2976 BLAKE2B 29f94b688fba371e91cff84b95e50821b8fcb8d9f8b59bb00a9bb8ef720db5a698a12762ca6200caf5de26141e5a2f1052c899a3085028f34ac85464b19e5089 SHA512 cb1a8c3d0136a3e939fcf7ef6bdea0f791b135d8075fb3df82a72dfb540f4846a101b508915ac46b6534173ab208616538172a8e3b05f147aac8243c0453202e
 MISC metadata.xml 254 BLAKE2B 53495a638333fedaee2d8d838a705aaa610797eae56298aa35ad3c965af321b3d8e9b12643d1c3564f4232ca4a7ec44182ee7b35aada373750beee6b1c2a8a12 SHA512 b4674c7f9d0dc24c25846b3fe716415b648a61099b8d2f7eb099cf14f9a8f4670af4638349f953fe1b32b9d357911e533b72eaf4bbf14f54827512fd9bbb0ee8
diff --git a/www-misc/awstats/awstats-7.4.ebuild b/www-misc/awstats/awstats-7.4.ebuild
index bac4b390c7bb..30a6da43390e 100644
--- a/www-misc/awstats/awstats-7.4.ebuild
+++ b/www-misc/awstats/awstats-7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -23,7 +23,7 @@ fi
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
-KEYWORDS="~alpha amd64 hppa ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86"
 IUSE="geoip ipv6"
 
 SLOT="0"
diff --git a/www-misc/awstats/awstats-7.5.ebuild b/www-misc/awstats/awstats-7.8-r1.ebuild
index b53c2ad5ba11..66748aa8bf71 100644
--- a/www-misc/awstats/awstats-7.5.ebuild
+++ b/www-misc/awstats/awstats-7.8-r1.ebuild
@@ -1,42 +1,39 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils
 
 MY_P=${PN}-${PV%_p*}
 
 DESCRIPTION="AWStats is short for Advanced Web Statistics"
-HOMEPAGE="http://www.awstats.org/"
-
-if [ ${MY_P} != ${P} ]; then
-	SRC_URI="https://dev.gentoo.org/~flameeyes/awstats/${P}.tar.gz"
-	# The following SRC_URI is useful only when fetching for the first time
-	# after bump; upstream does not bump the version when they change it, so
-	# we rename it to include the date and upload to our mirrors instead.
-	#SRC_URI="http://www.awstats.org/files/${MY_P}.tar.gz -> ${P}.tar.gz"
-else
-	SRC_URI="http://www.awstats.org/files/${P}.tar.gz"
-fi
-
+HOMEPAGE="https://www.awstats.org/"
+SRC_URI="https://www.awstats.org/files/${P}.tar.gz"
 S=${WORKDIR}/${MY_P}
-
 LICENSE="GPL-3"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE="geoip ipv6"
 
 SLOT="0"
 
-RDEPEND=">=dev-lang/perl-5.6.1
-	virtual/perl-Time-Local
+RDEPEND="
+	>=dev-lang/perl-5.6.1
 	dev-perl/URI
-	geoip? ( dev-perl/Geo-IP )
-	ipv6? ( dev-perl/Net-IP dev-perl/Net-DNS )"
+	virtual/perl-Time-Local
+	geoip? (
+		dev-perl/Geo-IP
+	)
+	ipv6? (
+		dev-perl/Net-DNS
+		dev-perl/Net-IP
+	)
+"
 DEPEND=""
 
 src_prepare() {
 	eapply "${FILESDIR}"/${PN}-7.1-gentoo.diff
+	eapply "${FILESDIR}"/${P}-mime.patch
 
 	# change default installation directory
 	find . -type f -exec sed \
@@ -103,7 +100,7 @@ src_install() {
 pkg_postinst() {
 	elog "The AWStats-Manual is available either inside"
 	elog "the /usr/share/doc/${PF} - folder, or at"
-	elog "http://awstats.sourceforge.net/docs/index.html ."
+	elog "https://awstats.sourceforge.net/docs/index.html ."
 	elog
 	elog "Copy the /etc/awstats/awstats.model.conf to"
 	elog "/etc/awstats/awstats.<yourdomain>.conf and edit it."
diff --git a/www-misc/awstats/awstats-7.1_p20121017.ebuild b/www-misc/awstats/awstats-7.8.ebuild
index 2257b4cdf060..4946a4565b30 100644
--- a/www-misc/awstats/awstats-7.1_p20121017.ebuild
+++ b/www-misc/awstats/awstats-7.8.ebuild
@@ -1,42 +1,38 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit eutils
 
 MY_P=${PN}-${PV%_p*}
 
 DESCRIPTION="AWStats is short for Advanced Web Statistics"
-HOMEPAGE="http://www.awstats.org/"
-
-if [ ${MY_P} != ${P} ]; then
-	SRC_URI="https://dev.gentoo.org/~flameeyes/awstats/${P}.tar.gz"
-	# The following SRC_URI is useful only when fetching for the first time
-	# after bump; upstream does not bump the version when they change it, so
-	# we rename it to include the date and upload to our mirrors instead.
-	#SRC_URI="http://www.awstats.org/files/${MY_P}.tar.gz -> ${P}.tar.gz"
-else
-	SRC_URI="http://www.awstats.org/files/${P}.tar.gz"
-fi
-
+HOMEPAGE="https://www.awstats.org/"
+SRC_URI="https://www.awstats.org/files/${P}.tar.gz"
 S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 hppa ppc ~sparc x86"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~hppa ppc ~sparc ~x86"
 IUSE="geoip ipv6"
 
 SLOT="0"
 
-RDEPEND=">=dev-lang/perl-5.6.1
-	virtual/perl-Time-Local
+RDEPEND="
+	>=dev-lang/perl-5.6.1
 	dev-perl/URI
-	geoip? ( dev-perl/Geo-IP )
-	ipv6? ( dev-perl/Net-IP dev-perl/Net-DNS )"
+	virtual/perl-Time-Local
+	geoip? (
+		dev-perl/Geo-IP
+	)
+	ipv6? (
+		dev-perl/Net-DNS
+		dev-perl/Net-IP
+	)
+"
 DEPEND=""
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7.1-gentoo.diff
+	eapply "${FILESDIR}"/${PN}-7.1-gentoo.diff
 
 	# change default installation directory
 	find . -type f -exec sed \
@@ -64,11 +60,16 @@ src_prepare() {
 	fi
 
 	find "${S}" '(' -type f -not -name '*.pl' ')' -exec chmod -x {} + || die
+
+	eapply_user
 }
 
+HTML_DOCS="docs/"
+DOCS="README.md"
+
 src_install() {
-	dohtml -r docs/*
-	dodoc README.TXT
+	einstalldocs
+
 	newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm
 	dodoc -r tools/xslt
 
@@ -98,7 +99,7 @@ src_install() {
 pkg_postinst() {
 	elog "The AWStats-Manual is available either inside"
 	elog "the /usr/share/doc/${PF} - folder, or at"
-	elog "http://awstats.sourceforge.net/docs/index.html ."
+	elog "https://awstats.sourceforge.net/docs/index.html ."
 	elog
 	elog "Copy the /etc/awstats/awstats.model.conf to"
 	elog "/etc/awstats/awstats.<yourdomain>.conf and edit it."
diff --git a/www-misc/awstats/files/awstats-7.8-mime.patch b/www-misc/awstats/files/awstats-7.8-mime.patch
new file mode 100644
index 000000000000..a8d7f6d122a5
--- /dev/null
+++ b/www-misc/awstats/files/awstats-7.8-mime.patch
@@ -0,0 +1,12 @@
+diff -ur awstats-7.8-old/wwwroot/cgi-bin/lib/mime.pm awstats-7.8/wwwroot/cgi-bin/lib/mime.pm
+--- awstats-7.8-old/wwwroot/cgi-bin/lib/mime.pm	2020-04-16 09:18:35.000000000 +0000
++++ awstats-7.8/wwwroot/cgi-bin/lib/mime.pm	2020-05-13 09:38:30.654537576 +0000
+@@ -56,7 +56,7 @@
+ 'diskimage', 'Disc and media file extensions',
+ 'vm',        'Virtual Machine image',
+ 'torrent',   'BitTorrent File',
+-'gis',       'GIS File'
++'gis',       'GIS File',
+ 'ebook',     'Ebook File'
+ );
+