gentoo resync : 25.08.2018

11 files changed, 462 insertions, 62 deletions

diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index 12ebe9646d91..fa55cd617c3a 100644
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -1,10 +1,14 @@
 AUX gentoo-config 989 BLAKE2B cbf31d5d55ba2e104c2e757baac3d6cc097fe19e4950de41d11a5f61de83ce159b1c6b438bb05824eb1dc04d0cee6f7f001b00abf7cf859fd0df30cf25dda132 SHA512 bfd38aeb08f26b158dd1127c33bc858f5e59cda0b3aecf79d2283391018201b35ccac051309662ae11df46241fc30461923e2d542d4fa2580e3dc6f8c8d91f6d
-AUX urt-3.1b-build-fixes.patch 5182 BLAKE2B e1daff2dae2e82c13cc3c1d15f05a492482684d2a7af8f92af17f5df2039edd8035f325803398ee219f4e20d43bf1396857cd7aa6520d6697ffb059a019bb806 SHA512 0649f89182b7d197e126ea5874be7c531a5396953a56d360d7e8809f9fc1694646dbbcce871893d9015d2e6d62d828d082c045cf2fd68fd9621059fa6fff75fa
-AUX urt-3.1b-compile-updates.patch 3397 BLAKE2B 0cbbce5dfba5bc4025b991754e828c90aeff134216ea609492074b2d94b55c08c3f34ba83e283bf7e7950e708d94136198a9175c74313759e6c7dec9015a3616 SHA512 27f2266983c108d166e8704512beec36a57a14e9f92b226a33195deaf9966ef089e29bd739061a35bcbfc0601e45ab270a654b0f036d23c4e2bdc9607609b683
+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
 AUX urt-3.1b-make.patch 2455 BLAKE2B 9709fdbb29f33326f3006d0205cf7885cdf737fb18a9fab0daa98fcf39be3c69de1cb5558416d0b661099511993a1121b53f28ea1a45daff2774f50a3be76afb SHA512 44b4463fb9b63e5a0c9af3f574ff523138117f7e0b5012e4bbd5c7b3119797f812410da7909d22dce914017bc3e704ea830307d63f908b4c508b48fff8d8898a
-AUX urt-3.1b-rle-fixes.patch 5072 BLAKE2B ebaf3c54ccb83fff9884cf80b6fef719ee63379006b89cc2b464d272b550b7f9824d13c739e450eb298a812c6f94934a9c93df8c4fd7f5ce8698198f4d5e5100 SHA512 ea6b5211ff23abd9480b371ef4fb0feb87b759621d8604ec6634c38f3ed66dbc0327e01fc4382f03ae41bf1133e9a21844235f59b15e24072efc5dc7ecacac51
-AUX urt-3.1b-solaris.patch 277 BLAKE2B 6f7541f8f7de18b332c2e0a8189269158ae0a7710c02dde6bef6568cbbe320ff628aafbde37c0672f29a696180264e56ffa2c58a411798d6dbe3b93bc0178f7c SHA512 871ff71abd69473b23e133aa01868803a4c6776828ae80761b4215648605c6b18fee7fb4c6948963bb1705c51476b4de30f89221fe5240aca6f6c90399b439c6
-AUX urt-3.1b-tempfile.patch 593 BLAKE2B eef5868c8499b399dadea82284bb25f0df636cfafe3849d68fbf0821e663122c5944a4fdd30429628551c30e57517f4e1fff907e76c2d63128d1ea70e7210def SHA512 d456b7219a3d7986698f8f4f7b75c6b10c5b4d9fb5ef1491ec3e85e4263832f24514d187f31a5c76c747dd9381cb7a6be94b1c2147153e774c70dec7b5ca1b11
+AUX urt-3.1b-r2-build-fixes.patch 4888 BLAKE2B 0bb2dba64a62429df650652937712a7a51e5839af8565bab393f2d4df9d240e31872aeb7a113af0f85117036dafe600a486d3c7ad3f5debef2f7307c0fb0650a SHA512 698594422160f4f5102f7dd45cab479e981d753d68801862dc90a2c84e174d8bacc08afa650b3a1c54aefd0d73d358830f396cd2a3b682c1bdf3b64bdf922ae3
+AUX urt-3.1b-rle-fixes.patch 5108 BLAKE2B 0aca69e90f54386a654d1a20958239c988b48dd8a5bf1c879d2000df202beaa134a6d1aad538de4f9333e7c78010f27c55e227e332cef2dd232f84c834527d0c SHA512 b5a05d2ee083ee35105346fd7d0aa9e0f36c98f709abaa40e354adf858480c90793cfebfbd0a6214e832454c446828d50baedbc9767e7bc742209c9e86d0b030
+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 2048 BLAKE2B ebc3ba7771fc3d28fa320bb582a0633967b0f66ddd338894fa2b8cf47094e8b1b445bcb761bd0fff7620c280f45b821f9915a5dabbde8bd9636c542a0a0de3be SHA512 aac4efadbcc839df66b3538fb43c0dd0659bc8f8b3c362a358763a2a911c538993fb7ab7f05eeaf96e2d325df0b977a2271202cb9aa798dfee70924538e05e2a
-MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
+EBUILD urt-3.1b-r3.ebuild 2394 BLAKE2B 0af0c58376306fc5d977988b67948ed7db37ceb19623710ef31a4cabcda5e348c6f40e74dc27707fa39144b6b75e904d0e1b6313da9a0807ada9916821d0c27d SHA512 f5e46847535a3879790470e7d1eabf5095c1beea90e4c6e738a3de86f69f5544fb5138ffdf4fde1f4baaff184c843044f6d5acfb932136f010dd27832773c1e8
+MISC metadata.xml 308 BLAKE2B 6006038e97bc7af97fd7e4c95f87d19d2458452da5ba066df88aff58fd10bf0f29daef641aaf39ec14a102f4e23a0b3be30006a6aed3830322e2f148a13dc5b7 SHA512 1056a163d7f6c3f2e540e6f1b315ea23aa4e9664c14ba51d094e33ab8ac4e3888fc9b049b91e3f2596e9458efe6041a7e2c5c40979171f7fd473fa6994862ffd
diff --git a/media-libs/urt/files/urt-3.1b-build-fixes.patch b/media-libs/urt/files/urt-3.1b-build-fixes.patch
index 28da6b9b66d9..2f801e0c984a 100644
--- a/media-libs/urt/files/urt-3.1b-build-fixes.patch
+++ b/media-libs/urt/files/urt-3.1b-build-fixes.patch
@@ -4,8 +4,8 @@ http://bugs.gentoo.org/107428
 respect user LDFLAGS
 http://bugs.gentoo.org/126872
 
---- urt/lib/makefile.src
-+++ urt/lib/makefile.src
+--- a/lib/makefile.src
++++ b/lib/makefile.src
 @@ -181,8 +181,7 @@
  # Rebuild the library from all the .o files.
  buildlib: $(OBJS)
@@ -16,8 +16,8 @@ http://bugs.gentoo.org/126872
  #ifndef NO_RANLIB
  	ranlib $(LIBNAME)
  #endif
---- urt/tools/clock/makefile.src
-+++ urt/tools/clock/makefile.src
+--- a/tools/clock/makefile.src
++++ b/tools/clock/makefile.src
 @@ -6,7 +6,7 @@ install: rleClock
  	mv rleClock ../rleClock.out
  
@@ -27,8 +27,8 @@ http://bugs.gentoo.org/126872
  
  font.c:font.src makeFont
  	chmod +x makeFont
---- urt/tools/makefile.src
-+++ urt/tools/makefile.src
+--- 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
@@ -64,8 +64,8 @@ http://bugs.gentoo.org/126872
  	mv $*.new $@
  
  .c.o:
---- urt/cnv/makefile.src
-+++ urt/cnv/makefile.src
+--- a/cnv/makefile.src
++++ b/cnv/makefile.src
 @@ -76,13 +76,13 @@ PBMDIR = 
  # ppmtorle - ppm format to RLE
  # rletoppm - RLE to ppm format
@@ -127,8 +127,8 @@ http://bugs.gentoo.org/126872
  	mv $*.new $@
  
  # Dependency lines.  Make sure to #ifdef them.
---- urt/cnv/rletoabA62/makefile.src
-+++ urt/cnv/rletoabA62/makefile.src
+--- 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.
  
@@ -138,8 +138,8 @@ http://bugs.gentoo.org/126872
  			  rletoabA62.o rle.o $(LIBS)
  			mv rletoabA62.new rletoabA62.out
  
---- urt/cnv/rletogif/makefile.src
-+++ urt/cnv/rletogif/makefile.src
+--- 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.
  
diff --git a/media-libs/urt/files/urt-3.1b-compile-updates.patch b/media-libs/urt/files/urt-3.1b-compile-updates.patch
index 105f7c41f6a7..d33f004fe80f 100644
--- a/media-libs/urt/files/urt-3.1b-compile-updates.patch
+++ b/media-libs/urt/files/urt-3.1b-compile-updates.patch
@@ -1,13 +1,13 @@
---- get/getx11/XGetHClrs.c
-+++ get/getx11/XGetHClrs.c
+--- a/get/getx11/XGetHClrs.c
++++ b/get/getx11/XGetHClrs.c
 @@ -1,5 +1,4 @@
  #ifndef XLIBINT_H_NOT_AVAILABLE
 -#include <X11/copyright.h>
  
  /* $XConsortium: XGetHClrs.c,v 11.10 88/09/06 16:07:50 martin Exp $ */
  /* Copyright    Massachusetts Institute of Technology    1986	*/
---- tools/mallocNd.c
-+++ tools/mallocNd.c
+--- a/tools/mallocNd.c
++++ b/tools/mallocNd.c
 @@ -67,7 +67,7 @@
  
  /* Imports */
@@ -17,8 +17,8 @@
  
  /* Forward declarations */
  char *BuildIndirectionTable();
---- tools/into.c
-+++ tools/into.c
+--- a/tools/into.c
++++ b/tools/into.c
 @@ -40,8 +40,8 @@
  static char buf[MAXPATHLEN+1];
  short forceflg;				/* overwrite an unwritable file? */
@@ -39,8 +39,8 @@
  	unlink(buf);
  	exit(1);
      }
---- cnv/tex/dvirle2.c
-+++ cnv/tex/dvirle2.c
+--- a/cnv/tex/dvirle2.c
++++ b/cnv/tex/dvirle2.c
 @@ -55,7 +55,6 @@
  void DumpTopOfBand(), MoveDown(), WriteBuf(), WriteBlanks();
  
@@ -49,8 +49,8 @@
  extern char *optarg;
  extern int optind;
  
---- cnv/wasatchrle.c
-+++ cnv/wasatchrle.c
+--- a/cnv/wasatchrle.c
++++ b/cnv/wasatchrle.c
 @@ -32,7 +32,6 @@
  #include <errno.h>
  #include "rle.h"
@@ -59,8 +59,8 @@
  
  /* "short" in our world is 16 bits.  Beware of swyte-bopping. */
  
---- get/getx11/x11_stuff.c
-+++ get/getx11/x11_stuff.c
+--- a/get/getx11/x11_stuff.c
++++ b/get/getx11/x11_stuff.c
 @@ -155,7 +155,6 @@
  			IPC_CREAT|0777 );
  	    if ( img->shm_img.shmid < 0 )
@@ -77,8 +77,8 @@
  		if ( errno == ENOSPC )
  		{
  		    if ( !no_shared_space )
---- get/qcr/qcr.h
-+++ get/qcr/qcr.h
+--- a/get/qcr/qcr.h
++++ b/get/qcr/qcr.h
 @@ -6,8 +6,6 @@
  #define GREEN 1
  #define BLUE 2
@@ -88,8 +88,8 @@
  /* Command defs for QCR-Z Film Recorder */
  
  /* These are for 8 bit Look Up Tables */
---- get/gettaac.c
-+++ get/gettaac.c
+--- a/get/gettaac.c
++++ b/get/gettaac.c
 @@ -24,6 +24,7 @@
   * Send bug fixes and improvements to:  ksp@maxwell.nde.swri.edu
   */
@@ -106,8 +106,8 @@
       struct  direct     *nameEntry;
       DIR                *dirChan;
       struct  passwd     *pwdEntry;
---- tools/clock/rleClock.c
-+++ tools/clock/rleClock.c
+--- a/tools/clock/rleClock.c
++++ b/tools/clock/rleClock.c
 @@ -598,7 +598,7 @@
      { TRUE,  "-tf", STRING, "Text area format string", 	          (char *)&FormatString }, 
      { FALSE, "-Xm", BOOL,   "Output the alpha channel on RGB",    (char *)&DebugAlpha },
@@ -117,8 +117,8 @@
  };
  
  void
---- tools/to8.c
-+++ tools/to8.c
+--- a/tools/to8.c
++++ b/tools/to8.c
 @@ -175,7 +175,7 @@
  	 * Give it a background color of black, since the real background
  	 * will be dithered anyway.
@@ -128,8 +128,8 @@
  	{
  	    out_hdr.bg_color = (int *)malloc( sizeof( int ) );
  	    RLE_CHECK_ALLOC( cmd_name( argv ), out_hdr.bg_color, 0 );
---- cnv/rletoabA62/rletoabA62.c
-+++ cnv/rletoabA62/rletoabA62.c
+--- a/cnv/rletoabA62/rletoabA62.c
++++ b/cnv/rletoabA62/rletoabA62.c
 @@ -157,7 +157,7 @@
  	exit(1);
      }
diff --git a/media-libs/urt/files/urt-3.1b-implicit-function-declarations.patch b/media-libs/urt/files/urt-3.1b-implicit-function-declarations.patch
new file mode 100644
index 000000000000..4e0e31e660b1
--- /dev/null
+++ b/media-libs/urt/files/urt-3.1b-implicit-function-declarations.patch
@@ -0,0 +1,96 @@
+Fix implicit declaration of functions
+
+--- a/cnv/rletoabA62/rletoabA62.c
++++ b/cnv/rletoabA62/rletoabA62.c
+@@ -42,6 +42,10 @@
+ */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <sys/stat.h>
++#include <fcntl.h>
+ 
+ #ifndef TRUE
+ #define TRUE 1
+--- a/tools/mallocNd.c
++++ b/tools/mallocNd.c
+@@ -67,6 +67,7 @@
+ 
+ /* Imports */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ 
+ /* Forward declarations */
+--- a/get/getx11/getx11.h
++++ b/get/getx11/getx11.h
+@@ -29,6 +29,8 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <ctype.h>
++#include <unistd.h>
++#include <X11/Xlibint.h>
+ #include <X11/X.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+--- a/tools/into.c
++++ b/tools/into.c
+@@ -27,6 +27,7 @@
+ 
+ #include "rle_config.h"
+ #include <stdio.h>
++#include <unistd.h>
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/param.h>			/* for MAXPATHLEN */
+--- a/tools/rlecat.c
++++ b/tools/rlecat.c
+@@ -15,6 +15,7 @@
+ */
+ 
+ #include <stdio.h>
++#include <unistd.h>
+ #include "rle.h"
+ #include "rle_raw.h"
+ 
+--- a/tools/rleaddcom.c
++++ b/tools/rleaddcom.c
+@@ -26,6 +26,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <unistd.h>
+ #include "rle.h"
+ #include <sys/types.h>
+ #include <sys/param.h>			/* for MAXPATHLEN */
+--- a/tools/rlenoise.c
++++ b/tools/rlenoise.c
+@@ -20,6 +20,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <time.h>
+ #include "rle.h"
+ 
+ /* Change this according the value on your system.  This is a crock. */
+--- a/cnv/rletorla.c
++++ b/cnv/rletorla.c
+@@ -29,6 +29,7 @@
+  * System includes.
+  */
+ #include <stdio.h>
++#include <unistd.h>
+ #include "rlb_header.h"
+ #include "rle.h"
+ 
+--- a/cnv/giftorle.c
++++ b/cnv/giftorle.c
+@@ -22,6 +22,7 @@
+ /* +------------------------------------------------------------------+ */
+ 
+ #include	<stdio.h>
++#include	<unistd.h>
+ #include	"rle.h"
+ 
+ #ifndef lint
diff --git a/media-libs/urt/files/urt-3.1b-librle-toolchain.patch b/media-libs/urt/files/urt-3.1b-librle-toolchain.patch
new file mode 100644
index 000000000000..19c492988a1e
--- /dev/null
+++ b/media-libs/urt/files/urt-3.1b-librle-toolchain.patch
@@ -0,0 +1,60 @@
+--- a/lib/makefile.src
++++ b/lib/makefile.src
+@@ -5,10 +5,6 @@
+ DEST =
+ #endif
+ 
+-#ifndef NO_RANLIB
+-RANLIB = ranlib
+-#endif
+-
+ # If nothing else is specified, default is to build the library.
+ default: buildlib
+ 
+@@ -40,8 +36,8 @@
+ 		echo cp $(LIBNAME) $(DEST)/$(LIBNAME) ; \
+ 		cp $(LIBNAME) $(DEST)/$(LIBNAME) ; \
+ 		if test x$(RANLIB) != x ; then \
+-			echo ranlib $(DEST)/$(LIBNAME) ; \
+-			ranlib $(DEST)/$(LIBNAME) ; \
++			echo $(RANLIB) $(DEST)/$(LIBNAME) ; \
++			$(RANLIB) $(DEST)/$(LIBNAME) ; \
+ 		else \
+ 			true ; \
+ 		fi ; \
+@@ -49,11 +45,11 @@
+ 			echo cp $(LIBNAME) $(DEST)/debug/$(LIBNAME) ; \
+ 			if test x$(RANLIB) != x ; then \
+ 				cp $(LIBNAME) $(DEST)/debug/$(LIBNAME) ; \
+-				echo ranlib $(DEST)/debug/$(LIBNAME) ; \
++				echo $(RANLIB) $(DEST)/debug/$(LIBNAME) ; \
+ 			else \
+ 				true ; \
+ 			fi ; \
+-			ranlib $(DEST)/debug/$(LIBNAME) ; \
++			$(RANLIB) $(DEST)/debug/$(LIBNAME) ; \
+ 		else \
+ 			true ; \
+ 		fi ; \
+@@ -65,13 +61,18 @@
+ # 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)
++	$(RANLIB) $(LIBNAME)
+ #endif
+ 	touch buildlib
+ 
++# Gentoo wants dynamic linking
++buildlibso: $(OBJS)
++	-rm -f $(LIBNAME).so
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=librle-0.0.0.so $(OBJS) -lm -o librle.so
++	touch buildlibso
++
+ # Clean up installed stuff and binaries
+ pristine: clean
+ 	-@if test $(DEST)X != X ; then \
diff --git a/media-libs/urt/files/urt-3.1b-r2-build-fixes.patch b/media-libs/urt/files/urt-3.1b-r2-build-fixes.patch
new file mode 100644
index 000000000000..0463abec15de
--- /dev/null
+++ b/media-libs/urt/files/urt-3.1b-r2-build-fixes.patch
@@ -0,0 +1,139 @@
+some hosts are more anal about ar usage than others
+http://bugs.gentoo.org/107428
+
+respect user LDFLAGS
+http://bugs.gentoo.org/126872
+
+--- 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/files/urt-3.1b-rle-fixes.patch b/media-libs/urt/files/urt-3.1b-rle-fixes.patch
index 3720806960fe..b892f0acdeee 100644
--- a/media-libs/urt/files/urt-3.1b-rle-fixes.patch
+++ b/media-libs/urt/files/urt-3.1b-rle-fixes.patch
@@ -1,7 +1,7 @@
 Fixes taken from netpbm
 
---- lib/rle_global.c
-+++ lib/rle_global.c
+--- a/lib/rle_global.c
++++ b/lib/rle_global.c
 @@ -76,7 +76,7 @@ rle_hdr rle_dflt_hdr = {
      8,				/* cmaplen (log2 of length of color map) */
      NULL,			/* pointer to color map */
@@ -11,8 +11,8 @@ Fixes taken from netpbm
      { 7 },			/* RGB channels only */
      0L,				/* Can't free name and file fields. */
      "Urt",			/* Default "program name". */
---- lib/rle_hdr.c
-+++ lib/rle_hdr.c
+--- a/lib/rle_hdr.c
++++ b/lib/rle_hdr.c
 @@ -269,6 +273,9 @@
  {
      rle_hdr *ret_hdr;
@@ -23,8 +23,8 @@ Fixes taken from netpbm
      if ( the_hdr == &rle_dflt_hdr )
  	return the_hdr;
  
---- lib/dither.c
-+++ lib/dither.c
+--- a/lib/dither.c
++++ b/lib/dither.c
 @@ -38,10 +38,10 @@ void	make_square();
  #endif
  
@@ -40,8 +40,8 @@ Fixes taken from netpbm
  };
  
  /* basic dithering macro */
---- lib/rle_open_f.c
-+++ lib/rle_open_f.c
+--- a/lib/rle_open_f.c
++++ b/lib/rle_open_f.c
 @@ -9,7 +9,11 @@
   */
  
@@ -62,8 +62,8 @@ Fixes taken from netpbm
  
      /* Check args. */
      if ( *mode != 'r' && *mode != 'w' )
---- lib/rle_getcom.c
-+++ lib/rle_getcom.c
+--- a/lib/rle_getcom.c
++++ b/lib/rle_getcom.c
 @@ -53,11 +53,12 @@
  {
      for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ )
@@ -78,8 +78,8 @@ Fixes taken from netpbm
  
      return NULL;
  }
---- lib/scanargs.c
-+++ lib/scanargs.c
+--- a/lib/scanargs.c
++++ b/lib/scanargs.c
 @@ -128,10 +130,10 @@
  va_list argl;
  {
@@ -124,8 +124,8 @@ Fixes taken from netpbm
  				    if (typchr == 'N')
  					tmpflg = toupper( tmpflg );
  
---- lib/inv_cmap.c
-+++ lib/inv_cmap.c
+--- a/lib/inv_cmap.c
++++ b/lib/inv_cmap.c
 @@ -42,7 +42,7 @@
  static long cbinc, cginc, crinc;
  static unsigned long *gdp, *rdp, *cdp;
@@ -135,8 +135,8 @@ Fixes taken from netpbm
  static long x, xsqr, colormax;
  static int cindex;
  #ifdef INSTRUMENT_IT
---- lib/rle_getrow.c
-+++ lib/rle_getrow.c
+--- a/lib/rle_getrow.c
++++ b/lib/rle_getrow.c
 @@ -351,7 +351,7 @@
  	    bzero( (char *)scanline[-1] + the_hdr->xmin,
  		   the_hdr->xmax - the_hdr->xmin + 1 );
@@ -185,8 +185,8 @@ Fixes taken from netpbm
  	    if ( RLE_BIT( *the_hdr, channel ) )
  	    {
  		/* Don't fill past end of scanline! */
---- lib/rle_putcom.c
-+++ lib/rle_putcom.c
+--- a/lib/rle_putcom.c
++++ b/lib/rle_putcom.c
 @@ -53,11 +53,12 @@
  {
      for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ )
diff --git a/media-libs/urt/files/urt-3.1b-solaris.patch b/media-libs/urt/files/urt-3.1b-solaris.patch
index c1775d7e9783..739b937d8903 100644
--- a/media-libs/urt/files/urt-3.1b-solaris.patch
+++ b/media-libs/urt/files/urt-3.1b-solaris.patch
@@ -2,8 +2,8 @@ usage of errno requires errno.h
 
 Fabian Groffen <grobian@gentoo.org>
 
---- get/getx11/x11_stuff.c
-+++ get/getx11/x11_stuff.c
+--- a/get/getx11/x11_stuff.c
++++ b/get/getx11/x11_stuff.c
 @@ -42,6 +42,7 @@
  #ifdef X_SHARED_MEMORY
  #include <sys/errno.h>
diff --git a/media-libs/urt/files/urt-3.1b-tempfile.patch b/media-libs/urt/files/urt-3.1b-tempfile.patch
index 12acce151b5d..8be2793ed71c 100644
--- a/media-libs/urt/files/urt-3.1b-tempfile.patch
+++ b/media-libs/urt/files/urt-3.1b-tempfile.patch
@@ -1,5 +1,5 @@
---- tools/rlecat.c
-+++ tools/rlecat.c
+--- a/tools/rlecat.c
++++ b/tools/rlecat.c
 @@ -110,8 +110,14 @@
  	    nflag = 0;		/* Not really repeating! */
  	else
diff --git a/media-libs/urt/metadata.xml b/media-libs/urt/metadata.xml
index 19bf1be2581e..86d48d06885f 100644
--- a/media-libs/urt/metadata.xml
+++ b/media-libs/urt/metadata.xml
@@ -5,4 +5,7 @@
 	<email>graphics@gentoo.org</email>
 	<name>Gentoo Graphics Project</name>
 </maintainer>
+<use>
+<flag name='tools'>Install tools</flag>
+</use>
 </pkgmetadata>
diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild
new file mode 100644
index 000000000000..d17db2efb3d0
--- /dev/null
+++ b/media-libs/urt/urt-3.1b-r3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="the Utah Raster Toolkit is a library for dealing with raster images"
+HOMEPAGE="http://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/3.1b-r2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="gif postscript static-libs tiff tools X"
+
+RDEPEND="
+	X? ( x11-libs/libXext )
+	gif? ( media-libs/giflib )
+	postscript? ( app-text/ghostscript-gpl )
+	tiff? ( media-libs/tiff:= )
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+S=${WORKDIR}
+
+urt_config() {
+	use $1 && echo "#define $2" || echo "##define $2"
+}
+PATCHES=(
+	"${FILESDIR}"/${P}-rle-fixes.patch
+	"${FILESDIR}"/${P}-compile-updates.patch
+	"${FILESDIR}"/${P}-tempfile.patch
+	"${FILESDIR}"/${P}-r2-build-fixes.patch
+	"${FILESDIR}"/${P}-make.patch
+	"${FILESDIR}"/${P}-solaris.patch
+	"${FILESDIR}"/${P}-librle-toolchain.patch
+	"${FILESDIR}"/${P}-implicit-function-declarations.patch
+)
+
+src_prepare() {
+	rm -f bin/README
+
+	default
+
+	# 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
+
+}
+
+src_configure() {
+	append-cflags -fPIC
+
+	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
+
+	./Configure config/gentoo || die "config"
+}
+
+src_compile() {
+	tc-export AR RANLIB
+
+	emake CC=$(tc-getCC) -C lib buildlibso
+	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
+
+	use tools && dobin bin/*
+
+	use static-libs && dolib.a lib/librle.a
+
+	dolib.so lib/librle.so
+	dosym librle.so /usr/$(get_libdir)/librle-0.0.0.so
+
+	insinto /usr/include
+	doins include/rle*.h
+	doman man-dest/man?/*.[135]
+	dodoc *-changes CHANGES* README blurb
+}