gentoo resync : 22.12.2021

5 files changed, 18 insertions, 17 deletions

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index ab0d031817a1..dfd5413301cc 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -11,7 +11,7 @@ DIST seamonkey-2.53.9.1.source.tar.xz 285481656 BLAKE2B c96107de40c83515fff49d4b
 DIST seamonkey-2.53.9.source-l10n.tar.xz 13615680 BLAKE2B ce5baea8c004219af74d25671272b2a4104018e35f54adee46bacd8eadbc9c44a53c7ab8f6382402a16dd4353068e0e6144158d3ec874105a5c03ac89a15af7a SHA512 c0dd469a12a4acc7e84793a56615fa109e00c638ed71fe0b51b3125750ed115bf921dbc6e8a4b391bb5cfccd679cdcbdfe9b23e619590c0f22c62489566d459f
 DIST seamonkey-2.53.9.source.tar.xz 285118824 BLAKE2B 524e51ca00e36658787aa734dd775ef009ef6d4dfd6917f00ebc8d4ec4ecb72c61a50dc33c89fabe2e65e4b95086645db9e26ef12776574f47d3928a42af100b SHA512 17f7009f2b5a1f337c24f98e2bfac2b63498f6e5b5080cbfc1c541ee60fa07f5116b76b7f20f2fc4e000b8c38c4558c7c9ef10abbdfec52dd597bc25d5a952f4
 DIST seamonkey-2.53.9_beta1-patches-01.tar.xz 43328 BLAKE2B 66869b0ebb3259da19148473311b00cb2b2ca762f6ae7003b5374c51f53e6d58fecdf00084d9c43c62023b14666b08efa6138fb28642cc11272851d799f8d0ad SHA512 38b8759da9230d745ab5c8cf1f3964762893e88174f20f3a0458a3196297845fb0876bdb330fac21a24a2661c2b319c8bfb0a7d6e8e47048ced1955500291638
-EBUILD seamonkey-2.53.8.1.ebuild 16934 BLAKE2B a2135f9da2d222e348069e7ac8430dc0e7addd7abe3bc004b930258b28c606d2de1842a2cc8401c5f45904d5fb9b0efa8baf88db4ac14869a1334626e5c02c20 SHA512 121b6c5b8abd1db2d1b0f51832982d93f6ad2ac9812d6287edddb39314f17dd874396ae6a377cc9dc3b9612543daa5b1bccb37a88b094d5ea0d770763c78a211
-EBUILD seamonkey-2.53.9.1.ebuild 16865 BLAKE2B 322e2a5fd063719b1c42d0d1fc07f2e5a6b83b577b3d6f1274dab319c8a32c529521d0912ddb05b01544b96c2abb6ee985e6f8ef6061e3cb2f66a7bbf690dca6 SHA512 5878b32b4291ca8f25791522a882f59a40be7f5432a8885c9503e2d2947db814346e933a0812a0b4b267b85ca1f6281e42cad89242fe3d456dc5bf11bfb776fb
-EBUILD seamonkey-2.53.9.ebuild 16868 BLAKE2B a40c7c0736d27291b0275ff7e1eadaa1893faed988bca249f3530dca12add8f1ca2343772baab01f6e7c2fd1395206887a6b417c5989f449f8b8ea3313f74a6a SHA512 8448ad5926db3c0e53754c5b88e3f5ea75e1ceeb5012e2a42e5e9cb90b5b19ad610c8122ce89b03fde8dca465b6acbd5b29dbebabe36898674ce3146fc172acb
-MISC metadata.xml 1820 BLAKE2B a53636a295ab335bd7220c0b53ffac93e3a09bad64e95b22c1c44a6ed1a77dfb445a5de17a5242c10b7b2f8775f962c34c620acfe35495492ad749431396f0e4 SHA512 0bd8a363e762626cebe9c7a5da198ef2d754d38c35209a4fa519f930b4071f19ca4090d483eb0342faa74013d67587168a650ef0bd63ed532be01b9f9157728b
+EBUILD seamonkey-2.53.8.1-r1.ebuild 16929 BLAKE2B d5749fc2e2f0ef3b845c5ef99aaa5425a53bdb54c707c4e00231403130f81627f0e1751cc54544e237a03d9be3f45d657a426c285c3b4fef757b682ba80804a0 SHA512 65d85bd7f6337fa320af7a154d6fccc49f6156f4772ceab331864e5809ea469cfe1f0820a4363d3d8d42995f5d7e51eacd612b60581adcdbc4c3c8039a8799df
+EBUILD seamonkey-2.53.9-r1.ebuild 16863 BLAKE2B 6d5a2a6850410752544f53612a94f79bb860ac859219d4ef0bd73189c6f3bdeede9fb731c8d8029437f938fb93d498fbf7a298d26c757eba434d32caea707fb3 SHA512 b15462fd9b1535d962903011b51c2986cba0cbe63c401202b1f9bb40b0189c64d1bacf5af67035225488e3707b381d3606b486e026f76bd9d293f5d5fd67eff5
+EBUILD seamonkey-2.53.9.1-r1.ebuild 16859 BLAKE2B 3a1e0c2988233904d73c766d98d953671d1070f8bb3de8e2176eca7384e5fee7aba0240fb5dc4c3eab40f2eae44fb7b2840ea00c03dfb3e4310502e504e02bc2 SHA512 305f7023d5c1c53b11b0345e7e49b3c34c9b641ffa97cc29f8f85aeb13b3c0a4c214d3c461cef7ec8ce9563ed97caed51d4d4b40a3b286a7c8c5c236864bef13
+MISC metadata.xml 1945 BLAKE2B cbe3e22610ab3a24e8a61285a5fc40dc82593b19e5036c0ce0465ec856c2012e699147f27874c3afe19bae458a4eaacd0566809a57e7ce0e48e03fde56602e23 SHA512 09a349791ca3f959340730c4b7dd9b6bcff0045a7c4ecc24bebb0c3759e844ea49ef5b0c8b3acc6f8d3c583c43a188500eecee811369ad3a6d601c6fb12a4f83
diff --git a/www-client/seamonkey/metadata.xml b/www-client/seamonkey/metadata.xml
index 44ca1be0e3a4..f3fa056f0caa 100644
--- a/www-client/seamonkey/metadata.xml
+++ b/www-client/seamonkey/metadata.xml
@@ -19,6 +19,7 @@
 		<flag name="system-jpeg">Use the system-wide <pkg>media-libs/libjpeg-turbo</pkg> instead of bundled</flag>
 		<flag name="system-libevent">Use the system-wide <pkg>dev-libs/libevent</pkg> instead of bundled</flag>
 		<flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg> instead of bundled</flag>
+		<flag name="system-png">Use the system-wide <pkg>media-libs/libpng</pkg> instead of bundled (requires APNG patches)</flag>
 		<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg> installation with secure-delete enabled</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-client/seamonkey/seamonkey-2.53.8.1.ebuild b/www-client/seamonkey/seamonkey-2.53.8.1-r1.ebuild
index 7177fd03cc79..c6468ec65cd5 100644
--- a/www-client/seamonkey/seamonkey-2.53.8.1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.8.1-r1.ebuild
@@ -49,7 +49,7 @@ SRC_URI+="
 
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,libvpx,sqlite} )
+SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,libvpx,png,sqlite} )
 IUSE="+chatzilla cpu_flags_arm_neon +crypt dbus debug +gmp-autoupdate +ipc jack
 lto pulseaudio +roaming selinux startup-notification test wifi"
 IUSE+=" ${SYSTEM_IUSE[@]}"
@@ -67,7 +67,7 @@ BDEPEND="
 	sys-apps/findutils
 	>=sys-devel/binutils-2.16.1
 	virtual/pkgconfig
-	>=virtual/rust-1.34.0
+	<virtual/rust-1.56.0
 	amd64? ( ${ASM_DEPEND} )
 	lto? ( sys-devel/binutils[gold] )
 	x86? ( ${ASM_DEPEND} )
@@ -81,7 +81,6 @@ COMMON_DEPEND="
 	>=dev-libs/nss-3.47.1
 	media-libs/fontconfig
 	>=media-libs/freetype-2.4.10
-	>=media-libs/libpng-1.6.31:0=[apng]
 	>=media-libs/mesa-10.2:=
 	>=sys-libs/zlib-1.2.3
 	>=x11-libs/cairo-1.10[X]
@@ -123,6 +122,7 @@ COMMON_DEPEND="
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
 	system-libevent? ( >=dev-libs/libevent-2.0:0= )
 	system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] )
+	system-png? ( >=media-libs/libpng-1.6.31:0=[apng] )
 	system-sqlite? ( >=dev-db/sqlite-3.31.0:3[secure-delete,debug=] )
 	wifi? (
 		kernel_linux? (
@@ -309,7 +309,6 @@ src_configure() {
 	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
 	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
 	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
 	mozconfig_annotate '' --enable-system-ffi
 	mozconfig_annotate '' --disable-gconf
 	mozconfig_annotate '' --with-intl-api
@@ -344,6 +343,7 @@ src_configure() {
 	mozconfig_use_with system-jpeg
 	mozconfig_use_with system-icu
 	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-png
 	mozconfig_use_with system-harfbuzz
 	mozconfig_use_with system-harfbuzz system-graphite2
 	mozconfig_use_with system-av1
diff --git a/www-client/seamonkey/seamonkey-2.53.9.ebuild b/www-client/seamonkey/seamonkey-2.53.9-r1.ebuild
index 639b00c6f4ec..079f44cf3770 100644
--- a/www-client/seamonkey/seamonkey-2.53.9.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.9-r1.ebuild
@@ -48,7 +48,7 @@ SRC_URI+="
 
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,libvpx,sqlite} )
+SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,libvpx,png,sqlite} )
 IUSE="+chatzilla cpu_flags_arm_neon +crypt dbus debug +gmp-autoupdate +ipc jack
 lto pulseaudio +roaming selinux startup-notification test wifi"
 IUSE+=" ${SYSTEM_IUSE[@]}"
@@ -66,7 +66,7 @@ BDEPEND="
 	sys-apps/findutils
 	>=sys-devel/binutils-2.16.1
 	virtual/pkgconfig
-	>=virtual/rust-1.34.0
+	<virtual/rust-1.56.0
 	amd64? ( ${ASM_DEPEND} )
 	lto? ( sys-devel/binutils[gold] )
 	x86? ( ${ASM_DEPEND} )
@@ -80,7 +80,6 @@ COMMON_DEPEND="
 	>=dev-libs/nss-3.47.1
 	media-libs/fontconfig
 	>=media-libs/freetype-2.4.10
-	>=media-libs/libpng-1.6.31:0=[apng]
 	>=media-libs/mesa-10.2:=
 	>=sys-libs/zlib-1.2.3
 	>=x11-libs/cairo-1.10[X]
@@ -122,6 +121,7 @@ COMMON_DEPEND="
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
 	system-libevent? ( >=dev-libs/libevent-2.0:0= )
 	system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] )
+	system-png? ( >=media-libs/libpng-1.6.31:0=[apng] )
 	system-sqlite? ( >=dev-db/sqlite-3.33.0:3[secure-delete,debug=] )
 	wifi? (
 		kernel_linux? (
@@ -307,7 +307,6 @@ src_configure() {
 	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
 	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
 	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
 	mozconfig_annotate '' --enable-system-ffi
 	mozconfig_annotate '' --disable-gconf
 	mozconfig_annotate '' --with-intl-api
@@ -342,6 +341,7 @@ src_configure() {
 	mozconfig_use_with system-jpeg
 	mozconfig_use_with system-icu
 	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-png
 	mozconfig_use_with system-harfbuzz
 	mozconfig_use_with system-harfbuzz system-graphite2
 	mozconfig_use_with system-av1
diff --git a/www-client/seamonkey/seamonkey-2.53.9.1.ebuild b/www-client/seamonkey/seamonkey-2.53.9.1-r1.ebuild
index 021b6d5a98ff..ab3a3adb15ef 100644
--- a/www-client/seamonkey/seamonkey-2.53.9.1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.9.1-r1.ebuild
@@ -48,11 +48,11 @@ SRC_URI+="
 
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,libvpx,sqlite} )
+SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,libvpx,png,sqlite} )
 IUSE="+chatzilla cpu_flags_arm_neon +crypt dbus debug +gmp-autoupdate +ipc jack
 lto pulseaudio +roaming selinux startup-notification test wifi"
 IUSE+=" ${SYSTEM_IUSE[@]}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 RESTRICT="!test? ( test )"
 
@@ -66,7 +66,7 @@ BDEPEND="
 	sys-apps/findutils
 	>=sys-devel/binutils-2.16.1
 	virtual/pkgconfig
-	>=virtual/rust-1.34.0
+	<virtual/rust-1.56.0
 	amd64? ( ${ASM_DEPEND} )
 	lto? ( sys-devel/binutils[gold] )
 	x86? ( ${ASM_DEPEND} )
@@ -80,7 +80,6 @@ COMMON_DEPEND="
 	>=dev-libs/nss-3.47.1
 	media-libs/fontconfig
 	>=media-libs/freetype-2.4.10
-	>=media-libs/libpng-1.6.31:0=[apng]
 	>=media-libs/mesa-10.2:=
 	>=sys-libs/zlib-1.2.3
 	>=x11-libs/cairo-1.10[X]
@@ -122,6 +121,7 @@ COMMON_DEPEND="
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
 	system-libevent? ( >=dev-libs/libevent-2.0:0= )
 	system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] )
+	system-png? ( >=media-libs/libpng-1.6.31:0=[apng] )
 	system-sqlite? ( >=dev-db/sqlite-3.33.0:3[secure-delete,debug=] )
 	wifi? (
 		kernel_linux? (
@@ -307,7 +307,6 @@ src_configure() {
 	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
 	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
 	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
 	mozconfig_annotate '' --enable-system-ffi
 	mozconfig_annotate '' --disable-gconf
 	mozconfig_annotate '' --with-intl-api
@@ -342,6 +341,7 @@ src_configure() {
 	mozconfig_use_with system-jpeg
 	mozconfig_use_with system-icu
 	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-png
 	mozconfig_use_with system-harfbuzz
 	mozconfig_use_with system-harfbuzz system-graphite2
 	mozconfig_use_with system-av1