gentoo resync : 15.12.2019

3 files changed, 2 insertions, 59 deletions

diff --git a/app-admin/analog/Manifest b/app-admin/analog/Manifest
index ef544ba83fd5..d21cdf4a3bb7 100644
--- a/app-admin/analog/Manifest
+++ b/app-admin/analog/Manifest
@@ -2,8 +2,6 @@ AUX analog-5.1-gentoo.diff 799 BLAKE2B 66aae5e4f66ab232cdb98eef893ffe2794e06ecb7
 AUX analog-6.0-bzip2.patch 3260 BLAKE2B a9bab8a2a7d070b59690606f393d80407f6ffcb38f2c40c30c22ffadcaf8de3f868c56660fbdf358e76ca342296305670b12d41cdefd5d03acb0ce22dea371c7 SHA512 ea256338713338043ccaa48ffd8344753811721cf42c8269a2c58c2a14f7ebe901b16131ff021163a02c570b1b902bb3ab6516e34570a7961bce716cf600920b
 AUX analog-6.0-undefined-macro.patch 997 BLAKE2B 9ae68f90acfa81e861a6fddbd588ed4cbfdf9b4ad26355894bc3aaa0df50e5bbd180096c4baf393f6dcdd7d91d28b4e6a85e5b5c65714ff540e9ae127a08905b SHA512 759d6dfc2a09305a6178d1c147219487f988d432bf6d011e49776cec2de04ccc7ab27568638063f0ca723a92a75abeda82eddd5240a0b42bab3a2de3ae99007f
 AUX analog.cfg 3992 BLAKE2B 8e68cc26a59a5bbed57f84e06ac8f5c9874cf1a36bdbb5c6f9144bc39df17ea380ebd323b2ddb891dd968078fd3d7bae6b29a90cb5ec2051a10722489d0d83d2 SHA512 af6e8eb3013fea513efcce2e57b2680850604552a8def8f3148cfc4b11bf01114778fc112ee562b7ce4cce6b496b37a53251d1061d67fe5748d39c5225f94141
-DIST analog-6.0.tar.gz 1553316 BLAKE2B 5363880cf65e8a4e845603a19dd30b79d4fb13b51b68d0cbcf59c2827a2c099d02c662e55b59ef9b4526ade53ca3f7401415a3bc78de3d7cc39b4e4988299241 SHA512 42b766d45f86a32d2e97cc2be35ebb5f4e0ffc2fb72d48196939027ea1ed3398a8cc0a43c47868f542bfb464199ab35bd93fa2ba5e37c4fc83ff15cfe19b9c60
 DIST analog-src-6013ce.zip 4875246 BLAKE2B 6b0663f3367faf84a8c65a778a065165ddfba6cd902e5cc6c9e0e84d94e1600629b9f9f89b87ec293f4b81f4034e21941ad45784ae5f35352f71f7b0917eb731 SHA512 8f8dbf0bd95873132414f558deeff61fbe9ac6cac40936f00515ccaead86642613c3f0a5a88046eb4d1f4e263cb01d638291c9a1596ea36098b455572b7364ed
-EBUILD analog-6.0-r4.ebuild 1324 BLAKE2B 3e8e566b541ce86cac1270c7f65fc0656e63b532777f35e022073edf9cb4123c6233a64cdcb35eaeceb55e07b7848924f54c50c9794e6d39ab22fac93026e7f8 SHA512 3d2d68366229b53000d872261a01eae6e8fe291937b6d614b7e2fb3fc29bd05742e03a0178a30b1ece779e453e3b71ec49c647727eb860bdba826b1d522d797f
-EBUILD analog-6.0.13.ebuild 1375 BLAKE2B 6958e8335810fe01c2803af543855edeb2f32947147db6acb392600e0b73179335af21418ddda27c91162bc91d56043c340cdbee3e0fbd47f11d56478f71011d SHA512 4a252dfa76940584f26f8e01e1b79a7f00695214c77aeaec42a2b6ec55e947ee762f157cc87d585b79a92690bdfd05d8a73f771ea9a9da9021962704f951f35c
+EBUILD analog-6.0.13.ebuild 1373 BLAKE2B 53be6fbf065bffff1d95bef6726605a6667d1e79ae6b074645b4116203e5ec68cdb9a5b0bdb90822f929237329fb7fc41bd2ab8f096c29fd4d0340e5abb71b13 SHA512 ed04fba607e61a497a1a6a21460a95823c89f15e2307a5b0b4f0738f3facf4e03a123a07d8b6e4790e413de8be49dd189054b947e5991c7ad08e53a90e2fd5eb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/analog/analog-6.0-r4.ebuild b/app-admin/analog/analog-6.0-r4.ebuild
deleted file mode 100644
index 26824d6fb25a..000000000000
--- a/app-admin/analog/analog-6.0-r4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A webserver log analyzer"
-HOMEPAGE="https://www.c-amie.co.uk/software/analog/"
-SRC_URI="https://web.archive.org/web/20140331011039/http://www.analog.cx/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=">=dev-libs/libpcre-3.4
-	>=media-libs/gd-1.8.4-r2[jpeg,png]
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cd src/
-	epatch "${FILESDIR}/${PN}-5.1-gentoo.diff"
-	epatch "${FILESDIR}/${P}-bzip2.patch"
-	epatch "${FILESDIR}/${P}-undefined-macro.patch"
-
-	sed -i Makefile \
-		-e 's| -o | $(LDFLAGS)&|g' \
-		|| die "sed Makefile"
-}
-
-src_compile() {
-	tc-export CC
-	# emake in main dir just executes "cd src && make",
-	# i.e. MAKEOPTS are ignored
-	emake -C src
-}
-
-src_install() {
-	dobin analog
-	newman analog.man analog.1
-
-	dodoc README.txt Licence.txt analog.cfg
-	dohtml -a html,gif,css,ico docs/*
-	dohtml -r how-to
-	dodoc -r examples
-	docinto cgi ; dodoc anlgform.pl
-
-	insinto /usr/share/analog/images ; doins images/*
-	insinto /usr/share/analog/lang ; doins lang/*
-	dodir /var/log/analog
-	dosym ../../../usr/share/analog/images /var/log/analog/images
-	insinto /etc/analog ; doins "${FILESDIR}/analog.cfg"
-}
diff --git a/app-admin/analog/analog-6.0.13.ebuild b/app-admin/analog/analog-6.0.13.ebuild
index cf508ebd6e23..2f7f9b8e601b 100644
--- a/app-admin/analog/analog-6.0.13.ebuild
+++ b/app-admin/analog/analog-6.0.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.c-amie.co.uk/static/analog/6013/${MY_P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
 
 DEPEND="
 	app-arch/unzip