gentoo resync : 14.12.2020

4 files changed, 2 insertions, 232 deletions

diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index da63e07fbd82..049f3a429138 100644
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -1,5 +1,4 @@
 AUX gentoo-config 989 BLAKE2B cbf31d5d55ba2e104c2e757baac3d6cc097fe19e4950de41d11a5f61de83ce159b1c6b438bb05824eb1dc04d0cee6f7f001b00abf7cf859fd0df30cf25dda132 SHA512 bfd38aeb08f26b158dd1127c33bc858f5e59cda0b3aecf79d2283391018201b35ccac051309662ae11df46241fc30461923e2d542d4fa2580e3dc6f8c8d91f6d
-AUX urt-3.1b-build-fixes.patch 5158 BLAKE2B 06d7768168d11166c8543f7d3377ae3968520661a5dcf7f0c59f10b20a60dfff67e476aa16273e8d8578bdadaa77dcd7b0e1a951875298fe820f05e9e532c41b SHA512 baa3719b62af4580ca8636052448811c1024f102df11f04c36a1acdd69883877cd793251e8aa23d05db5762989e2544dd25ffad77174da52deaf485532db0770
 AUX urt-3.1b-compile-updates.patch 3441 BLAKE2B f3c09e7bbd8f19c9ebe949c0f030e017e84f7d4ff73d6c5e160e709d63b95dc05be6a8b8ee4ab75027192ff7c8d1850e8e8599ec2f7efc773b9af691bde01677 SHA512 aec58e4065cafeded2de5adb7c679867f7144bfc501d03a9dd8d9d65f8dcf380360f2365a1a117a933882888c17917b76e2aafe72283a363b7ebe29f1b2d698c
 AUX urt-3.1b-implicit-function-declarations.patch 1840 BLAKE2B 00c019eacc36814c0ddf8b709c510538ee2c8829498c37b899b0b107371bb09dc6e098231eab3e3384a825df4a48392d56a5286a74c1a8a409df7eb8f6754070 SHA512 91474bbfa13a9d5249ed8eeafbc3291447f97a39a085cab4b0bccd48658b41bf4e9c534b466a410aa9b91418a7bbc85dcd13a50770313747f8edfe0d00e0e137
 AUX urt-3.1b-librle-toolchain.patch 1491 BLAKE2B 6fcdae4a255cb2ab7ee9dd6a2ad7e5dde6d5b42647029ea892d67e0171c7b299dabe352f0bc920eeb09f617d1840f8c9a7ff0138b9457036853f63f2fb2ac459 SHA512 49dbf6d00e27c1bbd7f25d14427219e55c1c7fb49d209d5c940118113dfb911c57d3ccf8488182e06f9cb34224defe54fc5fa64a1e04f53746e9afd04ce65503
@@ -9,6 +8,5 @@ AUX urt-3.1b-rle-fixes.patch 5108 BLAKE2B 0aca69e90f54386a654d1a20958239c988b48d
 AUX urt-3.1b-solaris.patch 281 BLAKE2B 55cc8b4824624c5b9f6db6ff6e62c841950c222981de896c8c6e9d66a8dbb1cbe5b90e54e3f24b07bea23c508c260e0639720b4103ada81fea3277e06ca63939 SHA512 6403f48e858af2f8a177588e231367c09f8c939fc614198a10e45ca83ec000f9d5baf67681c5a65fe75177d59d34ab10c19c3621ac0eda6382793ed3b6bd8d84
 AUX urt-3.1b-tempfile.patch 597 BLAKE2B 9f032e0b4dab232d4540a5e7043ff73ace2e6fcdc69e0b2ba1ecedc7f2b62902e0dfadaa78a2e1cddf6f0c173767afe36ee20af0a586072472c77d8f7d81212a SHA512 83784725f216d387771698b0f29c6d5b2bd5e79e5f6deb091905bbb87839824314217641df760cfb18ce87c9d58196860a4c9d12f08da6020fc80a2e7d40347f
 DIST urt-3.1b.tar.Z 1016405 BLAKE2B 68742773591e2ae28702efb4286939c4000d32edd93110548abc25ab62bfa85e36354f20de6aa74c805ea1c4c8dfa23219c9e6fb08e1c73d90d2625404583aa1 SHA512 6c9070cd106f1d696d22f862cc1c4e10325fafc7bae51e8bb1fb98f6bf8babe21a133e21b3acc0c11cf1b28a23123c8ee7bb064c9d86301b14a1c217fbe1a12d
-EBUILD urt-3.1b-r1.ebuild 2024 BLAKE2B 83ced9f74ef19a2c24d0c93f55f1eb8d58d7e6c9e963b7c25485ce5fdb5215e7ce4612ab47533f9d5fbf5d0283bda98d151a1371d3a8fd4ff65066d4cc77902b SHA512 7b71e6690bc1297c30550e54ae92b842748c3ad41a3a32ffd4faa05d60404c5c0b136f0332d24c9f0229a75465c675fd6fb488ea16ceea361d228fcc900fbcb4
-EBUILD urt-3.1b-r3.ebuild 2358 BLAKE2B e54f679e95e44661ad7e334196ac1a5a6631c0ca0b3da637540fe514a8b363ba941b69dbe43d9126495186d20edab9f0c2a152e1593fbdbb248f12a1d73aafd4 SHA512 dab0b1fcb0b8a6acf46b6763a4d86f8949d1b311bb66fa89bc77520b866b915e0ed286f3edbfafa342106b67a145836a9291f5aebbeff9c1d75ed67c0068a426
+EBUILD urt-3.1b-r3.ebuild 2364 BLAKE2B dd8b8c569083a95468ee3a1b112c0734acfe50b2016c9597bcc014f01e177c18bc13d2af4e1600759a25759302d405644ffac6ba7925b45bd29d891a94539ed6 SHA512 ad6eea2aa672b1814f9c7ede85dba981a6c2d5ca67328a8b67836c05f534c7c5df5c04ff65511e0ae744918e0c1e69c69bce8341981b16f6f3b8754d80b5ad15
 MISC metadata.xml 219 BLAKE2B 5fa48553765105c349c2191a280c44bd60cd54219abd17acb444e50eb7d1a4d5c669847b048d3155746e8ccf74f3a7698c2b8dc040fff6b3d919dc36e1978638 SHA512 b1650774ef8d66b16dc9449ca934cfbfb5d130eea013dbfa961a060763ce1765a95330776b6334b954a55077149f2d089b8866bc4d06e69228f02262d8fe1d28
diff --git a/media-libs/urt/files/urt-3.1b-build-fixes.patch b/media-libs/urt/files/urt-3.1b-build-fixes.patch
deleted file mode 100644
index 2f801e0c984a..000000000000
--- a/media-libs/urt/files/urt-3.1b-build-fixes.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-some hosts are more anal about ar usage than others
-http://bugs.gentoo.org/107428
-
-respect user LDFLAGS
-http://bugs.gentoo.org/126872
-
---- a/lib/makefile.src
-+++ b/lib/makefile.src
-@@ -181,8 +181,7 @@
- # Rebuild the library from all the .o files.
- buildlib: $(OBJS)
- 	-rm -f $(LIBNAME)
--	ar rc $(LIBNAME)
--	ar q $(LIBNAME) $(OBJS)
-+	ar rc $(LIBNAME) $(OBJS)
- #ifndef NO_RANLIB
- 	ranlib $(LIBNAME)
- #endif
---- a/tools/clock/makefile.src
-+++ b/tools/clock/makefile.src
-@@ -6,7 +6,7 @@ install: rleClock
- 	mv rleClock ../rleClock.out
- 
- rleClock:rleClock.o font.o
--	${CC} ${CFLAGS} rleClock.o font.o -lm ${LIBS} -o rleClock
-+	${CC} ${CFLAGS} ${LDFLAGS} rleClock.o font.o ${LIBS} -o rleClock -lm
- 
- font.c:font.src makeFont
- 	chmod +x makeFont
---- a/tools/makefile.src
-+++ b/tools/makefile.src
-@@ -62,21 +62,21 @@ applymap.out rlebg.out: $(RI)/rle_raw.h
- pyrlib.o: pyrlib.c $(RI)/pyramid.h $(RI)/rle.h $(RI)/rle_config.h
- 	$(CC) $(CFLAGS) pyrlib.c -c
- pyrmask.out: pyrlib.o pyrmask.c $(RI)/pyramid.h
--	$(CC) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new
-+	$(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new
- 	mv pyrmask.new pyrmask.out
- 
- fant.out: fant.o mallocNd.o
--	$(CC) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new
-+	$(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new
- 	mv fant.new fant.out
- 	
- # rlebox and crop use some common code.
- rle_box.o: $(RI)/rle.h $(RI)/rle_config.h $(RI)/rle_raw.h
- 
- crop.out: crop.c rle_box.o
--	${CC} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new
-+	${CC} ${LDFLAGS} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new
- 	mv crop.new crop.out
- rlebox.out: rlebox.c rle_box.o
--	${CC} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new
-+	${CC} ${LDFLAGS} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new
- 	mv rlebox.new rlebox.out
- 
- # rleClock has it's own directory, must be built special
-@@ -100,7 +100,7 @@ clean:	clean-pgm
- .SUFFIXES:
- .SUFFIXES: .out .c .o
- .c.out:
--	$(CC) $(CFLAGS) $< $(LIBS) -lm -o $*.new
-+	$(CC) $(LDFLAGS) $(CFLAGS) $< $(LIBS) -lm -o $*.new
- 	mv $*.new $@
- 
- .c.o:
---- a/cnv/makefile.src
-+++ b/cnv/makefile.src
-@@ -76,13 +76,13 @@ PBMDIR = 
- # ppmtorle - ppm format to RLE
- # rletoppm - RLE to ppm format
- pgmtorle.out: pgmtorle.c
--	$(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
- 	mv $*.new $@
- ppmtorle.out: ppmtorle.c
--	$(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
- 	mv $*.new $@
- rletoppm.out: rletoppm.c
--	$(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
- 	mv $*.new $@
- #endif
- 
-@@ -95,10 +95,10 @@ rletoppm.out: rletoppm.c
- # iristorle/rletoiris - Convert between RLE and SGI image format.
- #
- iristorle.out: iristorle.c
--	$(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
- 	mv $*.new $@
- rletoiris.out: rletoiris.c
--	$(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
- 	mv $*.new $@
- #endif
- 
-@@ -108,10 +108,10 @@ TIFFDIR =
- # tifftorle - Convert TIFF images to RLE
- # rletotiff - Convert RLE images to TIFF
- rletotiff.out: rletotiff.c
--	$(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
- 	mv $*.new $@
- tifftorle.out: tifftorle.c
--	$(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
- 	mv $*.new $@
- #endif
- 
-@@ -125,7 +125,7 @@ tifftorle.out: tifftorle.c
- # Will build with the default rule.
- # rletorla - RLE to Wavefront RLA
- rletorla.out: rletorla.c
--	$(CC) $(CFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new
- 	mv $*.new $@
- #endif WAVEFRONT
- 
-@@ -144,7 +144,7 @@ pristine: pristine-pgm
- .SUFFIXES:
- .SUFFIXES: .out .c
- .c.out:
--	$(CC) $(CFLAGS) $*.c $(LIBS) -lm -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) -lm -o $*.new
- 	mv $*.new $@
- 
- # Dependency lines.  Make sure to #ifdef them.
---- a/cnv/rletoabA62/makefile.src
-+++ b/cnv/rletoabA62/makefile.src
-@@ -15,7 +15,7 @@ all		:	$(PGMS)
- # Executables.  The .out will be stripped off in the install action.
- 
- rletoabA62.out	:	rletoabA62.o rle.o
--			$(CC) $(CFLAGS) -o rletoabA62.new \
-+			$(CC) $(CFLAGS) $(LDFLAGS) -o rletoabA62.new \
- 			  rletoabA62.o rle.o $(LIBS)
- 			mv rletoabA62.new rletoabA62.out
- 
---- a/cnv/rletogif/makefile.src
-+++ b/cnv/rletogif/makefile.src
-@@ -15,7 +15,7 @@ all:	$(PGMS)
- # The executable.  The ".out" will be stripped off in the install action.
- 
- rletogif.out: ${OBJ}
--	${CC} ${CFLAGS} ${OBJ} ${LIBS} -o rletogif.new
-+	${CC} ${CFLAGS} ${LDFLAGS} ${OBJ} ${LIBS} -o rletogif.new
- 	mv rletogif.new rletogif.out
- 
- # Incremental install, copies executable to DEST dir.
diff --git a/media-libs/urt/urt-3.1b-r1.ebuild b/media-libs/urt/urt-3.1b-r1.ebuild
deleted file mode 100644
index 4765c23d3cfa..000000000000
--- a/media-libs/urt/urt-3.1b-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="the Utah Raster Toolkit is a library for dealing with raster images"
-HOMEPAGE="https://www.cs.utah.edu/gdc/projects/urt/"
-SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
-
-LICENSE="URT gif? ( free-noncomm )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="gif postscript tiff X"
-
-RDEPEND="X? ( x11-libs/libXext )
-	gif? ( media-libs/giflib )
-	tiff? ( media-libs/tiff )
-	postscript? ( app-text/ghostscript-gpl )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-S=${WORKDIR}
-
-urt_config() {
-	use $1 && echo "#define $2" || echo "##define $2"
-}
-
-src_prepare() {
-	rm -f bin/README
-
-	epatch "${FILESDIR}"/${P}-rle-fixes.patch
-	epatch "${FILESDIR}"/${P}-compile-updates.patch
-	epatch "${FILESDIR}"/${P}-tempfile.patch
-	epatch "${FILESDIR}"/${P}-build-fixes.patch
-	epatch "${FILESDIR}"/${P}-make.patch
-	epatch "${FILESDIR}"/${P}-solaris.patch
-
-	# punt bogus manpage #109511
-	rm -f man/man1/template.1
-
-	# stupid OS X declares a stack_t type already #107428
-	sed -i -e 's:stack_t:_urt_stack:g' tools/clock/rleClock.c || die
-
-	sed -i -e '/^CFLAGS/s: -O : :' makefile.hdr
-	cp "${FILESDIR}"/gentoo-config config/gentoo
-	cat >> config/gentoo <<-EOF
-	$(urt_config X X11)
-	$(urt_config postscript POSTSCRIPT)
-	$(urt_config tiff TIFF)
-	ExtraCFLAGS = ${CFLAGS}
-	MFLAGS = ${MAKEOPTS}
-	# prevent circular depend #111455
-	$(has_version media-libs/giflib && urt_config gif GIF)
-	EOF
-}
-
-src_configure() {
-	./Configure config/gentoo || die "config"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
-
-src_install() {
-	mkdir -p man-dest/man{1,3,5}
-	# this just installs it into some local dirs
-	make install || die
-	dobin bin/*
-	dolib.a lib/librle.a
-	insinto /usr/include
-	doins include/rle*.h
-	doman man-dest/man?/*.[135]
-	dodoc *-changes CHANGES* README blurb
-}
diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild
index 04a75fb83a64..7b2d16703e9d 100644
--- a/media-libs/urt/urt-3.1b-r3.ebuild
+++ b/media-libs/urt/urt-3.1b-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
 
 LICENSE="URT gif? ( free-noncomm )"
 SLOT="0/3.1b-r2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="gif postscript static-libs tiff tools X"
 
 RDEPEND="