gentoo resync : 22.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
commit: abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree: eca3dd248b73b92013cba00a0fcc1edf2696e19a /sci-electronics
parent: 24fd814c326e282c4321965c31f341dad77e270d (diff)
64 files changed, 188 insertions, 2048 deletions
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 7c7ce88e1661..d73c6f4f7ef2 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
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
diff --git a/sci-electronics/eagle/Manifest b/sci-electronics/eagle/Manifest
index 4c9b3b5ece47..fd182b953947 100644
--- a/sci-electronics/eagle/Manifest
+++ b/sci-electronics/eagle/Manifest
@@ -1,14 +1,8 @@
 AUX eagle_wrapper_script 247 BLAKE2B 62fb49b87be84527b983473c7f9876da75a037cb82321de16a3fd49d8d8dbab875bcf9837537520103c4f9a26369b3be6e331ea910bb7d582aadd6311e9b36ab SHA512 a347dc4f4ec8f369ff6a1beb8eaf3dfc9f4d8c2de3fe8b33b0f662cfb469905b17a72d5273c4627bc8a3fee9ef650654d1d654d33ea3a01c4f9a2ef57961256d
 DIST eagle-lin32-7.3.0.run 48599533 BLAKE2B 9412464dec7f3dee0944bfa588c5d9d1c8fd35316d1acc95b3cfdad2347b42c6a04e63230dadc08fb16e3483d25948d0244f9f7facbcbbfe74ddbbc5d5d7fbb3 SHA512 ef25fe7910a89e80b0c4c2d8a8f80269474510d5bd9250c6a2751ac198e7a5b4c687a30d1d784a86196589377ef7df527ff8cfa2a747c4f6e0f85496c3a180ab
-DIST eagle-lin32-7.4.0.run 49535353 BLAKE2B bd72bc28cf8f33a2117080ee308d9bc29a0b441c0cdd7286ac259753dfbde374dbc4d3aeec864a06312ac7db47f91c1ee2c6639590249d3bf9b4b379c375d85c SHA512 667d213861458fb8f915dd1d46161e0b87fa9151f9686564638afdd33a8b2924fde28850c8bd6815d405104e48aa25957a5050e6276c43d5550a106016c0625a
-DIST eagle-lin32-7.6.0.run 51535802 BLAKE2B 25fda2b121e97e0f77265ad65c51e95b9bbe91dfaad71b6dc7e292547aa44482960c1743fdf83b43b299840087c4d415daafa01f062d455889056b368bd0ba48 SHA512 1151a34b16240dfd6ba1aff108e75bbd14d2062b0d0c43a1587770bc4897018031eda685e86accdfbfd53f3988774db6e538d862eb5844c45e939098005c1e76
 DIST eagle-lin32-7.7.0.run 51488593 BLAKE2B e1556b7abe6fb405632015f39bdd8e8c61891ebab7e3f59d41aaa0c6ecaea2f050ced62552656a2311542fee497dbe8fbe43c958a8e76a9b00217c430f678072 SHA512 7ebe73bcd71857c5b8087e911ebfc45507715725abab15b80c9800476128790f8e373d01c52c05a87102597d355390ca0687964eff74af1283b162fba8dbb53b
 DIST eagle-lin64-7.3.0.run 48248700 BLAKE2B e7d8a7a23e0023159d626203bba2cf195fad3eac54b9b72947c9e72e7bb3f3534ce2545857ce76e70302eb1d2042cc30f9c327fc2a5a4dd4287e82aef4393dc6 SHA512 bd158b25ed682c63405b90358f82ffcb0903c7f5e5ae81737efcb56b6074a78125de31909c64f31a5f4bab7727c63b6aa0c7af0f6440793010f7f6de3f92f681
-DIST eagle-lin64-7.4.0.run 49186247 BLAKE2B cb28eb9a4c6c1989d15cd241908628eb28b35c7b8f81e7fa84c6ddf502e621055ed3eef7335405cca906892479c38b6d20ab6f2c896e91df397fa47481b96b69 SHA512 a840689487a120f03323cb05894e9de00bae0fefc44ca63eaf6642ebb91c839ddc59ea7efffa308072ca38692f9ba6da478f114a56180a4bb6ec74eb49740a13
-DIST eagle-lin64-7.6.0.run 51149541 BLAKE2B 343991dea47eb1526687f6904fc31420e3194df5ba4092de91d0b2a4e0038dd20848791190adfa5361f2586b0fdd2824ab5a483e9b004f89087ebb6e059105b4 SHA512 2eb3192c7aab36d23ecaae4ac4cf0b096306383bcf49680fb5936f9c45ef42d429f72796f03f818f46ba945ead5b60e57744d78ca1e3c63b73b44c185586a82c
 DIST eagle-lin64-7.7.0.run 51108322 BLAKE2B 1458199821328e811632cdb7457f256b9d97c40005c0ce71eb65d9c3f75049618e76e0c7e3cbb2e3171649bb412270409fd601bfe6f51c79c6cc3d01c12fcf66 SHA512 1f0b38be16b87f67f64709e7e39b888592240d98cdcb7b81ee77f236d9cdea5127e661db5cff470d9673f8247bea49732be3b443cdc5fbd1dca34e26896a6770
 EBUILD eagle-7.3.0-r1.ebuild 3575 BLAKE2B 13ddfd47fc56feb42a788e8f18ee3eb38a289a1710d4a3c1056b07f025ad8654dadcc965b4d70e1ae0390cbda1fb05f5236568ec6a99865d7ade623b0dfe099b SHA512 a0a02e65cb148606e37555c9ce86ace158524026e8fc9fa20e4babdd8af02a941bf24ad48ec0e29577999f599bab30deaba5dae266522f8e4fbd1ba94bc14a47
-EBUILD eagle-7.4.0-r1.ebuild 3577 BLAKE2B b198710d722d27bb9d6efc3b1e91521abadf43344d6559006d9f9d95bc87d125219fd5e3102efb006217d3244a0f154304417ef03cd122bfebffffd05404fe24 SHA512 784bf63234aa9b64539c56c0234977ee26c1397d30d281f7d373cfaa9d40e246dfe0fa97531740247ddd111149ba752122f1620e38db34ef623e47470597674f
-EBUILD eagle-7.6.0-r1.ebuild 3577 BLAKE2B da856a4731f74c1079218e58e23cf4bb6f0e42def12f69af914534bb0a5795fa88e47bd0bcaa8ecdeafbe7b732e2e19767ebc3fc071c8fab33b1a28f9ef8b069 SHA512 27b61b6006b0a45ed2a534df6b75b2a97d28f9cf9eccb851cc8019ff5deaac8f88ade3041ab3d9bd8552a6a63c88437f4d5119de48c54ee00cf78e8343670742
 EBUILD eagle-7.7.0-r1.ebuild 3577 BLAKE2B da856a4731f74c1079218e58e23cf4bb6f0e42def12f69af914534bb0a5795fa88e47bd0bcaa8ecdeafbe7b732e2e19767ebc3fc071c8fab33b1a28f9ef8b069 SHA512 27b61b6006b0a45ed2a534df6b75b2a97d28f9cf9eccb851cc8019ff5deaac8f88ade3041ab3d9bd8552a6a63c88437f4d5119de48c54ee00cf78e8343670742
 MISC metadata.xml 671 BLAKE2B fe104f5979bd1c3443983d0dd04b14fbce7c9f07b789a3faca57b3aacd3031855dd3eeda11775179f44a86b6f96274c235a574affb7b02abc21db34ce2e4c770 SHA512 e45c4c1d534e47500ad9a1354d568b879ba0b098f792c7bce74638148b153089fb85f2e5eb8198fe15406ded94981622be00db5572ec2d53dfca3d46f163d960
diff --git a/sci-electronics/eagle/eagle-7.4.0-r1.ebuild b/sci-electronics/eagle/eagle-7.4.0-r1.ebuild
deleted file mode 100644
index fe5ed4751887..000000000000
--- a/sci-electronics/eagle/eagle-7.4.0-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="CadSoft EAGLE schematic and printed circuit board (PCB) layout editor"
-HOMEPAGE="http://www.cadsoft.de"
-SRC_URI="
-	x86? ( ftp://ftp.cadsoft.de/${PN}/program/${PV%\.[0-9]}/${PN}-lin32-${PV}.run )
-	amd64? ( ftp://ftp.cadsoft.de/${PN}/program/${PV%\.[0-9]}/${PN}-lin64-${PV}.run )"
-
-LICENSE="cadsoft-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="doc"
-
-QA_PREBUILT="opt/eagle/bin/eagle"
-RESTRICT="mirror bindist"
-
-RDEPEND="
-	sys-libs/glibc
-	|| ( <dev-libs/openssl-1.1 dev-libs/openssl-compat:1.0.0 )
-	>=sys-libs/zlib-1.2.8-r1
-	>=media-libs/freetype-2.5.0.1
-	>=media-libs/fontconfig-2.10.92
-	x11-libs/libXext
-	x11-libs/libX11
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXrandr-1.4.2
-	>=x11-libs/libXcursor-1.1.14
-	>=x11-libs/libXi-1.7.2
-	net-print/cups
-	x11-libs/libxcb
-"
-
-# Append ${PV} since that's what upstream installs to
-case "${LINGUAS}" in
-	*de*)
-		MY_LANG="de";;
-	*)
-		MY_LANG="en";;
-esac
-
-src_unpack() {
-	# Extract the built-in .tar.bz2 file starting at __DATA__
-	sed  -e '1,/^__DATA__$/d' "${DISTDIR}/${A}" | tar xj || die "unpacking failed"
-}
-
-src_install() {
-	local installdir="/opt/eagle"
-
-	# Set MY_LANG for this function only since UPDATE_zh and README_zh
-	# don't exist
-	[[ ${LINGUAS} == *zh* ]] && MY_INST_LANG="zh" || MY_INST_LANG="${MY_LANG}"
-
-	# Install the documentation
-	cd doc/
-
-	local pattern="^((README|UPDATE)_${MY_LANG}|library_${MY_LANG}\.txt)$"
-	for docs in README_* UPDATE_* library_*.txt; do
-		if [[ $docs =~ $pattern ]]; then
-			dodoc $docs
-		fi
-
-		rm -f $docs
-	done
-
-	doman eagle.1
-	rm eagle.1
-
-	# Install extra documentation if requested
-	pattern="^((tutorial|manual|generate-3d-idf-data)_|(connect-device-split-symbol|make-symbol-device-package-bsdl-2011)-)${MY_LANG}.pdf$"
-	if use doc; then
-		cd ulp/
-			for docs in generate-3d-idf-data_*.pdf connect-device-split-symbol-*.pdf make-symbol-device-package-bsdl-2011-*.pdf; do
-				if [[ ! $docs =~ $pattern ]]; then
-					rm $docs
-				fi
-			done
-		cd ../
-
-		for docs in manual_* tutorial_*; do
-			if [[ ! $docs =~ $pattern ]]; then
-				rm $docs
-			fi
-		done
-	else
-		rm {elektro-tutorial,manual_*,tutorial_*,layer-setup_designrules}.pdf
-		rm -rf ulp/
-	fi
-
-	rm -f license*.txt eagle.dtd
-
-	cd "${S}"
-
-	insinto $installdir
-	doins -r .
-
-	fperms 0755 ${installdir}/bin/eagle
-
-	# Install wrapper (suppressing leading tabs)
-	# see bug #188368 or http://www.cadsoftusa.com/training/faq/#3
-	exeinto /opt/bin
-	newexe "${FILESDIR}/eagle_wrapper_script" eagle
-	# Finally, append the path of the eagle binary respecting $installdir and any
-	# arguments passed to the script (thanks Denilson)
-	echo "${installdir}/bin/eagle" '"$@"' >> "${D}/opt/bin/eagle"
-
-	echo -e "ROOTPATH=${installdir}/bin\nPRELINK_PATH_MASK=${installdir}" > "${S}/90eagle-${PV}"
-	doenvd "${S}/90eagle-${PV}"
-
-	# Create desktop entry
-	newicon bin/${PN}icon50.png ${PF}-icon50.png
-	make_desktop_entry "${ROOT}/opt/bin/eagle" "CadSoft EAGLE Layout Editor" ${PF}-icon50 "Graphics;Electronics"
-}
-
-pkg_postinst() {
-	elog "Run \`env-update && source /etc/profile\` from within \${ROOT}"
-	elog "now to set up the correct paths."
-	elog "You must first run eagle as root to invoke product registration."
-	echo
-	ewarn "Due to some necessary changes in the data structure, once you edit"
-	ewarn "a file with version 7.x you will no longer be able to edit it"
-	ewarn "with versions prior to 7.0!"
-	ewarn
-	ewarn "Please read /usr/share/doc/${PF}/UPDATE_${MY_LANG} if you are upgrading from a version prior 7.x!"
-}
diff --git a/sci-electronics/eagle/eagle-7.6.0-r1.ebuild b/sci-electronics/eagle/eagle-7.6.0-r1.ebuild
deleted file mode 100644
index 0471e5ea1037..000000000000
--- a/sci-electronics/eagle/eagle-7.6.0-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils
-
-DESCRIPTION="CadSoft EAGLE schematic and printed circuit board (PCB) layout editor"
-HOMEPAGE="http://www.cadsoft.de"
-SRC_URI="
-	x86? ( ftp://ftp.cadsoft.de/${PN}/program/${PV%\.[0-9]}/${PN}-lin32-${PV}.run )
-	amd64? ( ftp://ftp.cadsoft.de/${PN}/program/${PV%\.[0-9]}/${PN}-lin64-${PV}.run )"
-
-LICENSE="cadsoft-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="doc"
-
-QA_PREBUILT="opt/eagle/bin/eagle"
-RESTRICT="mirror bindist"
-
-RDEPEND="
-	sys-libs/glibc
-	|| ( <dev-libs/openssl-1.1 dev-libs/openssl-compat:1.0.0 )
-	>=sys-libs/zlib-1.2.8-r1
-	>=media-libs/freetype-2.5.0.1
-	>=media-libs/fontconfig-2.10.92
-	x11-libs/libXext
-	x11-libs/libX11
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXrandr-1.4.2
-	>=x11-libs/libXcursor-1.1.14
-	>=x11-libs/libXi-1.7.2
-	net-print/cups
-	x11-libs/libxcb
-"
-
-# Append ${PV} since that's what upstream installs to
-case "${LINGUAS}" in
-	*de*)
-		MY_LANG="de";;
-	*)
-		MY_LANG="en";;
-esac
-
-src_unpack() {
-	# Extract the built-in .tar.bz2 file starting at __DATA__
-	sed  -e '1,/^__DATA__$/d' "${DISTDIR}/${A}" | tar xj || die "unpacking failed"
-}
-
-src_install() {
-	local installdir="/opt/eagle"
-
-	# Set MY_LANG for this function only since UPDATE_zh and README_zh
-	# don't exist
-	[[ ${LINGUAS} == *zh* ]] && MY_INST_LANG="zh" || MY_INST_LANG="${MY_LANG}"
-
-	# Install the documentation
-	cd doc/
-
-	local pattern="^((README|UPDATE)_${MY_LANG}|library_${MY_LANG}\.txt)$"
-	for docs in README_* UPDATE_* library_*.txt; do
-		if [[ $docs =~ $pattern ]]; then
-			dodoc $docs
-		fi
-
-		rm -f $docs
-	done
-
-	doman eagle.1
-	rm eagle.1
-
-	# Install extra documentation if requested
-	pattern="^((tutorial|manual|generate-3d-idf-data)_|(connect-device-split-symbol|make-symbol-device-package-bsdl-2011)-)${MY_LANG}.pdf$"
-	if use doc; then
-		cd ulp/
-			for docs in generate-3d-idf-data_*.pdf connect-device-split-symbol-*.pdf make-symbol-device-package-bsdl-2011-*.pdf; do
-				if [[ ! $docs =~ $pattern ]]; then
-					rm $docs
-				fi
-			done
-		cd ../
-
-		for docs in manual_* tutorial_*; do
-			if [[ ! $docs =~ $pattern ]]; then
-				rm $docs
-			fi
-		done
-	else
-		rm {elektro-tutorial,manual_*,tutorial_*,layer-setup_designrules}.pdf
-		rm -rf ulp/
-	fi
-
-	rm -f license*.txt eagle.dtd
-
-	cd "${S}"
-
-	insinto $installdir
-	doins -r .
-
-	fperms 0755 ${installdir}/bin/eagle
-
-	# Install wrapper (suppressing leading tabs)
-	# see bug #188368 or http://www.cadsoftusa.com/training/faq/#3
-	exeinto /opt/bin
-	newexe "${FILESDIR}/eagle_wrapper_script" eagle
-	# Finally, append the path of the eagle binary respecting $installdir and any
-	# arguments passed to the script (thanks Denilson)
-	echo "${installdir}/bin/eagle" '"$@"' >> "${D}/opt/bin/eagle"
-
-	echo -e "ROOTPATH=${installdir}/bin\nPRELINK_PATH_MASK=${installdir}" > "${S}/90eagle-${PV}"
-	doenvd "${S}/90eagle-${PV}"
-
-	# Create desktop entry
-	newicon bin/${PN}icon50.png ${PF}-icon50.png
-	make_desktop_entry "${ROOT}/opt/bin/eagle" "CadSoft EAGLE Layout Editor" ${PF}-icon50 "Graphics;Electronics"
-}
-
-pkg_postinst() {
-	elog "Run \`env-update && source /etc/profile\` from within \${ROOT}"
-	elog "now to set up the correct paths."
-	elog "You must first run eagle as root to invoke product registration."
-	echo
-	ewarn "Due to some necessary changes in the data structure, once you edit"
-	ewarn "a file with version 7.x you will no longer be able to edit it"
-	ewarn "with versions prior to 7.0!"
-	ewarn
-	ewarn "Please read /usr/share/doc/${PF}/UPDATE_${MY_LANG} if you are upgrading from a version prior 7.x!"
-}
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 4389cbf9f2b0..294db4c34b78 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,7 +1,5 @@
-AUX boost173.patch 7177 BLAKE2B 45b8b5bda4274727bf9e55ab5a7d3eb1ccc403a91f1a6988fb2f6cc3c02a13c1d7cb921a483d793d2f6cb78a23724407a33dc40a6bcadd77c0b9e1b7f104bef9 SHA512 a7caa36a35087db455e06bf745d4b4e2ba20ddc4396a6e6998b609a6c9f0d0806630d1c38bae6da6ef264a9a4cfa8219d39e8f54fb88f6a1cb8d7d0927e649fb
-AUX boost174.patch 554 BLAKE2B 71b9e37079cde717a26d3ea36e4551adac3f3017c05e95fc488b9d51e0ef6cf79780dc5a622dad2f209ce862e4fa56ddf40ee198002184bb80add36370918576 SHA512 38854c65ca67924a10add9164659d28ca84bc1f8f5e50e6bfe98231103330d4d74596fd9de1b4d2cc23658fedaafd171acec87d552f48609c9a62265a8eb4912
 AUX cmake.patch 699 BLAKE2B 64edc9a3e51952ca5e15488a4fa148028d77bbb3a294937d9df263e8f0d78c59e6d2a40574534aa12911d79b8871901ff5fd16af236f32f0e580b7e86a3f8198 SHA512 95693482c14ddbc759af20c7ef30d1660e8630b21cf52d15ca14e8ef08d3631483c736e67423e2cabf1a8c8b834e8e25ece8a7bd15f71b38853b71d2fdcbce8f
-AUX qwt.patch 2136 BLAKE2B 3ab69581d1dac006ebd493c82bebee7df34fc00accf7957411a143ce1ba6fffebdffe3468ada7c1e51375cb55adca5d1b28c7a6d1708355d60508f85422e2494 SHA512 4a9edac8565bc7a77644d9b6adeec61187c34dcf72f309066eb6575de7baef5cb59668c70bf5b51fb22a8e5bad00da4d664d279b1d22aae5dbb8fe07f69ae91b
-DIST gazebo-11.1.0.tar.bz2 53856366 BLAKE2B 6e3df164e40c44265da68eae260012d873121631e56e9ae4ca3d8355e9c22ac80811549103e83d5f20d40f92c80f7a7a313c2395209b1c5177f518d0c0b2117c SHA512 39866991d8b996656a9f927a70e215175ecef671a1e317bfe9221df38bdc08be9825d36018da90cc6843480643a7716586ce8d61f36ffc8b4558ef7096ef6f76
-EBUILD gazebo-11.1.0-r1.ebuild 1897 BLAKE2B bd698c48be3d530f667b3e9ccbd10e8b83dd1666e2278a4723e5680ce17a26e7cc2ba5e6cf524a36dca2ab8219625199ec06309d53c88ea31be20a8afe4d26dd SHA512 12e26a463d9a7210e4e6a5b8497c48b8be5d97e3a9a2db7e8d82495cda9450a714fa20ba325ddec4f0c5da5ad371e17b9ad6b9c971fdd21648f60288be31b43d
+AUX qwt.patch 555 BLAKE2B f959e84dc5e144fd3dd35e6e6c7714507e1a4815495d41611198381165e386d135d334c4f3cb2293592abca72bbb16307b2e5a17d5903d4899c7fa2cd1790d5a SHA512 9a1138acd9bd5ce75a709d50dd585a17ca7d913d4cf37283d8db68e79fd08bf98ddd27ea5d2e459efac0a71df1369c83a67f6727419c0d26c0dd02f5a6ce22b8
+DIST gazebo-11.3.0.tar.bz2 56778002 BLAKE2B d466556c834935d8b3694461ddf6d7a7872b00d2f8f58d50d70cceb8bca3ab4ada1e72e7bb14b79404d45c48f95419e3dedd9019ecc3a8c1623afda077bcbeb2 SHA512 2e219655e45a787aeda50065dcec5d90954c18223f134d6da90b8cb43e119268262e515e527547d0b0b5ed1f73b5083d279551a01faa3d3c34ba7a580c077970
+EBUILD gazebo-11.3.0.ebuild 1870 BLAKE2B 97ef2feea9d27afc85eabdcd986009820340f98d2a434321558821b665dec17c26bd4f8a5bdd42aa054514b66d599a00d1c40cbe195f4cc45f740b823cee354c SHA512 fb7c20055c929c3221b7b04b13f13c9baa1a3e4d1c0551522068bae6e04df45fca0cf9511e5ff0b3d0cd48e9ccade5c6b50e6afe89c6d593eabe66f6a419f43e
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-electronics/gazebo/files/boost173.patch b/sci-electronics/gazebo/files/boost173.patch
deleted file mode 100644
index 618f6f1b5349..000000000000
--- a/sci-electronics/gazebo/files/boost173.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-Index: gazebo-11.0.0/gazebo/gui/model/ModelTreeWidget.cc
-===================================================================
---- gazebo-11.0.0.orig/gazebo/gui/model/ModelTreeWidget.cc
-+++ gazebo-11.0.0/gazebo/gui/model/ModelTreeWidget.cc
-@@ -162,7 +162,7 @@ ModelTreeWidget::ModelTreeWidget(QWidget
-   // Connections
-   this->connections.push_back(
-       gui::model::Events::ConnectSaveModel(
--      boost::bind(&ModelTreeWidget::OnSaveModel, this, _1)));
-+      boost::bind(&ModelTreeWidget::OnSaveModel, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectNewModel(
-@@ -170,11 +170,11 @@ ModelTreeWidget::ModelTreeWidget(QWidget
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectModelPropertiesChanged(
--      boost::bind(&ModelTreeWidget::OnModelPropertiesChanged, this, _1, _2)));
-+      boost::bind(&ModelTreeWidget::OnModelPropertiesChanged, this, boost::placeholders::_1, boost::placeholders::_2)));
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectModelNameChanged(
--      boost::bind(&ModelTreeWidget::OnModelNameChanged, this, _1)));
-+      boost::bind(&ModelTreeWidget::OnModelNameChanged, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectNestedModelInserted(
-@@ -183,51 +183,51 @@ ModelTreeWidget::ModelTreeWidget(QWidget
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectLinkInserted(
--      boost::bind(&ModelTreeWidget::OnLinkInserted, this, _1)));
-+      boost::bind(&ModelTreeWidget::OnLinkInserted, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectJointInserted(
--      boost::bind(&ModelTreeWidget::OnJointInserted, this, _1, _2, _3, _4)));
-+      boost::bind(&ModelTreeWidget::OnJointInserted, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4)));
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectModelPluginInserted(
--      boost::bind(&ModelTreeWidget::OnModelPluginInserted, this, _1)));
-+      boost::bind(&ModelTreeWidget::OnModelPluginInserted, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectNestedModelRemoved(
--      boost::bind(&ModelTreeWidget::OnNestedModelRemoved, this, _1)));
-+      boost::bind(&ModelTreeWidget::OnNestedModelRemoved, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectLinkRemoved(
--      boost::bind(&ModelTreeWidget::OnLinkRemoved, this, _1)));
-+      boost::bind(&ModelTreeWidget::OnLinkRemoved, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectJointRemoved(
--      boost::bind(&ModelTreeWidget::OnJointRemoved, this, _1)));
-+      boost::bind(&ModelTreeWidget::OnJointRemoved, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectModelPluginRemoved(
--      boost::bind(&ModelTreeWidget::OnModelPluginRemoved, this, _1)));
-+      boost::bind(&ModelTreeWidget::OnModelPluginRemoved, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(
-       gui::model::Events::ConnectJointNameChanged(
--      boost::bind(&ModelTreeWidget::OnJointNameChanged, this, _1, _2)));
-+      boost::bind(&ModelTreeWidget::OnJointNameChanged, this, boost::placeholders::_1, boost::placeholders::_2)));
- 
-   this->connections.push_back(
-      event::Events::ConnectSetSelectedEntity(
--       boost::bind(&ModelTreeWidget::OnDeselectAll, this, _1, _2)));
-+       boost::bind(&ModelTreeWidget::OnDeselectAll, this, boost::placeholders::_1, boost::placeholders::_2)));
- 
-   this->connections.push_back(
-      gui::model::Events::ConnectSetSelectedEntity(
--       boost::bind(&ModelTreeWidget::OnSetSelectedEntity, this, _1, _2)));
-+       boost::bind(&ModelTreeWidget::OnSetSelectedEntity, this, boost::placeholders::_1, boost::placeholders::_2)));
- 
-   this->connections.push_back(
-      gui::model::Events::ConnectSetSelectedJoint(
--       boost::bind(&ModelTreeWidget::OnSetSelectedJoint, this, _1, _2)));
-+       boost::bind(&ModelTreeWidget::OnSetSelectedJoint, this, boost::placeholders::_1, boost::placeholders::_2)));
- 
-   this->connections.push_back(
-      gui::model::Events::ConnectSetSelectedModelPlugin(
--     boost::bind(&ModelTreeWidget::OnSetSelectedModelPlugin, this, _1, _2)));
-+     boost::bind(&ModelTreeWidget::OnSetSelectedModelPlugin, this, boost::placeholders::_1, boost::placeholders::_2)));
- 
-   this->ClearModelTree();
- }
-Index: gazebo-11.0.0/gazebo/gui/model/SchematicViewWidget.cc
-===================================================================
---- gazebo-11.0.0.orig/gazebo/gui/model/SchematicViewWidget.cc
-+++ gazebo-11.0.0/gazebo/gui/model/SchematicViewWidget.cc
-@@ -83,31 +83,31 @@ void SchematicViewWidget::Reset()
- void SchematicViewWidget::Init()
- {
-   this->connections.push_back(gui::model::Events::ConnectLinkInserted(
--      boost::bind(&SchematicViewWidget::AddNode, this, _1)));
-+      boost::bind(&SchematicViewWidget::AddNode, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(gui::model::Events::ConnectLinkRemoved(
--      boost::bind(&SchematicViewWidget::RemoveNode, this, _1)));
-+      boost::bind(&SchematicViewWidget::RemoveNode, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(gui::model::Events::ConnectJointInserted(
--      boost::bind(&SchematicViewWidget::AddEdge, this, _1, _2, _3, _4, _5)));
-+      boost::bind(&SchematicViewWidget::AddEdge, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4, boost::placeholders::_5)));
- 
-   this->connections.push_back(gui::model::Events::ConnectJointRemoved(
--      boost::bind(&SchematicViewWidget::RemoveEdge, this, _1)));
-+      boost::bind(&SchematicViewWidget::RemoveEdge, this, boost::placeholders::_1)));
- 
-   this->connections.push_back(gui::model::Events::ConnectJointChanged(
--      boost::bind(&SchematicViewWidget::UpdateEdge, this, _1, _2, _3, _4, _5)));
-+      boost::bind(&SchematicViewWidget::UpdateEdge, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4, boost::placeholders::_5)));
- 
-   this->connections.push_back(
-      event::Events::ConnectSetSelectedEntity(
--       boost::bind(&SchematicViewWidget::OnDeselectAll, this, _1, _2)));
-+       boost::bind(&SchematicViewWidget::OnDeselectAll, this, boost::placeholders::_1, boost::placeholders::_2)));
- 
-   this->connections.push_back(
-      gui::model::Events::ConnectSetSelectedEntity(
--       boost::bind(&SchematicViewWidget::OnSetSelectedEntity, this, _1, _2)));
-+       boost::bind(&SchematicViewWidget::OnSetSelectedEntity, this, boost::placeholders::_1, boost::placeholders::_2)));
- 
-   this->connections.push_back(
-      gui::model::Events::ConnectSetSelectedJoint(
--       boost::bind(&SchematicViewWidget::OnSetSelectedJoint, this, _1, _2)));
-+       boost::bind(&SchematicViewWidget::OnSetSelectedJoint, this, boost::placeholders::_1, boost::placeholders::_2)));
- }
- 
- /////////////////////////////////////////////////
diff --git a/sci-electronics/gazebo/files/boost174.patch b/sci-electronics/gazebo/files/boost174.patch
deleted file mode 100644
index 82bbdf40f7a7..000000000000
--- a/sci-electronics/gazebo/files/boost174.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: gazebo-11.1.0/plugins/SimpleTrackedVehiclePlugin.cc
-===================================================================
---- gazebo-11.1.0.orig/plugins/SimpleTrackedVehiclePlugin.cc
-+++ gazebo-11.1.0/plugins/SimpleTrackedVehiclePlugin.cc
-@@ -30,6 +30,7 @@
- 
- #include "plugins/SimpleTrackedVehiclePlugin.hh"
- 
-+#if BOOST_VERSION < 107400 || defined(BOOST_NO_CXX11_HDR_FUNCTIONAL)
- namespace std {
- template<class T>
- class hash<boost::shared_ptr<T>> {
-@@ -38,6 +39,7 @@ class hash<boost::shared_ptr<T>> {
-   }
- };
- }
-+#endif
- 
- namespace gazebo
- {
diff --git a/sci-electronics/gazebo/files/qwt.patch b/sci-electronics/gazebo/files/qwt.patch
index d7bbce2f8cbe..d4f1538900bc 100644
--- a/sci-electronics/gazebo/files/qwt.patch
+++ b/sci-electronics/gazebo/files/qwt.patch
@@ -15,50 +15,3 @@ Index: gazebo-8.0.0/cmake/SearchForStuff.cmake
    /usr/lib
    /usr/local/lib
    /usr/local/lib/qwt.framework
-Index: gazebo-8.0.0/gazebo/gui/plot/qwt_gazebo.h
-===================================================================
---- gazebo-8.0.0.orig/gazebo/gui/plot/qwt_gazebo.h
-+++ gazebo-8.0.0/gazebo/gui/plot/qwt_gazebo.h
-@@ -23,24 +23,24 @@
- #pragma clang diagnostic push
- #pragma clang diagnostic ignored "-Wfloat-equal"
- 
--#include <qwt/qwt_curve_fitter.h>
--#include <qwt/qwt_legend.h>
--#include <qwt/qwt_painter.h>
--#include <qwt/qwt_picker_machine.h>
--#include <qwt/qwt_plot.h>
--#include <qwt/qwt_plot_canvas.h>
--#include <qwt/qwt_plot_curve.h>
--#include <qwt/qwt_plot_directpainter.h>
--#include <qwt/qwt_plot_grid.h>
--#include <qwt/qwt_plot_layout.h>
--#include <qwt/qwt_plot_magnifier.h>
--#include <qwt/qwt_plot_marker.h>
--#include <qwt/qwt_plot_panner.h>
--#include <qwt/qwt_plot_zoomer.h>
--#include <qwt/qwt_scale_engine.h>
--#include <qwt/qwt_scale_widget.h>
--#include <qwt/qwt_symbol.h>
--#include <qwt/qwt_plot_renderer.h>
-+#include <qwt6/qwt_curve_fitter.h>
-+#include <qwt6/qwt_legend.h>
-+#include <qwt6/qwt_painter.h>
-+#include <qwt6/qwt_picker_machine.h>
-+#include <qwt6/qwt_plot.h>
-+#include <qwt6/qwt_plot_canvas.h>
-+#include <qwt6/qwt_plot_curve.h>
-+#include <qwt6/qwt_plot_directpainter.h>
-+#include <qwt6/qwt_plot_grid.h>
-+#include <qwt6/qwt_plot_layout.h>
-+#include <qwt6/qwt_plot_magnifier.h>
-+#include <qwt6/qwt_plot_marker.h>
-+#include <qwt6/qwt_plot_panner.h>
-+#include <qwt6/qwt_plot_zoomer.h>
-+#include <qwt6/qwt_scale_engine.h>
-+#include <qwt6/qwt_scale_widget.h>
-+#include <qwt6/qwt_symbol.h>
-+#include <qwt6/qwt_plot_renderer.h>
- 
- #pragma clang diagnostic pop
- 
diff --git a/sci-electronics/gazebo/gazebo-11.1.0-r1.ebuild b/sci-electronics/gazebo/gazebo-11.3.0.ebuild
index 2bb213d040a5..e1a11ffee743 100644
--- a/sci-electronics/gazebo/gazebo-11.1.0-r1.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -64,14 +64,12 @@ BDEPEND="
 CMAKE_BUILD_TYPE=RelWithDebInfo
 PATCHES=(
 	"${FILESDIR}/qwt.patch"
-	"${FILESDIR}/boost173.patch"
 	"${FILESDIR}/cmake.patch"
-	"${FILESDIR}/boost174.patch"
 )
 
 src_configure() {
-	# doesnt build with as-needed
-	#append-ldflags "-Wl,--no-as-needed"
+	# find OGRE properly
+	sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
 
 	local mycmakeargs=(
 		"-DUSE_UPSTREAM_CFLAGS=OFF"
diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest
index b8b28ec7692f..de45930418cd 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1,7 +1,3 @@
-DIST kicad-footprints-5.1.6.tar.gz 6015680 BLAKE2B f0b5cfed0c6310867ace49c87e8c43340995b0fefca4bd528031743d19e77ce5624e3b14580e586bb529359a96b0c89fa1036c89a53c4ed2d5b88e3d49d423af SHA512 da0fa31b56da1210f9bbdd0719ba7b9fe642170a8093dc3411ee3bed1f24ebcc2a14e7aee314a7dcbb80c453ea72a44f7acb34e44814d0d52aeb78eeb1227ec6
-DIST kicad-footprints-5.1.7.tar.gz 6035007 BLAKE2B 9a2d72f1dc4eeef267055da091f531b6e45d8b469736551a9576ec5ed2b081068975b543c09955f2704946f26efd5c330c2b3a33fdedb6cae42cac8daddeebd4 SHA512 c21bb6e65b1e5d332d75bf2bcdf34da03a4f5301a1d8458da3780dc52099f536579a99a139925de33b2c57983043305dabbb80be3bef207461dbc42458281252
-DIST kicad-footprints-5.1.8.tar.bz2 3387152 BLAKE2B 38d4423eaa88d027114d2897a930ccc50091155109b8afdc4413d9b84f50fe261501dc55c84a6bd50d9723a66105f968ee6f5d713dda516ec3da335fee07ad9e SHA512 07a15d8906669816ad9aff82711d7f0401ad02965ee50e4cdf42eb0244daadea943144b7619c1db3c8656007645cb8db9fc3d971acfaea85aa5eb77fe1b537cb
-EBUILD kicad-footprints-5.1.6.ebuild 443 BLAKE2B ebd6c6c694086fb73bc57ae50b3bfc58e9ae64750dea360b0421cf4dd0b24b82362e0c14c7e09d91c2fa29ba5c21818ab449c4aa1849b6634fe5ee2578b6e363 SHA512 e4f14a2e199fda721c7ee45420b3429b45979e35993dcafd6ac93571e9884c73f026483c4f9f26f360cffb25476c61fa48da37f16095eb548ca74c2961516a76
-EBUILD kicad-footprints-5.1.7.ebuild 443 BLAKE2B ebd6c6c694086fb73bc57ae50b3bfc58e9ae64750dea360b0421cf4dd0b24b82362e0c14c7e09d91c2fa29ba5c21818ab449c4aa1849b6634fe5ee2578b6e363 SHA512 e4f14a2e199fda721c7ee45420b3429b45979e35993dcafd6ac93571e9884c73f026483c4f9f26f360cffb25476c61fa48da37f16095eb548ca74c2961516a76
-EBUILD kicad-footprints-5.1.8.ebuild 428 BLAKE2B eee43802fc531d1b0c91f56981c08f47c02676d3a955f609034c100577e313bffe86d000e85a573ab2bbf1ed8b03252be32cec5d22680deea095e82a12c665cc SHA512 7bf40ac39263d9d9c5a2a524027899305594701cd752add4319063aa6bd3eece6d9d5e087c3a4b5e0601d1ae04fa94b510fcdaf364295722f78dacf189516ebb
+DIST kicad-footprints-5.1.9.tar.bz2 3387238 BLAKE2B 8c8873a7feb72228fcc92ab5e8950f63fcb09b4b1b16b6f8da5aa3caa30985ceb02e326ebe8ba96fcae07fae71a6233a7d8009fbe6541f2e7c6807ea67c7046a SHA512 28030a750b806be664cb91b3b3e4c0bf2b9efa0518ec55b1ff433633c2f69ab99bedbbdd3264b50cbe80a182e3f97343f5dfdd25e073abe1563231a8318b4155
+EBUILD kicad-footprints-5.1.9.ebuild 428 BLAKE2B eee43802fc531d1b0c91f56981c08f47c02676d3a955f609034c100577e313bffe86d000e85a573ab2bbf1ed8b03252be32cec5d22680deea095e82a12c665cc SHA512 7bf40ac39263d9d9c5a2a524027899305594701cd752add4319063aa6bd3eece6d9d5e087c3a4b5e0601d1ae04fa94b510fcdaf364295722f78dacf189516ebb
 MISC metadata.xml 735 BLAKE2B 4799a945980798d07f6cd74cfe47f3e054ed5c149887247a92c191414f06c4d3a5740542624bee3e96a4482a6bcce9ef52294426075cb16ce8d85cf027d8d6bd SHA512 07adadb06d293a535f7b3ee1601120c6caa36a3d119f330f0ad9e9df39ea9c30e582d4fd97abb44d23a6ce2e73c3e3dbb86bfeab46c2bc3a8f547d1abca4dea2
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-5.1.6.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-5.1.6.ebuild
deleted file mode 100644
index 268f2b9a6d51..000000000000
--- a/sci-electronics/kicad-footprints/kicad-footprints-5.1.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools footprint libraries"
-HOMEPAGE="https://kicad.github.io/footprints/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-5.1.7.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-5.1.7.ebuild
deleted file mode 100644
index 268f2b9a6d51..000000000000
--- a/sci-electronics/kicad-footprints/kicad-footprints-5.1.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools footprint libraries"
-HOMEPAGE="https://kicad.github.io/footprints/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-5.1.8.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-5.1.9.ebuild
index f8f652eff266..f8f652eff266 100644
--- a/sci-electronics/kicad-footprints/kicad-footprints-5.1.8.ebuild
+++ b/sci-electronics/kicad-footprints/kicad-footprints-5.1.9.ebuild
diff --git a/sci-electronics/kicad-i18n/Manifest b/sci-electronics/kicad-i18n/Manifest
index c4d5ea1cd2f8..ecf4891a3584 100644
--- a/sci-electronics/kicad-i18n/Manifest
+++ b/sci-electronics/kicad-i18n/Manifest
@@ -1,7 +1,3 @@
-DIST kicad-i18n-5.1.6.tar.bz2 2929902 BLAKE2B 6ede4e7cf7972d054e9f69bf5a35bad5b48a1b6368ac5efd78ba8e54dd82edf1da4c3bca93b0d9aa083bbd1740e8e952eae044f802579d8942301b49ebeeaeb1 SHA512 58b213845de9359124e98df1e6bed4df3184da2fe075a1751fe4c9861084748853fd258ecf2d99849ca07a3c84d99657158d9168caf6ac5eaa9884b10dd9ca91
-DIST kicad-i18n-5.1.7.tar.bz2 3161083 BLAKE2B be8aca1365b755a2f910ee987c76bb6be8b910b189f9ee53b7cd12dbe4c3139085327eada2833b566f220da2224a1ec9504d83b245e91a0f5589a8161c10abeb SHA512 1877c28bffd0d29a32867fe2aa5eb1e24df4ab4c36c381976d712d2319e4b6049cfb91f26d1158cd2ba08eab63a7da12701532fe6207b8aa9c4470c951788fa0
-DIST kicad-i18n-5.1.8.tar.bz2 2933636 BLAKE2B b3253899ee500045fb050ed7559c8765a853dcb5dba371ac8c4c30b593e16c348bcee6a2ffcfd31eb391fc9b11b99537e91f4f711943acada02b765f94f2525b SHA512 e177dd590e82b8f23be582a682067ff0a5c615387fe9e5caf4b887f9219350c0766196e7e94e42a2bb37a9afc40186b601655cf528e65aaebf33f9659dac5e3c
-EBUILD kicad-i18n-5.1.6.ebuild 461 BLAKE2B 596ffc0b7af633c99fec772aa0cf8371e52eae087d1b0b368fc6cfd1d6404ef4709af60d3b13532cfc0738f0f6458a2560a05494319cfcb1ba3e38e5b1a971db SHA512 8d8d1ce354b40b4955a27d10d4ed94b65640ba38256ff71f5077d082a28ecfc74b29e6c3c23284c2c71dd8e3745899e65413087f5cee407cf3efc9810f6924d8
-EBUILD kicad-i18n-5.1.7.ebuild 461 BLAKE2B 596ffc0b7af633c99fec772aa0cf8371e52eae087d1b0b368fc6cfd1d6404ef4709af60d3b13532cfc0738f0f6458a2560a05494319cfcb1ba3e38e5b1a971db SHA512 8d8d1ce354b40b4955a27d10d4ed94b65640ba38256ff71f5077d082a28ecfc74b29e6c3c23284c2c71dd8e3745899e65413087f5cee407cf3efc9810f6924d8
-EBUILD kicad-i18n-5.1.8.ebuild 453 BLAKE2B 306a5d0daaa3c078053c6681e441d3324c83ead5486f0ce41bd5d2b86378431f9042d85aaa6d71d6c33454326e248307d3a99e101c9ad259033f4884ffba07ae SHA512 5852351bf53a61ff2074a2ce945c83b8cbbe93965d9ccfabd160ae52846cc9bc81cb4ac23293fed932eae4be363cc34e281a9fe0115d55e8d51d1d5cee6e2205
+DIST kicad-i18n-5.1.9.tar.bz2 2934490 BLAKE2B 391cd9b8a23f5dd723884704ce231f79d8bf57b7f2852a97b08228e887226f75714c6515c335122f9f34d13a033e9039423b8bbfb281e4f6396ac158bea5f4e8 SHA512 d41359464e3504263bb964af4f14db027f9b55861098f29d0fa97eb2fb26205d49c00cbda4795317a46b54157f2fda67a94be412cfab80ce81846e173bf1a14d
+EBUILD kicad-i18n-5.1.9.ebuild 453 BLAKE2B 306a5d0daaa3c078053c6681e441d3324c83ead5486f0ce41bd5d2b86378431f9042d85aaa6d71d6c33454326e248307d3a99e101c9ad259033f4884ffba07ae SHA512 5852351bf53a61ff2074a2ce945c83b8cbbe93965d9ccfabd160ae52846cc9bc81cb4ac23293fed932eae4be363cc34e281a9fe0115d55e8d51d1d5cee6e2205
 MISC metadata.xml 448 BLAKE2B ce544749e7aedb4f4643feeaea90298bce866d9750a4d1edaec7f8d9248520266a8534a936ee76da3fb1e4072b08cbcfb487b87defbfc921defe8ae193ca8e57 SHA512 0ea5cc77902187b805ca9894e31efbaaedae623bd4ebdc41944e0e57b399e5f7bc7209067fc126d8b9b65e75a9d6c718d41c8cdfed12775f3bd35c6d8cae6647
diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.1.6.ebuild b/sci-electronics/kicad-i18n/kicad-i18n-5.1.6.ebuild
deleted file mode 100644
index 4e4b8730b265..000000000000
--- a/sci-electronics/kicad-i18n/kicad-i18n-5.1.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools GUI translations"
-HOMEPAGE="https://gitlab.com/kicad/code/kicad-i18n"
-SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="sys-devel/gettext"
-RDEPEND=">=sci-electronics/kicad-5.1.6"
diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.1.7.ebuild b/sci-electronics/kicad-i18n/kicad-i18n-5.1.7.ebuild
deleted file mode 100644
index 4e4b8730b265..000000000000
--- a/sci-electronics/kicad-i18n/kicad-i18n-5.1.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools GUI translations"
-HOMEPAGE="https://gitlab.com/kicad/code/kicad-i18n"
-SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="sys-devel/gettext"
-RDEPEND=">=sci-electronics/kicad-5.1.6"
diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.1.8.ebuild b/sci-electronics/kicad-i18n/kicad-i18n-5.1.9.ebuild
index 581556469ff2..581556469ff2 100644
--- a/sci-electronics/kicad-i18n/kicad-i18n-5.1.8.ebuild
+++ b/sci-electronics/kicad-i18n/kicad-i18n-5.1.9.ebuild
diff --git a/sci-electronics/kicad-meta/Manifest b/sci-electronics/kicad-meta/Manifest
index 153e50714ade..22f42e7bf309 100644
--- a/sci-electronics/kicad-meta/Manifest
+++ b/sci-electronics/kicad-meta/Manifest
@@ -1,4 +1,2 @@
-EBUILD kicad-meta-5.1.6.ebuild 617 BLAKE2B 7cba176e653fcbfe26ba8af93d7337e0e64280c349b550d819dd188051588deb286f57bd6c66e9260b727c28b984272b78beb13f3afb24f6310c02b2162ccc29 SHA512 6c4ea61cc5374bc246c6ffce97034c52de9082b3cc6e7110da137e68cdfe8585187f88f532eb507c3ed1562d616f1e764f96640fb8c1528c8b94c8780c1698e2
-EBUILD kicad-meta-5.1.7.ebuild 617 BLAKE2B 02f8d6a3c29ca8e7d314ace47f5f312f4313838b6653a999cc2d4316a3cde153f88bb371a73bcd6d91f4269ca4319d187b10cdde2dd2ea2b8f9d25470c4f609c SHA512 79f725a9331088deed841a4a8c47ed8341484f9a998d63dde867a98711324389d88112a642f47cac00a42939555154ec49d12d7f093d569a2542d7cae76586b8
-EBUILD kicad-meta-5.1.8.ebuild 613 BLAKE2B c357f1730ccdeb70fa0da044f4a7d7280317c4f25cc5b4e64f34ee4b87fb31b617ba34ffb2dc351585bafdaeb3f8c88d819b740910420f7f6caa2e9650a62f85 SHA512 a70a114966951c027e4a3bcf9876ba372ff5c2f44379b8c12091b3e9bc8efefa1b2be40bbd15ac326fb249f5c4c5f06e069f89043f892aee1972ac91c8fe37c9
+EBUILD kicad-meta-5.1.9.ebuild 613 BLAKE2B c3d8e395671a385d27dc40ad324940811bec1045457b73a28279c4ffd7f6ff5955ec765a5e625ef251afe6da60bcca3b352f699baf53846ea2a4dad08bcbbb62 SHA512 8f064747c4b37155925e1c897d3af9ab1c5762118e5bf1e96bd6eabd5a58816838706c2bd804425fd645729a8dbc91b7752175b5ed82255ba0e62a643d6d2c30
 MISC metadata.xml 594 BLAKE2B f9fa7bf50bca85e78a51d280c8d040c0be2aa6c4384b9577e24d02518e7c21af352590c774129fd7cdac6ae9de6557e3f4e115be8d7996e12dc66946729dd9d7 SHA512 ce90535f2ca5a5e33fe577c4cc2ea8a345cf708bd2a223e8922354d73d9aa7e7b4be557f5f4e021f48f8d5f34bca34ed01e192094edc7764779630331463fadf
diff --git a/sci-electronics/kicad-meta/kicad-meta-5.1.6.ebuild b/sci-electronics/kicad-meta/kicad-meta-5.1.6.ebuild
deleted file mode 100644
index 2e480580842e..000000000000
--- a/sci-electronics/kicad-meta/kicad-meta-5.1.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Electronic Schematic and PCB design tools (meta package)"
-HOMEPAGE="http://www.kicad-pcb.org"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc minimal nls"
-
-RDEPEND="
-	>=sci-electronics/kicad-5.1.6
-	>=sci-electronics/kicad-symbols-5.1.6
-	>=sci-electronics/kicad-footprints-5.1.6
-	doc? (
-		>=app-doc/kicad-doc-5.1.6
-	)
-	!minimal? (
-		>=sci-electronics/kicad-packages3d-5.1.6
-		>=sci-electronics/kicad-templates-5.1.6
-	)
-	nls? (
-		>=sci-electronics/kicad-i18n-5.1.6
-	)
-"
diff --git a/sci-electronics/kicad-meta/kicad-meta-5.1.7.ebuild b/sci-electronics/kicad-meta/kicad-meta-5.1.7.ebuild
deleted file mode 100644
index 889616e7ac6b..000000000000
--- a/sci-electronics/kicad-meta/kicad-meta-5.1.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Electronic Schematic and PCB design tools (meta package)"
-HOMEPAGE="http://www.kicad-pcb.org"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc minimal nls"
-
-RDEPEND="
-	>=sci-electronics/kicad-5.1.7
-	>=sci-electronics/kicad-symbols-5.1.7
-	>=sci-electronics/kicad-footprints-5.1.7
-	doc? (
-		>=app-doc/kicad-doc-5.1.7
-	)
-	!minimal? (
-		>=sci-electronics/kicad-packages3d-5.1.7
-		>=sci-electronics/kicad-templates-5.1.7
-	)
-	nls? (
-		>=sci-electronics/kicad-i18n-5.1.7
-	)
-"
diff --git a/sci-electronics/kicad-meta/kicad-meta-5.1.8.ebuild b/sci-electronics/kicad-meta/kicad-meta-5.1.9.ebuild
index 88d76f40cae8..62c2a5a2f8ac 100644
--- a/sci-electronics/kicad-meta/kicad-meta-5.1.8.ebuild
+++ b/sci-electronics/kicad-meta/kicad-meta-5.1.9.ebuild
@@ -13,17 +13,17 @@ KEYWORDS="~amd64"
 IUSE="doc minimal nls"
 
 RDEPEND="
-	>=sci-electronics/kicad-5.1.8
-	>=sci-electronics/kicad-symbols-5.1.8
-	>=sci-electronics/kicad-footprints-5.1.8
+	>=sci-electronics/kicad-${PV}
+	>=sci-electronics/kicad-symbols-${PV}
+	>=sci-electronics/kicad-footprints-${PV}
 	doc? (
-		>=app-doc/kicad-doc-5.1.8
+		>=app-doc/kicad-doc-${PV}
 	)
 	!minimal? (
-		>=sci-electronics/kicad-packages3d-5.1.8
-		>=sci-electronics/kicad-templates-5.1.8
+		>=sci-electronics/kicad-packages3d-${PV}
+		>=sci-electronics/kicad-templates-${PV}
 	)
 	nls? (
-		>=sci-electronics/kicad-i18n-5.1.8
+		>=sci-electronics/kicad-i18n-${PV}
 	)
 "
diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index f43b2af314b5..840129295080 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,7 +1,3 @@
-DIST kicad-packages3d-5.1.6.tar.gz 922508706 BLAKE2B 2742791ee23d12ae25dcbab85e3b65f0126f3b3193392d60738b3cbee8ca0585aede1dc43b65e8c39526841ba9f960d6df95e5135af2feccecae403ec0583b3a SHA512 248fb4a759c7824d17b8a955f0636ed266e404a783af9a684ae09b8d2efc8871851c5236caf4092a97ba0485a9c3962bdea1898658aa17d6503832348b1968a9
-DIST kicad-packages3d-5.1.7.tar.gz 942594575 BLAKE2B abc7c4b31f109968a48f5177d2ce09d216aa4b191d083492cc2c72db4a3bcf2209b91552a4eea4593634af7b901a1adb842517cfd9ad032062d6cb1f2415af07 SHA512 b1189c4d8a82e16334a2d116370c3e50edea0c2efaf91f4856605b1e566e808e86fc076796a7855efe709c7fafc7a0e2f924ce31cb245d6a3e362793a4a8be64
-DIST kicad-packages3d-5.1.8.tar.bz2 727228580 BLAKE2B f6ba05432fea5dfd7ef9ba78772cef9838c3d98b0b7a98390b8c819b5411f4ba209c4fb12dc75ef31bee6d881438604b8658294bd13ba5ea482b5ea17770279f SHA512 8f5a54408f3ef01e5d3eca876f7ba33abb72a7ca5cb4584e093fda3ba92a6d938db8a2be486a147feb7a7a24b86ead98c33e5ae1ac7622109d8fe66eaab39014
-EBUILD kicad-packages3d-5.1.6.ebuild 554 BLAKE2B f90d89ffab9127f911cc42233d303ca5569f8a2c200c337a4cda7a94f08e25e323ab9435cceb60387583808247523159141b4ab88e0aee7563a19b08d49149dd SHA512 f2d5cbe81d5fce256049734f7be1aa9ecdc694613a27a76a0d0552578668d121e4ab5e259940d7992fe7eb6b4ea0c2c60ce380bb945a4c709e6bc5b4d3842c1a
-EBUILD kicad-packages3d-5.1.7.ebuild 554 BLAKE2B b4cbc50a746aa6c0ddebae52f1eb1ed39c83cead7d512a622e4eb766c41cf1caec493c69de6d91e3f73b0e1b0a7c6793e8bd6fb06e2688a878772f41092d8f81 SHA512 1fbcdf4bb2fccb2a7ddc171bfa07527f97d2a20fda067374b56c777eed87402b676ccd7fd6f4f2d88ae383867fb9bdcf22e634debef4f7e02834f20523ef8abd
-EBUILD kicad-packages3d-5.1.8.ebuild 592 BLAKE2B b353ce155200f95b0ef7499ff069f754dca3c6aba9472712542a1414f44f0aac1f94c11b58b9c407e436d3226851728860f56185efb026c89b676f5111f4bb30 SHA512 f9d86a768977340b5d1e8d7008c98f44367278dc8d0a2db4156642987717425844ff262f488a232673f612552cf6d1f2c3908c160ca9cfe95b9f3101b5bb3b74
+DIST kicad-packages3d-5.1.9.tar.bz2 727202241 BLAKE2B 2f80b2e1bbc6b5c5d5c7baf77af187dac07d8c9ebc47d99419378f20b3a8eb9eb00da106810f0a3042a90c4bec44b467e78bc9c60b71c2b85e017342766f9101 SHA512 f5bfb9793d204f8f1bf46fe18897d59775fe7805299fd6af0215b8b9e28ce99d5183930120bfa7b5ee8b7599ae3be76f598b42b74db44ee50b7838fada860dd0
+EBUILD kicad-packages3d-5.1.9.ebuild 592 BLAKE2B b353ce155200f95b0ef7499ff069f754dca3c6aba9472712542a1414f44f0aac1f94c11b58b9c407e436d3226851728860f56185efb026c89b676f5111f4bb30 SHA512 f9d86a768977340b5d1e8d7008c98f44367278dc8d0a2db4156642987717425844ff262f488a232673f612552cf6d1f2c3908c160ca9cfe95b9f3101b5bb3b74
 MISC metadata.xml 945 BLAKE2B 31ec093af697452fee944b3d8fab75e50604f5a243e265bbe355410e976bb420094fe2801e737195d3746bb6c3044a6f6730b7b673cd7c24ac264fab47f29024 SHA512 436f8220e032f2b08d7ec5217aa13e501547022bf61155728ccc3230684768de63d2a9fba823e2c166bda612648649f296abb6ae8a0cf362e0589af350f95146
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.6.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.6.ebuild
deleted file mode 100644
index f3d17f7c321b..000000000000
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries"
-HOMEPAGE="https://kicad.github.io/packages3d/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="occ +oce"
-
-REQUIRED_USE="|| ( occ oce )"
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.1.0[occ=,oce=]"
-
-CHECKREQS_DISK_BUILD="10G"
-S="${WORKDIR}/${P/3d/3D}"
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.7.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.7.ebuild
deleted file mode 100644
index 4069d0c179ef..000000000000
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries"
-HOMEPAGE="https://kicad.github.io/packages3d/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="occ +oce"
-
-REQUIRED_USE="|| ( occ oce )"
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.1.0[occ=,oce=]"
-
-CHECKREQS_DISK_BUILD="11G"
-S="${WORKDIR}/${P/3d/3D}"
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.8.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.9.ebuild
index 67a41a58de5d..67a41a58de5d 100644
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.8.ebuild
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.9.ebuild
diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
index 8e08306092fd..c72d027b9b31 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1,7 +1,3 @@
-DIST kicad-symbols-5.1.6.tar.gz 2993494 BLAKE2B ba4056e350f049633a3265d2bd4e68af7765858d7d26d282b4dd7913d7a0f9d0011de319c6303c89c94ed4a07eeb93d6e08fca0b966d1e1138bef1b1ed74ad50 SHA512 e090cbafe3cffea86ccfda18d521528bededb573af7a46d5e7af0047a8c70f553e11e56046ec26ea11f742031507ab1ddd99459488f7ee57d8a18d6b9a5249ed
-DIST kicad-symbols-5.1.7.tar.gz 3033099 BLAKE2B e7e81677c5432c034cfdd6eb8e5ae108129d761e33c3f1969f379c0068de0be64353be42e8ca8394ea4bd3d81753e64bec81fb1a6fd106370e1a5673226fb7ad SHA512 0b6a4451957fcbce9a08706d121bbb853782c1163f8daba35f229b08577001bc1de41148340e59d3865d5b2775537c6ced1bede913845dc531d025559725f393
-DIST kicad-symbols-5.1.8.tar.bz2 1815263 BLAKE2B baa0125218df3ac9c4714924114892689b4ed3da4fd4e7566acc1ff89e47151b7c3e64155ca45200b5a3a1a5eebbcb5e9d656aa5454ae1ee52a76835215247d1 SHA512 f3d55ebf014d53c44c8f064701f605b7c393ca9c48d24281afb093908c4d7e3b6fdad6e0a80feac4e9709fa603b451d090496905af794f875820cda472517b16
-EBUILD kicad-symbols-5.1.6.ebuild 437 BLAKE2B 1fc869649baccc9738d4aa2cb9ec056921a0b70a50bfbcb3b822963a3cf0f70b12dfbbb866af8947cdd6310eeb1028f240fd3293c7afb6e80bf5fe26ab53edab SHA512 6fed6e67aae47e2e85033349a0cb596a1a7af43fe5658497010124d787dd0ef4634b5aba6f6fa32304f3eac69338ff2bf330778f7c296fc5f2eb88f7f19d6160
-EBUILD kicad-symbols-5.1.7.ebuild 437 BLAKE2B 1fc869649baccc9738d4aa2cb9ec056921a0b70a50bfbcb3b822963a3cf0f70b12dfbbb866af8947cdd6310eeb1028f240fd3293c7afb6e80bf5fe26ab53edab SHA512 6fed6e67aae47e2e85033349a0cb596a1a7af43fe5658497010124d787dd0ef4634b5aba6f6fa32304f3eac69338ff2bf330778f7c296fc5f2eb88f7f19d6160
-EBUILD kicad-symbols-5.1.8.ebuild 422 BLAKE2B 791497e59d77ba606cfdbb486106db4b38997b7e6566b68b25e003e32c200a756a25178c9eeb8b9002279b7010c2633b5f1b0f85b6b4d07ca70bbee418cb4fb3 SHA512 fd5838962dfda45a526123c2642fbfeab539dcfe55192d262d505817d141164aefc5adca00f2e58ffd69db0cd8fca80b228318e5c359024e525f60e9d1361d27
+DIST kicad-symbols-5.1.9.tar.bz2 1814966 BLAKE2B 5c66513c276434410fcd8f9a8c1478fce8182bee3c92c4fff42d2cf13c416ddc5f8c25618725f2f9eb54b216557d346eff4ebea78aeb7ebb3ed960baa3137138 SHA512 21bd0308723cf7dba8ab2294d70714160db6c64e5ebdad1c9344df0b6cd56fb9216d64977de68bd7ca8be190a89809576b71d21486c3e85fe077cceac54aabb3
+EBUILD kicad-symbols-5.1.9.ebuild 422 BLAKE2B 791497e59d77ba606cfdbb486106db4b38997b7e6566b68b25e003e32c200a756a25178c9eeb8b9002279b7010c2633b5f1b0f85b6b4d07ca70bbee418cb4fb3 SHA512 fd5838962dfda45a526123c2642fbfeab539dcfe55192d262d505817d141164aefc5adca00f2e58ffd69db0cd8fca80b228318e5c359024e525f60e9d1361d27
 MISC metadata.xml 693 BLAKE2B a3b93ce0fcc955588ebcf3e3104c1b7af572e714ba255cacca945d130623e5fb1fb621169b728f9fb24e4d90b4776913220cd8b068f3e176b5dc7be9d6b9cd25 SHA512 e0f2002922b08d0ca4abfd39779def493aeb0870701a255b606da86ce9adbdf39f78ac9b80a885e9fc9186f59e7f77caf8cc4273bc64003715338e30833fd174
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-5.1.6.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-5.1.6.ebuild
deleted file mode 100644
index b0040b719b9e..000000000000
--- a/sci-electronics/kicad-symbols/kicad-symbols-5.1.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools symbol libraries"
-HOMEPAGE="https://kicad.github.io/symbols/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-5.1.7.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-5.1.7.ebuild
deleted file mode 100644
index b0040b719b9e..000000000000
--- a/sci-electronics/kicad-symbols/kicad-symbols-5.1.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools symbol libraries"
-HOMEPAGE="https://kicad.github.io/symbols/"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-5.1.8.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-5.1.9.ebuild
index 4baf883551d0..4baf883551d0 100644
--- a/sci-electronics/kicad-symbols/kicad-symbols-5.1.8.ebuild
+++ b/sci-electronics/kicad-symbols/kicad-symbols-5.1.9.ebuild
diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest
index 881ab11ed849..070510161213 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1,7 +1,3 @@
-DIST kicad-templates-5.1.6.tar.gz 1634919 BLAKE2B acf7f2bd709d8482fb8de408cf89d568a8130d2ddc619e0d3a19e717b507915681879cc8102993a3b0a99c8c9360e5c787243cf1be5f1f76e3a9518ac5b8623a SHA512 cd0d539322e8c4fe9787d68bf2d7c1e5a287824aacd89edff77e1531052664669ce1193f58f5e992ff28183afadcf14c080c9ff407247f0b3d6c12366b4d4b0d
-DIST kicad-templates-5.1.7.tar.gz 1643946 BLAKE2B fee5a92f0f6d1914a12b03c90cfe76239b84fabc6b1b34e1381a59a140459eb27fd9e347e27564faaeecc9f89c149f246d5171e97a12825d50a4cb89f9e33104 SHA512 1c836ac53ab87e83118d158076f8527c0ec47aa047a385f836536971d9f0adc56c6c0029a1ce14828c31d7d446ac4b0cac7403dddec122633dee42ae6c33e4f6
-DIST kicad-templates-5.1.8.tar.bz2 1552947 BLAKE2B 87eb0b40981e63a795ce900792998a27cbe5c7bd441bd27b78ff356b943cebd3a2664ce1ff629501cb107d806276150601cbf2a59a5a94e64199a229d2d94328 SHA512 0f6fcd09ab2c0e64386a5a9046aebc0dfa053a1d6c28a18daa896fc7899d121bc2214f515af4556adba2871bb903715d4751ec1ece770a48b371b8b2ad1e8bb0
-EBUILD kicad-templates-5.1.6.ebuild 446 BLAKE2B 12896ec15d7a6c2e6d7d91cea70399637dba9792f8b2d2a840392521668daab22d1ebf7ecac3b88a4e3604c33db6d8c2f4c0ecf40c2c48759f02df44deda1ff7 SHA512 c10cd091881cdedbad5a890d9a3e0867e3610f2efa7fd7a0eaaa73b002dc7cede615dcb1a4cd97dd48332d12b9060f26c61fea71c3f3aa636c29017766418aa0
-EBUILD kicad-templates-5.1.7.ebuild 446 BLAKE2B 12896ec15d7a6c2e6d7d91cea70399637dba9792f8b2d2a840392521668daab22d1ebf7ecac3b88a4e3604c33db6d8c2f4c0ecf40c2c48759f02df44deda1ff7 SHA512 c10cd091881cdedbad5a890d9a3e0867e3610f2efa7fd7a0eaaa73b002dc7cede615dcb1a4cd97dd48332d12b9060f26c61fea71c3f3aa636c29017766418aa0
-EBUILD kicad-templates-5.1.8.ebuild 431 BLAKE2B 526c92f9c32bc4b5989641a5c1d2c746dd18077c27a3aeb33550ed77f151f360d327f147cfd5d2e3145a07744a810256f58f0b85aa8df42bb229ecb0c97da622 SHA512 7df0045f7b30af7dc990423c4429712cd53e9ab9c1bc1d024652804bf7433d0cde76ceeedd50932fcc2257958ef0b80c712fe42f41ab85e2b9438a000e75ad4a
+DIST kicad-templates-5.1.9.tar.bz2 1552087 BLAKE2B d6637fc8acb2906ed2b07dceabb00982b4b9d8d4bb9703f8c3aadc174d3f7945748b80fe5a7c0b40a4f2340c4af7ed04cf82b775a5fbd4d807949c5c12aa67de SHA512 284676c7bd2c4bc1b1867e73da4827fca0df965a43850641f1836c0cac71b6270984af4fdd75fe25bd7f638f4b08ee115e84038390855d15c089f074ee4cff4e
+EBUILD kicad-templates-5.1.9.ebuild 431 BLAKE2B 526c92f9c32bc4b5989641a5c1d2c746dd18077c27a3aeb33550ed77f151f360d327f147cfd5d2e3145a07744a810256f58f0b85aa8df42bb229ecb0c97da622 SHA512 7df0045f7b30af7dc990423c4429712cd53e9ab9c1bc1d024652804bf7433d0cde76ceeedd50932fcc2257958ef0b80c712fe42f41ab85e2b9438a000e75ad4a
 MISC metadata.xml 453 BLAKE2B 56db0c51d13c0cc2b65536b09e23714f53951c9f25ee716c6ceaaa65e12b2a6c85bed8dfca279364641e1b346bb70ac25c693ab9a0bd17b06d5dc732a0164a73 SHA512 f15055be34911712c68e6500d5f94a17bb21ec4c82eebdbbeb98053bc3daebd6d33c1626389cac8fab0834235f621d078dc89cf0f37f1126b03f6dbccefcae4b
diff --git a/sci-electronics/kicad-templates/kicad-templates-5.1.6.ebuild b/sci-electronics/kicad-templates/kicad-templates-5.1.6.ebuild
deleted file mode 100644
index 8ce2e5c4c462..000000000000
--- a/sci-electronics/kicad-templates/kicad-templates-5.1.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools project templates"
-HOMEPAGE="https://github.com/kicad/kicad-templates"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-templates/kicad-templates-5.1.7.ebuild b/sci-electronics/kicad-templates/kicad-templates-5.1.7.ebuild
deleted file mode 100644
index 8ce2e5c4c462..000000000000
--- a/sci-electronics/kicad-templates/kicad-templates-5.1.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools project templates"
-HOMEPAGE="https://github.com/kicad/kicad-templates"
-SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-templates/kicad-templates-5.1.8.ebuild b/sci-electronics/kicad-templates/kicad-templates-5.1.9.ebuild
index 6bc0cb273a29..6bc0cb273a29 100644
--- a/sci-electronics/kicad-templates/kicad-templates-5.1.8.ebuild
+++ b/sci-electronics/kicad-templates/kicad-templates-5.1.9.ebuild
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index c53803eb78d0..547a1195860e 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,13 +1,7 @@
-AUX kicad-5.1.5-algorithm-header.patch 417 BLAKE2B 644aeb5a0c2b084aeea5fd1a18d03bd16df6762a8b848021d6a0e6549142c9e1d3318c7bf20c9b594f9cebe67ecdebd42eacd2d15cb9e0652a5fc3afbc9b12fe SHA512 22424e038ee90dc73344dde8de553c614b3c29fb98fd74879b9dff4196a0d3317be8ec55d95bef57303e5961b20098ed4e29e1dfc25c206d396167a835ac6e9f
 AUX kicad-5.1.5-help.patch 4660 BLAKE2B c0521bea600748605dd581c34d63b6d084225d339f035167c3d0f0801f396ddfbbee22d843be53f81440b199c307604c98f08509fe9ec55efab6c297a7175947 SHA512 704fb0cc60bc18610bd410028c5c6302548bac646b0653ba32355b03fadbe4d8366dbad18469d5fd49d1d86e70497a13cbc2748c9e4b139d3a640c46bce50a36
 AUX kicad-5.1.5-ldflags.patch 890 BLAKE2B 2c5436fccb50886faacd84102ba7bfefa84986a5d65ea70965d2f0ded81e746e544f774bdfc0c539114dbafa3de7340bc41ea5af7a5db8a54b706221cafee7ee SHA512 4fda20a73499df81614dd920d18767d901269375d17749982d2c51cf595c873531379ac8ef57b1fc7adc1f4f028907002135f2e0fccaf4ee753184298e7cf8fd
 AUX kicad-5.1.5-strict-aliasing.patch 916 BLAKE2B e17c085d09d5b028424d72036e6306aecf19300fa5ecc38e0a3b4f7668ed8e41aa7c66f5f6dc68f6a66905fea8947647de90788fe2ca5439703b3fe2010b287e SHA512 1000ea7dd6fef283d144ccd9d6193a68a399177e06b1f45cae5642f7c2854d16d3cf4d789f8444c6aa36028f23b7d66c6de7596ffef57c4ecdc28747fac84636
 AUX kicad-5.1.6-metainfo.patch 1740 BLAKE2B 26987940c5326d5fa27eb7a00bfec8af2bc7d4f61b937f4a12aaf08665c1d9a5d2816b154c76e954f80f7c8c620861e290988bafb3af071ae059bfb92113a2f2 SHA512 bf1b9d7adc23759e9b637f2d2f3d2843f1ef33a27c02f7e892a74a8743dfdcf635f918010f0bcc4a62ba0f7e939f89fa8c7786a761ffe709f670a0d6f63b3146
-AUX kicad-5.1.6-ninja-build.patch 2154 BLAKE2B 8b7fd64878e8dac5e9dcfdad262cdde1ca87460d7776d0213f0cfec39b432d638651260cc0b537b9fb5cb18de6e020d2920d065333cebc5f2dd1606e43a69d9a SHA512 8d1d9740b8f09623580ec1ddc8a9de407b3db0fe7ae0705ef3f1c7b234972a05b32885c581c9af26ae8a245c3b5b0e2c2eacc37bffce11881b50c43003ee77fa
-DIST kicad-5.1.6.tar.bz2 18299367 BLAKE2B b5bfda025bb0be249f2ff334e8b82c49e4e4265fe4cf5daad8a01bfd6149f4c2d1c55d689f3033136ab904f45e8deb9ea12ccde43ea083b14d92e677adf39c0f SHA512 4fd3d0ac1524cc113210be8dc1b76ab4e02bf271f598943ecab73af98a9dc99009b2d3818c97b358498d2f98ee863f13b21e958fd2143356c2a1368601f0d48a
-DIST kicad-5.1.7.tar.bz2 18279204 BLAKE2B 9d12cf06282d2b8a5c5c4b0a387774ef90f8035bf0fafd9f5d939819f71edbb248d2b15fb4b3f35a80950fd41d140d93165ece61748076d7e2938cc0c9140e46 SHA512 f853eed50245d875b2443cc9accb3c75e8404d8fee12f129df68b3ab7052c31cda1eb0ad22fc10eb23b35250188973fb51a8c55fcb1560ea65d6e5e22b94a182
-DIST kicad-5.1.8.tar.bz2 18282857 BLAKE2B 07afa95853dae587293f71b4b6b5e888610439d39dd5bd715a1f424a837d46894771bf3eb4b447f7a70ea0bb0a810fee141a81bf56a4be50e81415b38552ff11 SHA512 6d40c5ce65c4350174412359d03a9c0c3a311de9ba57d92c1b053fefbb3e518cccb7a38a2a87e8f5b1950a3676514d25ae0e5e14a97b72a56cc0d401aeab3452
-EBUILD kicad-5.1.6.ebuild 4552 BLAKE2B d4ef44bdb71f42c9dc39e8338caea02aed7457b0861a11019bb64560361151fc624f6e2649b9308c756a6ca26286d7edb279703e4b4910cf1b9707f55ed7efd6 SHA512 4fe63f3b918378835d365870cbcca7010ce85833cc973c0b132e33d60262a5dbdafb84e84a8991aca9594af1eb9b59218170bc747d9177220c344f4af20b4e62
-EBUILD kicad-5.1.7.ebuild 4516 BLAKE2B 34922791e769d2154d495434a5854837eda397e8252ef5e8169d4a2d3b5c367eee7c72556041538d7ee82f484ad28716f05cb1f9ddc7ddd79f0c533546a392c9 SHA512 5cbe19e4d7285f392b9b6db93a968c91ac94b3a19e639b7ad1f99b8b04c45f45c6e1f7ebb91523730b0869ac92c6381759e0dc2b06e8aad32c3b42675ef4c11f
-EBUILD kicad-5.1.8.ebuild 4510 BLAKE2B 37d532f5be896e3f08b83a981f01677d382b55a4834ad2b5b6efc40ef992dc63b9b602d84d6100147ed26b80fb484cc4bc1697a3af7a71ed153562ed8430de5b SHA512 a72a87ea78b48b4988d43262d562c7d307ef4473cf286c22eb99e8eebd73f273e36324e6fad906907cfc916a8c4401accdebdde4df0f90bbe5078181c7acb1ee
+DIST kicad-5.1.9.tar.bz2 18597932 BLAKE2B bc91e1249378970188f968590f70f7f1e4226f9d5cf576da6b3e751332f3a6a2160f261e7a28587ac71bae2e03f77ba3d0aa703422515ea1bd24212de5efd108 SHA512 565226a1ce8d8af8011062f767366b60449d9ce5961f343e495d5b996fb66fbfc885ac3d383892879bdade9e4d374816a54b5eee754fbe5f257e8aaa8de8f739
+EBUILD kicad-5.1.9.ebuild 4465 BLAKE2B 16b0c54f9dd11c7d3804f15c99ce8ec67be4a63c96b2941dc0786eb67133944320103472f8c48697d32fea58290068a2c6a7cee620b76b1fd85a96b3113ee41d SHA512 8ee198bfa529c73f246c2a33566165757b0b1d9a2cd78385dfecc32fa2b741504cff34e46319d840bbee5348cfcb69a40f5ae5d25d11b3e9e89675fa3cbb46b2
 MISC metadata.xml 1013 BLAKE2B b6469c6095bc87dd09a15b8c29df6901c8c3a9137a85f11bca0198b87de4dba56a363763e577303c046ba0ae5734af20f87aff574470942b222489b2c8081067 SHA512 68b19d35279516a088271a06fa2edae7109f2f79c1bf46add405d11885e221f8166e21448cb1e70d961c185712496410a3f32e34265d18360e779f12dc907611
diff --git a/sci-electronics/kicad/files/kicad-5.1.5-algorithm-header.patch b/sci-electronics/kicad/files/kicad-5.1.5-algorithm-header.patch
deleted file mode 100644
index aa118ea6f860..000000000000
--- a/sci-electronics/kicad/files/kicad-5.1.5-algorithm-header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur kicad-5.1.5-orig/common/lib_tree_model.cpp kicad-5.1.5/common/lib_tree_model.cpp
---- kicad-5.1.5-orig/common/lib_tree_model.cpp  2020-05-11 00:36:36.568301297 +0200
-+++ kicad-5.1.5/common/lib_tree_model.cpp       2020-05-11 00:37:50.472359703 +0200
-@@ -21,6 +21,7 @@
-
- #include <lib_tree_model.h>
-
-+#include <algorithm>
- #include <eda_pattern_match.h>
- #include <lib_tree_item.h>
- #include <make_unique.h>
diff --git a/sci-electronics/kicad/files/kicad-5.1.6-ninja-build.patch b/sci-electronics/kicad/files/kicad-5.1.6-ninja-build.patch
deleted file mode 100644
index baff144fbd85..000000000000
--- a/sci-electronics/kicad/files/kicad-5.1.6-ninja-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naur kicad-5.1.6-orig/pcbnew/CMakeLists.txt kicad-5.1.6/pcbnew/CMakeLists.txt
---- kicad-5.1.6-orig/pcbnew/CMakeLists.txt	2020-05-11 11:27:08.000000000 -0700
-+++ kicad-5.1.6/pcbnew/CMakeLists.txt	2020-05-25 20:57:03.387859088 -0700
-@@ -805,11 +805,7 @@
-         add_dependencies( ScriptingModulesPcbnewSoCopy ScriptingPythonDirectoryCreation )
-         set( PYMOD_EXT "so" )
-     else()  # only linux remains among supported platforms
--        add_library( pcbnew_python MODULE $<TARGET_OBJECTS:pcbnew_kiface_objects> )
--        target_link_libraries( pcbnew_python ${PCBNEW_KIFACE_LIBRARIES} )
--        set_target_properties( pcbnew_python PROPERTIES OUTPUT_NAME pcbnew PREFIX "_" SUFFIX ".so" )
--        install( TARGETS pcbnew_python DESTINATION ${PYTHON_DEST} COMPONENT binary )
--
-+        install( FILES ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.kiface DESTINATION ${PYTHON_DEST} COMPONENT binary RENAME "_pcbnew.so" )
-         set( PYMOD_EXT "so" )
-     endif()
- 
-@@ -824,18 +820,16 @@
-             DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
-             )
-     else()
--
--
--    # For phase 1, copy _pcbnew.kiface to the python module.
--    add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
--        DEPENDS pcbnew_kiface
--        COMMAND ${CMAKE_COMMAND} -E copy _pcbnew.kiface _pcbnew.${PYMOD_EXT}
--        COMMENT "Creating python's pcbnew native module _pcbnew.${PYMOD_EXT} for command line use."
--        )
--    add_custom_target(
--        pcbnew_python_module ALL
--        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
--        )
-+        # For phase 1, copy _pcbnew.kiface to the python module.
-+        add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
-+            DEPENDS pcbnew_kiface
-+            COMMAND ${CMAKE_COMMAND} -E copy _pcbnew.kiface _pcbnew.${PYMOD_EXT}
-+            COMMENT "Creating python's pcbnew native module _pcbnew.${PYMOD_EXT} for command line use."
-+            )
-+        add_custom_target(
-+            pcbnew_python_module ALL
-+            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
-+            )
-     endif()
- 
- endif()
diff --git a/sci-electronics/kicad/kicad-5.1.6.ebuild b/sci-electronics/kicad/kicad-5.1.6.ebuild
deleted file mode 100644
index 0eff75e7cb86..000000000000
--- a/sci-electronics/kicad/kicad-5.1.6.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools"
-HOMEPAGE="https://www.kicad-pcb.org"
-SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ GPL-3+ Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples github +ngspice occ +oce openmp +python"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	?? ( occ oce )
-"
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.61:=[context,nls,threads]
-	media-libs/freeglut
-	media-libs/glew:0=
-	>=media-libs/glm-0.9.9.1
-	media-libs/mesa[X(+)]
-	>=x11-libs/cairo-1.8.8:=
-	>=x11-libs/pixman-0.30
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	github? ( net-misc/curl:=[ssl] )
-	ngspice? (
-		>sci-electronics/ngspice-27[shared]
-	)
-	occ? ( >=sci-libs/opencascade-6.8.0:= )
-	oce? ( sci-libs/oce )
-	python? (
-		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.61:=[context,nls,threads,python,${PYTHON_MULTI_USEDEP}]
-			dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	python? ( >=dev-lang/swig-3.0:0 )"
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu
-"
-BDEPEND="doc? ( app-doc/doxygen )"
-CHECKREQS_DISK_BUILD="800M"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.1.5-help.patch"
-	"${FILESDIR}/${P}-ninja-build.patch"
-	"${FILESDIR}/${PN}-5.1.5-strict-aliasing.patch"
-	"${FILESDIR}/${PN}-5.1.5-algorithm-header.patch"
-	"${FILESDIR}/${P}-metainfo.patch"
-	"${FILESDIR}/${PN}-5.1.5-ldflags.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	use openmp && tc-check-openmp
-	setup-wxwidgets
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	default_src_unpack
-	# For the metainfo patch to work the kicad.appdata.xml has to be moved to
-	# avoid QA issue.  This is needed because /usr/share/appdata location is
-	# deprecated, it should not be used anymore by new software.
-	# Appdata/Metainfo files should be installed into /usr/share/metainfo
-	# directory. as per
-	# https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
-	mv "${S}/resources/linux/appdata" "${S}/resources/linux/metainfo" || die "Appdata move failed"
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local mycmakeargs=(
-		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}"
-		-DKICAD_HELP="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
-		-DBUILD_GITHUB_PLUGIN="$(usex github)"
-		-DKICAD_SCRIPTING="$(usex python)"
-		-DKICAD_SCRIPTING_MODULES="$(usex python)"
-		-DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
-		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX="$(usex python)"
-		-DKICAD_SCRIPTING_PYTHON3="$(usex python)"
-		-DKICAD_SCRIPTING_ACTION_MENU="$(usex python)"
-		-DKICAD_SPICE="$(usex ngspice)"
-		-DKICAD_USE_OCC="$(usex occ)"
-		-DKICAD_USE_OCE="$(usex oce)"
-		-DKICAD_INSTALL_DEMOS="$(usex examples)"
-		-DCMAKE_SKIP_RPATH="ON"
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_DEST="$(python_get_sitedir)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
-	use occ && mycmakeargs+=(
-		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-		-DOCC_LIBRARY_DIR="${CASROOT}"/lib
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_src_compile dev-docs doxygen-docs
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	use python && python_optimize
-	if use doc ; then
-		dodoc uncrustify.cfg
-		cd Documentation || die
-		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/.
-	fi
-}
-
-src_test() {
-	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
-	ln -s "${S}_build/eeschema/_eeschema.kiface" "${S}_build/qa/eeschema/_eeschema.kiface" || die
-
-	default
-}
-
-pkg_postinst() {
-	optfeature "Component symbols library" sci-electronics/kicad-symbols
-	optfeature "Component footprints library" sci-electronics/kicad-footprints
-	optfeature "3D models of components " sci-electronics/kicad-packages3d
-	optfeature "Project templates" sci-electronics/kicad-templates
-	optfeature "Different languages for GUI" sci-electronics/kicad-i18n
-	optfeature "Extended documentation" app-doc/kicad-doc
-	optfeature "Creating 3D models of components" media-gfx/wings
-
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/sci-electronics/kicad/kicad-5.1.7.ebuild b/sci-electronics/kicad/kicad-5.1.7.ebuild
deleted file mode 100644
index 4e39f2bdd57a..000000000000
--- a/sci-electronics/kicad/kicad-5.1.7.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools"
-HOMEPAGE="https://www.kicad-pcb.org"
-SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ GPL-3+ Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples github +ngspice occ +oce openmp +python"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	?? ( occ oce )
-"
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.61:=[context,nls,threads]
-	media-libs/freeglut
-	media-libs/glew:0=
-	>=media-libs/glm-0.9.9.1
-	media-libs/mesa[X(+)]
-	>=x11-libs/cairo-1.8.8:=
-	>=x11-libs/pixman-0.30
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	github? ( net-misc/curl:=[ssl] )
-	ngspice? (
-		>sci-electronics/ngspice-27[shared]
-	)
-	occ? ( >=sci-libs/opencascade-6.8.0:= )
-	oce? ( sci-libs/oce )
-	python? (
-		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.61:=[context,nls,threads,python,${PYTHON_MULTI_USEDEP}]
-			dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	python? ( >=dev-lang/swig-3.0:0 )"
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu
-"
-BDEPEND="doc? ( app-doc/doxygen )"
-CHECKREQS_DISK_BUILD="800M"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.1.5-help.patch"
-	"${FILESDIR}/${PN}-5.1.6-ninja-build.patch"
-	"${FILESDIR}/${PN}-5.1.5-strict-aliasing.patch"
-	"${FILESDIR}/${PN}-5.1.6-metainfo.patch"
-	"${FILESDIR}/${PN}-5.1.5-ldflags.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	use openmp && tc-check-openmp
-	setup-wxwidgets
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	default_src_unpack
-	# For the metainfo patch to work the kicad.appdata.xml has to be moved to
-	# avoid QA issue.  This is needed because /usr/share/appdata location is
-	# deprecated, it should not be used anymore by new software.
-	# Appdata/Metainfo files should be installed into /usr/share/metainfo
-	# directory. as per
-	# https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
-	mv "${S}/resources/linux/appdata" "${S}/resources/linux/metainfo" || die "Appdata move failed"
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local mycmakeargs=(
-		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}"
-		-DKICAD_HELP="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
-		-DBUILD_GITHUB_PLUGIN="$(usex github)"
-		-DKICAD_SCRIPTING="$(usex python)"
-		-DKICAD_SCRIPTING_MODULES="$(usex python)"
-		-DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
-		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX="$(usex python)"
-		-DKICAD_SCRIPTING_PYTHON3="$(usex python)"
-		-DKICAD_SCRIPTING_ACTION_MENU="$(usex python)"
-		-DKICAD_SPICE="$(usex ngspice)"
-		-DKICAD_USE_OCC="$(usex occ)"
-		-DKICAD_USE_OCE="$(usex oce)"
-		-DKICAD_INSTALL_DEMOS="$(usex examples)"
-		-DCMAKE_SKIP_RPATH="ON"
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_DEST="$(python_get_sitedir)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
-	use occ && mycmakeargs+=(
-		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-		-DOCC_LIBRARY_DIR="${CASROOT}"/lib
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_src_compile dev-docs doxygen-docs
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	use python && python_optimize
-	if use doc ; then
-		dodoc uncrustify.cfg
-		cd Documentation || die
-		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/.
-	fi
-}
-
-src_test() {
-	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
-	ln -s "${S}_build/eeschema/_eeschema.kiface" "${S}_build/qa/eeschema/_eeschema.kiface" || die
-
-	default
-}
-
-pkg_postinst() {
-	optfeature "Component symbols library" sci-electronics/kicad-symbols
-	optfeature "Component footprints library" sci-electronics/kicad-footprints
-	optfeature "3D models of components " sci-electronics/kicad-packages3d
-	optfeature "Project templates" sci-electronics/kicad-templates
-	optfeature "Different languages for GUI" sci-electronics/kicad-i18n
-	optfeature "Extended documentation" app-doc/kicad-doc
-	optfeature "Creating 3D models of components" media-gfx/wings
-
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/sci-electronics/kicad/kicad-5.1.8.ebuild b/sci-electronics/kicad/kicad-5.1.9.ebuild
index eb9b3fb01986..f738cbde21de 100644
--- a/sci-electronics/kicad/kicad-5.1.8.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.9.ebuild
@@ -56,7 +56,6 @@ CHECKREQS_DISK_BUILD="800M"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.1.5-help.patch"
-	"${FILESDIR}/${PN}-5.1.6-ninja-build.patch"
 	"${FILESDIR}/${PN}-5.1.5-strict-aliasing.patch"
 	"${FILESDIR}/${PN}-5.1.6-metainfo.patch"
 	"${FILESDIR}/${PN}-5.1.5-ldflags.patch"
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index 648c8db9dbe7..158b6df7a974 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,6 +1,8 @@
 DIST klayout-0.26.5.tar.gz 52335763 BLAKE2B b1ab39c378ce23c28f5a58191dbf43c5b8c165e9df241b00573c8f8b72a5a7251cddd41bf62a7e37f59cad68024c52ab99f8d0f10bf1bf45dba975bf37ba80db SHA512 b80dff34a9dd538921f6863fc94eb8a2160b989468ec0493a7ecfdfccea0e4f0441aa1ee860d000b150b0a0bc0b831dcb849ab77e9eb1304e9ed6fcced94689c
 DIST klayout-0.26.8.tar.gz 54423228 BLAKE2B 5839e77a7910b0a838b6d1f436fe697ea445e968044f7102ab71d3d485ea4631194bf002d4440771e73c77359b673372662506a9cc6e2d4a3b5dc8df171783c7 SHA512 a37b324194ed523ee70a1d63034db9ba48cf55d44d3a9d1bc612803cde2425f6909fd0571ad4a66318fc2c6735e19ba11a26ab153e1200adec405c16fc05f144
+DIST klayout-0.26.9.tar.gz 54223809 BLAKE2B 3800b0f49a77a73d4310485ba8539698b72c4a8f953723f4caee43a8c189aa044f7c8e617bc67640071e81d94e9edadbba11114b6d6edd4fcd67d02df33ec7d9 SHA512 1a163a055806fb9555aaf6253cb63d6ebe9648f6e165dfd1cbaa6d199652fa98363f6ddae32843cde5f768a8c2f42c8b06fb4691ed64e40979a22a96bd73874b
 EBUILD klayout-0.26.5.ebuild 1855 BLAKE2B b9ef2c667988f3e21c61b0cd9e7a1eea0e852db716a8c07a3ddff2d8f81d804edf97d6b135f4573f9c15f805102d8978d9f838cfe9357a85f5fc94a6b2dc5898 SHA512 588fd483e8634f242efca36871f9721f26fa7ba884d1eb672ee572b3b5e2ceaab787cdf305bc0b64a65564b5f02a45de401bd7bb1dce9a4da4c1ad1465e68146
 EBUILD klayout-0.26.8.ebuild 1856 BLAKE2B 45bfa423463b32a1cf25f1a26ef1cfb2ace40032be10849016d5b92bfecb663c8bfff82418a85bd0e0d4065e0fbe4aa6ff20efc9f75fd17a81359345ea712459 SHA512 412872dc99e28f95a88c3d0ce43669a3ef19e05caff9a7176ba63265aa85c8ac0b88234120131ffff444177ecccf9797a6c64f9106ce666593dc8944b2d50989
+EBUILD klayout-0.26.9.ebuild 1856 BLAKE2B ea16d7ed953eadec72c1988d134502cb6c304e6cea63766580f40cece48268b7af3ead16be361ed2246be01728f97b07a52190922770bc50a06ef38636c9bbf7 SHA512 59e9b04a835b5bf6637489d03962ea74894f93a123c4a2bf969a7b31a37ceb3f429bd87e32ce6425684d870d71afcaa45b94a0108ad22e88066e2bc7903e66f7
 EBUILD klayout-9999.ebuild 1856 BLAKE2B 45bfa423463b32a1cf25f1a26ef1cfb2ace40032be10849016d5b92bfecb663c8bfff82418a85bd0e0d4065e0fbe4aa6ff20efc9f75fd17a81359345ea712459 SHA512 412872dc99e28f95a88c3d0ce43669a3ef19e05caff9a7176ba63265aa85c8ac0b88234120131ffff444177ecccf9797a6c64f9106ce666593dc8944b2d50989
 MISC metadata.xml 380 BLAKE2B 3961dc3b4b0a6f3de5460e01e434f8ba1e4504247aac8cb40553d0752ece4f4be7e9d5fefee9d61e85681631eb200959b341c6aeda60b89c14119f95a40f4aa6 SHA512 92ee6b53a7dfed04d5a2aef510e0f2f0dcc70903258d5d4cb6ee497521cbb41214b7a45000693a0ecb66029767a48988c45b9b7fb78a09dc813710a9283d2f7d
diff --git a/sci-electronics/klayout/klayout-0.26.9.ebuild b/sci-electronics/klayout/klayout-0.26.9.ebuild
new file mode 100644
index 000000000000..6e5915021abb
--- /dev/null
+++ b/sci-electronics/klayout/klayout-0.26.9.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+RUBY_OPTIONAL=no
+USE_RUBY="ruby26"
+# note: define maximally ONE implementation here
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit toolchain-funcs python-single-r1 ruby-ng
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/klayoutmatthias/${PN}.git"
+	inherit git-r3
+	EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
+else
+	SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
+HOMEPAGE="https://www.klayout.de/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	sys-libs/zlib
+	${PYTHON_DEPS}
+	$(ruby_implementations_depend)
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ruby-ng_pkg_setup
+}
+
+each_ruby_configure() {
+	tc-export CC CXX AR LD RANLIB
+	export CFLAGS CXXFLAGS
+	./build.sh \
+		-expert \
+		-dry-run \
+		-qmake "/usr/$(get_libdir)/qt5/bin/qmake" \
+		-ruby "${RUBY}" \
+		-python "${PYTHON}" \
+		-build . \
+		-bin "${T}/bin" \
+		-rpath "/usr/$(get_libdir)/klayout" \
+		-option "${MAKEOPTS}" \
+		-with-qtbinding \
+		-without-64bit-coord \
+		-qt5 || die "Configuration failed"
+}
+
+each_ruby_compile() {
+	emake all
+}
+
+each_ruby_install() {
+	emake install
+
+	cd "${T}/bin" || die
+
+	dodir "/usr/$(get_libdir)/klayout"
+	mv lib* lay_plugins db_plugins "${ED}/usr/$(get_libdir)/klayout/" || die
+
+	mkdir -p "${D}/$(python_get_sitedir)" || die
+	mv pymod/* "${D}/$(python_get_sitedir)/" || die
+	rmdir pymod || die
+
+	dobin *
+
+	python_optimize
+}
diff --git a/sci-electronics/ngspice/Manifest b/sci-electronics/ngspice/Manifest
index ee1be738b55e..385bb79b729e 100644
--- a/sci-electronics/ngspice/Manifest
+++ b/sci-electronics/ngspice/Manifest
@@ -1,12 +1,4 @@
-AUX ngspice-27-autoconf_fftw3.patch 959 BLAKE2B bfc7e1eefd9ea591fee57e8e06dae4eddd5e677a6ffe493a274ad1c1ef9a580f05eda805252b837ce95df8bdf083e43beecb864118eee383d70a79fbaec8c0e7 SHA512 880269c6d3f5b1cb8fe7518df4763b5202923cc216481380ff3f4f3e519c181e3027d6310061df58ffac644aaf7255b768e184960c01fe1dd6afbd9ea7c31eec
-AUX ngspice-27-blt_linkage_workaround.patch 305 BLAKE2B d31977f4acbaf9d0f015cb34adf3b27733307ea98dc3c5a0206605546d62b4b207f19f277131bb6f351842e36de3e4df583c6c450d70d9ffee87e160a818ee8d SHA512 2eab1af989d1729d900f75505be0ddad9302705eb10a2aec6966a3abf9446cca66f42972770e2e24a085702bab49976fefa2868f06ffb5651c9197d13dc0bf2a
-AUX ngspice-27-fix_parsing_tcl_commands.patch 448 BLAKE2B d5d3532bca4301aa4c281173cbdf23d33ea61869ea6731d1ebf782e2bca5945a407ae1e566258564d1ab899330b5b7a85fa8c1b2fc79b2214dbf29a2a2c1e5b2 SHA512 ba82cf454d14fbfeb38a4b0942d1e947ca76a54976aec8fcac08913f8a08f12878593bb067ba469ea9a6c818ea6ea372119c500be1841058b840d9928dcf54ad
-AUX ngspice-27-split_terminfo.patch 1081 BLAKE2B 8e44c6fe8447b419986206cc658a255e3c574d81cbbb3079d00f08046978f7a08c8c3e9697fdbf009aa1840df60d0045bd6712351280977cf8e66e3d2d505ab2 SHA512 2e5b7f83045304fbc5b35a9c7aeff3ed343b27d830e4d69bf5b30c631f59965241116afc5d062f3fb16b20710e42897605fc614fecb01997a92c595c47510f66
-DIST ngspice-27-manual.pdf 3117788 BLAKE2B 6e271abc50b0139c4776844ea31176d231e68c70ce34d0daec48aefc5ef5a9eac90a77f3141081f38c6ac8d42bb95ec061bf1d43bfd3a4fb13e4822c2eff4f57 SHA512 ed87764715917e2cd832c49e911a2908dba9907f9f01c933cb7f97a92c7f9ff345bc26a2f0561dd34b2eede6874b6a67b4864abf3dcff127bd0306e778e997b5
-DIST ngspice-27.tar.gz 7372998 BLAKE2B ce8590518fa4eb4292c73c4eaefdd9d0da19bca8120b51daae954a5b9d86f51912d2dccb5a827480caadce8321373d96f045226db4986a78bcc9170f2e46f9a5 SHA512 1714f95ab5716c228a0b39395a742e8b9a823e0e6f7e08625d089541ea786df5fd7b9d2982bcec8431e27ac6ba7603ecc507f9cfcb0a6aacd53f5633f52bd2ea
 DIST ngspice-31-manual.pdf 2149244 BLAKE2B 155f7299cbb6d7c7953d8488e11f0bffc3c18097f02194c491174a9af387cda9e87cb79b13a37f402616386e7e82230eb4d41909fe37d900792e48f2f49c71dd SHA512 3322df92791718979a275f2640f82c3417f394a76d27ebf06b46f29a40a1ee3ef57c65a75a7ba67e697b55bd435f81e9ee61c78532f991a2dd6844b4f325eb55
 DIST ngspice-31.tar.gz 7250057 BLAKE2B dabc8e1084eba957d6dad06e74f878b51e97dc8bc49b04ee612a6f9eaadde7302450c9ab93e943c4af42197b6bbdca7cae534464ccd2fcd4869b8a48b6f3140d SHA512 448024f398d267911d5d2a48da03eb0d87ba1133ce39d5132bd318dde8ad359d19c7f85f6b4ec88c08b081c9140f7b931334d84173019a22aa2ac98482bd7d5d
-EBUILD ngspice-27-r1.ebuild 4247 BLAKE2B 01ebbb81f14e25e7ea8745ed6ff510223db3af93067fa28adf694a385c4dd26f5966fca08ac47ce968e9ba4181fc571428375a2eca95ddc66e73a13b7d58c6b2 SHA512 4a185c90365f8098001d6f8d0d0226774aed618418ce078e542d0e25ab511681d9294f494f853f6ef03fac2093f54880e998050efc1e67059e8dc720f99c23c9
-EBUILD ngspice-27.ebuild 1791 BLAKE2B be86cecfa0fd6fe392c1925ded82e154098767d0bc008811f872f77935aad13ab969a51b08299e138ba6c9526b07a9845c7d7d3f304241cda0fb99e543336aa6 SHA512 56fab5c12ab31ddfe654ae8c5021caaa80f019044f94c683987f5457e6401015a4a7d67f9f43499f57d3e798abbc7e09625b128085615e34ff3fcd25d9a41ed9
 EBUILD ngspice-31-r1.ebuild 4386 BLAKE2B 3d544f5195dd18e9b7d2ec94518157189a6fb4378b3ccf70865a02cecd69d2b43cea643792153fc8f8e25bdb423cd51ab023fe9a99c4e97bd845875e52932b8e SHA512 1397b9bdd333ced89c244b65d3b1d584b8d3ca1974bb74901dd7339bb20a45e0b96154a09e8b4ec346e13a2521d491a15be3dae4accd9b8cd9984e8063e260da
 MISC metadata.xml 676 BLAKE2B 9f7a12febdcf08bf12af50524f20250fdb253888ff12045d6033f957f9c6d81fd21ce47a1e6694d9aa48d28fa2b5f9e3cbabc8e54f4e810ea10e5f251ebf3165 SHA512 3a92c343662ecec1091a9bc8e5b4c9569c783e3ddd78027925487a93446d43c863f918de67a8738eea463994ba6c590e693245d36ed4e05e62312cf100a1f2a7
diff --git a/sci-electronics/ngspice/files/ngspice-27-autoconf_fftw3.patch b/sci-electronics/ngspice/files/ngspice-27-autoconf_fftw3.patch
deleted file mode 100644
index d0eec127c572..000000000000
--- a/sci-electronics/ngspice/files/ngspice-27-autoconf_fftw3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -191,6 +191,10 @@
- AC_ARG_WITH([ngshared],
-     [AS_HELP_STRING([--with-ngshared], [Compiles ngspice as shared library (dll)])])
- 
-+# --with-fftw3: Use fftw3 for Fourier transforms.  Default is "yes".
-+AC_ARG_WITH([fftw3],
-+    [AS_HELP_STRING([--with-fftw3[=yes/no]], [Use fftw3 for Fourier transforms. Default=yes.])])
-+
- # readline and editline cannot both be enabled
- if test "x$with_editline" = xyes; then
-     if test "x$with_readline" = xyes; then
-@@ -726,10 +730,12 @@
- # Look for math library:
- AC_CHECK_LIB([m], [sqrt])
- AC_CHECK_HEADERS([float.h limits.h values.h ieeefp.h])
-+if test "x$with_fftw3" != xno; then
- AC_CHECK_HEADERS([fftw3.h])
- AC_CHECK_LIB([fftw3], [fftw_plan_dft_1d],
-         [AC_DEFINE([HAVE_LIBFFTW3], [], [Have fft routines in libfftw3])
-          LIBS="$LIBS -lfftw3"])
-+fi
- 
- # Check for a few mathematical functions:
- AC_CHECK_FUNCS([erfc logb scalb scalbn asinh acosh atanh finite])
diff --git a/sci-electronics/ngspice/files/ngspice-27-blt_linkage_workaround.patch b/sci-electronics/ngspice/files/ngspice-27-blt_linkage_workaround.patch
deleted file mode 100644
index 53415c748d6d..000000000000
--- a/sci-electronics/ngspice/files/ngspice-27-blt_linkage_workaround.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -461,6 +461,9 @@
-         AC_MSG_ERROR([Couldn't find BLT])
-     fi
-     rm -f conftest.tcl
-+
-+    AC_SEARCH_LIBS([Blt_GetVector], [BLT BLT24 BLT25],,
-+        [AC_MSG_ERROR([Couldnt find BLT library.])])
-     
-     AC_CHECK_LIB([pthread], [pthread_create])
-     
diff --git a/sci-electronics/ngspice/files/ngspice-27-fix_parsing_tcl_commands.patch b/sci-electronics/ngspice/files/ngspice-27-fix_parsing_tcl_commands.patch
deleted file mode 100644
index bad336590dfa..000000000000
--- a/sci-electronics/ngspice/files/ngspice-27-fix_parsing_tcl_commands.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/tclspice.c
-+++ b/src/tclspice.c
-@@ -828,10 +828,9 @@
-     int i;
-     NG_IGNORE(clientData);
-     save_interp();
--    /* Looks backwards through the first command and strips the :: part */
--    for (i = strlen(argv[0])-1; i > 0; i--)
--        if (argv[0][i] == *":")
--            argv[0] += i + 1;
-+    char *prefix = strstr(argv[0], "spice::");
-+    if (prefix)
-+        argv[0] = prefix + 7;
-     return _run(argc, (char **)argv);
- }
- 
diff --git a/sci-electronics/ngspice/files/ngspice-27-split_terminfo.patch b/sci-electronics/ngspice/files/ngspice-27-split_terminfo.patch
deleted file mode 100644
index 09f5ee29a3c9..000000000000
--- a/sci-electronics/ngspice/files/ngspice-27-split_terminfo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1016,7 +1016,7 @@
-         AC_CHECK_HEADERS([readline/readline.h readline/history.h],
-             [AC_DEFINE([HAVE_GNUREADLINE], [], [Define if we have GNU readline])],
-             [AC_MSG_ERROR([Couldn't find GNU readline headers.])])
--        AC_SEARCH_LIBS([tputs], [ncurses termcap],
-+        AC_SEARCH_LIBS([tputs], [ncurses termcap tinfo],
-             [AC_DEFINE([HAVE_TERMCAP], [], [Define if we have ncurses or termcap])],
-             [AC_MSG_ERROR([Found neither ncurses or termcap])])
-         AC_CHECK_LIB([readline], [readline],
-@@ -1036,7 +1036,7 @@
-     AC_CHECK_HEADERS([editline/readline.h],
-         [AC_DEFINE([HAVE_BSDEDITLINE], [1], [Define to enable BSD editline])],
-         [AC_MSG_ERROR([Couldn't find BSD editline headers.])])
--    AC_SEARCH_LIBS([tputs], [ncurses termcap],
-+    AC_SEARCH_LIBS([tputs], [ncurses termcap tinfo],
-         [AC_DEFINE([HAVE_TERMCAP], [], [Define if we have ncurses or termcap])],
-         [AC_MSG_ERROR([Found neither ncurses or termcap])])
-     AC_CHECK_LIB([edit], [readline],
diff --git a/sci-electronics/ngspice/ngspice-27-r1.ebuild b/sci-electronics/ngspice/ngspice-27-r1.ebuild
deleted file mode 100644
index ee256f9f179c..000000000000
--- a/sci-electronics/ngspice/ngspice-27-r1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multibuild toolchain-funcs
-
-DESCRIPTION="The Next Generation Spice (Electronic Circuit Simulator)"
-SRC_URI="mirror://sourceforge/ngspice/${P}.tar.gz
-	doc? ( mirror://sourceforge/ngspice/${P}-manual.pdf )"
-HOMEPAGE="http://ngspice.sourceforge.net"
-LICENSE="BSD GPL-2"
-
-SLOT="0"
-IUSE="X debug doc examples fftw openmp readline +shared tcl"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x64-macos"
-
-DEPEND="sys-libs/ncurses:0=
-	X? ( x11-libs/libXaw
-		x11-libs/libXt
-		x11-libs/libX11 )
-	fftw? ( sci-libs/fftw:3.0 )
-	readline? ( sys-libs/readline:0= )
-	tcl? ( dev-lang/tcl:0
-		dev-tcltk/blt )"
-RDEPEND="${DEPEND}
-	X? ( sci-visualization/xgraph )"
-
-DOCS=(
-	ANALYSES
-	AUTHORS
-	BUGS
-	ChangeLog
-	DEVICES
-	NEWS
-	README
-	Stuarts_Poly_Notes
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-autoconf_fftw3.patch
-	"${FILESDIR}"/${P}-blt_linkage_workaround.patch
-	"${FILESDIR}"/${P}-fix_parsing_tcl_commands.patch
-	"${FILESDIR}"/${P}-split_terminfo.patch
-)
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( "binaries" )
-	use shared && MULTIBUILD_VARIANTS+=( "shared" )
-	use tcl && MULTIBUILD_VARIANTS+=( "tcl" )
-	use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	if use tcl; then
-		if use examples; then
-			find examples/tclspice -type f -iname \*tcl |
-			while read s
-			do
-				sed -i -e 's@../../../src/.libs/libspice.so@libspice.so@g' \
-					-e 's@package require BLT@package require Tk\npackage require BLT@g' \
-					-e "s@spice::codemodel \(.*\)/\(.*\).cm@spice::codemodel /usr/$(get_libdir)/ngspice/\2.cm@g" \
-					"${s}" || die "sed failed"
-			done
-		fi
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	multibuild_copy_sources
-	multibuild_foreach_variant ngspice_configure
-}
-
-ngspice_configure() {
-	pushd "${BUILD_DIR}"
-
-	local myconf
-	if use debug; then
-		myconf="--enable-debug \
-			--enable-ftedebug \
-			--enable-cpdebug \
-			--enable-sensdebug \
-			--enable-asdebug \
-			--enable-stepdebug \
-			--enable-pzdebug"
-	else
-		myconf="--disable-debug \
-			--disable-ftedebug \
-			--disable-cpdebug \
-			--disable-sensdebug \
-			--disable-asdebug \
-			--disable-stepdebug \
-			--disable-pzdebug"
-	fi
-	# As of December 2017, these do not compile
-	myconf="${myconf} \
-		--disable-blktmsdebug \
-		--disable-smltmsdebug"
-
-	myconf="${myconf} \
-		--enable-xspice \
-		--enable-cider \
-		--disable-xgraph \
-		--disable-rpath \
-		$(use_enable openmp) \
-		$(use_with fftw fftw3) \
-		$(use_with readline)"
-
-	if [ "${MULTIBUILD_VARIANT}" == "shared" ]; then
-		myconf="${myconf} \
-			--with-ngshared"
-	elif [ "${MULTIBUILD_VARIANT}" == "tcl" ]; then
-		myconf="${myconf} \
-			--with-tcl"
-	else
-		myconf="${myconf} \
-			$(use_with X x)"
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	multibuild_foreach_variant ngspice_compile
-}
-
-ngspice_compile() {
-	pushd "${BUILD_DIR}"
-	default
-}
-
-src_install() {
-	multibuild_foreach_variant ngspice_install
-
-	# merge the installations of all variants
-	for v in "${MULTIBUILD_VARIANTS[@]}" ; do
-		cp -a "${D}_${v}"/* "${D}" || die "Failed to combine multibuild installations"
-		rm -rf "${D}_${v}"
-	done
-
-	use tcl && DOCS+=( README.tcl )
-	use doc && DOCS+=( "${DISTDIR}"/${P}-manual.pdf )
-
-	default
-
-	# We don't need ngmakeidx to be installed
-	rm -f "${D}"/usr/bin/ngmakeidx
-	rm -f "${D}"/usr/share/man/man1/ngmakeidx.1
-
-	if use examples; then
-		use tcl || rm -rf examples/tclspice
-
-		insinto /usr/share/${PN}
-		doins -r examples
-	fi
-}
-
-ngspice_install() {
-	pushd "${BUILD_DIR}"
-
-	emake DESTDIR="${D}_${MULTIBUILD_VARIANT}" install
-
-	# Strip shared-library and Tcl-module builds to the bare minimum;
-	# all the support files will have been handled by the 'binaries' build.
-	if [ "${MULTIBUILD_VARIANT}" != "binaries" ]; then
-		rm -rf "${D}_${MULTIBUILD_VARIANT}"/usr/bin{,.debug}
-		rm -rf "${D}_${MULTIBUILD_VARIANT}"/usr/share
-		rm -rf "${D}_${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/*.la
-		rm -rf "${D}_${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/ngspice/*.cm{,.debug}
-	fi
-}
-
-src_test() {
-	if ! use debug; then
-		multibuild_foreach_variant ngspice_test
-	else
-		# https://sourceforge.net/p/ngspice/bugs/353/
-		ewarn
-		ewarn "Skipping tests because they are known to fail in debug mode"
-		ewarn
-	fi
-}
-
-ngspice_test() {
-	pushd "${BUILD_DIR}"
-	default
-}
diff --git a/sci-electronics/ngspice/ngspice-27.ebuild b/sci-electronics/ngspice/ngspice-27.ebuild
deleted file mode 100644
index 44503aaf4bc2..000000000000
--- a/sci-electronics/ngspice/ngspice-27.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="The Next Generation Spice (Electronic Circuit Simulator)"
-SRC_URI="mirror://sourceforge/ngspice/${P}.tar.gz
-	doc? ( mirror://sourceforge/ngspice/${P}-manual.pdf )"
-HOMEPAGE="http://ngspice.sourceforge.net"
-LICENSE="BSD GPL-2"
-
-SLOT="0"
-IUSE="X debug doc fftw openmp readline"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x64-macos"
-
-DEPEND="X? ( x11-libs/libICE
-		x11-libs/libXaw
-		x11-libs/libXext
-		x11-libs/libXmu )
-		fftw? ( sci-libs/fftw:3.0 )"
-RDEPEND="${DEPEND}
-	X? ( sci-visualization/xgraph )"
-
-DOCS=(
-	ANALYSES
-	AUTHORS
-	BUGS
-	ChangeLog
-	DEVICES
-	NEWS
-	README
-	Stuarts_Poly_Notes
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-autoconf_fftw3.patch
-	"${FILESDIR}"/${P}-split_terminfo.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use debug ; then
-		myconf="--enable-debug \
-			--enable-ftedebug \
-			--enable-cpdebug \
-			--enable-sensdebug \
-			--enable-asdebug \
-			--enable-stepdebug \
-			--enable-pzdebug"
-	else
-		myconf="--disable-debug \
-			--disable-ftedebug \
-			--disable-cpdebug \
-			--disable-sensdebug \
-			--disable-asdebug \
-			--disable-stepdebug \
-			--disable-pzdebug"
-	fi
-	# As of December 2017, these do not compile
-	myconf="${myconf}
-		--disable-blktmsdebug \
-		--disable-smltmsdebug"
-
-	econf \
-		${myconf} \
-		--enable-xspice \
-		--enable-cider \
-		--enable-ndev \
-		--disable-xgraph \
-		--disable-rpath \
-		$(use_enable openmp) \
-		$(use_with X x) \
-		$(use_with fftw fftw3) \
-		$(use_with readline)
-}
-
-src_install() {
-	default
-
-	# We don't need ngmakeidx to be installed
-	rm -f "${D}"/usr/bin/ngmakeidx
-	rm -f "${D}"/usr/share/man/man1/ngmakeidx.1
-
-	use doc && dodoc "${DISTDIR}"/${P}-manual.pdf
-}
diff --git a/sci-electronics/systemc/Manifest b/sci-electronics/systemc/Manifest
index 73915e4fd745..89b92f866d72 100644
--- a/sci-electronics/systemc/Manifest
+++ b/sci-electronics/systemc/Manifest
@@ -1,3 +1,3 @@
-DIST systemc-2.3.1a.tar.gz 7050669 BLAKE2B eb080ba177ada7fcd816134e62e6461da59a186cd5d1a14627d69d425f72becd587ef7d31e9e48af76cf54f92ccf83f38a079e5598b4fe2e6b349dc4ec74f640 SHA512 cd52eb6e413c8b852e19c8387766eacbddf85e9b2f4d137f3d82d0d4025f13a44216a2e6cacf7b9e2b972584912a4a1c75cdb37a568330ce66a6bf909ca1b723
-EBUILD systemc-2.3.1-r1.ebuild 1331 BLAKE2B a728bdd43f709bea98919ec750c79e908ce399d0469f99b4279cd227565db0847c7156a71177cd8a8677150231c16ce775a73dcfc30b12a56317c065b392b3c0 SHA512 8510e33478f9705c8ef435a4a19d1d8dde901f461d0f049109c4d1041ba33220321e4e733f75eb58f770298adc5e499f59c756e8f71587e55b5636bbafa1a949
-MISC metadata.xml 742 BLAKE2B 498b0bb60374137fcefdf08bb2c751d20fa7795777627a8b30bb7c4039274dc0d6f3bf88decb8ee49aa26fae32a53f4219c8ef73faedc2cde825961fe8999fa5 SHA512 a3d752c7f86e8d03dd62e0dd9c0e35ea38b654fa36db05925b7339d3a34e4bd97216948f10202f4a8efd7ef8ab15cc91d1437179b592816bd8bae63d3f5dffa3
+DIST systemc-2.3.4.tar.gz 7142529 BLAKE2B 8a7e7e9f49b0131c1536d217dcc4fc420bc72ed962736a457cdaf3e40390be2a5051010317a62ba1eca17ee7ee4a171950979d2f07cb7fecc7286d028675540f SHA512 77fd1810fafeaa639cb21fcd77c7132c0ba3cf42309d3e09953c62c92f83b18e6de2e26620cee267683ca851503e5a8419523e7c9161f2ae33aea372af0be966
+EBUILD systemc-2.3.4-r1.ebuild 1181 BLAKE2B 395047e7162753a958966f03e1d88d2e29f7aa6748e2e090c4b728181405fb9fe799e53d427cbe106953a2453ca7a2a16e83d969dca49356ea443d9542a2db0c SHA512 e94076b3df3fabf18c270ea8d5a8af2d62c1e2d04f63a83e9b60e060b0dc01e1323b79602731e6661e746e420ad2e7572a9bf0ed751982ce13541a58ff2589b5
+MISC metadata.xml 1063 BLAKE2B ddb2f5ae50f1be2e884bf275dae129234bee070a9d6a7bd9dc4647fbb3e40be7f83ac26098001169b42c95582a8fca7a7d1a3e510cea829c9dbbfe669455eeb4 SHA512 04211a6b31f25e0a985e4d98af36522dfe75c8836a48d0bf8b0c64ff146bb4f13fc1118693b6a8c647c7b58eefa319046caa1580beb46ffabd0559bd83efd715
diff --git a/sci-electronics/systemc/metadata.xml b/sci-electronics/systemc/metadata.xml
index 69bab89b6add..dfe18456e677 100644
--- a/sci-electronics/systemc/metadata.xml
+++ b/sci-electronics/systemc/metadata.xml
@@ -1,11 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>vowstar@gmail.com</email>
+		<name>Huang Rui</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>sci-electronics@gentoo.org</email>
 		<name>Gentoo Electronics Project</name>
 	</maintainer>
-	<longdescription>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">accellera-official/systemc</remote-id>
+	</upstream>
+	<longdescription lang="en">
 		SystemC provides hardware-oriented constructs within the context of C++
 		as a class library implemented in standard C++. Its use spans design and
 		verification from concept to implementation in hardware and software.
diff --git a/sci-electronics/systemc/systemc-2.3.1-r1.ebuild b/sci-electronics/systemc/systemc-2.3.1-r1.ebuild
deleted file mode 100644
index 118bb843f610..000000000000
--- a/sci-electronics/systemc/systemc-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs autotools-utils
-MY_P="${P}a"
-
-DESCRIPTION="A C++ based modeling platform for VLSI and system-level co-design"
-HOMEPAGE="https://accellera.org/community/systemc"
-SRC_URI="https://accellera.org/images/downloads/standards/${PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-IUSE="doc static-libs"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="test"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	for sfile in src/sysc/qt/md/*.s ; do
-		sed -i -e '$a \
-#if defined(__linux__) && defined(__ELF__) \
-.section .note.GNU-stack,"",%progbits \
-#endif' "${sfile}" || die "Patching ${sfile} failed"
-	done
-}
-
-src_configure() {
-	econf $(use_enable static-libs static) CXX=$(tc-getCXX)\
-	--with-unix-layout
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog INSTALL NEWS README RELEASENOTES
-	rm docs/Makefile* || die
-	use doc && dodoc -r docs/*
-	cd src
-	autotools-utils_src_install
-}
-
-pkg_postinst() {
-	elog "If you want to run the examples, you need to :"
-	elog "    tar xvfz ${PORTAGE_ACTUAL_DISTDIR}/${A}"
-	elog "    cd ${MY_P}"
-	elog "    find examples -name 'Makefile.*' -exec sed -i -e 's/-lm/-lm -lpthread/' '{}' \;"
-	elog "    ./configure"
-	elog "    cd examples"
-	elog "    make check"
-}
diff --git a/sci-electronics/systemc/systemc-2.3.4-r1.ebuild b/sci-electronics/systemc/systemc-2.3.4-r1.ebuild
new file mode 100644
index 000000000000..4669cd8f6d9b
--- /dev/null
+++ b/sci-electronics/systemc/systemc-2.3.4-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV}_pub_rev_20190614"
+
+inherit autotools
+
+DESCRIPTION="A C++ based modeling platform for VLSI and system-level co-design"
+HOMEPAGE="
+	https://accellera.org/community/systemc
+	https://github.com/accellera-official/systemc
+"
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/accellera-official/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/accellera-official/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="debug doc examples static-libs test"
+REQUIRED_USE="examples? ( doc )"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	default
+	eautoconf --force
+}
+
+src_configure() {
+	econf CXX=$(tc-getCXX) \
+		$(use_enable debug) \
+		$(use_enable static-libs static) \
+		--with-unix-layout
+}
+
+src_install() {
+	default
+	if use doc; then
+		if use examples; then
+			docompress -x /usr/share/doc/"${PF}"/examples
+		else
+			rm -r "${ED}"/usr/share/doc/"${PF}"/examples || die
+		fi
+	else
+		rm -r "${ED}"/usr/share/doc/"${PF}" || die
+	fi
+}
diff --git a/sci-electronics/voacapl/Manifest b/sci-electronics/voacapl/Manifest
index 428058f630e1..9180e571bc57 100644
--- a/sci-electronics/voacapl/Manifest
+++ b/sci-electronics/voacapl/Manifest
@@ -1,5 +1,3 @@
-DIST voacapl-0.7.2.tar.gz 2054761 BLAKE2B 8a6dc0f0af9c42b9463b4b436c8652e049b5e8b9874406da33352f5ad67e154d977ffadabbfd92764be61cfac1fea22f0900c3cf1a6c80b3e0c2297e4623df61 SHA512 d78bccdfb7db079dc77e60f80bbae66a48d6173fccec9dd32a6a0cbc283af64d8ab05eebd1e43f4b0461653919a557a88c9b3603b5d13927fbda41d2cbab78c0
 DIST voacapl-0.7.6.tar.gz 2114486 BLAKE2B 2177ccb93e83a2fe29ab14b1884c0a4adc9de02dfb35ab0d4e854405110ae2583e6d12f6d646e808f39e77e357639ce5ce3a3d8c425c86ee3d85f6050ba22e47 SHA512 192a974cad059ff265af272c195c8184e18785650e194d25906bc75de0c3d99b9730f2e8131e619300b5fe9f6dfb25cf1437b6701d019c5e6574340d8f6e113a
-EBUILD voacapl-0.7.2.ebuild 454 BLAKE2B c51603d3bcd3a614c87a9ac2bf5193299f396da39d378758655e141413c8c8b9760446623f1af422cbdba232077b02dc5d0a1d5d7d9bd98e6b47885bc1457001 SHA512 0b3829584b4b49d132ca6dd7611cd02f06b8c4829d8030019d396421c6a759c06e2e8c18a29cf9a41ef2d2fdc93d73ebb90dc6b34b16dabcf294b3becf1f0cd8
 EBUILD voacapl-0.7.6.ebuild 516 BLAKE2B 77a5509169b4cd99f873720edccda24b4f64a37e8f7272165e052454014f6a73222d91520a67debdfa755c561fb28cd10f410f25110dd0ea94755c7447a767ea SHA512 ed280e2b21ea1eeabb9c7459f0b174c378fa4da9a05b3f9c945ef08df7b2eb1446e8094d9ee276d7699bb7344fb1b3bd936cad060f86ec3146332e8c00f1357c
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/sci-electronics/voacapl/voacapl-0.7.2.ebuild b/sci-electronics/voacapl/voacapl-0.7.2.ebuild
deleted file mode 100644
index d50e3b75f800..000000000000
--- a/sci-electronics/voacapl/voacapl-0.7.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit fortran-2
-
-DESCRIPTION="HF propagation prediction tool"
-HOMEPAGE="https://www.qsl.net/hz1jw/voacapl/index.html"
-SRC_URI="https://www.qsl.net/hz1jw/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RESTRICT="mirror bindist"
-
-src_compile() {
-	# bug 513766
-	emake -j1 DESTDIR="${D}"
-}
diff --git a/sci-electronics/xnec2c/Manifest b/sci-electronics/xnec2c/Manifest
index 33a0e8c7af70..bdc6c4058a5b 100644
--- a/sci-electronics/xnec2c/Manifest
+++ b/sci-electronics/xnec2c/Manifest
@@ -1,5 +1,3 @@
-DIST xnec2c-3.5.1.tar.bz2 995554 BLAKE2B 697a7f1d5d89e108ebc02b6f21a3e9593cf617778f3b19c2bee2d901095c48e639b86922d360c752b8e9ecf1cb1dfd58169c33df3ee2d620968c236db334ba39 SHA512 3ba4bbe9d013176ced4d5aa584cd1e4b55caeb193cd3ec905e460421ed21038ff44dea332a3aa0650c34df6ef6bf5a2a9cbf5da7c7ba892b82c2fe7e253d99f5
 DIST xnec2c-4.1.1.tar.bz2 947969 BLAKE2B 81794dc557d5cc845043be97e07b628e69dcd26fddb3886d11bf31374eba0187491ad9787187f8f4a19cf04f644288c680d3b8778a7b6e144209951b25bbfbf1 SHA512 3a97521f568d79158d5d224958e4cb3708de8214476ba228f9ce0ac122899eb9b06f596d5b0c43a85a18dbd6d86e0751f1a70128c14dd8972f10deeb5a1db980
-EBUILD xnec2c-3.5.1.ebuild 708 BLAKE2B 24da62d8c61c43ffb67e1e253ccc30009e744af83bcbdf1b0e199b1d4e77a3204ad459aad101dfd7aa3bc1af3ffdd7e3fb81ff9bed8315ef437f207a25361f9a SHA512 0deb7a199bdbd6d2a11625b85827be4c4fd101e39213b31a717fcc5d2bc3dcbf89c004181b46d0570604d7c9bc47a74574a50177d3216f8c31f1e6af1556200a
 EBUILD xnec2c-4.1.1.ebuild 785 BLAKE2B 525e838b9b4b95226960ad3b63d4b0d3287e22d8bc95e0071afc0f3fb9b8fe049a4ee0b71ba42f75faab02521629df012825768d0f052c1de4aa97c2f5adc954 SHA512 e350dba8b64219dbd4ddbccd31c135b97bf2c62133d6d6a7dec1b4eeb06df2ab86851dd4aed32555b6a3ca53850f0b115c73d94df697449b6463c89e56c9b584
 MISC metadata.xml 1634 BLAKE2B f210b33b42df3619ad9f7870f35bb7330ca62005b2d47bc07024d3e8b1d4c52e340f0c790c5529c1838d14c244c2aaadf136178c9ab2d6eb7bfcd2ea66c44814 SHA512 3ba6cbd28a2f3d969c392607b29dfbbe225898674bbd9fbd732890a07c68514d3976739b04668bd255aa891480fd05dd3e7bfa6883b6594c00b594f85816ab32
diff --git a/sci-electronics/xnec2c/xnec2c-3.5.1.ebuild b/sci-electronics/xnec2c/xnec2c-3.5.1.ebuild
deleted file mode 100644
index 134ddca07cc1..000000000000
--- a/sci-electronics/xnec2c/xnec2c-3.5.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools eutils
-
-DESCRIPTION="A GTK+ graphical interactive version of nec2c"
-HOMEPAGE="https://www.qsl.net/5b4az/pages/nec2.html"
-SRC_URI="https://www.qsl.net/5b4az/pkg/nec2/xnec2c/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_prepare() {
-	eapply_user
-
-	glib-gettextize --force --copy || die
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS README doc/*.txt
-	use doc && dodoc -r doc/*.html doc/images
-	docinto examples
-	use examples && dodoc examples/*
-}
diff --git a/sci-electronics/xoscope/Manifest b/sci-electronics/xoscope/Manifest
index decd22e8f1f9..31aecee2c66e 100644
--- a/sci-electronics/xoscope/Manifest
+++ b/sci-electronics/xoscope/Manifest
@@ -1,7 +1,3 @@
-AUX xoscope-2.0-comedi_compile.patch 1068 BLAKE2B 23ed9dcbd18c897735da631853364e3cff5d348962bf8861b02847ed67ac32abd1c5489b4b0df27315606107cf9a62f95a66f6f80510f46f2a694df544864135 SHA512 00263be40f823610743fc69c74fb0ac69d58cc33bf21fde27f7d4f11923f7cae24138439706b1c478795e574d38f30f35f6e5dc955b3ca70ace829e00b432877
-AUX xoscope-2.0-implicit_decls.patch 687 BLAKE2B 9dfbb8f802c51d1eb1450673253246d6b8be5aa172929f73527de600862098f2de517fcb663b4c1a3568dc57b1548fe21b4dc759c0173ed1bb6d680b803fe73b SHA512 47e46ac1b2fa27a1b3378b65a0b5370045058d0d43a73a31f38ce01c3e0c551aa221e6dc2e2fbb8ff8c0263e5a31caa07adba8bdea7530d2af0196eebf0210b0
-AUX xoscope-2.0-man_no_-Tutf8.patch 369 BLAKE2B 7deae1551cda55e640f65f51ecf0f5e41ddcf7d234c1d8931b868f3e865332e23bf153f4dd662e08d81eb3dcb6db77d8db27ab823b4623932989acbc770524e4 SHA512 fcd9522fb8d45a565983d1da4cfdb9239cf2c5c994069ca2fa934fee9ec23d99b9e877bfdca5b0baf01f9722f7fdff791c99f468d088947961758fbb75bc2a0a
-AUX xoscope-2.0-remove_bundled_gtkdatabox.patch 6577 BLAKE2B 4e76e0eabbd7125be9a3c28eda71a9aa8f77f0d47bef3aeb00a5256ffffe70f12294ffab4a5365a30fa801bb0f82e05a6ed187c99c2f3c96bc9760426c1f39c7 SHA512 1a64615e99cfd160d28d9e1da04a000fe538b52b770b77db6fcbd907306aa67172c6848edccb6467f2b2e008bd243fc2c12949c91087fc17deb7b9bbc3980b9a
 AUX xoscope-2.2-fno-common.patch 489 BLAKE2B 3496854eb8a9437181178e7e78724a8fec2f11bbe2db0404395ccc09563219ce0088a14aef6494a518ed007c7a1892d81212e49020d5804ac20abaeeaa543be1 SHA512 bbc722fd45b999415e912a35ecf0be0ab9f8ec3e0d8a046bf3a094256d85eeb655d4a358b8dd942b9bafbd8175d8e3d0dfc74acb9ae4fd4d74498827ace5f42a
 AUX xoscope-2.2-man_no_-Tutf8.patch 421 BLAKE2B b8ba8523d7d6d717de4e4fb1a60061c1f929b095cdb9349b624ad589b39abae48f59cef33aa67486c3550594945b0260b8be494a950c6fad73dd597d1826b99d SHA512 54b39e8565cd464e014d111441edc8d191d85d07d4bd04679df3c771b9e28b3d7b619ae90ee532dcf8ebda6e79b5a3452130fc7157f79619e74cc8b3600d398d
 DIST xoscope-2.2.tar.gz 307319 BLAKE2B 860fe234e5958a005ff0cff5143fcc0711d69b958e2f6277589d08074001872b065ecb435493285231ff0c61aea1b50b221aa36127b25947184e059e951a70ec SHA512 77a1d7d673af3d82e5a3d563d6901c3d6f5a16a1d889e9b95ac2d7d10c8036461a94fb841266b6d131e96303d4fce47b4bc8255b3855690e9148ead6c38b74cd
diff --git a/sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch b/sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch
deleted file mode 100644
index 75d3820dad81..000000000000
--- a/sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- xoscope-2.0/comedi.c
-+++ xoscope-2.0/comedi.c
-@@ -27,7 +27,7 @@
- #include <sys/ioctl.h>
- #include <sys/time.h>
- #include <sys/poll.h>
--#include <asm/page.h>
-+//#include <asm/page.h>
- #include <comedilib.h>
- #include "oscope.h"		/* program defaults */
- #include "func.h"
-@@ -184,7 +184,9 @@
-      * avoid the bug.  This is the only reason we need <asm/page.h> in
-      * our include list.
-      */
--    comedi_bufsize = (comedi_bufsize + PAGE_SIZE - 1) & PAGE_MASK;
-+    //comedi_bufsize = (comedi_bufsize + PAGE_SIZE - 1) & PAGE_MASK;
-+    comedi_bufsize = (comedi_bufsize + sysconf(_SC_PAGE_SIZE) - 1) &
-+    (sysconf(_SC_PAGE_SIZE) - 1);
-     ret = comedi_set_buffer_size(comedi_dev, comedi_subdevice, comedi_bufsize);
-     if (ret < 0) {
-       comedi_error = comedi_errno();
-@@ -505,7 +507,7 @@
-     unsigned int chan;
-     int ret;
- 
--    ret = comedi_get_cmd_generic_timed(comedi_dev, comedi_subdevice, &cmd, 0);
-+    ret = comedi_get_cmd_generic_timed(comedi_dev, comedi_subdevice, &cmd, 0, 1);
- 
-     if (ret >= 0) {
-       chan = CR_PACK(4,0,AREF_DIFF);
-
diff --git a/sci-electronics/xoscope/files/xoscope-2.0-implicit_decls.patch b/sci-electronics/xoscope/files/xoscope-2.0-implicit_decls.patch
deleted file mode 100644
index 473243f2ec15..000000000000
--- a/sci-electronics/xoscope/files/xoscope-2.0-implicit_decls.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- xoscope-2.0/proscope.c
-+++ xoscope-2.0/proscope.c
-@@ -11,6 +11,7 @@
-  */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include "proscope.h"
- #include "oscope.h"
---- xoscope-2.0/oscope.c
-+++ xoscope-2.0/oscope.c
-@@ -408,7 +408,15 @@
-    */
- 
-   displayed_samples = p->signal ? samples(p->signal->rate) : 0;
--  max_samples = p->signal ? max(samples(p->signal->rate), p->signal->num) : 0;
-+  if ( p->signal ) {
-+    if ( samples(p->signal->rate) > p->signal->num ) {
-+      max_samples = samples(p->signal->rate);
-+    } else {
-+      max_samples = p->signal->num;
-+    }
-+  } else {
-+    max_samples = 0;
-+  }
- 
-   if (c >= 'A' && c <= 'Z') {
-     if (p->signal) {
diff --git a/sci-electronics/xoscope/files/xoscope-2.0-man_no_-Tutf8.patch b/sci-electronics/xoscope/files/xoscope-2.0-man_no_-Tutf8.patch
deleted file mode 100644
index 5cba9546e91d..000000000000
--- a/sci-electronics/xoscope/files/xoscope-2.0-man_no_-Tutf8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xoscope-2.0/acconfig.h
-+++ xoscope-2.0/acconfig.h
-@@ -61,7 +61,7 @@
-    interactive response time as the X server becomes too busy */
- 
- /* bourne shell command for X11 Help ("man -Tutf8 xoscope 2>&1") */
--#define HELPCOMMAND	"man -Tutf8 xoscope 2>&1"
-+#define HELPCOMMAND	"man xoscope 2>&1"
- 
- /* default file name ("oscope.dat") */
- #define FILENAME	"oscope.dat"
diff --git a/sci-electronics/xoscope/files/xoscope-2.0-remove_bundled_gtkdatabox.patch b/sci-electronics/xoscope/files/xoscope-2.0-remove_bundled_gtkdatabox.patch
deleted file mode 100644
index 3ae541011b3b..000000000000
--- a/sci-electronics/xoscope/files/xoscope-2.0-remove_bundled_gtkdatabox.patch
+++ /dev/null
@@ -1,205 +0,0 @@
---- xoscope-2.0/configure.in
-+++ xoscope-2.0/configure.in
-@@ -17,7 +17,7 @@
- 
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.2)
- 
--#PKG_CHECK_MODULES(GTKDATABOX, gtkdatabox)
-+PKG_CHECK_MODULES(GTKDATABOX, gtkdatabox)
- #AC_CONFIG_SUBDIRS(gtkdatabox-0.6.0.0)
- 
- dnl Set PACKAGE_DATA_DIR in config.h.
-@@ -106,5 +106,4 @@
- AC_OUTPUT([
- operl
- Makefile
--gtkdatabox-0.6.0.0/gtk/Makefile
- ])
---- xoscope-2.0/Makefile.am
-+++ xoscope-2.0/Makefile.am
-@@ -40,9 +40,6 @@
- comedisrc =
- endif
- 
--GTKDATABOX_CFLAGS = -I $(top_srcdir)/gtkdatabox-0.6.0.0/gtk
--GTKDATABOX_LIBS = $(top_builddir)/gtkdatabox-0.6.0.0/gtk/libgtkdatabox.a
--
- # Some bit of explaination is needed here for GUI_LIB.  automake won't
- # let us include source files in a subdirectory on a _SOURCES line,
- # and we do want all the auto-magically generated glade stuff confined
-@@ -52,7 +49,6 @@
- # trick used in things like comedi.c (see comments there) won't work
- # for a library.  So we put .o files in.
- 
--SUBDIRS = gtkdatabox-0.6.0.0/gtk
- INCLUDES = @GTK_CFLAGS@ $(GTKDATABOX_CFLAGS)
- GUI_LIB = callbacks.c callbacks.h interface.c interface.h support.c support.h
- 
---- xoscope-2.0/Makefile.in
-+++ xoscope-2.0/Makefile.in
-@@ -232,8 +232,6 @@
- 
- @COMEDI_FALSE@comedisrc = 
- @COMEDI_TRUE@comedisrc = comedi.c
--GTKDATABOX_CFLAGS = -I $(top_srcdir)/gtkdatabox-0.6.0.0/gtk
--GTKDATABOX_LIBS = $(top_builddir)/gtkdatabox-0.6.0.0/gtk/libgtkdatabox.a
- 
- # Some bit of explaination is needed here for GUI_LIB.  automake won't
- # let us include source files in a subdirectory on a _SOURCES line,
-@@ -243,7 +241,6 @@
- # they get built as one, because then the weak attribute override
- # trick used in things like comedi.c (see comments there) won't work
- # for a library.  So we put .o files in.
--SUBDIRS = gtkdatabox-0.6.0.0/gtk
- INCLUDES = @GTK_CFLAGS@ $(GTKDATABOX_CFLAGS)
- INCLUDES = @GTK_CFLAGS@
- GUI_LIB = callbacks.c callbacks.h interface.c interface.h support.c support.h
---- xoscope-2.0/display.c
-+++ xoscope-2.0/display.c
-@@ -27,7 +27,7 @@
- #include <gtkdatabox_points.h>
- #include <gtkdatabox_lines.h>
- #include <gtkdatabox_grid.h>
--#include <gtkdatabox_marker.h>
-+#include <gtkdatabox_markers.h>
- 
- extern GtkWidget *databox;
- 
---- xoscope-2.0/display.c
-+++ xoscope-2.0/display.c
-@@ -56,7 +56,7 @@
- gboolean clear_message_callback(gpointer ignored)
- {
-   gtk_databox_graph_remove (GTK_DATABOX(databox), databox_message);
--  gtk_databox_redraw (GTK_DATABOX (databox));
-+  gtk_widget_queue_draw (databox);
-   return FALSE;
- }
- 
-@@ -66,15 +66,15 @@
-   if (databox_message == NULL) {
-     GdkColor gcolor;
-     gcolor.red = gcolor.green = gcolor.blue = 65535;
--    databox_message = gtk_databox_marker_new(1, &databox_message_X,
-+    databox_message = gtk_databox_markers_new(1, &databox_message_X,
- 					     &databox_message_Y, &gcolor, 0,
--					     GTK_DATABOX_MARKER_NONE);
-+					     GTK_DATABOX_MARKERS_NONE);
-   }
- 
--  gtk_databox_marker_set_label(GTK_DATABOX_MARKER(databox_message), 0,
--			       GTK_DATABOX_TEXT_N, message, FALSE);
-+  gtk_databox_markers_set_label(GTK_DATABOX_MARKERS(databox_message), 0,
-+			       GTK_DATABOX_MARKERS_TEXT_N, message, FALSE);
-   gtk_databox_graph_add (GTK_DATABOX(databox), databox_message);
--  gtk_databox_redraw (GTK_DATABOX (databox));
-+  gtk_widget_queue_draw (databox);
- 
-   g_timeout_add (2000, clear_message_callback, NULL);
- }
-@@ -620,10 +620,10 @@
-   graticule_minor_graph = gtk_databox_grid_new (9, 9, &gcolor, 1);
-   graticule_major_graph = gtk_databox_grid_new (1, 1, &gcolor, 1);
- 
--  gtk_databox_grid_set_line_style(GTK_DATABOX_GRID(graticule_major_graph),
--				  GTK_DATABOX_GRID_SOLID_LINES);
--  gtk_databox_grid_set_line_style(GTK_DATABOX_GRID(graticule_minor_graph),
--				  GTK_DATABOX_GRID_DOTTED_LINES);
-+  //gtk_databox_grid_set_line_style(GTK_DATABOX_GRID(graticule_major_graph),
-+  //				  GTK_DATABOX_GRID_SOLID_LINES);
-+  //gtk_databox_grid_set_line_style(GTK_DATABOX_GRID(graticule_minor_graph),
-+  //				  GTK_DATABOX_GRID_DOTTED_LINES);
- 
-   recompute_graticule();
- }
-@@ -675,7 +675,7 @@
- 
- void configure_databox(void)
- {
--   GtkDataboxValue topleft, bottomright;
-+   GtkDataboxValueRectangle rect;
-    gfloat upper_time_limit;
-    int j;
- 
-@@ -723,24 +723,26 @@
- 
-    /* Now set the total canvas size of the databox */
- 
--   topleft.x = 0;
--   topleft.y = 1;
-+   rect.x1 = 0;
-+   rect.y1 = 1;
- 
--   bottomright.x = total_horizontal_divisions
-+   rect.x2 = total_horizontal_divisions
-      * 0.001 * (gfloat) scope.div / scope.scale;
--   bottomright.y = -1;
-+   rect.y2 = -1;
- 
--   gtk_databox_set_canvas(GTK_DATABOX(databox), topleft, bottomright);
-+   gtk_databox_set_total_limits(GTK_DATABOX(databox), 
-+     rect.x1, rect.x2, rect.y1, rect.y2);
- 
-    /* A slight adjustment gets us our visible area.  Note that this
-     * call also resets the databox viewport to its left most position.
-     */
- 
--   bottomright.x = 10 * 0.001 * (gfloat) scope.div / scope.scale;
--   gtk_databox_set_visible_canvas(GTK_DATABOX(databox), topleft, bottomright);
-+   rect.x2 = 10 * 0.001 * (gfloat) scope.div / scope.scale;
-+   gtk_databox_set_visible_limits(GTK_DATABOX(databox), 
-+     rect.x1, rect.x2, rect.y1, rect.y2);
- 
-    /* Temporary message is always centered on screen */
--   databox_message_X = bottomright.x / 2;
-+   databox_message_X = rect.x2 / 2;
- 
-    /* Decide if we need a scrollbar or not */
- 
-@@ -1208,7 +1210,7 @@
-     draw_graticule();
-   }
- 
--  gtk_databox_redraw (GTK_DATABOX (databox));
-+  gtk_widget_queue_draw (databox);
- }
- 
- /* animate() - get and plot some data
---- xoscope-2.0/gr_gtk.c
-+++ xoscope-2.0/gr_gtk.c
-@@ -1049,7 +1049,7 @@
-   l = p->signal->delay * num / 10000;
- 
-   if (scope.curs) {
--#if 1
-+#if 0
-     GtkDataboxCoord coord;
-     GtkDataboxValue value;
-     coord.x = event->x;
-@@ -1057,7 +1057,7 @@
-     value = gtk_databox_value_from_coord (GTK_DATABOX(databox), coord);
-     x = value.x;
- #else
--    x = gtk_databox_pixel_to_value_x (databox, event->x);
-+    x = gtk_databox_pixel_to_value_x (GTK_DATABOX(databox), event->x);
- #endif
-     cursor = rintf((x - l) / num) + 1;
- #if 0
-@@ -1205,7 +1205,7 @@
- 
-   glade_window = create_main_window();
- 
--  setup_help_text(glade_window);
-+  //setup_help_text(glade_window);
- 
- #if 0
-   gtk_signal_connect(GTK_OBJECT(window), "delete_event",
-@@ -1217,7 +1217,7 @@
-   gtk_box_reorder_child(GTK_BOX(LU("vbox1")), menubar, 0);
-   gtk_widget_show(menubar);
- 
--  gtk_databox_set_hadjustment (GTK_DATABOX (databox),
-+  gtk_databox_set_adjustment_x (GTK_DATABOX (databox),
- 			       gtk_range_get_adjustment (GTK_RANGE (LU("databox_hscrollbar"))));
- 
-   gtk_widget_show(glade_window);
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
commit	abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree	eca3dd248b73b92013cba00a0fcc1edf2696e19a /sci-electronics
parent	24fd814c326e282c4321965c31f341dad77e270d (diff)