gentoo auto-resync : 27:01:2024 - 18:57:08

4 files changed, 8 insertions, 80 deletions

diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index c068f70df468..4bbb2dac8682 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -3,8 +3,8 @@ DIST coucal-73ada075553b7607d083037a87cb9c73b3683bfc.gh.tar.gz 21306 BLAKE2B c04
 DIST gnulib-32a72f45374c9a36afa574d1a08bb98090270012-visibility.m4 3474 BLAKE2B 8b58ab88f22ee671eb97070e0470286e750db38bfe623b9ab31b1c8e70ca878432d0276d9bd79fde40c3fbf14c435a142430121a02356d0f9e5e21cb71ce9442 SHA512 63b6f76f955bbd55749cb08b657bcb257ef8cb1b2705d035d700f66d78ff6f82d81c7180fba6e2a6af51a2f97071929a8e253dc2e183b62dc843c7a68bc8e518
 DIST httrack-3.49.2.tar.gz 1835116 BLAKE2B 4073b70268bcea8acf0a9ac10deed14764ccd405c82f1b9f48dc74d3dbef130161234b59e70e72305a195d21155474831e8359eea9b96d275481a69b1c1ff561 SHA512 84a13a776b278533f7f0635ebd764387c3399b01c0644d8af9b46fc8112dc3c6e568c17969d4f6c2db32b5474344c39f86cf51957c09eb807ebe305a554ba5c8
 DIST httrack-3.49.4.gh.tar.gz 1761838 BLAKE2B 5fcfb3dcf97bb672dd7a93a61c0eee3d3d18615abd547932c77b46f930ae30d8395df61614c0ccb4cd42552546f6a81323e9048afc17eecfd2136da4199c6158 SHA512 7cc25af0cf493f3304e15e021769646ca035c54145eb9fdc0b383cfe05d369ae50ffd222cbbe23de3d8270947ff3a564ab59e7f7f5186d63e8e63d56fae1e10d
+DIST httrack-3.49.5.gh.tar.gz 1767597 BLAKE2B ed8b6915b8eb150b12d91d78c0225430796548c102b695b0917d5c9dd0e9fc3c28ec0c7fffa6bad0c7d594293915f5fb77c61dc7b1e7a378a45af3835d7da05a SHA512 4a4442563e3d4e80d3f5176793611317a86f8960c967cf0f1a568bea1e44335a76c2864dad600919d21c57ad48614d340d71a793f9f5e2a4032da24050251fd6
 EBUILD httrack-3.49.2-r2.ebuild 1661 BLAKE2B 5197d8ec76b8a1e66be3bb130d62f8ea791440c129b558e18ea86ca8d6f590505d2f3b6e8a2ad7100fa42f11fc18dfee2d7d3928baf841c989a045d872fb35d1 SHA512 42d5b1cda4dc4d1a8382ea4f30dcbd6a59ea2a6a575dd791371d658faadc2d7010b27d156eeeb0c3a1c908004ee3a03b5876ffb50fa51d759d6ae4446707362c
-EBUILD httrack-3.49.2-r3.ebuild 1655 BLAKE2B d1a32e89f0f6ac2cf32866341b1c87ce69fa9cd4349ca2e877fb231d100eeaab20cbe25d1e0efcabc1369274613aa881258997ee9a22f6f7337d42e7709c2ef1 SHA512 b277c6a991daf6460666b5acfa27c99a72a6f46c52073a932059656b2733cc9b5a7a7eaf776be56785386d10abdeda853892a4abfae1ed6515e42d87f1510e4a
 EBUILD httrack-3.49.4-r1.ebuild 2434 BLAKE2B c4780f81ba164e2b2ae16bd75ce269cd614c481f621466ac21650c9a20711a460e92c686629ae7f52cac163cda2982e86f3bd100f92deec2b44ac2e8e6e26f56 SHA512 762e75965b196c5bae88ac10ec364e777cd8ab3d7020439273ed239d23a1736243867b1616579aba0d8a55b91e8b593878a5309320aa1b466e2fd5d7cf6017fd
-EBUILD httrack-3.49.4.ebuild 2083 BLAKE2B ba51049902505833b67e47863c67833b40a0f8d4f531b2beebde40ebcb4489ff552a0fb41567d8acec5ad93068969ca48d352498b92739e607412d92ea487b0b SHA512 f4c6f8946264d57c37aa21e368ef11dec3808fdc75be815405d80296b59e8c35a0e0bce25cd7973d5d08a5dbbf9dd80ba49effc133cad02eb861b0ec0a240ea6
-MISC metadata.xml 290 BLAKE2B d0d0d9a8d0d04c609738293f8e46d011136922b37cd3492ed05307a2091bd5cdd460fdae15f2e7fc86c7e01e4774f8a9cb9967dd1fcb5aeed60b9d2c190fc913 SHA512 466c7fca17e3dee297a6fa176404c3aaa45d91370a6bebb4624f48f85b9f2c4ac56c80f20d00fed74d61ae3dccef28375adb116465c698bad6b8358ea3ae3d65
+EBUILD httrack-3.49.5.ebuild 2101 BLAKE2B 71e6fa9f9a0d179cf2954266b98a7384968a6bcc3eac5ca2bf8810f8b5d03b69e0cb937b7aa1a80d79e070718934c244defd3a3870df6f48a76216e92362fa69 SHA512 d974261bb085c0d46195a146d36158cfea68e6b6bb438df1e36b3eb7304240a7bdeacdd7d281fc72e7cd80166e9d5cb1fc27b57f6f6d448970e9ea9238dcad35
+MISC metadata.xml 243 BLAKE2B 0aedcdd4f8808e504166938759897706eae33c4391c08d66bf4e01e1fc9e8167e78f3e1ff5396f2d7903b2fa6c4914c8861a975cab4501a6e43b849c75dc95db SHA512 07a6cddf695275a98a5356028dbc88314743fe2cb34c39bad80325ea09cfa76e67dd58fd5ba589d4c30646bbf689ce476179c1cd863da0e026e275d337e62815
diff --git a/www-client/httrack/httrack-3.49.2-r3.ebuild b/www-client/httrack/httrack-3.49.2-r3.ebuild
deleted file mode 100644
index b306e0d666ba..000000000000
--- a/www-client/httrack/httrack-3.49.2-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools xdg-utils
-
-DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
-HOMEPAGE="https://www.httrack.com/"
-SRC_URI="https://mirror.httrack.com/historical/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
-	>=dev-libs/openssl-1.1.0:=
-	"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README greetings.txt history.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.48.13-minizip.patch
-)
-
-src_prepare() {
-	default
-
-	# We need to patch use of /usr/lib because it is a problem with
-	# linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/732272).
-	# The grep sandwich acts as a regression test so that a future
-	# version bump cannot break patching without noticing.
-	if [[ "$(get_libdir)" != lib ]]; then
-		grep -wq '{ZLIB_HOME}/lib' m4/check_zlib.m4 || die
-		sed "s,{ZLIB_HOME}/lib,{ZLIB_HOME}/$(get_libdir)," -i m4/check_zlib.m4 || die
-		grep -w '{ZLIB_HOME}/lib' m4/check_zlib.m4 && die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	# Make webhttrack work despite FEATURES=nodoc cutting
-	# all of /usr/share/doc/ away (bug #493376)
-	if has nodoc ${FEATURES} ; then
-		dodir /usr/share/${PF}/
-		mv "${D}"/usr/share/{doc/,}${PF}/html || die
-
-		rm "${D}"/usr/share/${PN}/html || die
-		dosym ../../${PF}/html /usr/share/${PN}/html
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/www-client/httrack/httrack-3.49.4.ebuild b/www-client/httrack/httrack-3.49.5.ebuild
index 2f90be8e6eb5..47bd86443e04 100644
--- a/www-client/httrack/httrack-3.49.4.ebuild
+++ b/www-client/httrack/httrack-3.49.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -7,15 +7,15 @@ inherit autotools xdg-utils
 
 # TODO unbundle coucal, upstream ticket https://github.com/xroche/httrack/issues/247
 COUCAL_COMMIT=73ada075553b7607d083037a87cb9c73b3683bfc
+
 DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
 HOMEPAGE="https://www.httrack.com/"
 SRC_URI="https://github.com/xroche/httrack/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
 	https://github.com/xroche/coucal/archive/${COUCAL_COMMIT}.tar.gz -> coucal-${COUCAL_COMMIT}.gh.tar.gz"
 
-COUCAL_LICENSE="BSD public-domain"
-LICENSE="GPL-3 ${COUCAL_LICENSE}"
+LICENSE="BSD GPL-3 public-domain"  # BSD and public-domain is from bundled Coucal
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
diff --git a/www-client/httrack/metadata.xml b/www-client/httrack/metadata.xml
index 13c8a9403797..9fd4a9d0ac53 100644
--- a/www-client/httrack/metadata.xml
+++ b/www-client/httrack/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>sping@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
 	<remote-id type="github">xroche/httrack</remote-id>
 </upstream>