From fe1c8b732bd548b699d4c2ef725f67f8b8c8911c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 4 May 2018 11:22:40 +0100 Subject: gentoo resync : 04.05.2018 --- sci-electronics/Manifest.gz | Bin 8719 -> 8557 bytes sci-electronics/qucs/Manifest | 4 - sci-electronics/qucs/files/qucs-0.0.18-gcc6.patch | 189 ---------------------- sci-electronics/qucs/metadata.xml | 15 -- sci-electronics/qucs/qucs-0.0.18.ebuild | 68 -------- 5 files changed, 276 deletions(-) delete mode 100644 sci-electronics/qucs/Manifest delete mode 100644 sci-electronics/qucs/files/qucs-0.0.18-gcc6.patch delete mode 100644 sci-electronics/qucs/metadata.xml delete mode 100644 sci-electronics/qucs/qucs-0.0.18.ebuild (limited to 'sci-electronics') diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz index cf9642d6330f..72e80c8e82a8 100644 Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ diff --git a/sci-electronics/qucs/Manifest b/sci-electronics/qucs/Manifest deleted file mode 100644 index 32edb922c9fc..000000000000 --- a/sci-electronics/qucs/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX qucs-0.0.18-gcc6.patch 7573 BLAKE2B aba9921625ed72be9b58490ef29b1e5ba7f70615dd235de7979a57ddc0c9c2074ab238f794b71ae3b63ccebe96d82e90193641a611ed35da93cee92122fee602 SHA512 3f90d0411a088364f1943d9a6603bb4b68a79b7ad927276f711ab9be8934c79692832c17ebd75bc79276cc8bec3f4d9ebec831356cfc53c6f6214089814d4177 -DIST qucs-0.0.18.tar.gz 45270816 BLAKE2B 84c70f23fc91decf4b237cab507c2a5de482126c27978e7c331264fc584323cf16c37509212e98f84aa0fd6c847a0aeb3d568bdb23c5551a357c9a794c96d614 SHA512 b6836837fde44fe04e6a0533905c7bbfdbb6f64412fbc2516cab281de2ec51738cf62bb245763a0be6711e02392f8d73e87b86bff6eb432fe3bbf47636c98313 -EBUILD qucs-0.0.18.ebuild 1671 BLAKE2B 78f1b560b44a4c2f2b404ca7c885a611abc97a61a4d33e9b240a0c4a376cbeb182b785faff07d39c6935ce2246ddde565a11ef718d1623d4bca6f84c7f74f770 SHA512 33853ed82dbbc8792e7b20198cbdd1e2284cb9dea4397a35128a3453295664460385e746dfb0390bb1f6586803593075f4b49cf436f11edde027c1aacf32c9c2 -MISC metadata.xml 451 BLAKE2B 0879b8cdd69e87dbd4e532791856cd5b31dbe08eb41f597a10d3efa3ed051f7816d6b434cf9e078e6690d50ad4d052c5f69472f48ebbeacdaea63e1cf3c8b21c SHA512 78882203fde2a16ac25041c35d1376066075da6db47dc7dc26b49693c335e2e98fc164534b65de8d366cad5faa02039b697bcddb59c0c61e33041ca71427c150 diff --git a/sci-electronics/qucs/files/qucs-0.0.18-gcc6.patch b/sci-electronics/qucs/files/qucs-0.0.18-gcc6.patch deleted file mode 100644 index bf1f7edbfc05..000000000000 --- a/sci-electronics/qucs/files/qucs-0.0.18-gcc6.patch +++ /dev/null @@ -1,189 +0,0 @@ -Bug: https://bugs.gentoo.org/show_bug.cgi?id=603902 - ---- a/qucs-core/src/components/verilog/bsim3v34nMOS.core.cpp -+++ b/qucs-core/src/components/verilog/bsim3v34nMOS.core.cpp -@@ -8432,9 +8432,9 @@ - fourkt=(5.5226012e-23*Temp); - leffx2=(leff*leff); - _save_flickernoise2(drainp,sourcep,((KF*pow(cdrain,AF))/(cox*leffx2)),EF,"flicker"); --_save_whitenoise2(drainp,sourcep,(((fourkt*ueff)*abs(qinv))/leffx2),"channel"); --_save_whitenoise2(drain,drainp,abs((fourkt*drainConductance)),"thermal"); --_save_whitenoise2(sourcep,source,abs((fourkt*sourceConductance)),"thermal"); -+_save_whitenoise2(drainp,sourcep,(((fourkt*ueff)*std::abs(qinv))/leffx2),"channel"); -+_save_whitenoise2(drain,drainp,std::abs((fourkt*drainConductance)),"thermal"); -+_save_whitenoise2(sourcep,source,std::abs((fourkt*sourceConductance)),"thermal"); - } - - /* ------------------ end of verilog analog equations --------------------- */ ---- a/qucs-core/src/components/verilog/bsim3v34pMOS.core.cpp -+++ b/qucs-core/src/components/verilog/bsim3v34pMOS.core.cpp -@@ -8432,9 +8432,9 @@ - fourkt=(5.5226012e-23*Temp); - leffx2=(leff*leff); - _save_flickernoise2(drainp,sourcep,((KF*pow(cdrain,AF))/(cox*leffx2)),EF,"flicker"); --_save_whitenoise2(drainp,sourcep,(((fourkt*ueff)*abs(qinv))/leffx2),"channel"); --_save_whitenoise2(drain,drainp,abs((fourkt*drainConductance)),"thermal"); --_save_whitenoise2(sourcep,source,abs((fourkt*sourceConductance)),"thermal"); -+_save_whitenoise2(drainp,sourcep,(((fourkt*ueff)*std::abs(qinv))/leffx2),"channel"); -+_save_whitenoise2(drain,drainp,std::abs((fourkt*drainConductance)),"thermal"); -+_save_whitenoise2(sourcep,source,std::abs((fourkt*sourceConductance)),"thermal"); - } - - /* ------------------ end of verilog analog equations --------------------- */ ---- a/qucs-core/src/components/verilog/bsim4v30nMOS.core.cpp -+++ b/qucs-core/src/components/verilog/bsim4v30nMOS.core.cpp -@@ -13629,16 +13629,16 @@ - { - fourkt=(5.5226012e-23*Temp); - leffx2=(leff*leff); --_save_whitenoise2(drainp,sourcep,((((fourkt*NTNOI)*ueff)*abs((qd+qs)))/leffx2),"channel"); -+_save_whitenoise2(drainp,sourcep,((((fourkt*NTNOI)*ueff)*std::abs((qd+qs)))/leffx2),"channel"); - } - if - (FNOIMOD==0) - { - leffx2=(leff*leff); --_save_flickernoise2(drainp,sourcep,((KF*pow(abs(cdrain),AF))/(cox*leffx2)),EF,"flicker"); -+_save_flickernoise2(drainp,sourcep,((KF*pow(std::abs(cdrain),AF))/(cox*leffx2)),EF,"flicker"); - } --_save_whitenoise2(drain,drainp,abs((fourkt*gdtot)),"thermal"); --_save_whitenoise2(sourcep,source,abs((fourkt*gstot)),"thermal"); -+_save_whitenoise2(drain,drainp,std::abs((fourkt*gdtot)),"thermal"); -+_save_whitenoise2(sourcep,source,std::abs((fourkt*gstot)),"thermal"); - - /* ------------------ end of verilog analog equations --------------------- */ - ---- a/qucs-core/src/components/verilog/bsim4v30pMOS.core.cpp -+++ b/qucs-core/src/components/verilog/bsim4v30pMOS.core.cpp -@@ -13629,16 +13629,16 @@ - { - fourkt=(5.5226012e-23*Temp); - leffx2=(leff*leff); --_save_whitenoise2(drainp,sourcep,((((fourkt*NTNOI)*ueff)*abs((qd+qs)))/leffx2),"channel"); -+_save_whitenoise2(drainp,sourcep,((((fourkt*NTNOI)*ueff)*std::abs((qd+qs)))/leffx2),"channel"); - } - if - (FNOIMOD==0) - { - leffx2=(leff*leff); --_save_flickernoise2(drainp,sourcep,((KF*pow(abs(cdrain),AF))/(cox*leffx2)),EF,"flicker"); -+_save_flickernoise2(drainp,sourcep,((KF*pow(std::abs(cdrain),AF))/(cox*leffx2)),EF,"flicker"); - } --_save_whitenoise2(drain,drainp,abs((fourkt*gdtot)),"thermal"); --_save_whitenoise2(sourcep,source,abs((fourkt*gstot)),"thermal"); -+_save_whitenoise2(drain,drainp,std::abs((fourkt*gdtot)),"thermal"); -+_save_whitenoise2(sourcep,source,std::abs((fourkt*gstot)),"thermal"); - - /* ------------------ end of verilog analog equations --------------------- */ - ---- a/qucs-core/src/components/verilog/hic2_full.core.cpp -+++ b/qucs-core/src/components/verilog/hic2_full.core.cpp -@@ -9642,7 +9642,7 @@ - #endif - d_Q=Q_pT; - while --(((abs(d_Q)>=(1.0e-5*abs(Q_pT)))&&(l_it<=100))) -+(((std::abs(d_Q)>=(1.0e-5*std::abs(Q_pT)))&&(l_it<=100))) - { - #if defined(_DYNAMIC) - d_Q0=d_Q; -@@ -19895,10 +19895,10 @@ - _save_whitenoise2(ci,ei,(twoq*it),"shot"); - _save_whitenoise2(ci,bi,(twoq*iavl),"shot"); - _save_whitenoise2(bi,ei,(twoq*ibei),"shot"); --_save_whitenoise2(bi,ci,(twoq*abs(ibci)),"shot"); -+_save_whitenoise2(bi,ci,(twoq*std::abs(ibci)),"shot"); - _save_whitenoise2(bp,ei,(twoq*ibep),"shot"); --_save_whitenoise2(bp,ci,(twoq*abs(ijbcx)),"shot"); --_save_whitenoise2(si,ci,(twoq*abs(ijsc)),"shot"); -+_save_whitenoise2(bp,ci,(twoq*std::abs(ijbcx)),"shot"); -+_save_whitenoise2(si,ci,(twoq*std::abs(ijsc)),"shot"); - } - - /* ------------------ end of verilog analog equations --------------------- */ ---- a/qucs-core/src/components/verilog/hicumL2V2p1.core.cpp -+++ b/qucs-core/src/components/verilog/hicumL2V2p1.core.cpp -@@ -4895,7 +4895,7 @@ - #endif - d_Q=Q_pT; - while --(((abs(d_Q)>=(1.0e-5*abs(Q_pT)))&&(l_it<=100))) -+(((std::abs(d_Q)>=(1.0e-5*std::abs(Q_pT)))&&(l_it<=100))) - { - #if defined(_DYNAMIC) - d_Q0=d_Q; ---- a/qucs-core/src/components/verilog/hicumL2V2p23.core.cpp -+++ b/qucs-core/src/components/verilog/hicumL2V2p23.core.cpp -@@ -11502,7 +11502,7 @@ - #endif - d_Q=Q_pT; - while --(((abs(d_Q)>=(1.0e-5*abs(Q_pT)))&&(l_it<=100))) -+(((std::abs(d_Q)>=(1.0e-5*std::abs(Q_pT)))&&(l_it<=100))) - { - #if defined(_DYNAMIC) - d_Q0=d_Q; -@@ -23949,10 +23949,10 @@ - } - twoq=(2.0*1.602176462e-19); - _save_whitenoise2(ci,bi,(twoq*iavl),"shot"); --_save_whitenoise2(bi,ci,(twoq*abs(ibci)),"shot"); -+_save_whitenoise2(bi,ci,(twoq*std::abs(ibci)),"shot"); - _save_whitenoise2(bp,ei,(twoq*ibep),"shot"); --_save_whitenoise2(bp,ci,(twoq*abs(ijbcx)),"shot"); --_save_whitenoise2(si,ci,(twoq*abs(ijsc)),"shot"); -+_save_whitenoise2(bp,ci,(twoq*std::abs(ijbcx)),"shot"); -+_save_whitenoise2(si,ci,(twoq*std::abs(ijsc)),"shot"); - _save_whitenoise1(n1,((2*1.602176462e-19)*ibei),"shot"); - _load_static_residual1(n1,NP(n1)); - #if defined(_DERIVATE) ---- a/qucs-core/src/components/verilog/hicumL2V2p24.core.cpp -+++ b/qucs-core/src/components/verilog/hicumL2V2p24.core.cpp -@@ -6090,7 +6090,7 @@ - #endif - d_Q=Q_pT; - while --(((abs(d_Q)>=(1.0e-5*abs(Q_pT)))&&(l_it<=100))) -+(((std::abs(d_Q)>=(1.0e-5*std::abs(Q_pT)))&&(l_it<=100))) - { - #if defined(_DYNAMIC) - d_Q0=d_Q; -@@ -11855,10 +11855,10 @@ - } - twoq=(2.0*1.602176462e-19); - _save_whitenoise2(ci,bi,(twoq*iavl),"shot"); --_save_whitenoise2(bi,ci,(twoq*abs(ibci)),"shot"); -+_save_whitenoise2(bi,ci,(twoq*std::abs(ibci)),"shot"); - _save_whitenoise2(bp,ei,(twoq*ibep),"shot"); --_save_whitenoise2(bp,ci,(twoq*abs(ijbcx)),"shot"); --_save_whitenoise2(si,ci,(twoq*abs(ijsc)),"shot"); -+_save_whitenoise2(bp,ci,(twoq*std::abs(ijbcx)),"shot"); -+_save_whitenoise2(si,ci,(twoq*std::abs(ijsc)),"shot"); - _save_whitenoise1(n1,((2*1.602176462e-19)*ibei),"shot"); - _load_static_residual1(n1,NP(n1)); - #if defined(_DERIVATE) ---- a/qucs-core/src/components/verilog/hicumL2V2p31n.core.cpp -+++ b/qucs-core/src/components/verilog/hicumL2V2p31n.core.cpp -@@ -6726,7 +6726,7 @@ - #endif - d_Q=Q_pT; - while --(((abs(d_Q)>=(1.0e-5*abs(Q_pT)))&&(l_it<=100))) -+(((std::abs(d_Q)>=(1.0e-5*std::abs(Q_pT)))&&(l_it<=100))) - { - #if defined(_DYNAMIC) - d_Q0=d_Q; -@@ -12817,10 +12817,10 @@ - } - twoq=(2.0*1.602176462e-19); - _save_whitenoise2(ci,bi,(twoq*iavl),"shot"); --_save_whitenoise2(bi,ci,(twoq*abs(ibci)),"shot"); -+_save_whitenoise2(bi,ci,(twoq*std::abs(ibci)),"shot"); - _save_whitenoise2(bp,ei,(twoq*ibep),"shot"); --_save_whitenoise2(bp,ci,(twoq*abs(ijbcx)),"shot"); --_save_whitenoise2(si,ci,(twoq*abs(ijsc)),"shot"); -+_save_whitenoise2(bp,ci,(twoq*std::abs(ijbcx)),"shot"); -+_save_whitenoise2(si,ci,(twoq*std::abs(ijsc)),"shot"); - if - (flcono==1) - { diff --git a/sci-electronics/qucs/metadata.xml b/sci-electronics/qucs/metadata.xml deleted file mode 100644 index f233ea25af13..000000000000 --- a/sci-electronics/qucs/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - mgorny@gentoo.org - Michał Górny - - - sci-electronics@gentoo.org - Gentoo Electronics Project - - - qucs - - diff --git a/sci-electronics/qucs/qucs-0.0.18.ebuild b/sci-electronics/qucs/qucs-0.0.18.ebuild deleted file mode 100644 index 6e2f31e81f3f..000000000000 --- a/sci-electronics/qucs/qucs-0.0.18.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Quite Universal Circuit Simulator in Qt4" -HOMEPAGE="http://qucs.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -RDEPEND="dev-qt/qtcore:4[qt3support] - dev-qt/qtgui:4[qt3support] - dev-qt/qtscript:4 - dev-qt/qtsvg:4 - dev-qt/qt3support:4 - x11-libs/libX11:0=" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-gcc6.patch ) - -src_prepare() { - default - - # oh my, they strip -g out of C*FLAGS and force -s into LDFLAGS - # note: edit .ac first, then generated files, so that the latter - # have newer timestamp and not trigger regen - sed -i \ - -e 's/C.*FLAGS.*sed.*-g.*$/:/' \ - -e 's/C.*FLAGS.*-O0.*$/:/' \ - -e 's/LDFLAGS.*-s.*$/:/' \ - configure.ac asco/configure.ac qucs-core/configure.ac \ - configure asco/configure qucs-core/configure \ - || die "C*FLAGS and LDFLAGS sanitization sed failed" -} - -src_configure() { - local myconf=( - # enables asserts and debug codepaths - $(use_enable debug) - - # avoid automagic dep - # TODO: add support for it - --disable-mpi - ) - - # automagic default on clang++ - tc-export CXX - - # the package doesn't use pkg-config on Linux, only on Darwin - # very smart of upstream... - append-ldflags $( $(tc-getPKG_CONFIG) --libs-only-L \ - QtCore QtGui QtScript QtSvg QtXml Qt3Support ) - - econf "${myconf[@]}" -} - -pkg_postinst() { - if ! has_version 'sci-electronics/freehdl'; then - elog "If you would like to be able to run digital simulations, please install:" - elog " sci-electronics/freehdl" - fi -} -- cgit v1.2.3