From 51f4e453f7bf13935d90198c2cdffe3b75ad33ae Mon Sep 17 00:00:00 2001 From: Jakov Smolic Date: Mon, 18 Jan 2021 11:14:20 +0100 Subject: sci-electronics/Stage: Remove old Signed-off-by: Jakov Smolic Signed-off-by: David Seifert --- sci-electronics/Stage/Manifest | 1 - sci-electronics/Stage/Stage-4.1.1.ebuild | 38 --------- sci-electronics/Stage/files/Stage-4.1.1-gcc6.patch | 95 ---------------------- 3 files changed, 134 deletions(-) delete mode 100644 sci-electronics/Stage/Stage-4.1.1.ebuild delete mode 100644 sci-electronics/Stage/files/Stage-4.1.1-gcc6.patch (limited to 'sci-electronics/Stage') diff --git a/sci-electronics/Stage/Manifest b/sci-electronics/Stage/Manifest index 25208863612e..5c03e8484aa7 100644 --- a/sci-electronics/Stage/Manifest +++ b/sci-electronics/Stage/Manifest @@ -1,2 +1 @@ -DIST Stage-4.1.1.tar.gz 1014322 BLAKE2B 18997dee3e40d0405c6973434f04fa3e57a42412f404f4202772b52d27618aa335f5bbc8465dfe7571eaf23a95c8c94c89387ed88043bd7a41a1bb3b90572654 SHA512 db39135ab2b93925dd0bfbec19d8c2820e3d6ba7caf3cf5f4b617fbdfa76b720ad99f21fde0a08559ab905d819325f5391b29deb7b6af7bb72f522ac15eb5bf2 DIST Stage-4.3.0.tar.gz 1039133 BLAKE2B 30a6083750b05f83884764ed5c56489df6e534af1ef4722212f3bd129180954321a111081e22916ec676d9e76e3f28cb6f5beb79d2290add76acef529d28d731 SHA512 37abf63c3a187dc2521c80d504aaef4b7eeef861cbbdce488a7d1c14e7e6eb6f84e010e014b1a3cb81f4ca9ccbebc564a32ffa7ba7b50458c50436216bd8250f 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 -- cgit v1.2.3-18-g5258