From bd4aeefe33e63f613512604e47bfca7b2187697d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 3 Nov 2019 16:06:58 +0000
Subject: gentoo resync : 03.11.2019

---
 www-client/httrack/Manifest                  |  9 ++---
 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.1.ebuild     | 49 ----------------------------
 www-client/httrack/httrack-3.49.2-r1.ebuild  | 49 ----------------------------
 www-client/httrack/httrack-3.49.2-r2.ebuild  |  4 +--
 6 files changed, 9 insertions(+), 110 deletions(-)
 delete mode 100644 www-client/httrack/httrack-3.49.1.ebuild
 delete mode 100644 www-client/httrack/httrack-3.49.2-r1.ebuild

(limited to 'www-client/httrack')

diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index 4bcc364a1236..648220407090 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -1,10 +1,7 @@
 AUX httrack-3.48.13-minizip.patch 1519 BLAKE2B f8b1202dfc0c0222d2d81fea01d5cbd83db8492db83b9022a56464c194ca38e5f7f380babf73d3ad2b93c23b1f166c0fab735c411688bfe6ea9f4aea28343085 SHA512 e366ea5e93888afcacc1a5df29fd4a0a6a8ea7a0eb9659e4f017a97a93c97ef12d286ed50762ee8e53a328d4cc2307bda169ae3c4d247919faec0010e1f1a10d
 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
-EBUILD httrack-3.48.21-r1.ebuild 1108 BLAKE2B b7b54c0bbaa61c27c460af48400c20b87028ba1d533521ba12dcff62521bafe5be2165733ac81f91c145e675aa89b05889ee2a8b4980decfcdda14b787d5bfed SHA512 ab2bba5e62e85a5dee4fdb913b2c360d273e207132c83ee284908cfdcf9c58273d0923e5c8c668eda6a9388820b44bd77ef0bb58a27cc857c617c01a5c9284b4
-EBUILD httrack-3.48.21-r2.ebuild 1190 BLAKE2B 4b01b5e73109cb5848ef24768992e3fcbc16b02c297393a26f750954dfa41be04d4119aabf10de944f6c6e275315701859a02f95869c5a079bd518a8219fe4ad SHA512 2bab717ae237df849936ada993697a394f8df49cecd26bd4ec6353da7be86509316913dcfdb2f8ffc67bbb3834dcb38a2ed69cc566705862b48fac80744b089e
-EBUILD httrack-3.49.1.ebuild 1177 BLAKE2B 40afc94dd34748e5c63396220f9bd30c96ede32047cf27f3dfff6f4e8b9998de854e44b35ddbeb01733f5818528eefd2ccce358210241f59a7ae8a342069f8e9 SHA512 0b18cb1c6dcd33c531261d7d0ae0f0c1c826ff194b59d6d2387f49a5e8e5b5433d99338322ef2ce040cf7ecb6f7fcc7ce573fbca1d9c4706ae96b7c176f9c020
-EBUILD httrack-3.49.2-r1.ebuild 1157 BLAKE2B b8cc2379bc1c4c98309c77cf10fd73f9a6025a06bc768215594f8d877d6529c37e8878671922d64a28c482776f0e88f3eba7669864c45884cd3deeae48dd980c SHA512 ba175c981e5fac834cef4f5c6f209c5e5da2e2bfb372e0ab5578c493840be249f03958ec8ac228e730414ece75e003a344eaf7197002d4ff9d72fe4cb02197a3
-EBUILD httrack-3.49.2-r2.ebuild 1264 BLAKE2B dcf358328aa5bc6d1324ad40a326424464e79960d2bd53132398cc13c2261b4819537bb076a268b409b2ba4e73c2d3226aee00004f27076eddf2f880d1f88e43 SHA512 a299b7760f8e8f443b3933e477b0da83a76e64266f8dd1566cfc01f0799b02d68bca5f44fda1b585fa6d0f66e0188d6c7f3530cb27585cb1a0ca0c990c4739e9
+EBUILD httrack-3.48.21-r1.ebuild 1112 BLAKE2B 73c8d48531a784a6dd861c27b7d60fe1fcaf63b9576e2f113901ba8e5584bdbe71e7031eae5974d1c32129ec6e675536fc1d376e1f49c87159f612ef4e2a2a3a SHA512 7e3f37415d324fff99ad41e14eb6e7f1eb0ddb348a8555d1af43a0ef9bffc2c051bd460066346f06c51ce20d42bbda37b8a25b94b6f63c303d30eae813df3caa
+EBUILD httrack-3.48.21-r2.ebuild 1194 BLAKE2B 4818b67ee18fbcf7af518826a904fb3ac21b33e56c147edc825bff5e84ee0cf3bbbfa848543026f4dd596b803ce60d1368d6cfab0aff3789b520e5564c077b5b SHA512 3dc5090dbc8f3851ab76961c937f89ef7f89491f357ff80ac5ab0aec18ffdf1160a234390e1c7bb5453f7b048d5dfa47531e92fe8f4617095b62653753d4b7f7
+EBUILD httrack-3.49.2-r2.ebuild 1270 BLAKE2B e32334156dc03f31e6c62167e8b38016f71716ce66c75e4c9aa686a8d3bbec2af5f894808b39a614eca72f3e43647efaf11620381f2d48a902d72242e1ab9317 SHA512 b89461ef88ed4f1290425aca8c6dcff5ae6d6fb4e4956012860284a407ba19a0a2ae15f41f1731e35e80514a6b65cd07aa8588129a423eca70ccb9edaca129ce
 MISC metadata.xml 213 BLAKE2B 89a7efa56dbdbb38950f944228541e36e90e427e1171bc1cc9103ebbfc435786bc60e2bc2e48a6f73a70ae9d8414a5748fbf8aa18476815a5a8b4c43bca0119e SHA512 54084c6097a56011194ffb5fcd237adaf6f2940fb41136bda541f0fb3c4301c87a553fa49b03a36865d7ce911f96e70349f0b40e3828d2edbcbf0d02472ba446
diff --git a/www-client/httrack/httrack-3.48.21-r1.ebuild b/www-client/httrack/httrack-3.48.21-r1.ebuild
index 2c0f42cea053..41e48ba58f85 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:="
+	<dev-libs/openssl-1.1.0:="
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS README greetings.txt history.txt )
diff --git a/www-client/httrack/httrack-3.48.21-r2.ebuild b/www-client/httrack/httrack-3.48.21-r2.ebuild
index 0c2645947120..2440c4e29eaf 100644
--- a/www-client/httrack/httrack-3.48.21-r2.ebuild
+++ b/www-client/httrack/httrack-3.48.21-r2.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="libressl static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
-	!libressl? ( dev-libs/openssl:= )
+	!libressl? ( <dev-libs/openssl-1.1.0:= )
 	libressl? ( dev-libs/libressl )
 	"
 DEPEND="${RDEPEND}"
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 e6edf6695a6e..000000000000
--- 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 849d51d0a2be..000000000000
--- 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
-}
diff --git a/www-client/httrack/httrack-3.49.2-r2.ebuild b/www-client/httrack/httrack-3.49.2-r2.ebuild
index 78bf2cf3fd66..56fdcbcf9003 100644
--- a/www-client/httrack/httrack-3.49.2-r2.ebuild
+++ b/www-client/httrack/httrack-3.49.2-r2.ebuild
@@ -11,11 +11,11 @@ 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
-	!libressl? ( dev-libs/openssl:= )
+	!libressl? ( >=dev-libs/openssl-1.1.0:= )
 	libressl? ( dev-libs/libressl )
 	"
 DEPEND="${RDEPEND}"
-- 
cgit v1.2.3