gentoo auto-resync : 06:05:2023 - 17:34:33

12 files changed, 26 insertions, 32 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 6caf98255c0a..214f733b83a2 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index c1ac7f4f05e8..435de2632f22 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -4,6 +4,6 @@ DIST geeqie-1.7.3.tar.xz 1949696 BLAKE2B c261a09446472f2decb0f332f227453e14fbffb
 DIST geeqie-2.0.1-ChangeLog.tar.gz 626106 BLAKE2B b1e166e7537d6e2bf8a9fec259315af4d70194688b489eb44715eb51c690806dd6387e6aa884b737222a25114c36b2e1a2a70fd2bbec015e64d5f6274cac1ab9 SHA512 a986981f28bad254747fb674ee16691bbec64afb354eb158dc511e0f9b198bba8e3bd0fc2ae432322806959a5ea7434687cb462c8cbb0d1c9dc17b5431f72288
 DIST geeqie-2.0.1.tar.xz 1666600 BLAKE2B e90d9b5c0bfe9d4f84c65e4754ba3ddaee8ba44c6d493cf4b5c0e37d398a4e2f6234c60fc6e88e4022ff4f8fcaf10626037c3a80450921f88f5fd937fd386958 SHA512 cd2251c831c6d4d461d92eee84df08590752ad625e1f50d57e1fb5d0fc6ac16a225584a8217e14bf4f993ba247f7df3296498b27fcc4f5f4c7f25307699aadc5
 EBUILD geeqie-1.7.3-r1.ebuild 2289 BLAKE2B 23866b8308713d9367014828564591070f1d0fc82fa4b92c45d70b19fe9a1be6946336bd453f06bbb0b8a5f9659c31b2049d56ef7d9b57318615a5145ca20307 SHA512 8a07e8657041421954a23276db5b0d0f8c57cbd78ab7735c2748178875d16e38f609cb322595916f43a8b125b37c1da89b0d1b06cc4c16c3daa360f44590846a
-EBUILD geeqie-2.0.1-r3.ebuild 3241 BLAKE2B c6d242a68b63fccf69d3cca2d2a57b9d2c651231d9d369496c93174d5439609dd608fc9a88fb972da095d95403f569d2481e0ff93b2ab5cb1c32b4aad334ec0e SHA512 127cef32c2fabb2d68b4ddda31a654d48b6710bd0e403c56950451e47a5178dcdfef7b17a0074caf33b9b5a1e0a460086d6275e61dbd71fb324dcf886e6900d4
-EBUILD geeqie-9999.ebuild 3168 BLAKE2B 5fd4e1a16f40f78b4648275311d70b1ac0032cf10e5f47a3acf2591be6653f3ebca7d2f32e7bc437d6bc2742c66658ea728da8f0292935fa52755ce75368fde5 SHA512 6d5004a264ffe76ef3cc017e51017306768b6f3f7d2ef77796840e36edde0300fc531504221b83ea2a1a6e5648053fcd06ca6c75e909e4a030889c11c8eb7771
-MISC metadata.xml 877 BLAKE2B 2ae83772a1b4df17699f627773f975824694a91a5c16539d0ef445cda9e077816588e417fc460ac9b307b007836cfcff19abd76e1ecc100b21977b192eb9fd47 SHA512 51bbee254ee3f5dad4b893591148cd0dcf4e798027862c0f5d24356e04ed9ea2c75983c23127f23ca71c20e25d24f754dee513f3d52158b9e02ecf8528260dd2
+EBUILD geeqie-2.0.1-r4.ebuild 3222 BLAKE2B edbd5227cd09fa9e3fa745011f2b10930308dad3a7114d1e37202ca8339e66ea41b9c0dbec31b45318409e085a04ac7f2e9ac0903d30db9ef099b0dca2a95cfc SHA512 3d2dd066abf75161822c379aef18457e6cf0e2c9009c3a45a8532efe0bad6e0cfa1eb8a5a7f69cb2dc35103e0e549b15ac273696da5faed9c46c93f5d546262a
+EBUILD geeqie-9999.ebuild 3149 BLAKE2B 0c2f3e3b42223096a96297ef0fc17c3eef27db82d85c5f4624025c5bf3b3e3df6647b56ee514ee18fe765370c3444332f0ae174d129466743d59ce55b234b442 SHA512 fb84879ef022ee8df2cbd3491751f6a210725534fca83f6f120b3972fe9a0932b9f6a2d4e920b3f5bb7782bbab39b8865960f00b295910815b2878eed68bf1e0
+MISC metadata.xml 964 BLAKE2B 68899bc0e99e06b4121753cbe15beea5a5edecff0673b1265dd09e43f06fcf76f9769949d2d08470711eafa4fc65a07a926a66465cab47aa0aa0393cab7969d4 SHA512 83ede5f6bb9ad78cddf27cb98f2985d18e46112118a823f728f29f76a1804f62bdc4252faea39adfd3a64d8959e0a9be75c7349eee5e0be4e306a8ef21597e0b
diff --git a/media-gfx/geeqie/geeqie-2.0.1-r3.ebuild b/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild
index f16b53d0df1e..1efc3af9dd12 100644
--- a/media-gfx/geeqie/geeqie-2.0.1-r3.ebuild
+++ b/media-gfx/geeqie/geeqie-2.0.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,7 +40,6 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	|| ( dev-util/xxdi app-editors/vim-core )
 	dev-util/glib-utils
-	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
 
diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild
index c6f4c4adff37..ae833800a507 100644
--- a/media-gfx/geeqie/geeqie-9999.ebuild
+++ b/media-gfx/geeqie/geeqie-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -41,7 +41,6 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	|| ( dev-util/xxdi app-editors/vim-core )
 	dev-util/glib-utils
-	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
 
diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml
index fe79e449c2dc..280f5ee936ea 100644
--- a/media-gfx/geeqie/metadata.xml
+++ b/media-gfx/geeqie/metadata.xml
@@ -12,4 +12,7 @@
 		<flag name="jpegxl">Enable support for JPEG XL image format</flag>
 		<flag name="map">Enable items GPS map display</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">BestImageViewer/geeqie</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 998cf3dc290f..c15990853912 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -3,7 +3,7 @@ AUX inkscape-1.2.2-fix-compile.patch 1948 BLAKE2B 4482e3f021f9cdee4a26e0d179e5e1
 DIST inkscape-1.2.1.tar.xz 98048464 BLAKE2B 2de10beb5a90ba81e2f212710dc78fce7c72acef5d004ab86f443b97dcf12e65fb755d7a2655520bd94561a71664dc75abd1ebf9e6bbba14c912cac487b7f18c SHA512 1f968cb20855e77ad8a1b16f8d4841e3279e139c7b1f41eccb7fbef9a7da092f3ffe7f123d032c395939a002725f68d6f1305b2a87ed68610a69a31052711521
 DIST inkscape-1.2.2.tar.xz 39392040 BLAKE2B 7a4f0e42d1d8b67f42b924c760be484156e210e5661dc48408c992cbef5e0ac997a468cf1263e5c14cd5c0c0a83345e77055ff59fd7fb2d01b2d196f42a9e858 SHA512 b3e95f7d45612140b38c95fd758b051c27b0ed55bac7e7980c0491d3ba94c62edd7f0b27034314388bf74faf2046d829f36d2f6745cb4a54fb43b8b684df235f
 EBUILD inkscape-1.2.1-r2.ebuild 5251 BLAKE2B fe6bfdbdc8de16ead4e418b91ac13a188d67c3607e7ddf3fa875b749df77894a4de8f96a6be990ae158c222d32ba4e3c2f6242e82224393d40cf98477a97b22c SHA512 070d799f453068cd4c1604fffbae7922373aeb386e9b7522c7860bba61ba82f4a81e342fd494a97b94931f8608d1e29ae48b05d076c89950b50fb7e942ec4a7a
-EBUILD inkscape-1.2.2-r1.ebuild 5251 BLAKE2B fd6ec2774783bd2a1aee418e6b8cfcafb9e40d2374efa2abcbd0d91b55a5066804c942d5e719277fa3f858f3877e035a9ffc8e895f4d18f10a11196af1940c10 SHA512 56f5545f6793d330a7a6d00a2695696621ec280fe886f53985283d38848bf931cec49884fe3e979dfc7b47850e27eab6836bc1bad840ca6a87d4f713fd564643
+EBUILD inkscape-1.2.2-r3.ebuild 5209 BLAKE2B 9447515517d0f3af60ddd1431cc3ac8ccbc5f9fd4684506430b9a8bdd5375e67ed67fe558aebe14b934d8afef96cd22eee9778cc67d714c5e2183ef79fff2cfc SHA512 5f4f1f32df63750d50bbd685a7dff020f20ae9a927dd5bf580d9284c813f64984b6f6b7df3e7193ed59f7a517429b805276b02d38e0c38c50136f7cca003a44e
 EBUILD inkscape-1.2.2.ebuild 5189 BLAKE2B 62a14c92e245ec737176aa3015bd508068fe0c12436f1487f5140bd0f6bf50f4ffed82abd67cb35b2b2814ea0fad9eea3c2b5f634784be5a1c64f8040d48ad55 SHA512 0aaf8dc62bc796b78ec7076fa9d6b6f2c75e767b98e251345e5b7727d65827a23dd55d3ee08fbff7650ef3533f7bf7692a2ab294299bfd36c8d01be3b63f9560
-EBUILD inkscape-9999.ebuild 5097 BLAKE2B de3a9a36fbb8e9c2b0b1695e1fc93780f5bfa7882f42c30c612ed449b532c23a53b96a63c354fc45c10488fe792d8855ed641c238a5f6aed63b319387525e8b2 SHA512 6bd47fdd4984b1f6b4cdc0888540414102b6be7351802aa5f7565189793f308ba1f96588b1663cef19703d0d8a736404014ed918629a664dee4b123061eaff97
+EBUILD inkscape-9999.ebuild 5055 BLAKE2B e2a38b8958ebb85819cbc9efe0d6f8cab0c97ea7469ade8c5687f5b2022e457c36b72d70a6e5b92339a0f0694e74ab6bac7866ca2c1fd5640a94e90f95dd24df SHA512 d58fea35fd761e3b1d48d68e73c11293ccc9b9c032d26dfdc9b1d0743736b333c59eb277c03d1ff7c8c8351e94307bff7626dbe12b4362e9ee0acc9f62c1461b
 MISC metadata.xml 876 BLAKE2B e8998be1909e5848fd13fa4a8c4e2d9a424c818c3a41ebdd0a5807f572f9d0037900ac2516d107b9ab016410c25bc4ca3225e832ef17bd6b345d6471d5b5f0bc SHA512 f9a8581f7f401a40b100f61e67adb032859b2c70bd49eaa60b13a18cf24cc24e3a2704e227cba5590aad4bbaf705f3a4bf8c6ffda75f473c39bb8177af4aca6b
diff --git a/media-gfx/inkscape/inkscape-1.2.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.2.2-r3.ebuild
index b608d9a3e9b7..dec3b3e7e1ac 100644
--- a/media-gfx/inkscape/inkscape-1.2.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.2-r3.ebuild
@@ -28,7 +28,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
 	dev-util/glib-utils
-	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	test? ( virtual/imagemagick-tools )
@@ -46,7 +45,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libsigc++-2.8:2
 	>=dev-libs/libxml2-2.7.4
 	>=dev-libs/libxslt-1.1.25
-	dev-libs/gdl:3
 	dev-libs/popt
 	media-gfx/potrace
 	media-libs/fontconfig
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 336e101cff8b..07e3302df825 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -28,7 +28,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
 	dev-util/glib-utils
-	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	test? ( virtual/imagemagick-tools )
@@ -46,7 +45,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libsigc++-2.8:2
 	>=dev-libs/libxml2-2.7.4
 	>=dev-libs/libxslt-1.1.25
-	dev-libs/gdl:3
 	dev-libs/popt
 	media-gfx/potrace
 	media-libs/libepoxy
diff --git a/media-gfx/jpegoptim/Manifest b/media-gfx/jpegoptim/Manifest
index 420a8b362a7a..9b8a91a7572e 100644
--- a/media-gfx/jpegoptim/Manifest
+++ b/media-gfx/jpegoptim/Manifest
@@ -1,5 +1,4 @@
-DIST jpegoptim-1.4.6.tar.gz 99004 BLAKE2B efe8d4155e6a111ef7f810ddfa9d2ddc2b58d2a54728b81698c47444eebde864662ecc397cd935af47070b84daf36b33815e87a2909fc8b6ba7ca2421eff9687 SHA512 1ebd4986cbfeae19c1e01521862c15de25e078ccb6483c29f0d89b9c8e308c93d8dca7a200a57dd5da793e481ca5dc9c4f0d84b252f5b9408b4e719c35d7e90f
+AUX jpegoptim-1.5.3-system-libjpeg-libm.patch 390 BLAKE2B f23acc7cf017fc8dc5402b7e940b26fef5870cc4ca03ad3a1d2776820126420acd9c03d5a4eeb2c76c7979af223fa00a4ad5eba8c76347c01d2935677348a7f2 SHA512 c76e4a44455374f15f1021876860014dc1bc256e4c474abbc01a35692a569b679194d341b0ceb8751a91c62d54125f21fa7090de7ce3feb4dd1125810b60acca
 DIST jpegoptim-1.5.3.tar.gz 121006 BLAKE2B 8fd54eb3e08268b080efb1747f5090a5a21500cea695483f1c892f1848155d3afc7b40304390d903cd3d7433e7811a0a77caa0747108be6e2e7535e7d664d3de SHA512 2e198636a7028d1781a00efed881e77af1324cf1906838ead9ffbb027c085cd287b26c3207e8b4f53e2f53ecb4dd2c035101b345a241a472288ba175e27d9423
-EBUILD jpegoptim-1.4.6.ebuild 521 BLAKE2B c3ed9280aa0a636ea102a73e681459d9435ed5a7ee689152e1fd9b0a8fe692d16dab2f709c4e100d1006cff90e1b1a1a8497dfba251ee7b6360fcb7d649567fa SHA512 3897cbc3888b8258f547321f1f64bbb2359a4d09bf4133f303a9b25e1172b0347148290e8716f7ecef9db1dfac292aa4f2d9de2f4a1a9330e7eda9efddf834b3
-EBUILD jpegoptim-1.5.3-r1.ebuild 631 BLAKE2B faed4e136cbab580519cd4c8c1041025c73e73c4278382cae754959df1e7fadb282c86027c2fc08eb81cdfef7787f0db3f2d3aefe1fee2e10ad8e0fe519282d0 SHA512 c66d2b92a5b57e1d5b111ca79e3f69902a53ff0dfb40e1482b2f05c77e0c63220a2e1394e803e577bb869ce6864824c0d6137185e50af211349b219985e3f12d
+EBUILD jpegoptim-1.5.3-r1.ebuild 695 BLAKE2B df130735db15d25abf223a06f51535c0aee69eae35186b4970ef8f9ecf8cbdf455d10a7ba1ba6a5018aca6b68f50976ea21bde22fa090dd8c23f8d4cd6164042 SHA512 4c586d24b79afd415c9607c7fe6b7ead5ac11aff7878572a3cd423be9f352913901c49efa17286b87083c74f39b799ac77e8bc8095b72bb3c605c6b9cd725180
 MISC metadata.xml 325 BLAKE2B f70f1cdb1d6d60bf87058a388fec1b87e26e6277a04c0b8334f1d05d64de12706b7402260f6fa425bbb6835ab06351cc2289f7060f6fd33f637a0e26c71fea3e SHA512 e85426100408710a2441322b71113131e63127cea6f42d47d583656b93e851e3611b0305de731c3548144289eb475bce2dfc58df1fa61839e682d97498e678a3
diff --git a/media-gfx/jpegoptim/files/jpegoptim-1.5.3-system-libjpeg-libm.patch b/media-gfx/jpegoptim/files/jpegoptim-1.5.3-system-libjpeg-libm.patch
new file mode 100644
index 000000000000..47e4cc1e539b
--- /dev/null
+++ b/media-gfx/jpegoptim/files/jpegoptim-1.5.3-system-libjpeg-libm.patch
@@ -0,0 +1,9 @@
+libm is used with mozjpeg and built libjpeg, but not if using system's,
+yet jpegoptim.c uses floor() either way.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -356,3 +356,3 @@
+         target_include_directories(${PROJECT_NAME} PRIVATE ${JPEG_INCLUDE_DIRS})
+-        target_link_libraries(${PROJECT_NAME} JPEG::JPEG)
++        target_link_libraries(${PROJECT_NAME} JPEG::JPEG m)
+     endif()
diff --git a/media-gfx/jpegoptim/jpegoptim-1.4.6.ebuild b/media-gfx/jpegoptim/jpegoptim-1.4.6.ebuild
deleted file mode 100644
index 905d570976eb..000000000000
--- a/media-gfx/jpegoptim/jpegoptim-1.4.6.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Utility to optimize JPEG files"
-HOMEPAGE="https://www.kokkonen.net/tjko/projects.html https://github.com/tjko/jpegoptim"
-SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz"
-
-LICENSE="GPL-2+" # While COPYING is plain GPL-2, COPYRIGHT is clarifying it to be 'any later version'
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="virtual/jpeg:0"
-RDEPEND="${DEPEND}"
diff --git a/media-gfx/jpegoptim/jpegoptim-1.5.3-r1.ebuild b/media-gfx/jpegoptim/jpegoptim-1.5.3-r1.ebuild
index 5db3691699a0..a46ab0bdf5cc 100644
--- a/media-gfx/jpegoptim/jpegoptim-1.5.3-r1.ebuild
+++ b/media-gfx/jpegoptim/jpegoptim-1.5.3-r1.ebuild
@@ -11,11 +11,15 @@ SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="media-libs/libjpeg-turbo:="
 DEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.3-system-libjpeg-libm.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_MOZJPEG=no