gentoo resync : 05.04.2019

3 files changed, 72 insertions, 4 deletions

diff --git a/app-admin/analog/Manifest b/app-admin/analog/Manifest
index 7e94e350fd57..0194ab1e8a21 100644
--- a/app-admin/analog/Manifest
+++ b/app-admin/analog/Manifest
@@ -3,5 +3,7 @@ AUX analog-6.0-bzip2.patch 3260 BLAKE2B a9bab8a2a7d070b59690606f393d80407f6ffcb3
 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
-EBUILD analog-6.0-r4.ebuild 1274 BLAKE2B f7f95820d6865ded71f6d71b2739c4ff5670572cd472ceace633878ae3c77156b72c7791ec6d8ed5b149e7b5c55915e3c72ee6e7bb26fccbf187c0085bffa2f0 SHA512 8dc0af3bd800e4deb00c3e3b65902fbdb58353365c3bb6366fc2c31f3395ca76761dea5b9dd65089f86a95a3f335a32cb2e50752923ee4f215f3b6c7b7044c28
+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 1381 BLAKE2B c6c9333eebbb26f4bba20da56f6fc4187fbe9bdb625e903a4bbb342a775889ffc8d78427b8ed069b27a73a65361e351a661eb679615bd32a1fe124dae0dda1d5 SHA512 d5af543fee7775d3a74fff2b187f74a7c4c095528ad75a583a1a83f63497a1a8d50bb348b6504639340ea0c418cb1e85f7dbb9f8eb9be78ea3ee2f2b9518b586
 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
index 334c5652bfc3..26824d6fb25a 100644
--- a/app-admin/analog/analog-6.0-r4.ebuild
+++ b/app-admin/analog/analog-6.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,8 +6,8 @@ EAPI=4
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A webserver log analyzer"
-HOMEPAGE="http://www.c-amie.co.uk/analog/"
-SRC_URI="http://www.analog.cx/${P}.tar.gz"
+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"
diff --git a/app-admin/analog/analog-6.0.13.ebuild b/app-admin/analog/analog-6.0.13.ebuild
new file mode 100644
index 000000000000..ba814b09ba7f
--- /dev/null
+++ b/app-admin/analog/analog-6.0.13.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${PN}-src-6013ce"
+
+DESCRIPTION="A webserver log analyzer"
+HOMEPAGE="https://www.c-amie.co.uk/software/analog/"
+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"
+
+DEPEND="
+	app-arch/unzip
+	>=dev-libs/libpcre-3.4
+	>=media-libs/gd-1.8.4-r2[jpeg,png]
+	sys-libs/zlib"
+
+RDEPEND="
+	${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1-gentoo.diff
+	"${FILESDIR}"/${PN}-6.0-bzip2.patch
+	"${FILESDIR}"/${PN}-6.0-undefined-macro.patch
+)
+
+src_prepare() {
+	default
+	sed -i src/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() {
+	newman analog.man analog.1
+
+	dodoc README.txt Licence.txt analog.cfg
+	dodoc -r examples
+	docinto html
+	dodoc docs/*.{html,gif,css,ico}
+	dodoc -r how-to
+	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"
+	dobin analog
+}