gentoo resync : 22.01.2021

3 files changed, 0 insertions, 136 deletions

diff --git a/sci-electronics/Stage/Manifest b/sci-electronics/Stage/Manifest
index 34585e68075b..ffcc883d8279 100644
--- a/sci-electronics/Stage/Manifest
+++ b/sci-electronics/Stage/Manifest
@@ -1,8 +1,5 @@
-AUX Stage-4.1.1-gcc6.patch 6713 BLAKE2B 7e20149e7195cff7ccac6175368a949cdd5cc7d004eddd702b55a8a416508eba2fb477698dca08703336f770c0b773520701b75e3663c23576f038939dcc2720 SHA512 972add3c8f690003ea08a5734015ef9dafe7fa87208af54f59f91b30374f20a9d05cba6bacb2ee4b1415e421ae3f1a3cd82deaae7014fc8a823c11a6d4dab0e4
 AUX libdir.patch 2638 BLAKE2B bcc1cce443ffde27cb8fe93e83c7242913fcb2efd2b2d0c9fadf1098565a4670a3fa34df4d03711f3546d8f99c71ea8f7ad15b76f1d5a3761edc9a969f817ecb SHA512 78cf1bfbc15cb5f1ba7c091a39cf3f356aba1dd8c90c319ae30d8655691a0d449e28fbcf0ec59bcb5a457ec59ebe061edd6fa30f11fd0e5f99748ee6f6abcc02
-DIST Stage-4.1.1.tar.gz 1014322 BLAKE2B 18997dee3e40d0405c6973434f04fa3e57a42412f404f4202772b52d27618aa335f5bbc8465dfe7571eaf23a95c8c94c89387ed88043bd7a41a1bb3b90572654 SHA512 db39135ab2b93925dd0bfbec19d8c2820e3d6ba7caf3cf5f4b617fbdfa76b720ad99f21fde0a08559ab905d819325f5391b29deb7b6af7bb72f522ac15eb5bf2
 DIST Stage-4.3.0.tar.gz 1039133 BLAKE2B 30a6083750b05f83884764ed5c56489df6e534af1ef4722212f3bd129180954321a111081e22916ec676d9e76e3f28cb6f5beb79d2290add76acef529d28d731 SHA512 37abf63c3a187dc2521c80d504aaef4b7eeef861cbbdce488a7d1c14e7e6eb6f84e010e014b1a3cb81f4ca9ccbebc564a32ffa7ba7b50458c50436216bd8250f
-EBUILD Stage-4.1.1.ebuild 737 BLAKE2B 0a5abcc255f4084a6cc518f1f5330d3222d89949ac2ae032e9568e776576fbd8367294d0195c4cc54b7f071ed54487eac12fa9b1b29716ed4d5b54d222baf891 SHA512 1d7b79e637774d894417ed3f6d3a5ba7fad29ab93c6c0d34ea84c83d79d77a2e5d910a9873e02d00bc5884a8710d677cfa58e77cabbae8414f097278234e289f
 EBUILD Stage-4.3.0.ebuild 756 BLAKE2B 38cbceeaaf27bfa803b48ce57448396219c7dd236dbe8e21d7de86d0beb07d55845a0f6a94753b671a861d601b45805943854ef013801adfc332ab9d5eb068b2 SHA512 80bd957cdee5cd700e0a655fe7e35e2ed4ae755712577a1bb5834d040d0ec050cce66bc83c59bbe31ed74577237cc0fc9974bb4549a5f34fcf30bc31711a79f0
 EBUILD Stage-9999.ebuild 717 BLAKE2B a81db8158592217daea0752c1d63d1d84d702db28cdf8b59439206fade10163ccbd77bd24dee5ab5822a7af57c08c8ec4644de845be1fbee7e1f061ef6734e0f SHA512 18d3a92336fe26cac99e50d7efbf25437b0e5924dec6ab9a8c5076323fc0fde23bc3ac7d58b2b56f70d45a4107623c4c659d736674e09fcfea4145a6910aa585
 MISC metadata.xml 323 BLAKE2B 49200b46f0f6bd82d98338ab7cd814cc1f7ef9bfda6d2f985aab045ff0f5b7aee94b10247b59ddf80d9980332cf90fd0c2fd075aeb2d81be7c98b9f5a477d44a SHA512 da00436c60c8d4037d44eb4f171f0df889d3bfb59a937ce38399487dd4e10ef98f835ac77132afefc5854e67513e527fcbf48e4d89f3eee4cd701c617b9e3871
diff --git a/sci-electronics/Stage/Stage-4.1.1.ebuild b/sci-electronics/Stage/Stage-4.1.1.ebuild
deleted file mode 100644
index b1263d3d673c..000000000000
--- a/sci-electronics/Stage/Stage-4.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/rtv/Stage"
-fi
-
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/rtv/Stage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="The Stage Robot Simulator"
-HOMEPAGE="http://rtv.github.io/Stage/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libltdl:0
-	virtual/jpeg:0
-	media-libs/libpng:0=
-	x11-libs/fltk[opengl]
-	virtual/glu
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PATCHES=( "${FILESDIR}/${P}-gcc6.patch" )
diff --git a/sci-electronics/Stage/files/Stage-4.1.1-gcc6.patch b/sci-electronics/Stage/files/Stage-4.1.1-gcc6.patch
deleted file mode 100644
index 9124baac64d1..000000000000
--- a/sci-electronics/Stage/files/Stage-4.1.1-gcc6.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=596434
-Author: Peter Levine
-
---- Stage-4.1.1/libstage/stage.hh.old	2016-10-12 01:12:18.828436085 -0400
-+++ Stage-4.1.1/libstage/stage.hh	2016-10-12 01:12:36.675465633 -0400
-@@ -622,46 +622,46 @@
-   { cont.erase( std::remove( cont.begin(), cont.end(), thing ), cont.end() ); }
-   
-   // Error macros - output goes to stderr
--#define PRINT_ERR(m) fprintf( stderr, "\033[41merr\033[0m: "m" (%s %s)\n", __FILE__, __FUNCTION__)
--#define PRINT_ERR1(m,a) fprintf( stderr, "\033[41merr\033[0m: "m" (%s %s)\n", a, __FILE__, __FUNCTION__)    
--#define PRINT_ERR2(m,a,b) fprintf( stderr, "\033[41merr\033[0m: "m" (%s %s)\n", a, b, __FILE__, __FUNCTION__) 
--#define PRINT_ERR3(m,a,b,c) fprintf( stderr, "\033[41merr\033[0m: "m" (%s %s)\n", a, b, c, __FILE__, __FUNCTION__)
--#define PRINT_ERR4(m,a,b,c,d) fprintf( stderr, "\033[41merr\033[0m: "m" (%s %s)\n", a, b, c, d, __FILE__, __FUNCTION__)
--#define PRINT_ERR5(m,a,b,c,d,e) fprintf( stderr, "\033[41merr\033[0m: "m" (%s %s)\n", a, b, c, d, e, __FILE__, __FUNCTION__)
-+#define PRINT_ERR(m) fprintf( stderr, "\033[41merr\033[0m: " m " (%s %s)\n", __FILE__, __FUNCTION__)
-+#define PRINT_ERR1(m,a) fprintf( stderr, "\033[41merr\033[0m: " m " (%s %s)\n", a, __FILE__, __FUNCTION__)    
-+#define PRINT_ERR2(m,a,b) fprintf( stderr, "\033[41merr\033[0m: " m " (%s %s)\n", a, b, __FILE__, __FUNCTION__) 
-+#define PRINT_ERR3(m,a,b,c) fprintf( stderr, "\033[41merr\033[0m: " m " (%s %s)\n", a, b, c, __FILE__, __FUNCTION__)
-+#define PRINT_ERR4(m,a,b,c,d) fprintf( stderr, "\033[41merr\033[0m: " m " (%s %s)\n", a, b, c, d, __FILE__, __FUNCTION__)
-+#define PRINT_ERR5(m,a,b,c,d,e) fprintf( stderr, "\033[41merr\033[0m: " m " (%s %s)\n", a, b, c, d, e, __FILE__, __FUNCTION__)
- 
-   // Warning macros
--#define PRINT_WARN(m) printf( "\033[44mwarn\033[0m: "m" (%s %s)\n", __FILE__, __FUNCTION__)
--#define PRINT_WARN1(m,a) printf( "\033[44mwarn\033[0m: "m" (%s %s)\n", a, __FILE__, __FUNCTION__)    
--#define PRINT_WARN2(m,a,b) printf( "\033[44mwarn\033[0m: "m" (%s %s)\n", a, b, __FILE__, __FUNCTION__) 
--#define PRINT_WARN3(m,a,b,c) printf( "\033[44mwarn\033[0m: "m" (%s %s)\n", a, b, c, __FILE__, __FUNCTION__)
--#define PRINT_WARN4(m,a,b,c,d) printf( "\033[44mwarn\033[0m: "m" (%s %s)\n", a, b, c, d, __FILE__, __FUNCTION__)
--#define PRINT_WARN5(m,a,b,c,d,e) printf( "\033[44mwarn\033[0m: "m" (%s %s)\n", a, b, c, d, e, __FILE__, __FUNCTION__)
-+#define PRINT_WARN(m) printf( "\033[44mwarn\033[0m: " m " (%s %s)\n", __FILE__, __FUNCTION__)
-+#define PRINT_WARN1(m,a) printf( "\033[44mwarn\033[0m: " m " (%s %s)\n", a, __FILE__, __FUNCTION__)    
-+#define PRINT_WARN2(m,a,b) printf( "\033[44mwarn\033[0m: " m " (%s %s)\n", a, b, __FILE__, __FUNCTION__) 
-+#define PRINT_WARN3(m,a,b,c) printf( "\033[44mwarn\033[0m: " m " (%s %s)\n", a, b, c, __FILE__, __FUNCTION__)
-+#define PRINT_WARN4(m,a,b,c,d) printf( "\033[44mwarn\033[0m: " m " (%s %s)\n", a, b, c, d, __FILE__, __FUNCTION__)
-+#define PRINT_WARN5(m,a,b,c,d,e) printf( "\033[44mwarn\033[0m: " m " (%s %s)\n", a, b, c, d, e, __FILE__, __FUNCTION__)
- 
-   // Message macros
- #ifdef DEBUG
--#define PRINT_MSG(m) printf( "Stage: "m" (%s %s)\n", __FILE__, __FUNCTION__)
--#define PRINT_MSG1(m,a) printf( "Stage: "m" (%s %s)\n", a, __FILE__, __FUNCTION__)    
--#define PRINT_MSG2(m,a,b) printf( "Stage: "m" (%s %s)\n", a, b, __FILE__, __FUNCTION__) 
--#define PRINT_MSG3(m,a,b,c) printf( "Stage: "m" (%s %s)\n", a, b, c, __FILE__, __FUNCTION__)
--#define PRINT_MSG4(m,a,b,c,d) printf( "Stage: "m" (%s %s)\n", a, b, c, d, __FILE__, __FUNCTION__)
--#define PRINT_MSG5(m,a,b,c,d,e) printf( "Stage: "m" (%s %s)\n", a, b, c, d, e,__FILE__, __FUNCTION__)
-+#define PRINT_MSG(m) printf( "Stage: " m " (%s %s)\n", __FILE__, __FUNCTION__)
-+#define PRINT_MSG1(m,a) printf( "Stage: " m " (%s %s)\n", a, __FILE__, __FUNCTION__)    
-+#define PRINT_MSG2(m,a,b) printf( "Stage: " m " (%s %s)\n", a, b, __FILE__, __FUNCTION__) 
-+#define PRINT_MSG3(m,a,b,c) printf( "Stage: " m " (%s %s)\n", a, b, c, __FILE__, __FUNCTION__)
-+#define PRINT_MSG4(m,a,b,c,d) printf( "Stage: " m " (%s %s)\n", a, b, c, d, __FILE__, __FUNCTION__)
-+#define PRINT_MSG5(m,a,b,c,d,e) printf( "Stage: " m " (%s %s)\n", a, b, c, d, e,__FILE__, __FUNCTION__)
- #else
--#define PRINT_MSG(m) printf( "Stage: "m"\n" )
--#define PRINT_MSG1(m,a) printf( "Stage: "m"\n", a)
--#define PRINT_MSG2(m,a,b) printf( "Stage: "m"\n,", a, b )
--#define PRINT_MSG3(m,a,b,c) printf( "Stage: "m"\n", a, b, c )
--#define PRINT_MSG4(m,a,b,c,d) printf( "Stage: "m"\n", a, b, c, d )
--#define PRINT_MSG5(m,a,b,c,d,e) printf( "Stage: "m"\n", a, b, c, d, e )
-+#define PRINT_MSG(m) printf( "Stage: " m "\n" )
-+#define PRINT_MSG1(m,a) printf( "Stage: " m "\n", a)
-+#define PRINT_MSG2(m,a,b) printf( "Stage: " m "\n,", a, b )
-+#define PRINT_MSG3(m,a,b,c) printf( "Stage: " m "\n", a, b, c )
-+#define PRINT_MSG4(m,a,b,c,d) printf( "Stage: " m "\n", a, b, c, d )
-+#define PRINT_MSG5(m,a,b,c,d,e) printf( "Stage: " m "\n", a, b, c, d, e )
- #endif
- 
-   // DEBUG macros
- #ifdef DEBUG
--#define PRINT_DEBUG(m) printf( "debug: "m" (%s %s)\n", __FILE__, __FUNCTION__)
--#define PRINT_DEBUG1(m,a) printf( "debug: "m" (%s %s)\n", a, __FILE__, __FUNCTION__)    
--#define PRINT_DEBUG2(m,a,b) printf( "debug: "m" (%s %s)\n", a, b, __FILE__, __FUNCTION__) 
--#define PRINT_DEBUG3(m,a,b,c) printf( "debug: "m" (%s %s)\n", a, b, c, __FILE__, __FUNCTION__)
--#define PRINT_DEBUG4(m,a,b,c,d) printf( "debug: "m" (%s %s)\n", a, b, c ,d, __FILE__, __FUNCTION__)
--#define PRINT_DEBUG5(m,a,b,c,d,e) printf( "debug: "m" (%s %s)\n", a, b, c ,d, e, __FILE__, __FUNCTION__)
-+#define PRINT_DEBUG(m) printf( "debug: " m " (%s %s)\n", __FILE__, __FUNCTION__)
-+#define PRINT_DEBUG1(m,a) printf( "debug: " m " (%s %s)\n", a, __FILE__, __FUNCTION__)    
-+#define PRINT_DEBUG2(m,a,b) printf( "debug: " m " (%s %s)\n", a, b, __FILE__, __FUNCTION__) 
-+#define PRINT_DEBUG3(m,a,b,c) printf( "debug: " m " (%s %s)\n", a, b, c, __FILE__, __FUNCTION__)
-+#define PRINT_DEBUG4(m,a,b,c,d) printf( "debug: " m " (%s %s)\n", a, b, c ,d, __FILE__, __FUNCTION__)
-+#define PRINT_DEBUG5(m,a,b,c,d,e) printf( "debug: " m " (%s %s)\n", a, b, c ,d, e, __FILE__, __FUNCTION__)
- #else
- #define PRINT_DEBUG(m)
- #define PRINT_DEBUG1(m,a)
---- Stage-4.1.1/libstage/world.cc.old	2016-10-12 01:17:16.689055842 -0400
-+++ Stage-4.1.1/libstage/world.cc	2016-10-12 01:17:22.039117546 -0400
-@@ -803,8 +803,8 @@
-   // Graphics Gems IV  
-   const int32_t sx(sgn(dx));  
-   const int32_t sy(sgn(dy));  
--  const int32_t ax(abs(dx)); 
--  const int32_t ay(abs(dy));  
-+  const int32_t ax(std::abs(dx)); 
-+  const int32_t ay(std::abs(dy));  
-   const int32_t bx(2*ax);	
-   const int32_t by(2*ay);	
-   int32_t exy(ay-ax); // difference between x and y distances