gentoo auto-resync : 17:08:2022 - 20:33:10

5 files changed, 8 insertions, 94 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index d61e608c17b9..9a9a0eaf0834 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 79ab8db124b4..9578ecabddc8 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,8 +1,6 @@
 AUX var-tmp-tests.patch 659 BLAKE2B 2869f1c28c3a59974758986bd464aeb5c1d86d1b4e23f33d809529a1f1b800ffdb3daf24780774766a16c1f45fff145dd5524c682293dd117b29582adeade7ae SHA512 79480bed41ff59f423087dfd6d0f5eaee665fcba6602c7876ed63397edeb6cf5fcb2ce9f2f91b375117e389ec2fcf6cba1cf1e8919efef2ccad3c84547b7824a
-DIST epiphany-42.2.tar.xz 6101892 BLAKE2B 81553836de2518b2aa490c34b238afe7dd71f63e5f9604ff98ada6663ad37d5a0457f5345574b776582c9ad7a728c0d221360af19cebc0157810757c8d09620b SHA512 3b7bcd9225f06caca547e8d822818e7d9b5a178028cd97b17b8e2474fec7337c4d6b4d718b3cf014784939d0b2f36e84305d6e9115521fdf762af178e5fc07d3
 DIST epiphany-42.3.tar.xz 6106824 BLAKE2B 97dc47e0df026210c8c81966ae02a2916d6a738b291261894b3c3bc9a21073e547de1dab00a64e378fb049eec6fbbb15346eb7489f6100f79ab2a4e3309f3366 SHA512 3bdbbbf97e80fcd55780312b9ee5c631e0a9ce8cfb27c4cb202cc5db56579d4aeb098781c4853464f9c22faacdaf75a960b10d8b878139ad24c42728529a4364
 DIST epiphany-42.4.tar.xz 6107820 BLAKE2B 7ab18ac6d8eceb3577ef53c761e26a64291219311f2d6d82ed13ce6746767b83124faf28c9627056938351a05e5d6aff50eb95eb4dec10ce8847123fb5775b36 SHA512 55153078bc460cc5a0bc17bb8d12fd5ed6495cd2415e128ec0b4917b07a4d2fe1fb74e871c033aaef43c89c125d79ad37e99ea2fa2ada07fbcdf09603129ae47
-EBUILD epiphany-42.2.ebuild 1939 BLAKE2B d190df9f7eae141ad1d96540a0796c24eb7ac5878c8f2a33ada4f794b3c3a1d925f26581998932e55d9f5e6bfc93686f593b9dc6a8253f128908e5670528f94a SHA512 ca7e3d82176e3957a57b1707aba92295c411cc4f76e282473d23fbcee8f7e99ea9ee103c45d51952fbcf307c7470858d00fe77c3a13051cf29ff1d3179057508
 EBUILD epiphany-42.3.ebuild 1939 BLAKE2B d190df9f7eae141ad1d96540a0796c24eb7ac5878c8f2a33ada4f794b3c3a1d925f26581998932e55d9f5e6bfc93686f593b9dc6a8253f128908e5670528f94a SHA512 ca7e3d82176e3957a57b1707aba92295c411cc4f76e282473d23fbcee8f7e99ea9ee103c45d51952fbcf307c7470858d00fe77c3a13051cf29ff1d3179057508
 EBUILD epiphany-42.4.ebuild 1982 BLAKE2B 3c58c94c8c2f4d71301856cad2b56ca2072264339c4a6961c3e908dd4cf9b05347c6a3d0a9edde18dfdd2ed1823406a0735a29884fe4881c513f6d5085a8005f SHA512 6d0d7914cee62eb726c59fe35169a25ac24355957e87227f9a437cc7dbd06378f1ddc7a6b5157d327e9e40937d7bfe506836b02e5efd094be374cfed6bb50eb8
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/www-client/epiphany/epiphany-42.2.ebuild b/www-client/epiphany/epiphany-42.2.ebuild
deleted file mode 100644
index 19e7f2c4789c..000000000000
--- a/www-client/epiphany/epiphany-42.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="https://wiki.gnome.org/Apps/Web"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-
-DEPEND="
-	>=dev-libs/glib-2.67.4:2
-	>=x11-libs/gtk+-3.24.0:3
-	>=dev-libs/nettle-3.4:=
-	>=net-libs/webkit-gtk-2.33.2:4=
-	>=x11-libs/cairo-1.2
-	>=app-crypt/gcr-3.5.5:=[gtk]
-	>=x11-libs/gdk-pixbuf-2.36.5:2
-	gnome-base/gsettings-desktop-schemas
-	>=app-text/iso-codes-0.35
-	>=dev-libs/json-glib-1.6
-	app-arch/libarchive:=
-	>=dev-libs/libdazzle-3.37.1
-	>=gui-libs/libhandy-1.5.0:1=
-	>=app-crypt/libsecret-0.19
-	>=net-libs/libsoup-2.48.0:2.4
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-db/sqlite-3.22:3
-	dev-libs/gmp:0=
-"
-RDEPEND="${DEPEND}
-	x11-themes/adwaita-icon-theme
-"
-# appstream-glib needed for appdata.xml gettext translation
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Allow /var/tmp prefixed recursive delete (due to package manager setting TMPDIR)
-	"${FILESDIR}"/var-tmp-tests.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Ddeveloper_mode=false
-		-Dlibportal=disabled
-		# maybe enable later if network-sandbox is off, but in 3.32.4 the network test
-		# is commented out upstream anyway
-		-Dnetwork_tests=disabled
-		-Dtech_preview=false
-		$(meson_feature test unit_tests)
-		-Dsoup2=enabled
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version net-libs/webkit-gtk[jpeg2k]; then
-		ewarn "Your net-libs/webkit-gtk is built without USE=jpeg2k."
-		ewarn "Various image galleries/managers may be broken."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index a7da2d6c9684..bdbd2e3cde63 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,5 +1,5 @@
 DIST qutebrowser-2.5.2.tar.gz 6114611 BLAKE2B 5f56e1e2c390bb2f36c95e25a2dae9e5203020ff6b2cf1e13092cf493efa950b24b8ff8f23af6eed93ca8b316e30f86715ecd2f2eb28c341210de0b25c9f67ad SHA512 4751ea1a5b1776f085fcd1f9ab5ff805155fca34d0272ba8eb6574f9074257929c3fb5b50c9053a522bfb346aee1a2551b58cf933c6ff7c5c84fd10559ec36fc
 EBUILD qutebrowser-2.5.2.ebuild 4386 BLAKE2B 46da9c624ce3e90ba1538686b52996d3c0886c99a52631694788b39acc7e2541a55417e03252314d3dd7e2106b1bba81b5f32279adfbe06b602d721a2b5c7efb SHA512 60924de2de77291d9b547693080c5edf1c4367aa3840db69ac7cb01ac241dc3b5a7c0897160b4031435d13f70f8b925722fb36cf33d6a487556c00ccb9167103
-EBUILD qutebrowser-3.0.0_pre9999.ebuild 6030 BLAKE2B 5be86c7fcac4dbdbe977d6ffad4a3a3b9d92d747fa12f1d9dd1857103f1e540b467c00e288f581884e30d4c98427a4c43456cacb2d0771e6e7f2caf34c660d33 SHA512 0ebe1577c9551154c3d7ccc04765ffa662bf16bb2b305641f22195ae56a3799d802a29ada6bcfab720ce65baecf71752f6a0ea02d47621bfe0b8291c55a4349b
+EBUILD qutebrowser-3.0.0_pre9999.ebuild 6075 BLAKE2B bd9bf4eac740f1bcea6608a32774130bc15358798443c0526d5dad3c7e5304529b2cee53784ce8f0e1a55b9c08fddf564296e7f5a71ee472a38c125d8299b1dd SHA512 9f64ad3231b4245160926fd844ef97548ce360073506f4c79daeceae99ce9cbd8611cb1dc7c7db8230c92b6bcd2e2a0209f45744447c37f4f51080bba0015490
 EBUILD qutebrowser-9999.ebuild 4387 BLAKE2B ff92d8705c2369729256a8de911634de9988c65cc8910da495d014c30a52d4e61722ade884c3989c4dbe506889ceb616b4e1794cdd860adf9d151dcce8b57b85 SHA512 0f074d74305762383bc647d3e883bee4d1b376d659844e4e2afe1867fc7b81da85c4e140f70e22fb268407d18e0166f813dbfe62fbeba085f8d8befce35027fe
 MISC metadata.xml 1018 BLAKE2B 9d0c406995b2036671113b6513c3ed2fdb5021eae9d1dde5c186efeccdde6dae127857e3e5898f7809edcc27eca4b47f37965155ac0ff21bedb78e242421fd54 SHA512 2af79f18d31f9efe8df852f4bca132caf1d79fc06f6388959deb367470d4975af541a75c70831b549d944112bcd0bc7e11510a81bce4ef1391fbf1354425b769
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
index baadc7dc34b0..a08871af437f 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
@@ -156,13 +156,15 @@ pkg_postinst() {
 
 	if [[ ! -v QUTEBROWSER_HAD_QT6 ]] && use qt6; then
 		elog "USE=qt6 is enabled using the qt6-v2 branch, it is work-in-progress"
-		elog "and some issues are to be expected. Can follow upstream progress at:"
+		elog "and some issues may be expected. Can follow upstream progress at:"
 		elog "  https://github.com/qutebrowser/qutebrowser/issues/7202 [qt6 general]"
 		elog "  https://github.com/qutebrowser/qutebrowser/tree/qt6-v2 [used branch]"
-		elog
-		elog "You may optionally want to backup your ~/.local/share/${PN} before"
-		elog "it is converted to use Qt6 WebEngine (one-way conversion). ${PN}"
-		elog "will also warn about this on launch for a last chance to abort."
+		if [[ ${REPLACING_VERSIONS} ]]; then
+			elog
+			elog "You may optionally want to backup your ~/.local/share/${PN} before"
+			elog "it is converted to use Qt6 WebEngine (one-way conversion). ${PN}"
+			elog "will also warn about this on launch for a last chance to abort."
+		fi
 	fi
 
 	# TODO: left-out given be confusing while IUSE is masked anywhere