summaryrefslogtreecommitdiff
path: root/sci-electronics
diff options
context:
space:
mode:
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/Manifest.gzbin8552 -> 8550 bytes
-rw-r--r--sci-electronics/gazebo/Manifest5
-rw-r--r--sci-electronics/gazebo/files/tinyxml6.patch20
-rw-r--r--sci-electronics/gazebo/gazebo-9.1.0.ebuild (renamed from sci-electronics/gazebo/gazebo-8.2.0-r1.ebuild)12
-rw-r--r--sci-electronics/xcircuit/Manifest2
-rw-r--r--sci-electronics/xcircuit/xcircuit-3.9.62.ebuild67
6 files changed, 8 insertions, 98 deletions
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index d4690de6d2e3..abc20f974011 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
Binary files differ
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index e7031ba69d7d..20895c53362c 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,8 +1,7 @@
AUX ffmpeg4.patch 1301 BLAKE2B 7ce55736e3a6fd4b9e0ebc8515305a666cc042c8063eb86aa7efc87c5bad290e15c9778f1be383fbd1bc6e1ed49f537671d522966523ccccba4f7644f1c24447 SHA512 6500270c1d5c9d165a70ec44f30bb6fc3d921461554af0d92d79ff9f659993cfbb87459cb0e78d49d507cd27b39354c53d93fd9839068fa28bcd0c8eaf03245c
AUX qwt.patch 2136 BLAKE2B 3ab69581d1dac006ebd493c82bebee7df34fc00accf7957411a143ce1ba6fffebdffe3468ada7c1e51375cb55adca5d1b28c7a6d1708355d60508f85422e2494 SHA512 4a9edac8565bc7a77644d9b6adeec61187c34dcf72f309066eb6575de7baef5cb59668c70bf5b51fb22a8e5bad00da4d664d279b1d22aae5dbb8fe07f69ae91b
-AUX tinyxml6.patch 870 BLAKE2B 2edfb3b8f3a2ec715f429bb982c8f33179d713206bd427d10e4f9277fcc48712c8be2683f9d1ed54447dfde3d055a4fdd87e779bb58918ea78e19dedd3ce6109 SHA512 819b67127e97abe0dfd2b145f8d4e1aab1a11d7a8d734f085d82b3c4b814a37498e2f6b913e6c4a3a558c0420fc6f5de3dae508e76c6465352a3e6e45292eec6
-DIST gazebo-8.2.0.tar.bz2 52513092 BLAKE2B d44c4ac837163331f50e266bb4880f42fff82037ccc9a7e1ac7ccea0a37415a2fc217c62b449358510308fc741e0c569e2613c70c328e323f6f018c5bc6f0b31 SHA512 d2561a6e5460ea068d9c84945e5955d986bc1f6f0d1ba16100aae53015c6e11da3a152ac6ecb906147d37261d4c680025bcc5f5587c6c09f127319dc184cf843
DIST gazebo-9.0.0.tar.bz2 52779811 BLAKE2B a85c9fd0e4b805e28ea8fb71c068ad53f18db91a474631b5da73a2a565181c8c22270742c9fabf1656d322fd63ba1caac3286b992d7dc7b197a0582ed724d06e SHA512 52394445d34ce24b2036102be08b6b626fb7021dd0ebaab8e588b68e1e0790d2e26ed2af8ead8f37b0c2e2d37c3d7fc22f95b0b2a8bd95e8dcd77e7fb296dd50
-EBUILD gazebo-8.2.0-r1.ebuild 1871 BLAKE2B de6a0ab367d0e12fd886b64b2f88467d19b923c7d86399baf1254ae61875399ed08d733cf6b4ca9cdcb5f7971f3fb7bf44d253f72c823972d40e5fa10bc58127 SHA512 83bb680ebeb1f08fa09c9192acbf5ad744bc37fd4782f3d2387bfbaee50bc202eb891a0a7798d0255fc77cc1b137913b5ceba21fa0ed41cc07cf2bd910c10000
+DIST gazebo-9.1.0.tar.bz2 52928923 BLAKE2B 2b152964d649a3eb572b96bbb27e8f6795bddd5347f893f200d97a80f4c0d8128d548d87dfa3e5051b9aa3af6a4a6be56e79f05252cc6f17278ef2c1592cfb0e SHA512 9ea27cf802e6ce657fe98c886f9d4582303abcec83f6be5e27980969564ec69f42c9589586baa19ea4fd514c3385b9b263f7205a0510b42414c90c1de7cbfd29
EBUILD gazebo-9.0.0.ebuild 1864 BLAKE2B eb60f9ede47bcf3d12a23472e59291d612d9528992f0f4ee9ff1a45911a305e9e2d38ef8b17090da9b61fafc16cf30c9147f8dae034c38a13f933cd767e4b909 SHA512 1b4b025892208067cd7276bebec5235f6708ef7e0d4ca9f2588c1a076dafcfa1d8b23489a5afbb32e49ce4cdc0778d5480b1d41641a629071d2bce92a675782b
+EBUILD gazebo-9.1.0.ebuild 1836 BLAKE2B 01ef8b3926fb57be24d79c8c84d018ef9f382007c29e73fa597c22b1958c52fa4fa75f17c9f82de6dd4d0a8fd193e30d6a59121995e1e06b8cc3aea88966cd8e SHA512 286428641b606469bdc2887d3b0a0d8a5bbf9eb356daf08b5cb1810469dc1fcea52553b86d9eb2ec74d021360e369a5820ab7f839cb4eb1f61824e7512ac6dd2
MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-electronics/gazebo/files/tinyxml6.patch b/sci-electronics/gazebo/files/tinyxml6.patch
deleted file mode 100644
index 16a3862fc78f..000000000000
--- a/sci-electronics/gazebo/files/tinyxml6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: gazebo-8.2.0/gazebo/util/LogPlay.cc
-===================================================================
---- gazebo-8.2.0.orig/gazebo/util/LogPlay.cc
-+++ gazebo-8.2.0/gazebo/util/LogPlay.cc
-@@ -125,12 +125,9 @@ void LogPlay::Open(const std::string &_l
- {
- gzerr << "Unable to load file[" << _logFile << "]. "
- << "Check the Gazebo server log file for more information.\n";
-- const char *errorStr1 = this->dataPtr->xmlDoc.GetErrorStr1();
-- const char *errorStr2 = this->dataPtr->xmlDoc.GetErrorStr2();
-- if (errorStr1)
-- gzlog << "Log Error 1:\n" << errorStr1 << std::endl;
-- if (errorStr2)
-- gzlog << "Log Error 2:\n" << errorStr2 << std::endl;
-+ const char *errorStr = this->dataPtr->xmlDoc.ErrorStr();
-+ if (errorStr)
-+ gzlog << "Log Error:\n" << errorStr << std::endl;
- gzthrow("Error parsing log file");
- }
-
diff --git a/sci-electronics/gazebo/gazebo-8.2.0-r1.ebuild b/sci-electronics/gazebo/gazebo-9.1.0.ebuild
index 2c1546415b0b..76ad65771aa8 100644
--- a/sci-electronics/gazebo/gazebo-8.2.0-r1.ebuild
+++ b/sci-electronics/gazebo/gazebo-9.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz
LICENSE="Apache-2.0"
# Subslot = major version = soname of libs
-SLOT="0/8"
+SLOT="0/9"
KEYWORDS="~amd64"
IUSE="cpu_flags_x86_sse2 libav test"
@@ -31,7 +31,7 @@ RDEPEND="
!libav? ( >=media-video/ffmpeg-2.6:0= )
sci-libs/gts
>=sci-physics/bullet-2.82
- >=dev-libs/sdformat-5.0:=
+ >=dev-libs/sdformat-6.0:=
dev-qt/qtwidgets:5
dev-qt/qtcore:5
dev-qt/qtopengl:5
@@ -43,9 +43,9 @@ RDEPEND="
sci-libs/hdf5:=[cxx]
sys-apps/util-linux
media-gfx/graphviz
- net-libs/ignition-msgs:0=
- >=sci-libs/ignition-math-2.3:3=
- net-libs/ignition-transport:3=
+ net-libs/ignition-msgs:1=
+ sci-libs/ignition-math:4=
+ net-libs/ignition-transport:4=
x11-libs/qwt:6=[qt5]
"
DEPEND="${RDEPEND}
@@ -57,7 +57,7 @@ DEPEND="${RDEPEND}
test? ( dev-libs/libxslt )
"
CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/tinyxml6.patch" )
+PATCHES=( "${FILESDIR}/qwt.patch" )
src_configure() {
# doesnt build without it
diff --git a/sci-electronics/xcircuit/Manifest b/sci-electronics/xcircuit/Manifest
index 493183218a7c..f690b7944b22 100644
--- a/sci-electronics/xcircuit/Manifest
+++ b/sci-electronics/xcircuit/Manifest
@@ -1,9 +1,7 @@
DIST xcircuit-3.7.48.tgz 1648993 BLAKE2B 4c3693a75323634ec39a4bc1b76a5310c68e63346cf92209fdce7576038315e4a3488f18c9835dca5069e947daabf143c6b6ab328ae37c4adc2bb6255bacedc9 SHA512 686bd2139a6d2d5011b51ff500ea9ffb4007326734eafc0afeec250cb844d8107a344c4ef90d2ed747d8485e7dc8dca69c7e62fd785fc17d3f3460212a0dcb84
DIST xcircuit-3.8.83.tgz 1533560 BLAKE2B 25e634effad9f5c81954982baacdcb6cf05423ed4c7b92abd85873af054f29b0886a6dddf9771862f839e8274067f990e684f20f3fd123b4298ddb1826637d53 SHA512 2fc798c7fd1e098e4cf1605cd46007ae980be27373cdc0089a129f4a98be475c6a7452e8498c39d28bc97e7b8d7dcd9ef35e029ca416fb49144f00bf83c4b36a
-DIST xcircuit-3.9.62.tgz 1610475 BLAKE2B 1d1c0e33aef24e9d68c5ea6aecda0897a3bfb269db653196c554b1847884837c459edb19c5a023d5ecaacc3bc8458664948cb2c6498c272011736b59b117aa08 SHA512 8042c2b891336e3985385eaefa5762f806af779f2885a74f180b91fdd5178cfb276e496974ad7e81e64cd3e403b4039d060ab6a660a52f18455cd67811609fd7
DIST xcircuit-3.9.73.tgz 1620922 BLAKE2B ac3f8e6f9370efd720b57a9cd7c487621534f477d1af4fd267d311da3bd949886eccd1c8e8e59071689637272ca23f985dd1809594aab692fa60ea2ca8f8a456 SHA512 2dfeb130a48c99bf08bdff94250f7157acd283bc3f3d6b41f963346deb1241aca0d59a3e8d60dbd36a4aa60acd89e131b263ddbf489b2b44e7e1831714d7b703
EBUILD xcircuit-3.7.48.ebuild 1212 BLAKE2B e462f909be5497e81247a0fa96f0cbbd080e3a9de4a4ece573977e9f77828f09815b454d61e1926832e4dcc7b57cc609415039f5226825f1524fdb3904873ab0 SHA512 35365cb0b11d21c406849a7d7edc09bf024e1b320561654e76d72f367c902f00c4079f7a9674b5b40992e3770cd119f4749b1df228328805f88d9ec51b05b590
EBUILD xcircuit-3.8.83.ebuild 1215 BLAKE2B ed8669698fd431940c1a82425f35bebd36daa2690e80bef00429546efcf39d85b9cac203830d944bc346e7c4d5e1ccf18730081f1922ba59063556e01d55da59 SHA512 39e18aaded14727d29bc4ec769fa645195b60768469654b08651934781cdbfcc9155a740f9a634919ada0edc34dd9ee0b523da4fcd5306eaddadc4136ba8cd39
-EBUILD xcircuit-3.9.62.ebuild 1286 BLAKE2B 5bcf938df171c5e92c5f772fc92721bd19e049b97ab5ec60cb5f5dc3569dd6716232cdb70dbb5183b6c8bbf90a8d233ee760ee4f600cc352af967eae4f959379 SHA512 4c128d4f95b5246aa025f275cebbb15bd201de5912e250e65067c3820b662c75c8fdb89013715f14a5bb131c23626271992a14e68233002dc058d80b80efc13e
EBUILD xcircuit-3.9.73.ebuild 972 BLAKE2B bf6c5041bfb0ae3bc107560c8958a2c776f00beca2271b4f9625ef6152e5a2a926a4a762974ec5f28fc5410ea792a52d8e7fedc815fb255afa86d2b9b3bc1026 SHA512 b93f9289f6c6bfd0809d6a48f5a94f80f4600feface7a1a7c8c20b98db2ac28407184d6c106d79de4edcc4079e1544ae1e9b77ecd2dc1f5ff55f8601ee045a78
MISC metadata.xml 1266 BLAKE2B cab37ad91d300f9a4b5d1dec7820284af0a4893df0a22642662105cc442fed2a51e4822ed005fe40fddeb3186161fe2212977fb829788dcab9a60793b3e1c633 SHA512 2cec9ece544f2c125f4413c3fe9d3f119b9f50a0c2da80e3f7b1164050986ed58a2f01299a5a844f951c490d56c169e196c8e1843e12504f3182d4893df11c3a
diff --git a/sci-electronics/xcircuit/xcircuit-3.9.62.ebuild b/sci-electronics/xcircuit/xcircuit-3.9.62.ebuild
deleted file mode 100644
index c43e347fcd25..000000000000
--- a/sci-electronics/xcircuit/xcircuit-3.9.62.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils multilib
-
-DESCRIPTION="Circuit drawing and schematic capture program"
-SRC_URI="http://opencircuitdesign.com/xcircuit/archive/${P}.tgz"
-HOMEPAGE="http://opencircuitdesign.com/xcircuit"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="
- app-text/ghostscript-gpl
- dev-lang/tk:0
- media-libs/fontconfig:1.0
- sys-libs/zlib
- x11-libs/cairo
- x11-libs/libX11
- x11-libs/libXt
- x11-libs/libXpm
- x11-libs/libSM
- x11-libs/libICE
-"
-RDEPEND=${DEPEND}
-
-RESTRICT="test" #131024
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
- # automake-1.12
- sed \
- -e '/AM_C_PROTOTYPES/d' \
- -i configure.in || die
- # automake-1.13
- mv configure.{in,ac} || die
- autotools-utils_src_prepare
-}
-
-src_configure() {
- export loader_run_path="/usr/$(get_libdir)"
- local myeconfargs=(
- --disable-dependency-tracking
- --with-tcl
- --with-ngspice
- --with-tk
- --with-cairo
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile appdefaultsdir="/usr/share/X11/app-defaults"
-}
-
-src_install () {
- autotools-utils_src_install \
- appdefaultsdir="/usr/share/X11/app-defaults" \
- appmandir="/usr/share/man/man1"
-}