[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2024-01-27 Thread Sebastian Pipping 
commit: 84265ce42f30769958eea8699e807ed307a2864b
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sat Jan 27 18:41:35 2024 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sat Jan 27 18:41:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84265ce4

www-client/httrack: Drop vulnerable

Bug: https://bugs.gentoo.org/923035
Signed-off-by: Sebastian Pipping  gentoo.org>

 www-client/httrack/Manifest |  3 --
 www-client/httrack/httrack-3.49.2-r2.ebuild | 70 
 www-client/httrack/httrack-3.49.4-r1.ebuild | 83 -
 3 files changed, 156 deletions(-)

diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index 16f32a737322..ec38b0c9926f 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -1,5 +1,2 @@
 DIST coucal-73ada075553b7607d083037a87cb9c73b3683bfc.gh.tar.gz 21306 BLAKE2B 
c04b369f6011aa14169a933ba2a39dcc114d056968a2dc51a752979c59e93332bc302f53e865b78c7324fd568fdc3666eebe60a887fb8417e8ee7a1fbe5ed0f6
 SHA512 
818cfdbf6038cf27433973d3994f7231c61c366b44a28dd74e1a6d216c9bbb66b0699bf40ccbd7816de7876d73b096b93d895f6f61efbd0d79c39d559b3aee73
-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

diff --git a/www-client/httrack/httrack-3.49.2-r2.ebuild 
b/www-client/httrack/httrack-3.49.2-r2.ebuild
deleted file mode 100644
index 2bb4535898f6..
--- a/www-client/httrack/httrack-3.49.2-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools multilib 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-r1.ebuild 
b/www-client/httrack/httrack-3.49.4-r1.ebuild
deleted file mode 100644
index 8ab76a904fa4..
--- a/www-client/httrack/httrack-3.49.4-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2024-01-27 Thread Sam James 
commit: 8b803e097f5a73ae5e219141762094978291d4fe
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 27 17:36:26 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 27 17:36:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b803e09

www-client/httrack: Stabilize 3.49.5 amd64, #923034

Signed-off-by: Sam James  gentoo.org>

 www-client/httrack/httrack-3.49.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/httrack/httrack-3.49.5.ebuild 
b/www-client/httrack/httrack-3.49.5.ebuild
index 43cf4a8c882d..47bd86443e04 100644
--- a/www-client/httrack/httrack-3.49.5.ebuild
+++ b/www-client/httrack/httrack-3.49.5.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/xroche/httrack/archive/refs/tags/${PV}.tar.gz -> ${P
 
 LICENSE="BSD GPL-3 public-domain"  # BSD and public-domain is from bundled 
Coucal
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 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

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2024-01-27 Thread Sam James 
commit: cebbbf47619d120f11460d2f190ed7801342c805
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 27 17:36:24 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 27 17:36:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cebbbf47

www-client/httrack: Stabilize 3.49.5 x86, #923034

Signed-off-by: Sam James  gentoo.org>

 www-client/httrack/httrack-3.49.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/httrack/httrack-3.49.5.ebuild 
b/www-client/httrack/httrack-3.49.5.ebuild
index 7dfaff746d39..43cf4a8c882d 100644
--- a/www-client/httrack/httrack-3.49.5.ebuild
+++ b/www-client/httrack/httrack-3.49.5.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/xroche/httrack/archive/refs/tags/${PV}.tar.gz -> ${P
 
 LICENSE="BSD GPL-3 public-domain"  # BSD and public-domain is from bundled 
Coucal
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 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

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2024-01-27 Thread Arthur Zamarin 
commit: c55dcc575de4747500c587264d2fb3d3e07edc4f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jan 27 17:29:02 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jan 27 17:29:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c55dcc57

www-client/httrack: Stabilize 3.49.5 ppc, #923034

Signed-off-by: Arthur Zamarin  gentoo.org>

 www-client/httrack/httrack-3.49.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/httrack/httrack-3.49.5.ebuild 
b/www-client/httrack/httrack-3.49.5.ebuild
index d8a338fd988d..7dfaff746d39 100644
--- a/www-client/httrack/httrack-3.49.5.ebuild
+++ b/www-client/httrack/httrack-3.49.5.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/xroche/httrack/archive/refs/tags/${PV}.tar.gz -> ${P
 
 LICENSE="BSD GPL-3 public-domain"  # BSD and public-domain is from bundled 
Coucal
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~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

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2024-01-27 Thread Arthur Zamarin 
commit: 84a0cb9d078e4e453349b8681881343571f06f0f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jan 27 17:29:01 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jan 27 17:29:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84a0cb9d

www-client/httrack: Keyword 3.49.5 arm64, #917589

Signed-off-by: Arthur Zamarin  gentoo.org>

 www-client/httrack/httrack-3.49.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/httrack/httrack-3.49.5.ebuild 
b/www-client/httrack/httrack-3.49.5.ebuild
index e65ed02e13f5..d8a338fd988d 100644
--- a/www-client/httrack/httrack-3.49.5.ebuild
+++ b/www-client/httrack/httrack-3.49.5.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/xroche/httrack/archive/refs/tags/${PV}.tar.gz -> ${P
 
 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

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2024-01-27 Thread Sebastian Pipping 
commit: f9c60d96aded857317f916390e624607d5f44337
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sat Jan 27 14:37:12 2024 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sat Jan 27 14:44:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9c60d96

www-client/httrack: 3.49.5 + ReferenceInMetadataVar

Signed-off-by: Sebastian Pipping  gentoo.org>

 www-client/httrack/Manifest  |  1 +
 www-client/httrack/httrack-3.49.5.ebuild | 77 
 2 files changed, 78 insertions(+)

diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index 1facd1646cc1..16f32a737322 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -2,3 +2,4 @@ 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

diff --git a/www-client/httrack/httrack-3.49.5.ebuild 
b/www-client/httrack/httrack-3.49.5.ebuild
new file mode 100644
index ..e65ed02e13f5
--- /dev/null
+++ b/www-client/httrack/httrack-3.49.5.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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/;
+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="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"
+
+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() {
+   rmdir "${S}"/src/coucal || die
+   mv "${WORKDIR}"/coucal-${COUCAL_COMMIT} "${S}"/src/coucal || die
+
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2024-01-27 Thread Sebastian Pipping 
commit: 099c35a85c20cd77e9ca97a3a77b60f8f2e402d7
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sat Jan 27 14:40:34 2024 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sat Jan 27 14:44:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=099c35a8

www-client/httrack: Drop myself as maintainer + drop old

Signed-off-by: Sebastian Pipping  gentoo.org>

 www-client/httrack/httrack-3.49.2-r3.ebuild | 70 --
 www-client/httrack/httrack-3.49.4.ebuild| 77 -
 www-client/httrack/metadata.xml |  4 +-
 3 files changed, 1 insertion(+), 150 deletions(-)

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..
--- 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.4.ebuild
deleted file mode 100644
index 2f90be8e6eb5..
--- a/www-client/httrack/httrack-3.49.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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/;
-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}"
-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() {
-   rmdir "${S}"/src/coucal || die
-   mv "${WORKDIR}"/coucal-${COUCAL_COMMIT} "${S}"/src/coucal || die
-
-   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
-

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2023-03-12 Thread Sebastian Pipping 
commit: ab0842d01d6c18cb80b511b296937465d68c825f
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Mon Mar 13 02:46:12 2023 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Mon Mar 13 02:46:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab0842d0

www-client/httrack: Provide missing autoconf macro gl_VISIBILITY

Closes: https://bugs.gentoo.org/898836
Signed-off-by: Sebastian Pipping  gentoo.org>

 www-client/httrack/Manifest |  1 +
 www-client/httrack/httrack-3.49.4-r1.ebuild | 83 +
 2 files changed, 84 insertions(+)

diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index 11e281aac811..1facd1646cc1 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -1,3 +1,4 @@
 DIST coucal-73ada075553b7607d083037a87cb9c73b3683bfc.gh.tar.gz 21306 BLAKE2B 
c04b369f6011aa14169a933ba2a39dcc114d056968a2dc51a752979c59e93332bc302f53e865b78c7324fd568fdc3666eebe60a887fb8417e8ee7a1fbe5ed0f6
 SHA512 
818cfdbf6038cf27433973d3994f7231c61c366b44a28dd74e1a6d216c9bbb66b0699bf40ccbd7816de7876d73b096b93d895f6f61efbd0d79c39d559b3aee73
+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

diff --git a/www-client/httrack/httrack-3.49.4-r1.ebuild 
b/www-client/httrack/httrack-3.49.4-r1.ebuild
new file mode 100644
index ..8ab76a904fa4
--- /dev/null
+++ b/www-client/httrack/httrack-3.49.4-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools xdg-utils
+
+# TODO unbundle coucal, upstream ticket 
https://github.com/xroche/httrack/issues/247
+COUCAL_COMMIT=73ada075553b7607d083037a87cb9c73b3683bfc
+# TODO drop with >=3.49.5, upstream 
https://github.com/xroche/httrack/issues/245
+GNULIB_COMMIT=32a72f45374c9a36afa574d1a08bb98090270012
+
+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
+   
https://raw.githubusercontent.com/coreutils/gnulib/${GNULIB_COMMIT}/m4/visibility.m4
 -> gnulib-${GNULIB_COMMIT}-visibility.m4"
+
+COUCAL_LICENSE="BSD public-domain"
+LICENSE="GPL-3 ${COUCAL_LICENSE}"
+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() {
+   rmdir "${S}"/src/coucal || die
+   mv "${WORKDIR}"/coucal-${COUCAL_COMMIT} "${S}"/src/coucal || die
+
+   cp "${DISTDIR}"/gnulib-${GNULIB_COMMIT}-visibility.m4 
"${S}"/m4/visibility.m4 || die
+
+   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

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2023-01-30 Thread Sebastian Pipping 
commit: 94010a6c269d8ccf568e7869515653827f86a793
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Tue Jan 31 02:30:44 2023 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Tue Jan 31 02:30:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94010a6c

www-client/httrack: Address MissingRemoteId

Signed-off-by: Sebastian Pipping  gentoo.org>

 www-client/httrack/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/www-client/httrack/metadata.xml b/www-client/httrack/metadata.xml
index c5e96a5ca3bc..13c8a9403797 100644
--- a/www-client/httrack/metadata.xml
+++ b/www-client/httrack/metadata.xml
@@ -4,4 +4,7 @@
 
sp...@gentoo.org
 
+
+   xroche/httrack
+

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2023-01-17 Thread Sebastian Pipping 
commit: 24c6a0ce8d0364a419b93ecb72c44199c1296e5b
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sat Jan 14 23:01:06 2023 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Tue Jan 17 23:26:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24c6a0ce

www-client/httrack: 3.49.4

Signed-off-by: Sebastian Pipping  gentoo.org>

 www-client/httrack/Manifest  |  2 +
 www-client/httrack/httrack-3.49.4.ebuild | 77 
 2 files changed, 79 insertions(+)

diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index fdce299d8943..11e281aac811 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -1 +1,3 @@
+DIST coucal-73ada075553b7607d083037a87cb9c73b3683bfc.gh.tar.gz 21306 BLAKE2B 
c04b369f6011aa14169a933ba2a39dcc114d056968a2dc51a752979c59e93332bc302f53e865b78c7324fd568fdc3666eebe60a887fb8417e8ee7a1fbe5ed0f6
 SHA512 
818cfdbf6038cf27433973d3994f7231c61c366b44a28dd74e1a6d216c9bbb66b0699bf40ccbd7816de7876d73b096b93d895f6f61efbd0d79c39d559b3aee73
 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

diff --git a/www-client/httrack/httrack-3.49.4.ebuild 
b/www-client/httrack/httrack-3.49.4.ebuild
new file mode 100644
index ..2f90be8e6eb5
--- /dev/null
+++ b/www-client/httrack/httrack-3.49.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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/;
+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}"
+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() {
+   rmdir "${S}"/src/coucal || die
+   mv "${WORKDIR}"/coucal-${COUCAL_COMMIT} "${S}"/src/coucal || die
+
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2022-11-28 Thread Sebastian Pipping 
commit: 60310bff700efe979b3303e7ff3627d2c3abf287
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Tue Nov 29 01:17:17 2022 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Tue Nov 29 01:17:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60310bff

www-client/httrack: EAPI 8 + UnusedInherits

Signed-off-by: Sebastian Pipping  gentoo.org>

 www-client/httrack/httrack-3.49.2-r3.ebuild | 70 +
 1 file changed, 70 insertions(+)

diff --git a/www-client/httrack/httrack-3.49.2-r3.ebuild 
b/www-client/httrack/httrack-3.49.2-r3.ebuild
new file mode 100644
index ..b306e0d666ba
--- /dev/null
+++ b/www-client/httrack/httrack-3.49.2-r3.ebuild
@@ -0,0 +1,70 @@
+# 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
+}

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2021-04-30 Thread Mikle Kolyada 
commit: c985f12d801f6cee2476e58aa828a83d4cf96466
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Apr 30 18:34:13 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Apr 30 18:34:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c985f12d

www-client/httrack: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 www-client/httrack/httrack-3.49.2-r2.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/www-client/httrack/httrack-3.49.2-r2.ebuild 
b/www-client/httrack/httrack-3.49.2-r2.ebuild
index 9e6ea62d9c1..2bb4535898f 100644
--- a/www-client/httrack/httrack-3.49.2-r2.ebuild
+++ b/www-client/httrack/httrack-3.49.2-r2.ebuild
@@ -12,11 +12,10 @@ SRC_URI="https://mirror.httrack.com/historical/${P}.tar.gz;
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="libressl static-libs"
+IUSE="static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
-   !libressl? ( >=dev-libs/openssl-1.1.0:= )
-   libressl? ( dev-libs/libressl )
+   >=dev-libs/openssl-1.1.0:=
"
 DEPEND="${RDEPEND}"

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2021-04-16 Thread Sam James 
commit: 80e28de864afe2202d51b187cc71a3ca838a6096
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 16 08:06:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 16 11:22:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80e28de8

www-client/httrack: eutils--

Signed-off-by: Sam James  gentoo.org>

 www-client/httrack/httrack-3.49.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/httrack/httrack-3.49.2-r2.ebuild 
b/www-client/httrack/httrack-3.49.2-r2.ebuild
index 6dc538f5928..9e6ea62d9c1 100644
--- a/www-client/httrack/httrack-3.49.2-r2.ebuild
+++ b/www-client/httrack/httrack-3.49.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit autotools multilib eutils xdg-utils
+inherit autotools multilib xdg-utils
 
 DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
 HOMEPAGE="https://www.httrack.com/;

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2021-03-24 Thread Sebastian Pipping 
commit: 0d6b4f77e689f30c9a9fc7f0012caec35c338ed3
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Wed Mar 24 16:08:58 2021 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Wed Mar 24 16:10:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d6b4f77

www-client/httrack: Fix libdir patching

Closes: https://bugs.gentoo.org/777996
Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-3.0.17, Repoman-3.0.2

 www-client/httrack/httrack-3.49.2-r2.ebuild | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/www-client/httrack/httrack-3.49.2-r2.ebuild 
b/www-client/httrack/httrack-3.49.2-r2.ebuild
index a6bded23cc6..6dc538f5928 100644
--- a/www-client/httrack/httrack-3.49.2-r2.ebuild
+++ b/www-client/httrack/httrack-3.49.2-r2.ebuild
@@ -33,9 +33,11 @@ src_prepare() {
# 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.
-   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
+   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
 }

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2021-01-31 Thread Sebastian Pipping 
commit: a25a763b7acf4ba6a02094ce0696baef94e617ee
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sun Jan 31 20:00:34 2021 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sun Jan 31 20:00:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a25a763b

www-client/httrack: Fix linking with lld for profile 17.1

Closes: https://bugs.gentoo.org/732272
Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-3.0.14, Repoman-3.0.2

 www-client/httrack/httrack-3.49.2-r2.ebuild | 18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/www-client/httrack/httrack-3.49.2-r2.ebuild 
b/www-client/httrack/httrack-3.49.2-r2.ebuild
index 11539e76c33..a6bded23cc6 100644
--- a/www-client/httrack/httrack-3.49.2-r2.ebuild
+++ b/www-client/httrack/httrack-3.49.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit eutils xdg-utils
+inherit autotools multilib eutils xdg-utils
 
 DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
 HOMEPAGE="https://www.httrack.com/;
@@ -26,6 +26,20 @@ 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.
+   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
+
+   eautoreconf
+}
+
 src_configure() {
econf $(use_enable static-libs static)
 }

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2020-01-31 Thread Sebastian Pipping 
commit: 1b9ebc191fb6af7c408753bcdb87d16f515709f1
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Fri Jan 31 18:35:44 2020 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Fri Jan 31 18:35:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b9ebc19

www-client/httrack: Drop old + de-warn AbsoluteSymlink

Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20

 www-client/httrack/Manifest  |  1 -
 www-client/httrack/httrack-3.48.21-r1.ebuild | 47 --
 www-client/httrack/httrack-3.48.21-r2.ebuild | 49 
 3 files changed, 97 deletions(-)

diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index 18de6602713..fdce299d894 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -1,2 +1 @@
-DIST httrack-3.48.21.tar.gz 1805754 BLAKE2B 
a73c8210b3710a7eacce1e60556e302bb947d3195054bf8a664caba6e3c0c3fe42887fce9b30b7a9bc81afea1409d1ee389bf84218aa6ed33fa995660874f9d4
 SHA512 
1cf98225488e8d9570bb55c48ef1a04dcd48184f2285497c6fb4beaeb28d3ce4751c85783253baa73de1bd21c4bf01b0acd6beede77373c2f622a4124dc19246
 DIST httrack-3.49.2.tar.gz 1835116 BLAKE2B 
4073b70268bcea8acf0a9ac10deed14764ccd405c82f1b9f48dc74d3dbef130161234b59e70e72305a195d21155474831e8359eea9b96d275481a69b1c1ff561
 SHA512 
84a13a776b278533f7f0635ebd764387c3399b01c0644d8af9b46fc8112dc3c6e568c17969d4f6c2db32b5474344c39f86cf51957c09eb807ebe305a554ba5c8

diff --git a/www-client/httrack/httrack-3.48.21-r1.ebuild 
b/www-client/httrack/httrack-3.48.21-r1.ebuild
deleted file mode 100644
index 41e48ba58f8..000
--- a/www-client/httrack/httrack-3.48.21-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
-HOMEPAGE="http://www.httrack.com/;
-SRC_URI="http://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
-   http://www.httrack.com/;
-SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="libressl static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
-   !libressl? (

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2019-11-12 Thread Agostino Sarubbo 
commit: 47e6d2ab1b883af5d94f494da8765b137256f1bd
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 12 18:07:46 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 12 18:07:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47e6d2ab

www-client/httrack: ppc stable wrt bug #697026

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 www-client/httrack/httrack-3.49.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/httrack/httrack-3.49.2-r2.ebuild 
b/www-client/httrack/httrack-3.49.2-r2.ebuild
index 56fdcbcf900..353f6e428cd 100644
--- a/www-client/httrack/httrack-3.49.2-r2.ebuild
+++ b/www-client/httrack/httrack-3.49.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mirror.httrack.com/historical/${P}.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="libressl static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.5.1-r1

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2019-10-28 Thread Agostino Sarubbo 
commit: 0b1b03f65e84e8fb77def8ec6c9c3a4a16f5658a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Oct 28 07:41:00 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Oct 28 07:41:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b1b03f6

www-client/httrack: amd64 stable wrt bug #697026

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 www-client/httrack/httrack-3.49.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/httrack/httrack-3.49.2-r2.ebuild 
b/www-client/httrack/httrack-3.49.2-r2.ebuild
index fa49bfacead..56fdcbcf900 100644
--- a/www-client/httrack/httrack-3.49.2-r2.ebuild
+++ b/www-client/httrack/httrack-3.49.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mirror.httrack.com/historical/${P}.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="libressl static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.5.1-r1

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2019-10-27 Thread Thomas Deutschmann 
commit: e62447d49188030992bfe619a751e93dc4c6a5ef
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Oct 27 23:11:49 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Oct 27 23:11:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e62447d4

www-client/httrack: x86 stable (bug #697026)

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 www-client/httrack/httrack-3.49.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/httrack/httrack-3.49.2-r2.ebuild 
b/www-client/httrack/httrack-3.49.2-r2.ebuild
index 158cd63ef4b..fa49bfacead 100644
--- a/www-client/httrack/httrack-3.49.2-r2.ebuild
+++ b/www-client/httrack/httrack-3.49.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mirror.httrack.com/historical/${P}.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="libressl static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.5.1-r1

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2019-10-26 Thread Sebastian Pipping 
commit: b7c48f8b609631c28b3fcabeb5106041bf5591dc
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sat Oct 26 17:56:16 2019 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sat Oct 26 18:16:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7c48f8b

www-client/httrack: Drop old

Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.68, Repoman-2.3.16

 www-client/httrack/Manifest |  1 -
 www-client/httrack/httrack-3.49.1.ebuild| 49 -
 www-client/httrack/httrack-3.49.2-r1.ebuild | 49 -
 3 files changed, 99 deletions(-)

diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index 8b063c9c8a5..18de6602713 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -1,3 +1,2 @@
 DIST httrack-3.48.21.tar.gz 1805754 BLAKE2B 
a73c8210b3710a7eacce1e60556e302bb947d3195054bf8a664caba6e3c0c3fe42887fce9b30b7a9bc81afea1409d1ee389bf84218aa6ed33fa995660874f9d4
 SHA512 
1cf98225488e8d9570bb55c48ef1a04dcd48184f2285497c6fb4beaeb28d3ce4751c85783253baa73de1bd21c4bf01b0acd6beede77373c2f622a4124dc19246
-DIST httrack-3.49.1.tar.gz 1835077 BLAKE2B 
e628ebfa7d789e527e8cdf6d63c6639c26c0f6b0ba79b320646a501e55e566230d66fc3a62a4459d76d411ba32a4f3830d95dedc9e7685bff163d68d61440fc2
 SHA512 
b9ad8b50de30389fe0c2b5b52aaf137cedd20ebe1fcc165db2f34aec95f795a420219eac7c9aae2f9c1ba053d646717428bc4d23c84c63a6e2ddd5ea76b02593
 DIST httrack-3.49.2.tar.gz 1835116 BLAKE2B 
4073b70268bcea8acf0a9ac10deed14764ccd405c82f1b9f48dc74d3dbef130161234b59e70e72305a195d21155474831e8359eea9b96d275481a69b1c1ff561
 SHA512 
84a13a776b278533f7f0635ebd764387c3399b01c0644d8af9b46fc8112dc3c6e568c17969d4f6c2db32b5474344c39f86cf51957c09eb807ebe305a554ba5c8

diff --git a/www-client/httrack/httrack-3.49.1.ebuild 
b/www-client/httrack/httrack-3.49.1.ebuild
deleted file mode 100644
index e6edf6695a6..000
--- a/www-client/httrack/httrack-3.49.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils
-
-DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
-HOMEPAGE="http://www.httrack.com/;
-SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="libressl static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
-   !libressl? ( dev-libs/openssl:= )
-   libressl? ( dev-libs/libressl )
-   "
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README greetings.txt history.txt )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.48.13-minizip.patch
-)
-
-src_configure() {
-   econf $(use_enable static-libs static) \
-   --docdir="${EPREFIX}"/usr/share/doc/${PF} \
-   --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-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 /usr/share/${PF}/html /usr/share/${PN}/html
-   fi
-
-   find "${ED}" -type f -name '*.la' -delete || die
-}

diff --git a/www-client/httrack/httrack-3.49.2-r1.ebuild 
b/www-client/httrack/httrack-3.49.2-r1.ebuild
deleted file mode 100644
index 849d51d0a2b..000
--- a/www-client/httrack/httrack-3.49.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils ltprune
-
-DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
-HOMEPAGE="http://www.httrack.com/;
-SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="libressl static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
-   !libressl? ( dev-libs/openssl:= )
-   libressl? ( dev-libs/libressl )
-   "
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README greetings.txt history.txt )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.48.13-minizip.patch
-)
-
-src_configure() {
-   econf $(use_enable static-libs static) \
-   --docdir="${EPREFIX}"/usr/share/doc/${PF} \
-   --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-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
-
-   prune_libtool_files --all
-}

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2019-10-26 Thread Sebastian Pipping 
commit: 8dc95144b3636e74ac259e9ca80f38e22fb0d760
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sat Oct 26 18:10:13 2019 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sat Oct 26 18:16:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dc95144

www-client/httrack: Fix openssl dependency

Bug: https://bugs.gentoo.org/697026
Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.68, Repoman-2.3.16

 www-client/httrack/httrack-3.48.21-r1.ebuild | 4 ++--
 www-client/httrack/httrack-3.48.21-r2.ebuild | 4 ++--
 www-client/httrack/httrack-3.49.2-r2.ebuild  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/www-client/httrack/httrack-3.48.21-r1.ebuild 
b/www-client/httrack/httrack-3.48.21-r1.ebuild
index 2c0f42cea05..41e48ba58f8 100644
--- a/www-client/httrack/httrack-3.48.21-r1.ebuild
+++ b/www-client/httrack/httrack-3.48.21-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
-   dev-libs/openssl:="
+

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2019-03-31 Thread Sebastian Pipping 
commit: d0c7f3efc70a10189696aed2e00c67745061996c
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sun Mar 31 21:04:36 2019 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sun Mar 31 21:05:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0c7f3ef

www-client/httrack: EAPI 7 + ltprune + icon cache

Closes: https://bugs.gentoo.org/675958
Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.12

 www-client/httrack/httrack-3.49.2-r2.ebuild | 57 +
 1 file changed, 57 insertions(+)

diff --git a/www-client/httrack/httrack-3.49.2-r2.ebuild 
b/www-client/httrack/httrack-3.49.2-r2.ebuild
new file mode 100644
index 000..f513c18ae01
--- /dev/null
+++ b/www-client/httrack/httrack-3.49.2-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit eutils 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 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="libressl static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
+   !libressl? ( dev-libs/openssl:= )
+   libressl? ( dev-libs/libressl )
+   "
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README greetings.txt history.txt )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.48.13-minizip.patch
+)
+
+src_configure() {
+   econf $(use_enable static-libs static) \
+   --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+   --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2018-04-21 Thread Sebastian Pipping 
commit: 03d2069c06a0c678832d791b4188a67005356b69
Author: Marty E. Plummer  startmail  com>
AuthorDate: Fri Apr 20 14:33:48 2018 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sat Apr 21 20:56:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03d2069c

www-client/httrack: epatch->PATCHES=()

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 www-client/httrack/httrack-3.49.1.ebuild| 9 -
 www-client/httrack/httrack-3.49.2-r1.ebuild | 9 -
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/www-client/httrack/httrack-3.49.1.ebuild 
b/www-client/httrack/httrack-3.49.1.ebuild
index 4018cd13894..e4b6f51a159 100644
--- a/www-client/httrack/httrack-3.49.1.ebuild
+++ b/www-client/httrack/httrack-3.49.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -22,10 +22,9 @@ DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS README greetings.txt history.txt )
 
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-3.48.13-minizip.patch
-   eapply_user
-}
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.48.13-minizip.patch
+)
 
 src_configure() {
econf $(use_enable static-libs static) \

diff --git a/www-client/httrack/httrack-3.49.2-r1.ebuild 
b/www-client/httrack/httrack-3.49.2-r1.ebuild
index c3d92855583..746cc70c8f2 100644
--- a/www-client/httrack/httrack-3.49.2-r1.ebuild
+++ b/www-client/httrack/httrack-3.49.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -22,10 +22,9 @@ DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS README greetings.txt history.txt )
 
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-3.48.13-minizip.patch
-   eapply_user
-}
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.48.13-minizip.patch
+)
 
 src_configure() {
econf $(use_enable static-libs static) \

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2017-08-20 Thread Sebastian Pipping 
commit: 60170306efcc9b75888fa02a91c2591f6960799e
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sun Aug 20 21:38:01 2017 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sun Aug 20 21:38:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60170306

www-client/httrack: Prune all .la files

Forgot to pass --all to prune_libtool_files...

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 www-client/httrack/{httrack-3.49.2.ebuild => httrack-3.49.2-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/httrack/httrack-3.49.2.ebuild 
b/www-client/httrack/httrack-3.49.2-r1.ebuild
similarity index 97%
rename from www-client/httrack/httrack-3.49.2.ebuild
rename to www-client/httrack/httrack-3.49.2-r1.ebuild
index a94e31511ba..c3d92855583 100644
--- a/www-client/httrack/httrack-3.49.2.ebuild
+++ b/www-client/httrack/httrack-3.49.2-r1.ebuild
@@ -46,5 +46,5 @@ src_install() {
dosym ../../${PF}/html /usr/share/${PN}/html
fi
 
-   prune_libtool_files
+   prune_libtool_files --all
 }

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2017-08-20 Thread Sebastian Pipping 
commit: 42a20c10a429f9c401811cf4cfbaa20c5c67bfd3
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sun Aug 20 21:23:33 2017 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sun Aug 20 21:30:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42a20c10

www-client/httrack: 3.49.2

Also:
* Remove old ebuild 3.48.22
* Address dosym warning "could use relative path"
* Use prune_libtool_files of ltprune eclass

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 www-client/httrack/Manifest   |  2 +-
 .../httrack/{httrack-3.48.22.ebuild => httrack-3.49.2.ebuild} | 11 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index 6676d70e0ea..6048e54d400 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -1,3 +1,3 @@
 DIST httrack-3.48.21.tar.gz 1805754 SHA256 
871b60a1e22d7ac217e4e14ad4d562fbad5df7c370e845f1ecf5c0e4917be482 SHA512 
1cf98225488e8d9570bb55c48ef1a04dcd48184f2285497c6fb4beaeb28d3ce4751c85783253baa73de1bd21c4bf01b0acd6beede77373c2f622a4124dc19246
 WHIRLPOOL 
3bc85e0e094dfd5eef20658af0a0681e78105b6f4fcd8a4235b2bc0bf0381d5ab2b2ed206a06acb9ab34c3cf0ffe0664f73ee04f018fdd61476a8e645006a252
-DIST httrack-3.48.22.tar.gz 1834758 SHA256 
b2831ad7b48e933959f83a9de8a72bcaa0f8eb87e9453ad85debd50d33a9c48f SHA512 
9252aec5fce454b6e95b4bdb89dd60e86eb3f01c4cebffe14e3f9288bec8e295c03f6543f5458293f78be7b9001520100aacb0fe79bb78322e1085b1a7232684
 WHIRLPOOL 
0e881d7c4050bed3ee7df6ca07a092e45a53ec0671c427bf891d34c798e857f130c37753d00bf6b3ac1882d58b73d3e323ad99bc005a5eff813de5009abefdf1
 DIST httrack-3.49.1.tar.gz 1835077 SHA256 
8640ab00cabc9189667cc88829620ce08ac796688f0ef94876350d14fbe7a842 SHA512 
b9ad8b50de30389fe0c2b5b52aaf137cedd20ebe1fcc165db2f34aec95f795a420219eac7c9aae2f9c1ba053d646717428bc4d23c84c63a6e2ddd5ea76b02593
 WHIRLPOOL 
a2d2e221e76cb3a6faee2ca93278c09d91ae4da2dac3af93867e7f8599bcd61a3236f2c171f1ec315c93b529efb9d57c2e4e0efe0dbf16d7b4c5ab03925c6f76
+DIST httrack-3.49.2.tar.gz 1835116 SHA256 
3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025 SHA512 
84a13a776b278533f7f0635ebd764387c3399b01c0644d8af9b46fc8112dc3c6e568c17969d4f6c2db32b5474344c39f86cf51957c09eb807ebe305a554ba5c8
 WHIRLPOOL 
80a82e2eb541e19241004e068ba3125f9ceace8f655edeb96be04ea3084d92cdd975b94b2357229e764da6e3c731d102cc1c7cb093a558d6f4aaac7f3e95bdda

diff --git a/www-client/httrack/httrack-3.48.22.ebuild 
b/www-client/httrack/httrack-3.49.2.ebuild
similarity index 86%
rename from www-client/httrack/httrack-3.48.22.ebuild
rename to www-client/httrack/httrack-3.49.2.ebuild
index b2eff62cf33..a94e31511ba 100644
--- a/www-client/httrack/httrack-3.48.22.ebuild
+++ b/www-client/httrack/httrack-3.49.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-inherit eutils
+inherit eutils ltprune
 
 DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
 HOMEPAGE="http://www.httrack.com/;
@@ -24,6 +24,7 @@ DOCS=( AUTHORS README greetings.txt history.txt )
 
 src_prepare() {
epatch "${FILESDIR}"/${PN}-3.48.13-minizip.patch
+   eapply_user
 }
 
 src_configure() {
@@ -42,8 +43,8 @@ src_install() {
mv "${D}"/usr/share/{doc/,}${PF}/html || die
 
rm "${D}"/usr/share/${PN}/html || die
-   dosym /usr/share/${PF}/html /usr/share/${PN}/html
+   dosym ../../${PF}/html /usr/share/${PN}/html
fi
 
-   find "${ED}" -type f -name '*.la' -delete || die
+   prune_libtool_files
 }

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2017-05-14 Thread Sebastian Pipping 
commit: 9a8e7d8a7acef690f861b084f0f4629924d79780
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sun May 14 18:58:10 2017 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sun May 14 19:43:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a8e7d8a

www-client/httrack: 3.49.1

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 www-client/httrack/Manifest  |  1 +
 www-client/httrack/httrack-3.49.1.ebuild | 50 
 2 files changed, 51 insertions(+)

diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index 855de2b04d9..6676d70e0ea 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -1,2 +1,3 @@
 DIST httrack-3.48.21.tar.gz 1805754 SHA256 
871b60a1e22d7ac217e4e14ad4d562fbad5df7c370e845f1ecf5c0e4917be482 SHA512 
1cf98225488e8d9570bb55c48ef1a04dcd48184f2285497c6fb4beaeb28d3ce4751c85783253baa73de1bd21c4bf01b0acd6beede77373c2f622a4124dc19246
 WHIRLPOOL 
3bc85e0e094dfd5eef20658af0a0681e78105b6f4fcd8a4235b2bc0bf0381d5ab2b2ed206a06acb9ab34c3cf0ffe0664f73ee04f018fdd61476a8e645006a252
 DIST httrack-3.48.22.tar.gz 1834758 SHA256 
b2831ad7b48e933959f83a9de8a72bcaa0f8eb87e9453ad85debd50d33a9c48f SHA512 
9252aec5fce454b6e95b4bdb89dd60e86eb3f01c4cebffe14e3f9288bec8e295c03f6543f5458293f78be7b9001520100aacb0fe79bb78322e1085b1a7232684
 WHIRLPOOL 
0e881d7c4050bed3ee7df6ca07a092e45a53ec0671c427bf891d34c798e857f130c37753d00bf6b3ac1882d58b73d3e323ad99bc005a5eff813de5009abefdf1
+DIST httrack-3.49.1.tar.gz 1835077 SHA256 
8640ab00cabc9189667cc88829620ce08ac796688f0ef94876350d14fbe7a842 SHA512 
b9ad8b50de30389fe0c2b5b52aaf137cedd20ebe1fcc165db2f34aec95f795a420219eac7c9aae2f9c1ba053d646717428bc4d23c84c63a6e2ddd5ea76b02593
 WHIRLPOOL 
a2d2e221e76cb3a6faee2ca93278c09d91ae4da2dac3af93867e7f8599bcd61a3236f2c171f1ec315c93b529efb9d57c2e4e0efe0dbf16d7b4c5ab03925c6f76

diff --git a/www-client/httrack/httrack-3.49.1.ebuild 
b/www-client/httrack/httrack-3.49.1.ebuild
new file mode 100644
index 000..4018cd13894
--- /dev/null
+++ b/www-client/httrack/httrack-3.49.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils
+
+DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
+HOMEPAGE="http://www.httrack.com/;
+SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="libressl static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
+   !libressl? ( dev-libs/openssl:= )
+   libressl? ( dev-libs/libressl )
+   "
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README greetings.txt history.txt )
+
+src_prepare() {
+   epatch "${FILESDIR}"/${PN}-3.48.13-minizip.patch
+   eapply_user
+}
+
+src_configure() {
+   econf $(use_enable static-libs static) \
+   --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+   --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+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 /usr/share/${PF}/html /usr/share/${PN}/html
+   fi
+
+   find "${ED}" -type f -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2016-08-03 Thread Sebastian Pipping 
commit: 308c34533ac0f3ccc5e018856395797a264f479a
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Wed Aug  3 15:01:05 2016 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Wed Aug  3 15:03:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=308c3453

www-client/httrack: 3.48.22 (bug #589904)

Package-Manager: portage-2.2.28

 www-client/httrack/Manifest   |  1 +
 www-client/httrack/httrack-3.48.22.ebuild | 50 +++
 2 files changed, 51 insertions(+)

diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index cd08827..855de2b 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -1 +1,2 @@
 DIST httrack-3.48.21.tar.gz 1805754 SHA256 
871b60a1e22d7ac217e4e14ad4d562fbad5df7c370e845f1ecf5c0e4917be482 SHA512 
1cf98225488e8d9570bb55c48ef1a04dcd48184f2285497c6fb4beaeb28d3ce4751c85783253baa73de1bd21c4bf01b0acd6beede77373c2f622a4124dc19246
 WHIRLPOOL 
3bc85e0e094dfd5eef20658af0a0681e78105b6f4fcd8a4235b2bc0bf0381d5ab2b2ed206a06acb9ab34c3cf0ffe0664f73ee04f018fdd61476a8e645006a252
+DIST httrack-3.48.22.tar.gz 1834758 SHA256 
b2831ad7b48e933959f83a9de8a72bcaa0f8eb87e9453ad85debd50d33a9c48f SHA512 
9252aec5fce454b6e95b4bdb89dd60e86eb3f01c4cebffe14e3f9288bec8e295c03f6543f5458293f78be7b9001520100aacb0fe79bb78322e1085b1a7232684
 WHIRLPOOL 
0e881d7c4050bed3ee7df6ca07a092e45a53ec0671c427bf891d34c798e857f130c37753d00bf6b3ac1882d58b73d3e323ad99bc005a5eff813de5009abefdf1

diff --git a/www-client/httrack/httrack-3.48.22.ebuild 
b/www-client/httrack/httrack-3.48.22.ebuild
new file mode 100644
index 000..8f5c193
--- /dev/null
+++ b/www-client/httrack/httrack-3.48.22.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
+HOMEPAGE="http://www.httrack.com/;
+SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="libressl static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
+   !libressl? ( dev-libs/openssl:= )
+   libressl? ( dev-libs/libressl )
+   "
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README greetings.txt history.txt )
+
+src_prepare() {
+   epatch "${FILESDIR}"/${PN}-3.48.13-minizip.patch
+}
+
+src_configure() {
+   econf $(use_enable static-libs static) \
+   --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+   --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+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 /usr/share/${PF}/html /usr/share/${PN}/html
+   fi
+
+   find "${ED}" -type f -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2016-02-19 Thread Fabian Groffen 
commit: ecdaf95457f19a29342df4d2f961f76a0ae0692e
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Feb 19 15:32:46 2016 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Feb 19 15:32:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecdaf954

www-client/httrack: fix for Prefix by * in bug #574940

Package-Manager: portage-2.2.20-prefix

 www-client/httrack/httrack-3.48.21-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-client/httrack/httrack-3.48.21-r2.ebuild 
b/www-client/httrack/httrack-3.48.21-r2.ebuild
index 0a53cb8..d3375e5 100644
--- a/www-client/httrack/httrack-3.48.21-r2.ebuild
+++ b/www-client/httrack/httrack-3.48.21-r2.ebuild
@@ -29,8 +29,8 @@ src_prepare() {
 
 src_configure() {
econf $(use_enable static-libs static) \
-   --docdir=/usr/share/doc/${PF} \
-   --htmldir=/usr/share/doc/${PF}/html
+   --docdir=${EPREFIX}/usr/share/doc/${PF} \
+   --htmldir=${EPREFIX}/usr/share/doc/${PF}/html
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2015-11-20 Thread Anthony G. Basile 
commit: bf5b2a84ef8273d7a25474d1decc454a7fd525aa
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Nov 21 06:55:41 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 21 07:17:23 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5b2a84

www-client/httrack: add libressl support

Package-Manager: portage-2.2.20.1

 www-client/httrack/httrack-3.48.21-r2.ebuild | 50 
 1 file changed, 50 insertions(+)

diff --git a/www-client/httrack/httrack-3.48.21-r2.ebuild 
b/www-client/httrack/httrack-3.48.21-r2.ebuild
new file mode 100644
index 000..0a53cb8
--- /dev/null
+++ b/www-client/httrack/httrack-3.48.21-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
+HOMEPAGE="http://www.httrack.com/;
+SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="libressl static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
+   !libressl? ( dev-libs/openssl:= )
+   libressl? ( dev-libs/libressl )
+   "
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README greetings.txt history.txt )
+
+src_prepare() {
+   epatch "${FILESDIR}"/${PN}-3.48.13-minizip.patch
+}
+
+src_configure() {
+   econf $(use_enable static-libs static) \
+   --docdir=/usr/share/doc/${PF} \
+   --htmldir=/usr/share/doc/${PF}/html
+}
+
+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/httrack/html || die
+   dosym /usr/share/${PF}/html /usr/share/httrack/html
+   fi
+
+   find "${ED}" -type f -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2015-11-12 Thread Agostino Sarubbo 
commit: 042291c7602763722f2ba951638aa9db1ad32055
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Nov 12 09:39:41 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Nov 12 09:39:41 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=042291c7

www-client/httrack: ppc stable wrt bug #565400

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc"

 www-client/httrack/httrack-3.48.21-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/httrack/httrack-3.48.21-r1.ebuild 
b/www-client/httrack/httrack-3.48.21-r1.ebuild
index 54d6d90..1a77153 100644
--- a/www-client/httrack/httrack-3.48.21-r1.ebuild
+++ b/www-client/httrack/httrack-3.48.21-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.5.1-r1

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/, www-client/httrack/files/

2015-11-12 Thread Sebastian Pipping 
commit: a8eb7d7fa7bb9ceaec76cdb7c536434141160edf
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Thu Nov 12 17:27:58 2015 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Thu Nov 12 17:27:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8eb7d7f

www-client/httrack: Remove older buggy releases

Package-Manager: portage-2.2.24

 www-client/httrack/Manifest|  1 -
 .../files/httrack-3.44.1+zlib-1.2.5.1.patch| 21 ---
 .../httrack/files/httrack-3.45.4-cflags.patch  | 12 
 .../httrack/files/httrack-3.45.4-htmldir.patch | 35 ---
 .../files/httrack-3.45.4-install-once.patch| 32 --
 .../httrack/files/httrack-3.45.4-parallel.patch| 68 --
 .../httrack/files/httrack-3.46.1-parallel.patch| 48 ---
 .../files/httrack-3.47.2-ac-config-headers.patch   | 24 
 .../httrack/files/httrack-3.47.26-desktop.patch| 37 
 .../httrack/files/httrack-3.47.7-cflags.patch  | 27 -
 .../httrack/files/httrack-3.47.7-warnings.patch| 41 -
 www-client/httrack/httrack-3.45.4.ebuild   | 45 --
 www-client/httrack/httrack-3.48.21.ebuild  | 37 
 13 files changed, 428 deletions(-)

diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index 169c8f6..cd08827 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -1,2 +1 @@
-DIST httrack-3.45.4.tar.gz 1699651 SHA256 
715b1638acee2685d5a012c3848bf087a6e420dba3cde4305b897054f54affd4 SHA512 
39494adb30d04fd891ea0006d5f776501a03d2dda5c9d8470ee8b680550de753125546d196576b7fa9a9918358cf0c554facee60db3765c2de6e80cc0d9daf7b
 WHIRLPOOL 
58de8ffa48a7ef3826ca880f8073f3b404c540237f13013a316bb5b0de3eaf18c50dc10dded3b968172f18f914f88c962e4f23b41d055ce0c23025b4191533c7
 DIST httrack-3.48.21.tar.gz 1805754 SHA256 
871b60a1e22d7ac217e4e14ad4d562fbad5df7c370e845f1ecf5c0e4917be482 SHA512 
1cf98225488e8d9570bb55c48ef1a04dcd48184f2285497c6fb4beaeb28d3ce4751c85783253baa73de1bd21c4bf01b0acd6beede77373c2f622a4124dc19246
 WHIRLPOOL 
3bc85e0e094dfd5eef20658af0a0681e78105b6f4fcd8a4235b2bc0bf0381d5ab2b2ed206a06acb9ab34c3cf0ffe0664f73ee04f018fdd61476a8e645006a252

diff --git a/www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch 
b/www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch
deleted file mode 100644
index cadaa8c..000
--- a/www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
 httrack-3.44.1/src/minizip/ioapi.h
-+++ httrack-3.44.1/src/minizip/ioapi.h
-@@ -9,6 +9,7 @@
- #ifndef _ZLIBIOAPI_H
- #define _ZLIBIOAPI_H
- 
-+#define OF(x) x
- 
- #define ZLIB_FILEFUNC_SEEK_CUR (1)
- #define ZLIB_FILEFUNC_SEEK_END (2)
 httrack-3.44.1/src/minizip/zip.h
-+++ httrack-3.44.1/src/minizip/zip.h
-@@ -42,6 +42,8 @@
-   ftp://ftp.pkware.com/probdesc.zip
- */
- 
-+#define OF(x) x
-+
- #ifndef _zip_H
- #define _zip_H
- 

diff --git a/www-client/httrack/files/httrack-3.45.4-cflags.patch 
b/www-client/httrack/files/httrack-3.45.4-cflags.patch
deleted file mode 100644
index a84c499..000
--- a/www-client/httrack/files/httrack-3.45.4-cflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 /configure.in  2012-07-10 20:19:09.958552772 +0200
-+++ /configure.in  2012-07-10 20:19:39.011189564 +0200
-@@ -13,8 +13,7 @@
- AC_PROG_LN_S
- 
- ### Default CFLAGS
--DEFAULT_CFLAGS=""
--DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \
-+DEFAULT_CFLAGS="-Wall -Wcast-align -Wstrict-prototypes \
- -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \
- -Wnested-externs -D_REENTRANT"
- AC_SUBST(DEFAULT_CFLAGS)

diff --git a/www-client/httrack/files/httrack-3.45.4-htmldir.patch 
b/www-client/httrack/files/httrack-3.45.4-htmldir.patch
deleted file mode 100644
index d13fe14..000
--- a/www-client/httrack/files/httrack-3.45.4-htmldir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
 html/Makefile.am   2012-07-10 19:54:41.844906721 +0200
-+++ html/Makefile.am   2012-07-10 19:54:47.885831199 +0200
-@@ -1,13 +1,13 @@
- 
--HelpHtmlrootdir = $(datadir)/doc/httrack
--HelpHtmldir = $(datadir)/doc/httrack/html
--HelpHtmlimgdir = $(datadir)/doc/httrack/html/img
--HelpHtmldivdir = $(datadir)/doc/httrack/html/div
--HelpHtmlimagesdir = $(datadir)/doc/httrack/html/images
--HelpHtmlTxtdir = $(datadir)/doc/httrack/html
--WebHtmldir = $(datadir)/doc/httrack/html/server
--WebHtmlimagesdir = $(datadir)/doc/httrack/html/server/images
--WebHtmlsfxdir = $(datadir)/doc/httrack/html/server/sfx
-+HelpHtmlrootdir = $(docdir)
-+HelpHtmldir = $(htmldir)
-+HelpHtmlimgdir = $(HelpHtmldir)/img
-+HelpHtmldivdir = $(HelpHtmldir)/div
-+HelpHtmlimagesdir = $(HelpHtmldir)/images
-+HelpHtmlTxtdir = $(HelpHtmldir)
-+WebHtmldir = $(HelpHtmldir)/server
-+WebHtmlimagesdir = $(HelpHtmldir)/server/images
-+WebHtmlsfxdir = $(HelpHtmldir)/server/sfx
- WebPixmapdir = $(datadir)/pixmaps
- WebGPixmapdir = $(datadir)/httrack/icons
-

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2015-11-11 Thread Agostino Sarubbo 
commit: 0b5d8efaef0a15480f4c4fe36e5b266e0b1b1301
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 11 10:05:28 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 11 10:05:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b5d8efa

www-client/httrack: x86 stable wrt bug #565400

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"

 www-client/httrack/httrack-3.48.21-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/httrack/httrack-3.48.21-r1.ebuild 
b/www-client/httrack/httrack-3.48.21-r1.ebuild
index e8e2482..54d6d90 100644
--- a/www-client/httrack/httrack-3.48.21-r1.ebuild
+++ b/www-client/httrack/httrack-3.48.21-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.5.1-r1

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2015-11-11 Thread Agostino Sarubbo 
commit: 5fe5e47b3f468128885f92b4bcab408318b32d46
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 11 08:54:37 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 11 08:54:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fe5e47b

www-client/httrack: amd64 stable wrt bug #565400

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 www-client/httrack/httrack-3.48.21-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/httrack/httrack-3.48.21-r1.ebuild 
b/www-client/httrack/httrack-3.48.21-r1.ebuild
index bf94826..e8e2482 100644
--- a/www-client/httrack/httrack-3.48.21-r1.ebuild
+++ b/www-client/httrack/httrack-3.48.21-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.5.1-r1

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2015-11-08 Thread Sebastian Pipping 
commit: 08ac0d4809002c7eeb442ee07c55165cca9aa75e
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sun Nov  8 16:21:52 2015 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sun Nov  8 16:26:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08ac0d48

www-client/httrack: Remove old testing versions

Package-Manager: portage-2.2.24

 www-client/httrack/Manifest   |  4 
 www-client/httrack/httrack-3.47.27.ebuild | 31 --
 www-client/httrack/httrack-3.48.13.ebuild | 37 ---
 www-client/httrack/httrack-3.48.19.ebuild | 37 ---
 www-client/httrack/httrack-3.48.20.ebuild | 37 ---
 5 files changed, 146 deletions(-)

diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index f68dd00..169c8f6 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -1,6 +1,2 @@
 DIST httrack-3.45.4.tar.gz 1699651 SHA256 
715b1638acee2685d5a012c3848bf087a6e420dba3cde4305b897054f54affd4 SHA512 
39494adb30d04fd891ea0006d5f776501a03d2dda5c9d8470ee8b680550de753125546d196576b7fa9a9918358cf0c554facee60db3765c2de6e80cc0d9daf7b
 WHIRLPOOL 
58de8ffa48a7ef3826ca880f8073f3b404c540237f13013a316bb5b0de3eaf18c50dc10dded3b968172f18f914f88c962e4f23b41d055ce0c23025b4191533c7
-DIST httrack-3.47.27.tar.gz 1778104 SHA256 
7c96bfb63dab9e55efea89d0408e3743115e524c688545b94f9b60dc78d2f9e1 SHA512 
69f5e3e5bb7389d5442e5513e99ec065d45bc4083d737e0fc33698b1dc0716e9bd29fb707d6f6af8b829e1961e811530ad9add34dad334d8f4e9ab25b249a7f1
 WHIRLPOOL 
6cdfd3b0d199e37e64e5e154ad391d030b7d9bf1133373f6193fdd1dbff56f0b319c16fcdf2c3eb247a17a167cb70f733741e52074bd7c189a28e7a1ef18c387
-DIST httrack-3.48.13.tar.gz 1790992 SHA256 
02c34571e974605b0a0398c1c65336bbe94142391d61a9be4234c2d19b09e947 SHA512 
c6770f911c2349aaf9f1216df902648578f9a21bd572b2523918fc7737f6fcf6ab260a47bff7b8b5e170ad731401e73c2500c71237d88dc61ee6ada8e4906bec
 WHIRLPOOL 
1a1ce6cb4e26624639b069ef536c2ba843fd04d109f6acfbc6419bae329222a704fe1e6095f85caa6c5b1e0bdc87f05036cad07e5552070d7d4307c0634e0ccb
-DIST httrack-3.48.19.tar.gz 1818985 SHA256 
16f0cd0ea21042106879238fe4892b56018e106347d69dcb0b93816ee8f68afe SHA512 
c7202c4d86963fe935ce1f1a81f43f47544e03e4743528f52acd541ba87d6ef47d9e691b432f9bebedbf06e764bd67fe85748762b6ec3c09491b7528957cda8b
 WHIRLPOOL 
c250ab2d7e8e1ec8cdfb3f86bb8e21ff7d4d583d0c6adba3f1f4448cc60304b6e572fe9d760322094affebe45f7f9eee1c1a6f94332ae83d01b7d91132274e77
-DIST httrack-3.48.20.tar.gz 1821746 SHA256 
3156515e9ecd949851ffc1e3e83e30ef046a959378ee5d11eb18462286bb2c89 SHA512 
45fc348f9bece70044102fc374f391362f57ef680b14635dd30bf69008d30b04cd54b87297f738eee821e5e54031365d6ff66300cd3f9d67bd35ed7851b5b086
 WHIRLPOOL 
6dfac187859d1afc6049a61017f88d0f18f1e8ac61f661ff55a34c01bac4ce687857d843d9db1abcf4ffd4b563934322cd8560b3f33670da789ab527f4073ec3
 DIST httrack-3.48.21.tar.gz 1805754 SHA256 
871b60a1e22d7ac217e4e14ad4d562fbad5df7c370e845f1ecf5c0e4917be482 SHA512 
1cf98225488e8d9570bb55c48ef1a04dcd48184f2285497c6fb4beaeb28d3ce4751c85783253baa73de1bd21c4bf01b0acd6beede77373c2f622a4124dc19246
 WHIRLPOOL 
3bc85e0e094dfd5eef20658af0a0681e78105b6f4fcd8a4235b2bc0bf0381d5ab2b2ed206a06acb9ab34c3cf0ffe0664f73ee04f018fdd61476a8e645006a252

diff --git a/www-client/httrack/httrack-3.47.27.ebuild 
b/www-client/httrack/httrack-3.47.27.ebuild
deleted file mode 100644
index 937f170..000
--- a/www-client/httrack/httrack-3.47.27.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
-HOMEPAGE="http://www.httrack.com/;
-SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
-   dev-libs/openssl"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README greetings.txt history.txt )
-
-src_configure() {
-   econf $(use_enable static-libs static) \
-   --docdir=/usr/share/doc/${PF} \
-   --htmldir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-   default
-   find "${ED}" -type f -name '*.la' -delete || die
-}

diff --git a/www-client/httrack/httrack-3.48.13.ebuild 
b/www-client/httrack/httrack-3.48.13.ebuild
deleted file mode 100644
index 462eae3..000
--- a/www-client/httrack/httrack-3.48.13.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
-HOMEPAGE="http://www.httrack.com/;
-SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

2015-11-08 Thread Sebastian Pipping 
commit: 9f0f3455a481afb5ca69cb13d9a2eaebaff259a7
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sun Nov  8 16:20:25 2015 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sun Nov  8 16:26:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f0f3455

www-client/httrack: Handle FEATURES=nodoc (bug #493376)

Also bump to EAPI 5 and address "matches more than one slot" warning

Package-Manager: portage-2.2.24

 www-client/httrack/httrack-3.48.21-r1.ebuild | 48 
 1 file changed, 48 insertions(+)

diff --git a/www-client/httrack/httrack-3.48.21-r1.ebuild 
b/www-client/httrack/httrack-3.48.21-r1.ebuild
new file mode 100644
index 000..bf94826
--- /dev/null
+++ b/www-client/httrack/httrack-3.48.21-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
+HOMEPAGE="http://www.httrack.com/;
+SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
+   dev-libs/openssl:="
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README greetings.txt history.txt )
+
+src_prepare() {
+   epatch "${FILESDIR}"/${PN}-3.48.13-minizip.patch
+}
+
+src_configure() {
+   econf $(use_enable static-libs static) \
+   --docdir=/usr/share/doc/${PF} \
+   --htmldir=/usr/share/doc/${PF}/html
+}
+
+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/httrack/html || die
+   dosym /usr/share/${PF}/html /usr/share/httrack/html
+   fi
+
+   find "${ED}" -type f -name '*.la' -delete || die
+}