summaryrefslogtreecommitdiff
path: root/sci-electronics
diff options
context:
space:
mode:
authorLiguros - Gitlab CI/CD [master] <gitlab@liguros.net>2021-01-27 18:53:03 +0000
committerLiguros - Gitlab CI/CD [master] <gitlab@liguros.net>2021-01-27 18:53:03 +0000
commit3482ddf943eff7b8848f1fb31350b99ce349e86a (patch)
tree9c9bb6ec6679e9dc44a84d87ba611989409b12ca /sci-electronics
parent8e8120eabdd28020aa69c7a60505cce2edd20adc (diff)
downloadbaldeagleos-repo-21.1.3.tar.gz
baldeagleos-repo-21.1.3.tar.xz
baldeagleos-repo-21.1.3.zip
Updating liguros repov21.1.3
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/Stage/Manifest1
-rw-r--r--sci-electronics/Stage/Stage-4.1.1.ebuild38
-rw-r--r--sci-electronics/Stage/files/Stage-4.1.1-gcc6.patch95
-rw-r--r--sci-electronics/eagle/Manifest4
-rw-r--r--sci-electronics/eagle/eagle-7.4.0-r1.ebuild129
-rw-r--r--sci-electronics/eagle/eagle-7.6.0-r1.ebuild129
-rw-r--r--sci-electronics/gazebo/Manifest2
-rw-r--r--sci-electronics/gazebo/files/boost173.patch135
-rw-r--r--sci-electronics/gazebo/files/boost174.patch20
-rw-r--r--sci-electronics/gazebo/files/qwt.patch47
-rw-r--r--sci-electronics/gazebo/gazebo-11.3.0.ebuild (renamed from sci-electronics/gazebo/gazebo-11.1.0-r1.ebuild)8
-rw-r--r--sci-electronics/kicad-footprints/Manifest3
-rw-r--r--sci-electronics/kicad-footprints/kicad-footprints-5.1.6.ebuild18
-rw-r--r--sci-electronics/kicad-footprints/kicad-footprints-5.1.7.ebuild18
-rw-r--r--sci-electronics/kicad-footprints/kicad-footprints-5.1.8.ebuild16
-rw-r--r--sci-electronics/kicad-i18n/Manifest3
-rw-r--r--sci-electronics/kicad-i18n/kicad-i18n-5.1.6.ebuild18
-rw-r--r--sci-electronics/kicad-i18n/kicad-i18n-5.1.7.ebuild18
-rw-r--r--sci-electronics/kicad-i18n/kicad-i18n-5.1.8.ebuild17
-rw-r--r--sci-electronics/kicad-meta/kicad-meta-5.1.6.ebuild29
-rw-r--r--sci-electronics/kicad-meta/kicad-meta-5.1.7.ebuild29
-rw-r--r--sci-electronics/kicad-meta/kicad-meta-5.1.8.ebuild29
-rw-r--r--sci-electronics/kicad-packages3d/Manifest3
-rw-r--r--sci-electronics/kicad-packages3d/kicad-packages3d-5.1.6.ebuild23
-rw-r--r--sci-electronics/kicad-packages3d/kicad-packages3d-5.1.7.ebuild23
-rw-r--r--sci-electronics/kicad-packages3d/kicad-packages3d-5.1.8.ebuild22
-rw-r--r--sci-electronics/kicad-symbols/Manifest3
-rw-r--r--sci-electronics/kicad-symbols/kicad-symbols-5.1.6.ebuild18
-rw-r--r--sci-electronics/kicad-symbols/kicad-symbols-5.1.7.ebuild18
-rw-r--r--sci-electronics/kicad-symbols/kicad-symbols-5.1.8.ebuild16
-rw-r--r--sci-electronics/kicad-templates/Manifest3
-rw-r--r--sci-electronics/kicad-templates/kicad-templates-5.1.6.ebuild18
-rw-r--r--sci-electronics/kicad-templates/kicad-templates-5.1.7.ebuild18
-rw-r--r--sci-electronics/kicad-templates/kicad-templates-5.1.8.ebuild16
-rw-r--r--sci-electronics/kicad/Manifest3
-rw-r--r--sci-electronics/kicad/files/kicad-5.1.5-algorithm-header.patch11
-rw-r--r--sci-electronics/kicad/files/kicad-5.1.6-ninja-build.patch45
-rw-r--r--sci-electronics/kicad/kicad-5.1.6.ebuild159
-rw-r--r--sci-electronics/kicad/kicad-5.1.7.ebuild158
-rw-r--r--sci-electronics/kicad/kicad-5.1.8.ebuild158
-rw-r--r--sci-electronics/klayout/Manifest1
-rw-r--r--sci-electronics/klayout/klayout-0.26.8.ebuild4
-rw-r--r--sci-electronics/klayout/klayout-0.26.9.ebuild91
-rw-r--r--sci-electronics/ngspice/Manifest2
-rw-r--r--sci-electronics/ngspice/files/ngspice-27-autoconf_fftw3.patch26
-rw-r--r--sci-electronics/ngspice/files/ngspice-27-blt_linkage_workaround.patch12
-rw-r--r--sci-electronics/ngspice/files/ngspice-27-fix_parsing_tcl_commands.patch16
-rw-r--r--sci-electronics/ngspice/files/ngspice-27-split_terminfo.patch20
-rw-r--r--sci-electronics/ngspice/ngspice-27-r1.ebuild191
-rw-r--r--sci-electronics/ngspice/ngspice-27.ebuild92
-rw-r--r--sci-electronics/systemc/Manifest1
-rw-r--r--sci-electronics/systemc/systemc-2.3.1-r1.ebuild54
-rw-r--r--sci-electronics/voacapl/Manifest1
-rw-r--r--sci-electronics/voacapl/voacapl-0.7.2.ebuild22
-rw-r--r--sci-electronics/xnec2c/Manifest1
-rw-r--r--sci-electronics/xnec2c/xnec2c-3.5.1.ebuild36
-rw-r--r--sci-electronics/xoscope/files/xoscope-2.0-comedi_compile.patch32
-rw-r--r--sci-electronics/xoscope/files/xoscope-2.0-implicit_decls.patch29
-rw-r--r--sci-electronics/xoscope/files/xoscope-2.0-man_no_-Tutf8.patch11
-rw-r--r--sci-electronics/xoscope/files/xoscope-2.0-remove_bundled_gtkdatabox.patch205
60 files changed, 98 insertions, 2270 deletions
diff --git a/sci-electronics/Stage/Manifest b/sci-electronics/Stage/Manifest
index 25208863612e..5c03e8484aa7 100644
--- a/sci-electronics/Stage/Manifest
+++ b/sci-electronics/Stage/Manifest
@@ -1,2 +1 @@
-DIST Stage-4.1.1.tar.gz 1014322 BLAKE2B 18997dee3e40d0405c6973434f04fa3e57a42412f404f4202772b52d27618aa335f5bbc8465dfe7571eaf23a95c8c94c89387ed88043bd7a41a1bb3b90572654 SHA512 db39135ab2b93925dd0bfbec19d8c2820e3d6ba7caf3cf5f4b617fbdfa76b720ad99f21fde0a08559ab905d819325f5391b29deb7b6af7bb72f522ac15eb5bf2
DIST Stage-4.3.0.tar.gz 1039133 BLAKE2B 30a6083750b05f83884764ed5c56489df6e534af1ef4722212f3bd129180954321a111081e22916ec676d9e76e3f28cb6f5beb79d2290add76acef529d28d731 SHA512 37abf63c3a187dc2521c80d504aaef4b7eeef861cbbdce488a7d1c14e7e6eb6f84e010e014b1a3cb81f4ca9ccbebc564a32ffa7ba7b50458c50436216bd8250f
diff --git a/sci-electronics/Stage/Stage-4.1.1.ebuild b/sci-electronics/Stage/Stage-4.1.1.ebuild
deleted file mode 100644
index 399e776bffed..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="https://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 611747f50c5b..4c751787aa0c 100644
--- a/sci-electronics/eagle/Manifest
+++ b/sci-electronics/eagle/Manifest
@@ -1,8 +1,4 @@
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
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 2e609d43f5ab..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="https://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 a3fc54695bcd..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="https://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 5e66a9b61693..ce307cd34ade 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1 +1 @@
-DIST gazebo-11.1.0.tar.bz2 53856366 BLAKE2B 6e3df164e40c44265da68eae260012d873121631e56e9ae4ca3d8355e9c22ac80811549103e83d5f20d40f92c80f7a7a313c2395209b1c5177f518d0c0b2117c SHA512 39866991d8b996656a9f927a70e215175ecef671a1e317bfe9221df38bdc08be9825d36018da90cc6843480643a7716586ce8d61f36ffc8b4558ef7096ef6f76
+DIST gazebo-11.3.0.tar.bz2 56778002 BLAKE2B d466556c834935d8b3694461ddf6d7a7872b00d2f8f58d50d70cceb8bca3ab4ada1e72e7bb14b79404d45c48f95419e3dedd9019ecc3a8c1623afda077bcbeb2 SHA512 2e219655e45a787aeda50065dcec5d90954c18223f134d6da90b8cb43e119268262e515e527547d0b0b5ed1f73b5083d279551a01faa3d3c34ba7a580c077970
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 cb6ff78bae15..609c6dce526b 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 c13359b58d40..ee615f7a9d6c 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1,4 +1 @@
-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
DIST kicad-footprints-5.1.9.tar.bz2 3387238 BLAKE2B 8c8873a7feb72228fcc92ab5e8950f63fcb09b4b1b16b6f8da5aa3caa30985ceb02e326ebe8ba96fcae07fae71a6233a7d8009fbe6541f2e7c6807ea67c7046a SHA512 28030a750b806be664cb91b3b3e4c0bf2b9efa0518ec55b1ff433633c2f69ab99bedbbdd3264b50cbe80a182e3f97343f5dfdd25e073abe1563231a8318b4155
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.8.ebuild
deleted file mode 100644
index f8f652eff266..000000000000
--- a/sci-electronics/kicad-footprints/kicad-footprints-5.1.8.ebuild
+++ /dev/null
@@ -1,16 +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://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-i18n/Manifest b/sci-electronics/kicad-i18n/Manifest
index 7cc9682330ff..e48d78958dcc 100644
--- a/sci-electronics/kicad-i18n/Manifest
+++ b/sci-electronics/kicad-i18n/Manifest
@@ -1,4 +1 @@
-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
DIST kicad-i18n-5.1.9.tar.bz2 2934490 BLAKE2B 391cd9b8a23f5dd723884704ce231f79d8bf57b7f2852a97b08228e887226f75714c6515c335122f9f34d13a033e9039423b8bbfb281e4f6396ac158bea5f4e8 SHA512 d41359464e3504263bb964af4f14db027f9b55861098f29d0fa97eb2fb26205d49c00cbda4795317a46b54157f2fda67a94be412cfab80ce81846e173bf1a14d
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.8.ebuild
deleted file mode 100644
index 581556469ff2..000000000000
--- a/sci-electronics/kicad-i18n/kicad-i18n-5.1.8.ebuild
+++ /dev/null
@@ -1,17 +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"
-
-BDEPEND="sys-devel/gettext"
-RDEPEND=">=sci-electronics/kicad-5.1.6"
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 b0e1f174d87b..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="https://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 18a459fd15b5..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="https://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.8.ebuild
deleted file mode 100644
index deb72c62cfae..000000000000
--- a/sci-electronics/kicad-meta/kicad-meta-5.1.8.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="https://www.kicad.org"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-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
- doc? (
- >=app-doc/kicad-doc-5.1.8
- )
- !minimal? (
- >=sci-electronics/kicad-packages3d-5.1.8
- >=sci-electronics/kicad-templates-5.1.8
- )
- nls? (
- >=sci-electronics/kicad-i18n-5.1.8
- )
-"
diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index d399db6f350b..f6738e7f1814 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,4 +1 @@
-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
DIST kicad-packages3d-5.1.9.tar.bz2 727202241 BLAKE2B 2f80b2e1bbc6b5c5d5c7baf77af187dac07d8c9ebc47d99419378f20b3a8eb9eb00da106810f0a3042a90c4bec44b467e78bc9c60b71c2b85e017342766f9101 SHA512 f5bfb9793d204f8f1bf46fe18897d59775fe7805299fd6af0215b8b9e28ce99d5183930120bfa7b5ee8b7599ae3be76f598b42b74db44ee50b7838fada860dd0
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.8.ebuild
deleted file mode 100644
index 67a41a58de5d..000000000000
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.8.ebuild
+++ /dev/null
@@ -1,22 +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://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${PV}/kicad-packages3D-${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="occ +oce"
-
-REQUIRED_USE="|| ( occ oce )"
-
-RDEPEND=">=sci-electronics/kicad-5.1.0[occ=,oce=]"
-
-CHECKREQS_DISK_BUILD="11G"
-S="${WORKDIR}/${P/3d/3D}"
diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
index 0714ae32ef99..d3c435b43547 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1,4 +1 @@
-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
DIST kicad-symbols-5.1.9.tar.bz2 1814966 BLAKE2B 5c66513c276434410fcd8f9a8c1478fce8182bee3c92c4fff42d2cf13c416ddc5f8c25618725f2f9eb54b216557d346eff4ebea78aeb7ebb3ed960baa3137138 SHA512 21bd0308723cf7dba8ab2294d70714160db6c64e5ebdad1c9344df0b6cd56fb9216d64977de68bd7ca8be190a89809576b71d21486c3e85fe077cceac54aabb3
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.8.ebuild
deleted file mode 100644
index 4baf883551d0..000000000000
--- a/sci-electronics/kicad-symbols/kicad-symbols-5.1.8.ebuild
+++ /dev/null
@@ -1,16 +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://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest
index 4d62475ba4c1..6aa91f44e03b 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1,4 +1 @@
-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
DIST kicad-templates-5.1.9.tar.bz2 1552087 BLAKE2B d6637fc8acb2906ed2b07dceabb00982b4b9d8d4bb9703f8c3aadc174d3f7945748b80fe5a7c0b40a4f2340c4af7ed04cf82b775a5fbd4d807949c5c12aa67de SHA512 284676c7bd2c4bc1b1867e73da4827fca0df965a43850641f1836c0cac71b6270984af4fdd75fe25bd7f638f4b08ee115e84038390855d15c089f074ee4cff4e
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.8.ebuild
deleted file mode 100644
index 6bc0cb273a29..000000000000
--- a/sci-electronics/kicad-templates/kicad-templates-5.1.8.ebuild
+++ /dev/null
@@ -1,16 +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://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=sci-electronics/kicad-5.1.0"
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index aa0af793ab92..a3d6d27bf935 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,4 +1 @@
-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
DIST kicad-5.1.9.tar.bz2 18597932 BLAKE2B bc91e1249378970188f968590f70f7f1e4226f9d5cf576da6b3e751332f3a6a2160f261e7a28587ac71bae2e03f77ba3d0aa703422515ea1bd24212de5efd108 SHA512 565226a1ce8d8af8011062f767366b60449d9ce5961f343e495d5b996fb66fbfc885ac3d383892879bdade9e4d374816a54b5eee754fbe5f257e8aaa8de8f739
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 bfe1705f3a2a..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,10} )
-
-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 20e2b8f75cfa..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,10} )
-
-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.8.ebuild
deleted file mode 100644
index b0ed90bc950a..000000000000
--- a/sci-electronics/kicad/kicad-5.1.8.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,10} )
-
-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.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/klayout/Manifest b/sci-electronics/klayout/Manifest
index a037c664253a..eee46bfb3fc3 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/sci-electronics/klayout/klayout-0.26.8.ebuild b/sci-electronics/klayout/klayout-0.26.8.ebuild
index 2f7f4336c587..18ca9dd0fcd7 100644
--- a/sci-electronics/klayout/klayout-0.26.8.ebuild
+++ b/sci-electronics/klayout/klayout-0.26.8.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
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
else
SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
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..2b411939c147
--- /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,9,10} )
+
+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 57c13c48af82..b47873025363 100644
--- a/sci-electronics/ngspice/Manifest
+++ b/sci-electronics/ngspice/Manifest
@@ -1,4 +1,2 @@
-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
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 8ca014939fdd..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="https://sourceforge.net/projects/ngspice/"
-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 df19fdd110b9..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="https://sourceforge.net/projects/ngspice/"
-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 48ad212d20eb..73e4b47d2bfe 100644
--- a/sci-electronics/systemc/Manifest
+++ b/sci-electronics/systemc/Manifest
@@ -1,2 +1 @@
-DIST systemc-2.3.1a.tar.gz 7050669 BLAKE2B eb080ba177ada7fcd816134e62e6461da59a186cd5d1a14627d69d425f72becd587ef7d31e9e48af76cf54f92ccf83f38a079e5598b4fe2e6b349dc4ec74f640 SHA512 cd52eb6e413c8b852e19c8387766eacbddf85e9b2f4d137f3d82d0d4025f13a44216a2e6cacf7b9e2b972584912a4a1c75cdb37a568330ce66a6bf909ca1b723
DIST systemc-2.3.4.tar.gz 7142529 BLAKE2B 8a7e7e9f49b0131c1536d217dcc4fc420bc72ed962736a457cdaf3e40390be2a5051010317a62ba1eca17ee7ee4a171950979d2f07cb7fecc7286d028675540f SHA512 77fd1810fafeaa639cb21fcd77c7132c0ba3cf42309d3e09953c62c92f83b18e6de2e26620cee267683ca851503e5a8419523e7c9161f2ae33aea372af0be966
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/voacapl/Manifest b/sci-electronics/voacapl/Manifest
index edc0e9a7adf2..9c41aa91deca 100644
--- a/sci-electronics/voacapl/Manifest
+++ b/sci-electronics/voacapl/Manifest
@@ -1,2 +1 @@
-DIST voacapl-0.7.2.tar.gz 2054761 BLAKE2B 8a6dc0f0af9c42b9463b4b436c8652e049b5e8b9874406da33352f5ad67e154d977ffadabbfd92764be61cfac1fea22f0900c3cf1a6c80b3e0c2297e4623df61 SHA512 d78bccdfb7db079dc77e60f80bbae66a48d6173fccec9dd32a6a0cbc283af64d8ab05eebd1e43f4b0461653919a557a88c9b3603b5d13927fbda41d2cbab78c0
DIST voacapl-0.7.6.tar.gz 2114486 BLAKE2B 2177ccb93e83a2fe29ab14b1884c0a4adc9de02dfb35ab0d4e854405110ae2583e6d12f6d646e808f39e77e357639ce5ce3a3d8c425c86ee3d85f6050ba22e47 SHA512 192a974cad059ff265af272c195c8184e18785650e194d25906bc75de0c3d99b9730f2e8131e619300b5fe9f6dfb25cf1437b6701d019c5e6574340d8f6e113a
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 ee715c61bc76..2e9161df57da 100644
--- a/sci-electronics/xnec2c/Manifest
+++ b/sci-electronics/xnec2c/Manifest
@@ -1,2 +1 @@
-DIST xnec2c-3.5.1.tar.bz2 995554 BLAKE2B 697a7f1d5d89e108ebc02b6f21a3e9593cf617778f3b19c2bee2d901095c48e639b86922d360c752b8e9ecf1cb1dfd58169c33df3ee2d620968c236db334ba39 SHA512 3ba4bbe9d013176ced4d5aa584cd1e4b55caeb193cd3ec905e460421ed21038ff44dea332a3aa0650c34df6ef6bf5a2a9cbf5da7c7ba892b82c2fe7e253d99f5
DIST xnec2c-4.1.1.tar.bz2 947969 BLAKE2B 81794dc557d5cc845043be97e07b628e69dcd26fddb3886d11bf31374eba0187491ad9787187f8f4a19cf04f644288c680d3b8778a7b6e144209951b25bbfbf1 SHA512 3a97521f568d79158d5d224958e4cb3708de8214476ba228f9ce0ac122899eb9b06f596d5b0c43a85a18dbd6d86e0751f1a70128c14dd8972f10deeb5a1db980
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/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);