gentoo auto-resync : 24:06:2024 - 00:11:52

3 files changed, 68 insertions, 1 deletions

diff --git a/app-admin/analog/Manifest b/app-admin/analog/Manifest
index 4a06c67f93da..40ba1310a1f0 100644
--- a/app-admin/analog/Manifest
+++ b/app-admin/analog/Manifest
@@ -2,6 +2,8 @@ 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.17.tar.gz 1593749 BLAKE2B 88a36128e9965ff99131c73025652be5585a77a5400df61526832e52c9faa6d81d89b16646678fee11680f4268380c54988186c7d82db3db66ded3530008551d SHA512 d4e324d4297069765896b877ce3190370ce85b6f06fd164887652aea1862cc8c3f40eb15b0964bc4435481b9ec61d50dd49961e1e75346414daf5dc979bddf32
 DIST analog-src-6013ce.zip 4875246 BLAKE2B 6b0663f3367faf84a8c65a778a065165ddfba6cd902e5cc6c9e0e84d94e1600629b9f9f89b87ec293f4b81f4034e21941ad45784ae5f35352f71f7b0917eb731 SHA512 8f8dbf0bd95873132414f558deeff61fbe9ac6cac40936f00515ccaead86642613c3f0a5a88046eb4d1f4e263cb01d638291c9a1596ea36098b455572b7364ed
 EBUILD analog-6.0.13.ebuild 1390 BLAKE2B b3eb4e5486b443a7eca97f0483ec231f0c14cab6b4e84d56a0c8dd82958f2df9150d4e780c7ca1b54e2ddb7088d02b0cbe8b536eb91877eb2a665b82259eeb30 SHA512 59de73c264d2c6ba6ad7ed5fbacc9fcca32004abe77a0df4bc2ef2a8625939c4b00eec97ae3bf4f9acb32fde003095802e849c8951060736da04dadc473d61dc
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+EBUILD analog-6.0.17.ebuild 1444 BLAKE2B e16a5b783a8446b586d967e5925f64afc1b3228387cd538137ce0ae2f71b25a4e365336511f4adf5522b45fc22990a48b38442559fcb7e8a85516d1999c631c4 SHA512 6f8666f8ffe3ed2686c5ce112081f6c3c9fab58ee553948f41d96bef78ceaf561bfbb066970f73741aa443e00f4fa99975282d17008020181257846132d71917
+MISC metadata.xml 246 BLAKE2B e24d8eafc30dbf95838af510c267afa9f0e01928d95b83fa08398bcbc0c3281993688c112f3a00824a52673d430cc95e31c8a25ad02f3ff2347a4be974ec9ed6 SHA512 01bbab46e3c7bbc01d5987c8c917d0278f882309091caa0c96d49c13457cb15fd9acf407b7701b422b1d954a69448842ccbb438b7b4fd076b538c04bde5eae8e
diff --git a/app-admin/analog/analog-6.0.17.ebuild b/app-admin/analog/analog-6.0.17.ebuild
new file mode 100644
index 000000000000..183e69685337
--- /dev/null
+++ b/app-admin/analog/analog-6.0.17.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Multi-purpose, multi-platform log file analyser"
+HOMEPAGE="
+	https://www.c-amie.co.uk/software/analog/
+	https://github.com/c-amie/analog-ce"
+SRC_URI="https://github.com/c-amie/${PN}-ce/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-ce-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/libpcre-3.4
+	>=media-libs/gd-1.8.4-r2[jpeg,png]
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+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 ${PN}.cfg-sample
+	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
+}
diff --git a/app-admin/analog/metadata.xml b/app-admin/analog/metadata.xml
index 85e4ed814fa2..ecc93bc3122d 100644
--- a/app-admin/analog/metadata.xml
+++ b/app-admin/analog/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
+<upstream>
+  <remote-id type="github">c-amie/analog-ce</remote-id>
+</upstream>
 </pkgmetadata>