gentoo auto-resync : 27:02:2024 - 23:40:33

5 files changed, 126 insertions, 1 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 07db32a34d4d..a3f4faf6566d 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index c710c82f794d..abc30589c588 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -1,4 +1,11 @@
-DIST geoipupdate-4.9.0-deps.tar.xz 2894004 BLAKE2B 2995d4f2f8632d232b156294cca8bd76f40373c948df9ca5b4813bf630923168063eb094de52582af5221950343b998afb50c97bfe9077cf952951b00e5b3349 SHA512 c83c05cd5063199b21b8eb621a80da8679ddac2881da53b6914a7cb1419a1a6ef8cabd62562722d61b7e5d05d93f430a707d4e082e126514bfad27537f4e3ff7
+AUX geoipupdate-6.0.0-use-go-md2man-instead-of-pandoc.patch 944 BLAKE2B e81f8bcae03324288af919326e05f857caa7b9c768282e46b63bca6cb4bc25f1477a6ed0111d4ff8274cec21ef51977a439aacf002acdd6e910a12d05a0f8e15 SHA512 3838b2fde45be7c40b0ffe0a049be0e108aa0f0d80c2aa9806122a68511cac6d971be29af02722d8f5036c49a0ceb1cb0eee2b845cfe47151227abe081537a07
+DIST geoipupdate-4.9.0-deps.tar.xz 911156 BLAKE2B 136df3a0e94ab0934b48e8860b152edacffae093d26bdbe9593c24f540ce0d6cff215e4cf4ea158bd8dc9a9f3157d5634fea4d66315c5dbc537b42041d0625e6 SHA512 88579ba0e804d7dd9f6cab24d2ac01186f39c47f1ae79d395a77b0725d25e8675928ce34532506f164157cbce4fb2e947efbd2e66c23ed18d61bc67be74ce74d
 DIST geoipupdate-4.9.0.tar.gz 36646 BLAKE2B 9eb5e16c39e8c599d3b0fa60804f179d1fb726c44f9f4ed4ed6ff3b853c31c9dece809dcd690e14157f1290c4a9088e696e967f3baeeb7f2762638c70aad6b6a SHA512 29d0639fe636885b1527b4cb795332c103c011d028ada80eb7b07805d91f575554fc0b9fa9a506c644236a2ceab5509f54f0cc1a03a300480350c520484d959c
+DIST geoipupdate-6.0.0-deps.tar.xz 864256 BLAKE2B 6f9a7adf4bfef6c38a06b3f5e8b49362218dd8b698eec29921ac1d587094c49b26bc307924327600cb06327aae7171a6865cc79134eddee9e08004a82dfcbb84 SHA512 678ecb798b9b736a82d3e2b64c426e966408bbf3858a32e84dd142f0392444248c34c78dec07a5f8c0f04752c965c5cfb1602d96a541462e40a4c84039c71237
+DIST geoipupdate-6.0.0.tar.gz 46523 BLAKE2B ff14026acf39797f69b7cde527c826b78740a65ac4e0914cdffc6276473e3f4367e87e962dfa4634114b7f5b02c33a4a8e675518f4de85238a2342cb367c9f25 SHA512 2b2a6573b6af30ad1ad4c8ed3b97df41bba96212a0e6d90e4a92bd0615f02c9e989168ad56a651d8f35a7d2534e223de5a6f8a34d587f3c8a7a8e19f3b913ca4
+DIST geoipupdate-6.1.0-deps.tar.xz 866588 BLAKE2B aabda8132d0f8866e3450b5c2f07dccc7b1555cac0a987fea48ffe3f07a8c66c72bb41ca1478d47f03cb61bd29a6183bd0621126222decc4e29b8525c3ba991e SHA512 4a03b35258dc77659471299fe119da1e435b1360df08b0b8a19f6374e3880c1c6153fcdb5146f74900ebf540c2c66a3007228f05b702f526ed9e75e01f51f98d
+DIST geoipupdate-6.1.0.tar.gz 47557 BLAKE2B ef33058f8504c06dc2c2a350421866cd88a6b87624874cf6bd29d99c77637c3b99468a6ba615d71310e0c5d49d6ee2820d9a3841c1127437fa602864a014d77d SHA512 b20a3101fb055ed71fe999fe924b71f6d0eb76da8bc4444f7281a3deceac1ee7d1854f3d672b93edabf152cc69551933dd951419ab484259d47f56b243e568eb
 EBUILD geoipupdate-4.9.0.ebuild 1172 BLAKE2B b2f103b2a8ebb3c393941ee89ee1d9a65d9424e95394ccaa7274a8864849ed0f3577cfebf844ed33ec6fd3d6892511a20a2747fd413f4e0ff00d4ff7ebf3b721 SHA512 e35c5e850809341c25db52843ca9bf8531a7caa86d750607f32805ddb5e3c1018ac5d57616d50a0453b5addaa1f701bf8e363a667bfd0d1ef0f75c7e026700b2
+EBUILD geoipupdate-6.0.0.ebuild 1119 BLAKE2B 449e37ff1b7c580a417b2d574f1b8e7e23e43a70d8d682d3dd28bbb84e7ed4dc36f1b0cbb381dee6c5e5bf2dab4174937945e621da14e91a73de8d4ef0cffdd5 SHA512 95dcfa44e74b8ec4a0447aea2ee4fc2719b80d9e2ab4b64431c670065878bb872311937d7511fcf6b5a01b62294fa7cbe0bbd01a2b89f777cb9a35d39b1ba165
+EBUILD geoipupdate-6.1.0.ebuild 1176 BLAKE2B 0dab802ad3f9d8b8b29b716d6cb4d0623b1b659649e9a079359b4879c7f52211ec93bab6281dc122f9644ddde54662c80950515d8afa5a00e64be3f794ebff98 SHA512 2a530fc95db2e1362654a5ddd492be63426a2aac1840f99dda38e4f1cc93c03e184edd4ff738d00356bb0010a1c7b67b5625e252ddb22119fb3878da0264fa78
 MISC metadata.xml 365 BLAKE2B fe03fdda21f1ab1dcbf3fe2263aabd4a567e0527a33f551a2c9e5883fc9738607705710f10125fd50127d71e86b6a935d955c12dfa588713b40adeb84001a4c0 SHA512 bbf7afa666726fb1b3b9ddc8a899a8fc404c141bdd1c2adc3a458c9a5b4b7b60697fcf3e43df8a5a4ce3cb96db46d92d0af2887bba7aa52d759171dd240c4415
diff --git a/net-misc/geoipupdate/files/geoipupdate-6.0.0-use-go-md2man-instead-of-pandoc.patch b/net-misc/geoipupdate/files/geoipupdate-6.0.0-use-go-md2man-instead-of-pandoc.patch
new file mode 100644
index 000000000000..aa48a97ef155
--- /dev/null
+++ b/net-misc/geoipupdate/files/geoipupdate-6.0.0-use-go-md2man-instead-of-pandoc.patch
@@ -0,0 +1,26 @@
+From 250049909d1f9ed3c8ab06e07fcb10487942953a Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Wed, 13 Dec 2023 18:59:31 +0200
+Subject: [PATCH] Use go-md2man instead of perl script with pandoc
+
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+--- a/Makefile
++++ b/Makefile
+@@ -53,10 +53,11 @@ $(BUILDDIR)/GeoIP.conf.md: $(BUILDDIR) doc/GeoIP.conf.md
+ $(BUILDDIR)/geoipupdate.md: $(BUILDDIR) doc/geoipupdate.md
+ 	sed -e 's|CONFFILE|$(CONFFILE)|g' -e 's|DATADIR|$(DATADIR)|g' -e 's|$$|$(MAYBE_CR)|g' doc/geoipupdate.md > $(BUILDDIR)/geoipupdate.md
+ 
+-$(BUILDDIR)/GeoIP.conf.5: $(BUILDDIR)/GeoIP.conf.md  $(BUILDDIR)/geoipupdate.md
+-	dev-bin/make-man-pages.pl "$(BUILDDIR)"
++$(BUILDDIR)/GeoIP.conf.5: %.5 : %.md
++	go-md2man -in $< -out $@
+ 
+-$(BUILDDIR)/geoipupdate.1: $(BUILDDIR)/GeoIP.conf.5
++$(BUILDDIR)/geoipupdate.1: %.1: %.md
++	go-md2man -in $< -out $@
+ 
+ clean:
+ 	rm -rf $(BUILDDIR)/GeoIP.conf \
+-- 
+2.43.0
+
diff --git a/net-misc/geoipupdate/geoipupdate-6.0.0.ebuild b/net-misc/geoipupdate/geoipupdate-6.0.0.ebuild
new file mode 100644
index 000000000000..eeedc3970bee
--- /dev/null
+++ b/net-misc/geoipupdate/geoipupdate-6.0.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
+HOMEPAGE="https://github.com/maxmind/geoipupdate"
+SRC_URI="https://github.com/maxmind/geoipupdate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="BSD MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+
+BDEPEND="dev-go/go-md2man"
+
+DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md )
+
+PATCHES=(
+	"${FILESDIR}/geoipupdate-6.0.0-use-go-md2man-instead-of-pandoc.patch"
+)
+
+src_compile() {
+	# Do not let these leak from outside into the package
+	unset GOBIN GOPATH GOCODE
+
+	# the horror, the horror ... but it's all automagic
+	export CONFFILE=/etc/GeoIP.conf
+	export DATADIR=/usr/share/GeoIP
+	export VERSION=${PV}
+
+	default
+}
+
+src_install() {
+	dobin build/geoipupdate
+
+	keepdir /usr/share/GeoIP
+
+	insinto /etc
+	doins build/GeoIP.conf
+
+	doman build/GeoIP.conf.5 build/geoipupdate.1
+
+	einstalldocs
+}
diff --git a/net-misc/geoipupdate/geoipupdate-6.1.0.ebuild b/net-misc/geoipupdate/geoipupdate-6.1.0.ebuild
new file mode 100644
index 000000000000..c0e08724e787
--- /dev/null
+++ b/net-misc/geoipupdate/geoipupdate-6.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
+HOMEPAGE="https://github.com/maxmind/geoipupdate"
+SRC_URI="https://github.com/maxmind/geoipupdate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="ISC BSD BSD-2 MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~s390 ~x86"
+
+DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md )
+
+src_compile() {
+	# Do not let these leak from outside into the package
+	unset GOBIN GOPATH GOCODE
+
+	# requires pandoc but the information is still in the distributed md files
+	sed -i -e '/GeoIP.conf.5 /d' -e '/geoipupdate.1$/d' Makefile || die
+	#sed -i -e 's/go build/go build -x/' Makefile || die
+
+	# the horror, the horror ... but it's all automagic
+	export CONFFILE=/etc/GeoIP.conf
+	export DATADIR=/usr/share/GeoIP
+	export VERSION=${PV}
+
+	default
+}
+
+src_install() {
+	dobin build/geoipupdate
+
+	keepdir /usr/share/GeoIP
+
+	insinto /etc
+	doins build/GeoIP.conf
+
+	einstalldocs
+}