Adding metadata

4 files changed, 18 insertions, 107 deletions

diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index 7445f3ec7e77..ec38b0c9926f 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -1,3 +1,2 @@
-DIST 3.49.5.tar.gz 1767597 BLAKE2B ed8b6915b8eb150b12d91d78c0225430796548c102b695b0917d5c9dd0e9fc3c28ec0c7fffa6bad0c7d594293915f5fb77c61dc7b1e7a378a45af3835d7da05a SHA512 4a4442563e3d4e80d3f5176793611317a86f8960c967cf0f1a568bea1e44335a76c2864dad600919d21c57ad48614d340d71a793f9f5e2a4032da24050251fd6
-DIST coucal-73ada075553b7607d083037a87cb9c73b3683bfc.tar.gz 21306 BLAKE2B c04b369f6011aa14169a933ba2a39dcc114d056968a2dc51a752979c59e93332bc302f53e865b78c7324fd568fdc3666eebe60a887fb8417e8ee7a1fbe5ed0f6 SHA512 818cfdbf6038cf27433973d3994f7231c61c366b44a28dd74e1a6d216c9bbb66b0699bf40ccbd7816de7876d73b096b93d895f6f61efbd0d79c39d559b3aee73
-DIST httrack-3.49.6.tar.gz 1771770 BLAKE2B 2bffa65f7105cb21ea7e9a1c73dbf835ae390c8580d0aeb2cdd405aa06b824a9431dd27a8d17653daf584c03a03d82a20962da8111ae4b06408314bdc3a9ae52 SHA512 c5c080812afd8793f85ef7e67b1043e6e369648b370131e592809742053a3fb53abc15d82a925a6821b0036169194bbe610077ce257fc6d16a2a36ffe8c15ce8
+DIST coucal-73ada075553b7607d083037a87cb9c73b3683bfc.gh.tar.gz 21306 BLAKE2B c04b369f6011aa14169a933ba2a39dcc114d056968a2dc51a752979c59e93332bc302f53e865b78c7324fd568fdc3666eebe60a887fb8417e8ee7a1fbe5ed0f6 SHA512 818cfdbf6038cf27433973d3994f7231c61c366b44a28dd74e1a6d216c9bbb66b0699bf40ccbd7816de7876d73b096b93d895f6f61efbd0d79c39d559b3aee73
+DIST httrack-3.49.5.gh.tar.gz 1767597 BLAKE2B ed8b6915b8eb150b12d91d78c0225430796548c102b695b0917d5c9dd0e9fc3c28ec0c7fffa6bad0c7d594293915f5fb77c61dc7b1e7a378a45af3835d7da05a SHA512 4a4442563e3d4e80d3f5176793611317a86f8960c967cf0f1a568bea1e44335a76c2864dad600919d21c57ad48614d340d71a793f9f5e2a4032da24050251fd6
diff --git a/www-client/httrack/httrack-3.49.5.ebuild b/www-client/httrack/httrack-3.49.5.ebuild
index 1cfd5022ee7a..acff50786c0f 100644
--- a/www-client/httrack/httrack-3.49.5.ebuild
+++ b/www-client/httrack/httrack-3.49.5.ebuild
@@ -1,25 +1,25 @@
-# Copyright 2022-2024 Liguros Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=8
 
-inherit autotools multilib xdg-utils
+EAPI="8"
+
+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/"
-COUCAL_COMMIT="73ada075553b7607d083037a87cb9c73b3683bfc"
-SRC_URI="
-	https://github.com/xroche/httrack/archive/refs/tags/${PV}.tar.gz
-	https://github.com/xroche/coucal/archive/${COUCAL_COMMIT}.tar.gz -> coucal-${COUCAL_COMMIT}.tar.gz
-"
+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"
 
-LICENSE="GPL-3"
+LICENSE="BSD GPL-3 public-domain"  # BSD and public-domain is from bundled Coucal
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=" static-libs"
+KEYWORDS="amd64 ~arm64 ppc x86"
+IUSE="static-libs"
 
-RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
+RDEPEND=">=virtual/zlib-1.2.5.1-r1:=
 	>=dev-libs/openssl-1.1.0:=
-
 	"
 DEPEND="${RDEPEND}"
 
@@ -30,10 +30,10 @@ PATCHES=(
 )
 
 src_prepare() {
+	rmdir "${S}"/src/coucal || die
+	mv "${WORKDIR}"/coucal-${COUCAL_COMMIT} "${S}"/src/coucal || die
+
 	default
-	# mv third party sources into the tree
-	cp -r ${WORKDIR}/coucal-${COUCAL_COMMIT}/* ${S}/src/coucal
-	rm -rf ${WORKDIR}/coucal-${COUCAL_COMMIT}
 
 	# 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).
diff --git a/www-client/httrack/httrack-3.49.6.ebuild b/www-client/httrack/httrack-3.49.6.ebuild
deleted file mode 100644
index 391ab2561d81..000000000000
--- a/www-client/httrack/httrack-3.49.6.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2022-2024 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-inherit autotools multilib xdg-utils
-
-DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
-HOMEPAGE="https://www.httrack.com/"
-COUCAL_COMMIT="73ada075553b7607d083037a87cb9c73b3683bfc"
-GIT_COMMIT="748c35de7858ead963daf1393ad023d75b7820c2"
-SRC_URI="
-	https://github.com/xroche/httrack/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/xroche/coucal/archive/${COUCAL_COMMIT}.tar.gz -> coucal-${COUCAL_COMMIT}.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 )
-S=${WORKDIR}/${PN}-${GIT_COMMIT}
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.48.13-minizip.patch
-)
-
-src_prepare() {
-	default
-	# mv third party sources into the tree
-	cp -r ${WORKDIR}/coucal-${COUCAL_COMMIT}/* ${S}/src/coucal
-	rm -rf ${WORKDIR}/coucal-${COUCAL_COMMIT}
-
-	# 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/metadata.xml b/www-client/httrack/metadata.xml
index 0c0091a26cc5..5f33304011d5 100644
--- a/www-client/httrack/metadata.xml
+++ b/www-client/httrack/metadata.xml
@@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>dev@liguros.net</email>
-    <name>Development</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>sping@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:httrack:httrack</remote-id>
-  </upstream>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>