gentoo auto-resync : 11:10:2024 - 04:04:14

4 files changed, 2 insertions, 232 deletions

diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 6c49d22fb2f8..ed7a558d27d1 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -1,8 +1,5 @@
-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_V3.2.0_src.zip 14690714 BLAKE2B a2bd45883c213c0906ce94be525f6d7fa6e7378925ad08cb8577819fb2d1b5f6a16b6600a9d4b15972df6048323726fbe8fd16a23010c4dc7461007e45f20362 SHA512 17e73e74d0581bf2c0bab17598bcaf8c2cc556e675e944a315cccc9ddf8c3a0b946c7d88f87b1e4d29d9edba222bc76a497f570affe1d15d08c5ceec2b1b995d
 DIST Argyll_V3.3.0_src.zip 14761699 BLAKE2B 2ae04cbc973b9613f33f3b4ef4498a88a9bab8db4b26165e6bbb59478e3a8094a05714cdf4ac4aa7a41c65406596579e9ab33e59bbd7bbd5b38f4082542ee512 SHA512 96e9aeaec991ae005ea7156a691c1cff508fa1cad538261b1a128bceb763d641b93ab86b586eaa8b89eb37334f3eaaf97ac412db51b116690a9228232361651d
-EBUILD argyllcms-2.1.2-r3.ebuild 2120 BLAKE2B 0f7b414ceb466e2b710f4da0bb50942891f0c9c92ce55598bd4922758192bf220d4fc557bff3a4c39f1efd7df03a95c80f6b6b3f89b7dd87ac16115a789c2826 SHA512 0d85fb8555dd82d6e8995efc995796d99005dc3363ed9e0d7202f9f3b0772a4a790f3f8446a04f9c0e257976f4741c581469b786651ff5f72a300fc758e9ce7b
-EBUILD argyllcms-3.2.0.ebuild 2110 BLAKE2B d87cda7627462b0885bf2512e89145817a5cdc4b4654485d9cf3b6d4c7e0b446e2c92a6fb1f29b271ff7263c15ac94d23d5d023c9dc62edf20a4e029db48a080 SHA512 d97b835df915a36c773630f0a8d37cb504311183f9855ee07c0293be1e8b119a3655359f8892776f3ab8873c5e3874ba166a2a562f8c3074d1fd84e0baa43683
+EBUILD argyllcms-3.2.0.ebuild 2109 BLAKE2B a132bd6147e3fa90fc2997e98f41ebc04afce2177551f964ed03c7ce668a3133bdfe2d2f07cce7ad270d0c1427c6067985bd11dc20cbac5829b836c21d77733e SHA512 38df7fa7507f8042db4fbb1d08dfedae7c2c67a76a8178ef4c1bc758590dde2dd3890e3cba02bacbf3699a2d7eca2c8ec42df93211ea32bd63805d7ca1c1fd14
 EBUILD argyllcms-3.3.0.ebuild 2112 BLAKE2B eebf1e90d90c36126f1ae7b312005af8916101de80599b35eb211cbb42437084c9e192475f49cecd197aede42b2275b22773a2a75d179886aa01bd6fa3c45541 SHA512 71c3e73313fbc6ea16bba83950436f8b4e3fd63f833767cd4b13a18f61125d316fff8921de2e51b83925845f21e70a80d994ecf4163dfaffb963f0d8ef078e22
 MISC metadata.xml 253 BLAKE2B 8557c513beef73e834b0a000c523a3241da961c6307b6e98ac857dad0888c4bbd028c98f8499f01086c24e8f2f57c64bc75db20154dab232adefc2510fccac03 SHA512 67dd372ef7b684101d9198c6199a6403f8750132d80aab4f4daa4b31ebaea3d82eb9a18e904734e2ac10c77b237d67210055949ff1c6d5aad4f75951a096884a
diff --git a/media-gfx/argyllcms/argyllcms-2.1.2-r3.ebuild b/media-gfx/argyllcms/argyllcms-2.1.2-r3.ebuild
deleted file mode 100644
index b5f8e47cfd60..000000000000
--- a/media-gfx/argyllcms/argyllcms-2.1.2-r3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 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 x86"
-IUSE="doc"
-
-RDEPEND="
-	media-libs/libjpeg-turbo:=
-	media-libs/tiff:=
-	sys-libs/zlib
-	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:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip
-	dev-util/ftjam"
-
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
-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-3.2.0.ebuild b/media-gfx/argyllcms/argyllcms-3.2.0.ebuild
index 56d6912b0f61..b8979f958b6a 100644
--- a/media-gfx/argyllcms/argyllcms-3.2.0.ebuild
+++ b/media-gfx/argyllcms/argyllcms-3.2.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~loong ~mips ~riscv x86"
+KEYWORDS="amd64 arm64 ~hppa ~loong ~mips ~riscv x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-gfx/argyllcms/files/argyllcms-2.1.2-fno-common.patch b/media-gfx/argyllcms/files/argyllcms-2.1.2-fno-common.patch
deleted file mode 100644
index 36bf87d12550..000000000000
--- a/media-gfx/argyllcms/files/argyllcms-2.1.2-fno-common.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-argyllcms: Fix compilation with GCC 10
-
-A common mistake in C is omitting extern when declaring a global variable
-in a header file.  If the header is included by several files it  results
-in multiple definitions of the same variable.  In previous GCC versions
-this error is ignored.  GCC 10 defaults to -fno-common,  which means a
-linker error will now be reported. To fix this, use extern in header
-files when declaring global variables, and ensure each global is defined
-in exactly one C file. As a workaround, legacy C code can be compiled
-with -fcommon.
-
-      int x;  // tentative definition - avoid in header files 
-      extern int y;  // correct declaration in a header file 
-
-References:
-https://bugzilla.opensuse.org/show_bug.cgi?id=1160244
-https://bugzilla.opensuse.org/show_bug.cgi?id=1160256
-
-In case of vinflate.c and inflate.c, both files define local variables
-with the same name as global. It is no more possible with GCC 10. To
-prevent sharing variables across files, add "static" to all local
-variables.
-
-Index: Argyll_V2.1.2/gamut/gamut.h
-===================================================================
---- Argyll_V2.1.2.orig/gamut/gamut.h
-+++ Argyll_V2.1.2/gamut/gamut.h
-@@ -36,7 +36,7 @@
- #define MAXGAMN 10				/* Maximum gamut point neighbors returned */
- #define NSLOTS 6				/* Number of maximum direction slots */
- 
--struct _vrml *wrl;				/* Declared in vrml.h, which may be #included after this */
-+struct _vrml;					/* Declared in vrml.h, which may be #included after this */
- 
- /* ------------------------------------ */
- #define NODE_STRUCT							\
-Index: Argyll_V2.1.2/spectro/vinflate.c
-===================================================================
---- Argyll_V2.1.2.orig/spectro/vinflate.c
-+++ Argyll_V2.1.2/spectro/vinflate.c
-@@ -92,7 +92,7 @@ int vinflate(void);
- */
- 
- #define WSIZE 0x8000
--unsigned int wp;             /* current position in slide */
-+static unsigned int wp;             /* current position in slide */
- uch slide[32768];
- 
- static int vflush_output(unsigned int w) {
-@@ -160,8 +160,8 @@ static ush cpdext[] = {         /* Extra
-    the stream.
-  */
- 
--ulg bb;                         /* bit buffer */
--unsigned bk;                    /* bits in bit buffer */
-+static ulg bb;                         /* bit buffer */
-+static unsigned bk;                    /* bits in bit buffer */
- 
- ush vmask_bits[] = {
-     0x0000,
-@@ -230,8 +230,8 @@ ush vmask_bits[] = {
-  */
- 
- 
--int vlbits = 9;          /* bits in base literal/length lookup table */
--int vdbits = 6;          /* bits in base distance lookup table */
-+static int vlbits = 9;          /* bits in base literal/length lookup table */
-+static int vdbits = 6;          /* bits in base distance lookup table */
- 
- 
- /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */
-@@ -239,7 +239,7 @@ int vdbits = 6;          /* bits in base
- #define N_MAX 288       /* maximum number of codes in any set */
- 
- 
--unsigned hufts;         /* track memory usage */
-+static unsigned hufts;  /* track memory usage */
- 
- /* Given a list of code lengths and a maximum table size, make a set of
-    tables to decode that set of codes.  Return zero on success, one if
-Index: Argyll_V2.1.2/spectro/inflate.c
-===================================================================
---- Argyll_V2.1.2.orig/spectro/inflate.c
-+++ Argyll_V2.1.2/spectro/inflate.c
-@@ -49,7 +49,7 @@ typedef unsigned int ulg;
-    the next table, which codes e - 16 bits, and lastly e == 99 indicates
-    an unused code.  If a code with e == 99 is looked up, this implies an
-    error in the data. */
--struct huft {
-+static struct huft {
-   uch e;                /* number of extra bits or operation */
-   uch b;                /* number of bits in this code or subcode */
-   union {
-@@ -87,7 +87,7 @@ int inflate(void);
- /* unsigned wp;             current position in slide */
- 
- #define WSIZE 0x8000
--unsigned int wp;             /* current position in slide */
-+static unsigned int wp;             /* current position in slide */
- uch slide[32768];
- 
- static int flush_output(unsigned int w) {
-@@ -155,8 +155,8 @@ static ush cpdext[] = {         /* Extra
-    the stream.
-  */
- 
--ulg bb;                         /* bit buffer */
--unsigned bk;                    /* bits in bit buffer */
-+static ulg bb;                         /* bit buffer */
-+static unsigned bk;                    /* bits in bit buffer */
- 
- ush mask_bits[] = {
-     0x0000,
-@@ -201,8 +201,8 @@ ush mask_bits[] = {
-  */
- 
- 
--int lbits = 9;          /* bits in base literal/length lookup table */
--int dbits = 6;          /* bits in base distance lookup table */
-+static int lbits = 9;          /* bits in base literal/length lookup table */
-+static int dbits = 6;          /* bits in base distance lookup table */
- 
- 
- /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */
-@@ -210,7 +210,7 @@ int dbits = 6;          /* bits in base
- #define N_MAX 288       /* maximum number of codes in any set */
- 
- 
--unsigned hufts;         /* track memory usage */
-+static unsigned hufts;         /* track memory usage */
- 
- 
- static int huft_build(b, n, s, d, e, t, m)
-