gentoo resync : 09.07.2022

3 files changed, 15 insertions, 102 deletions

diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 84018579cc01..65e0f41c030d 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -1,10 +1,8 @@
 AUX argyllcms-2.1.2-fno-common.patch 5132 BLAKE2B 5398d60a364a36ea24d6cce682330db177aaaec874a39e4f2a9c754a8862504938471851a14ce0871bb7863a9fd9a794f7ede2144090e1f44718f001344032e8 SHA512 d60f0eb9bd6d32b85d8ac88aa32558d1446357c6643fbdb393e90eba08f8f701ba8185741879b2320bda73e08ed14989cc1a16ffd4d2996d5e9afb05774e4e76
 DIST Argyll_V2.1.2_src.zip 13837056 BLAKE2B cf6181549e37b1deda11bdd4a63b27e101180a1e82b132ea8dca5af6830a74d5e2f940633f5aecf9a8d62fe8c2b0cdce8f2af44124ce7432b33d2a1bdbaa2c21 SHA512 f49b588c5f0a39edcc30a068a8bde8c7b74611d3feb15d07d4a61b205ed1231c288629f65e1a5a60a3921d552a28e075667ada555401a0d9694fd882bddd4b06
-DIST Argyll_V2.2.0_src.zip 14020205 BLAKE2B e278f31de2c09e7d736d13b0ada01a6ff8b0641dcbef2e82ba83987f7835d3cfbe71e479314c76be91725698dbdff8f5a77b607dbdda340a9c583c82477cc9d0 SHA512 42552ebd10280df16ec419e3c7ce6700db2c290e26ab4ab62296bf92abc90dd50265aef04b5b8f0a5bee735d485760bab4278e38d27b2a245c5a3122cbf2ba88
-DIST Argyll_V2.2.1_src.zip 14030108 BLAKE2B 22785536a3a5113998947294c34512e3b6dd5d080a11dbcfe3c4b0c22e34277656ba8dc6fa8f59a9dd20cf69692bd24b4e53044086d21bcf7c6d93820c6dbc4e SHA512 58339dfc550950703a5ab6708765a4f01e5fcdeeac54c750e8db82b7ea0dd9b42e9f1163524811a93beabb86cbf557b37302fc4a6a5c1a339cba8af9dcd3e239
 DIST Argyll_V2.3.0_src.zip 14042268 BLAKE2B 3611198746bc443d3425bd297ee6c36f3ae28ace24bfa011a7b0fa491ac1185418f0fba004c2d076f350a27d176d1a6295c26584906744de6002bff6b55035e4 SHA512 959ee656967de583d3061f8c345b6c6cdb86bb23aab21f961271563b7ce33da9e64492a9f1bb248a92ff16709b1c13ef6ccbd4478df92e4b90c62a992d79eedd
+DIST Argyll_V2.3.1_src.zip 14098636 BLAKE2B 0f215d5852c3ad383833dd643d78729a03e178b2bfad1a955a4ca8108a7b33b5a98507436c2a3bfa9f030ad968787e933e50940a0a7cc045b1082f4c8d519c6a SHA512 a8c2b02638569727015ad8e6e16999e398214fa5d11656bae0a9fe0b3268e81674621e3a7de96b727c578c5fc612ada39b37a94ca8b62f4221c56917654a22e8
 EBUILD argyllcms-2.1.2-r1.ebuild 2109 BLAKE2B 613f7e41d8f53956e534b962f21f8c0ac95ce5658fc63228b75bc9610a13bfa73c25e18b8c5c0cfaa49af53105a6389ebd2b926337b73cf732bf072dca448db2 SHA512 a2b8af905f634fbebf45073fa5fd7f9885b483e2e9c16015c701b79bdb7802840d5f3fa4ce67fee29c801448efaa7947160a808b9a4e229de56ea4b881d62aac
-EBUILD argyllcms-2.2.0.ebuild 2070 BLAKE2B 96061849cc2b8601111b30ab9f301216fbe0a7e90da29e04f628ecb631c9e062a30df128857f583fc70bbf40ee5400497b4c0f331ea3bfb7d6ae9263abab2d15 SHA512 601dbe59b9e94f45cc0f2cdac3156c77bcaa97672a018d664de88e998a0021bc9eb7f700d6d4da61cd1505994dc7be2c8a82c81164d103f54818f2a31b16d948
-EBUILD argyllcms-2.2.1.ebuild 2070 BLAKE2B 96061849cc2b8601111b30ab9f301216fbe0a7e90da29e04f628ecb631c9e062a30df128857f583fc70bbf40ee5400497b4c0f331ea3bfb7d6ae9263abab2d15 SHA512 601dbe59b9e94f45cc0f2cdac3156c77bcaa97672a018d664de88e998a0021bc9eb7f700d6d4da61cd1505994dc7be2c8a82c81164d103f54818f2a31b16d948
 EBUILD argyllcms-2.3.0.ebuild 2077 BLAKE2B 0d4f4ce6eef36bc7d27bcc66385644e9c47d2edee462e6da33c82c27039b062eb5aeac46a2146061affb09c5b268ca0813642d1dda303a971dc0e6b25393230a SHA512 606523bcf9e7463d06e3172e3fd56575f6720b93627dc1d2302ab7ae554cbd0a3b2ae8b0624b47a91ef065e8a7962a4c70fcbdd7ef54efe9ab44bba725bee836
+EBUILD argyllcms-2.3.1.ebuild 2127 BLAKE2B c1b6a7604da5db1e2916ce07d302728eac86a64bfa14367ec0e39ffce6b6c00e6b390bae280cf169444485eb170249b6bce560f83e5c14d600eb987da21e2f9c SHA512 e6cbf2aee12de9499589b090c6e6913c6756c742717557181947cc57f32fa9d31c516b2a38032218974563b52118a65e770ad614306907d05eb81a937d0d761b
 MISC metadata.xml 253 BLAKE2B 8557c513beef73e834b0a000c523a3241da961c6307b6e98ac857dad0888c4bbd028c98f8499f01086c24e8f2f57c64bc75db20154dab232adefc2510fccac03 SHA512 67dd372ef7b684101d9198c6199a6403f8750132d80aab4f4daa4b31ebaea3d82eb9a18e904734e2ac10c77b237d67210055949ff1c6d5aad4f75951a096884a
diff --git a/media-gfx/argyllcms/argyllcms-2.2.1.ebuild b/media-gfx/argyllcms/argyllcms-2.2.1.ebuild
deleted file mode 100644
index d4e795b9baee..000000000000
--- a/media-gfx/argyllcms/argyllcms-2.2.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multiprocessing toolchain-funcs udev
-
-MY_P="Argyll_V${PV}"
-
-DESCRIPTION="Open source, ICC compatible color management system"
-HOMEPAGE="http://www.argyllcms.com/"
-SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86"
-IUSE="doc"
-
-RDEPEND="
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXxf86vm
-	x11-libs/libXScrnSaver
-	dev-libs/openssl:0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip
-	dev-util/ftjam"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	# Make it respect LDFLAGS
-	echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
-
-	# Evil hack to get --as-needed working. The build system unfortunately lists all
-	# the shared libraries by default on the command line _before_ the object to be built...
-	echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
-
-	append-cflags -DUNIX -D_THREAD_SAFE
-
-	sed \
-		-e 's:CCFLAGS:CFLAGS:g' \
-		-e "s:ar rusc:$(tc-getAR) rusc:g" \
-		-i Jambase || die
-
-	tc-export CC RANLIB
-
-	jam -dx -fJambase "-j$(makeopts_jobs)" || die
-}
-
-src_install() {
-	jam -dx -fJambase install || die
-
-	rm bin/License.txt || die
-
-	pushd bin > /dev/null
-	local binname
-	for binname in * ; do
-		newbin ${binname} argyll-${binname}
-	done
-	popd > /dev/null
-
-	dodoc log.txt Readme.txt ttbd.txt notes.txt
-	if use doc;  then
-		docinto html
-		dodoc doc/*html doc/*jpg doc/*gif
-	fi
-
-	insinto /usr/share/${PN}
-	doins -r ref
-
-	udev_dorules usb/55-Argyll.rules
-}
-
-pkg_postinst() {
-	elog "If you have a Spyder2 you need to extract the firmware"
-	elog "from the CVSpyder.dll of the windows driver package"
-	elog "and store it as /usr/share/color/spyd2PLD.bin"
-	echo
-	elog "For further info on setting up instrument access read"
-	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
-	echo
-}
diff --git a/media-gfx/argyllcms/argyllcms-2.2.0.ebuild b/media-gfx/argyllcms/argyllcms-2.3.1.ebuild
index d4e795b9baee..b500de7c28eb 100644
--- a/media-gfx/argyllcms/argyllcms-2.2.0.ebuild
+++ b/media-gfx/argyllcms/argyllcms-2.3.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic multiprocessing toolchain-funcs udev
 
@@ -13,22 +13,22 @@ SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~loong ~riscv ~x86"
 IUSE="doc"
 
 RDEPEND="
+	dev-libs/openssl:0=
+	media-libs/libjpeg-turbo:=
 	media-libs/tiff:0
 	sys-libs/zlib
-	virtual/jpeg:0
 	x11-libs/libX11
+	x11-libs/libXScrnSaver
 	x11-libs/libXau
 	x11-libs/libXdmcp
 	x11-libs/libXext
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXxf86vm
-	x11-libs/libXScrnSaver
-	dev-libs/openssl:0=
 "
 DEPEND="${RDEPEND}"
 BDEPEND="app-arch/unzip
@@ -48,10 +48,10 @@ src_compile() {
 
 	sed \
 		-e 's:CCFLAGS:CFLAGS:g' \
-		-e "s:ar rusc:$(tc-getAR) rusc:g" \
 		-i Jambase || die
 
 	tc-export CC RANLIB
+	export AR="$(tc-getAR) ruscU"
 
 	jam -dx -fJambase "-j$(makeopts_jobs)" || die
 }
@@ -81,6 +81,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	udev_reload
+
 	elog "If you have a Spyder2 you need to extract the firmware"
 	elog "from the CVSpyder.dll of the windows driver package"
 	elog "and store it as /usr/share/color/spyd2PLD.bin"
@@ -89,3 +91,7 @@ pkg_postinst() {
 	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
 	echo
 }
+
+pkg_postrm() {
+	udev_reload
+}