diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
| commit | fcc5224904648a8e6eb528d7603154160a20022f (patch) | |
| tree | 3bfce096b38a9cea8eed13fc70c1526c456e9abd /sci-electronics | |
| parent | 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff) | |
gentoo resync : 02.02.2022
Diffstat (limited to 'sci-electronics')
35 files changed, 577 insertions, 149 deletions
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz Binary files differindex 577994c55abe..bf80fab02a3c 100644 --- a/sci-electronics/Manifest.gz +++ b/sci-electronics/Manifest.gz diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest index b4fed9525826..2bdaad491bf4 100644 --- a/sci-electronics/gazebo/Manifest +++ b/sci-electronics/gazebo/Manifest @@ -4,8 +4,8 @@ DIST gazebo-11.3.0.tar.bz2 56778002 BLAKE2B d466556c834935d8b3694461ddf6d7a7872b DIST gazebo-11.5.1.tar.bz2 56486174 BLAKE2B c1bffc5067f2739a8eb2e178bb2209d9c7b5a58d0589710cc515c4bcbbca281fb94ddf16de977f3771bc4b64fb6afe8e86327dde00d19ef62754e4d7634bb65f SHA512 7c922963881cf079e926c239f510e722fc6cabd07ef5e846a4b78772364a3aecb0b68f2b690ff451d42ceb11e88e2f831c30515e5a228f12826516ecad10e53a DIST gazebo-11.7.0.tar.bz2 56394312 BLAKE2B 2da58a2702113c1954f0202bb779b723ad8e59cab678f9ca6fe64908785198b996ef71c845a1a85f00e2f4eddb9ed5683f815ada850917b2af4afad214eac77d SHA512 7de40908a021655b2a200a73cf979585f4bdb245064f7e9a853998f87df329223252c73882aa1e2b705bc7de5841e2a87d67f772dfef18e5735c1b06c2663192 DIST gazebo-11.9.1.tar.bz2 56472954 BLAKE2B c7a1c3c4a03112a90e8a0cb35dde32f5bb478dafb0d8c582d8cbad15ff1f43699782df3d69a75c47efec44d8a15ad96730f1ae9c1b5b0b1ff2099fbc6b8f2e4e SHA512 51af82305ef0758950e2752624cd98bd31abe55469a1cad6432b1edde1a8f896798a554c672f8694c080f7076d13fe1aa91b182227e26f04cb99e9e0f3907694 -EBUILD gazebo-11.3.0-r3.ebuild 1881 BLAKE2B f9f7a612ca0d644a0d27de55f707ead14bbcc50913a641d5f030661ec9879097ef7bedd2bc039585c613c2e6bf4be8169aa0bfd6d51af1bec6eab3f77a0faf17 SHA512 6a3b5d447c84081b9f71a91996755919f2dc654546ba19b3daea6770b31baa989def79d14f17a7fa4a6b1876f7b5b602fd7efc692c5ad990dfb8c1343879c54d -EBUILD gazebo-11.5.1-r3.ebuild 1881 BLAKE2B f9f7a612ca0d644a0d27de55f707ead14bbcc50913a641d5f030661ec9879097ef7bedd2bc039585c613c2e6bf4be8169aa0bfd6d51af1bec6eab3f77a0faf17 SHA512 6a3b5d447c84081b9f71a91996755919f2dc654546ba19b3daea6770b31baa989def79d14f17a7fa4a6b1876f7b5b602fd7efc692c5ad990dfb8c1343879c54d -EBUILD gazebo-11.7.0-r2.ebuild 1881 BLAKE2B f9f7a612ca0d644a0d27de55f707ead14bbcc50913a641d5f030661ec9879097ef7bedd2bc039585c613c2e6bf4be8169aa0bfd6d51af1bec6eab3f77a0faf17 SHA512 6a3b5d447c84081b9f71a91996755919f2dc654546ba19b3daea6770b31baa989def79d14f17a7fa4a6b1876f7b5b602fd7efc692c5ad990dfb8c1343879c54d -EBUILD gazebo-11.9.1.ebuild 1888 BLAKE2B 417685453d6c685f4e74059c379c0ac942b783c99369fa3e1e84a6c8db8c322b5b2068e29fd807ee696c5447cdfe83ed48dd8cbb308a627499e8a7b90be237d9 SHA512 dfe8255e2f9f50caaea354cfcf39cb2327d62e82ae8d173738d7ac6c607eee2e6c98cbd2654097b27840683bcf6122fd788d37fd7d3c5da18769639074bfaf1c +EBUILD gazebo-11.3.0-r4.ebuild 1905 BLAKE2B a40989966fd5b5ff6af51a2451228c62d724ddc3393555111bc6fbd27e7b32156c14779a625bb6be4e68db1d41e15c9847fe7ab3d2d98693d938eb33b125667d SHA512 7b828b121533ca25db7f70d44ed81367b858c3958de21edad1cabb371d4cbb3ab32b3a71aae2102d534e4b6a86956db0def40d77fdfd38b2dc9d789b78fd16ac +EBUILD gazebo-11.5.1-r4.ebuild 1905 BLAKE2B a40989966fd5b5ff6af51a2451228c62d724ddc3393555111bc6fbd27e7b32156c14779a625bb6be4e68db1d41e15c9847fe7ab3d2d98693d938eb33b125667d SHA512 7b828b121533ca25db7f70d44ed81367b858c3958de21edad1cabb371d4cbb3ab32b3a71aae2102d534e4b6a86956db0def40d77fdfd38b2dc9d789b78fd16ac +EBUILD gazebo-11.7.0-r3.ebuild 1905 BLAKE2B a40989966fd5b5ff6af51a2451228c62d724ddc3393555111bc6fbd27e7b32156c14779a625bb6be4e68db1d41e15c9847fe7ab3d2d98693d938eb33b125667d SHA512 7b828b121533ca25db7f70d44ed81367b858c3958de21edad1cabb371d4cbb3ab32b3a71aae2102d534e4b6a86956db0def40d77fdfd38b2dc9d789b78fd16ac +EBUILD gazebo-11.9.1-r1.ebuild 1912 BLAKE2B ab1806c0767335f5d3d51f9bf1832cb7e75c44c9ad47560153867167451019d1b296fce5a7c66cb4d1db7379b59970f3612f2b180ecb2a3a963b64e2389b152f SHA512 77e581310235fcba1f4e140d44b0525ba2fd5a29aa0810c9013937defe94cf75cb9a1560544f86a8c35db8de1bb01c29ed75931d6e2a46a387a7b756fdd58b56 MISC metadata.xml 244 BLAKE2B 5a5426f4a80c61e49915e23ab7298bd1e53d89bd5361ad61fdaa3a50c88e7f27ea69205fd8c407addfdfde991e10cbe70aa554bfd737daf9d3d639c4eddd5934 SHA512 052b13f84da2d92069cdab006492e4b72274519bae5081f01ee4605215c7dca16bade6fa3856a7fec9435d1b564e607c9c52e0f9fdf199363af330778bf6c0af diff --git a/sci-electronics/gazebo/gazebo-11.3.0-r3.ebuild b/sci-electronics/gazebo/gazebo-11.3.0-r4.ebuild index dd11acd611ae..22a15762cc2c 100644 --- a/sci-electronics/gazebo/gazebo-11.3.0-r3.ebuild +++ b/sci-electronics/gazebo/gazebo-11.3.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -57,7 +57,7 @@ DEPEND="${RDEPEND} test? ( dev-libs/libxslt ) " BDEPEND=" - app-text/ronn + || ( app-text/ronn-ng app-text/ronn ) app-arch/gzip virtual/pkgconfig " diff --git a/sci-electronics/gazebo/gazebo-11.5.1-r3.ebuild b/sci-electronics/gazebo/gazebo-11.5.1-r4.ebuild index dd11acd611ae..22a15762cc2c 100644 --- a/sci-electronics/gazebo/gazebo-11.5.1-r3.ebuild +++ b/sci-electronics/gazebo/gazebo-11.5.1-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -57,7 +57,7 @@ DEPEND="${RDEPEND} test? ( dev-libs/libxslt ) " BDEPEND=" - app-text/ronn + || ( app-text/ronn-ng app-text/ronn ) app-arch/gzip virtual/pkgconfig " diff --git a/sci-electronics/gazebo/gazebo-11.7.0-r2.ebuild b/sci-electronics/gazebo/gazebo-11.7.0-r3.ebuild index dd11acd611ae..22a15762cc2c 100644 --- a/sci-electronics/gazebo/gazebo-11.7.0-r2.ebuild +++ b/sci-electronics/gazebo/gazebo-11.7.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -57,7 +57,7 @@ DEPEND="${RDEPEND} test? ( dev-libs/libxslt ) " BDEPEND=" - app-text/ronn + || ( app-text/ronn-ng app-text/ronn ) app-arch/gzip virtual/pkgconfig " diff --git a/sci-electronics/gazebo/gazebo-11.9.1.ebuild b/sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild index c6602d9de1c3..f34484f385e7 100644 --- a/sci-electronics/gazebo/gazebo-11.9.1.ebuild +++ b/sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -57,7 +57,7 @@ DEPEND="${RDEPEND} test? ( dev-libs/libxslt ) " BDEPEND=" - app-text/ronn + || ( app-text/ronn-ng app-text/ronn ) app-arch/gzip virtual/pkgconfig " diff --git a/sci-electronics/gnucap/Manifest b/sci-electronics/gnucap/Manifest index e218864760ab..a1a47e2491e6 100644 --- a/sci-electronics/gnucap/Manifest +++ b/sci-electronics/gnucap/Manifest @@ -1,7 +1,11 @@ +AUX gnucap-20210107-fix-paths.patch 2683 BLAKE2B 17b1eb4e0907b0e29e9205118d718f4da791f607fcbe9b63200c2c033e15a54fd305a25a5ba6c8440a84c15117175c912b53f8420e11b251ffe98ee505982faf SHA512 8d3be906e263e5444c4dd9ae9cc3ce241ab49a9fe9e4ee947a0ec594336f980a79d9a62905391d2ba2f510e2f2157dd8b9482bd384c7042ed8b893d51aefcfea +AUX gnucap-20210107-respect-ldflags.patch 4151 BLAKE2B bb169c64b85625151d1edbdd06de0922459a94a6233164f11f1673d5863abf785e919e5a7484127a1ce6b2892eb3aa44c8dcbcf7e6c58e8538846e187e856e0a SHA512 1df0dce4e1aa44f540f731dad1bd85b72b90422b38e29a7c1a80f3d79e83a0fb4501895da2783e6d92e9301e5921e8a75940bdaf633be53fe6fb2fd22a200a56 DIST gnucap-2009-12-07-models-bsim.tar.gz 4074699 BLAKE2B e8d48be7eb22bfe360a4cd80e3605b292be7839100e1ebd40a718bc23c5f9d2330fb3a58c9c18bebaf8b87a6fad3002f5596a4f83e41eefa0eab8f4ed5d9b18e SHA512 4f7caaeab0268df113da726f4fbd5a0f3eff63c325a7c08f0cd10ec727318aff6a51ce81619f0f3e31b87f89a51643cd608cb14ba09a70fb7294df9748ed1db4 DIST gnucap-2009-12-07-models-jspice3-2.5.tar.gz 502564 BLAKE2B a0c60671cb338035035a50cdc6f2d7e9df9aaf7f2ee3c0bd600ec4d0a8aafd2628c6acf37c89f9f7c7ec3879220dc81ceec191ad9cc0a31def76d6df5bba1606 SHA512 90d93912d5d000218f43e7b63efcd43473467d7d51c1cee160f3fbe53b0bafd5bdeaf5680e2ca67d3176063ba026352248412d1e266d3f6ed93e731e476d61fe DIST gnucap-2009-12-07-models-ngspice17.tar.gz 4418060 BLAKE2B b7d300cc93b870b13eab25d4b0303af647303551f2777e61cc38d18d770e9b446b9a1e4f8fd94b81c11f96eb1c6bac4ef113f69806a979ac3fe69903e0855d91 SHA512 0f26b4491531d41f18d35b8cde339e99b593794495346186dac74f72bd3632dfe4690ede50a972c47ae41b2229a62d708ecd28bb8fc04b5b7347a481bca709d5 DIST gnucap-2009-12-07-models-spice3f5.tar.gz 629424 BLAKE2B 3369374942a0b0b14dc484a6d49b9650d461112f15623f43b1140a4bddd4d23a6035c4c31294f1003828b93bc21b1c1c059acf61c2db85c9578bb8162e247234 SHA512 4c16e4bcdd3b4092bd6c89c56421ef9ca85b6aba90d9e244fee03278916c6b5ac1c56ecba62d4a5561ff3d93abc61492c0116ccc350c483128ca792b52fa7155 DIST gnucap-2009-12-07.tar.gz 545578 BLAKE2B a1ff8ed82a8ab57c455fdb96c399a5e480b1eb898d439e39380c4287d65538e9c0e1f61aef08c616aff34390a507243edc1fbb2f55b2bfc6d383264e2281e1c9 SHA512 c0e8a4f6b66eeff2cf95e9cf2050a25aa08f660de1e4b3e78011998deb93cd4e5b562cdcf5f3beb72e04cb3c7650cde6ae8c81602ffc31f5e333d84e7e3867a9 +DIST gnucap-20210107.tar.gz 801944 BLAKE2B fcef1e234710575285446c63cae85e2ef7e82e74ab65627614b8cc2bd0511427b63aa352a335c2b56c159b9129ce4cac998b86ddd29c19f9c57a63cfc2354676 SHA512 7f85a69f73808091b0826bb671174ad2515771c36e624031fb2fe79671366c57cd20ce9c973359869146a90fc568bc0ae1c354655e9d5cd75507b069f45cbfb7 EBUILD gnucap-0.35.20091207-r1.ebuild 2114 BLAKE2B 5043eb866c439ed881cfe01f58e6666362dcd480765a342f7363d01d1e969eaf95ce4aa85d5ed23295fbcfbe1269e094b2d6fec5a50fc7df91cfc09b6c364af8 SHA512 b27f2c5c55bde8a2fcf2790f7ba37517c44959a9cf02de9eb482e7ad2e640185fcb7c5dc03e133ecc50f861736a57110e76ad68d5576804fdb053ace5b428778 +EBUILD gnucap-20210107.ebuild 492 BLAKE2B 3fa7cd89ffcd9779e987a019112eac06902c50701a51bde131666536718b2bbe525712a8dc320aa7adec8eef43057608f2d8119ef8d5b3250e882f8f21639a85 SHA512 e04ca57ec66df550ecb1f2c9f6aec27c3da257fee3097217eeb2a3a3359526236be6111e2c6d2a19997ac8e65fce09e922df5a3b2434e897484e2ad499167f2f MISC metadata.xml 745 BLAKE2B e60b11b8af54db5c7f8080f7397a82a2c6583cf517cc5d1f4a0db7af846015d385584a05e3725d2a60b448e448fe350ed020806ec5ce66f4e42e4b830dd8fd3d SHA512 55022ee6b895bcc4ffe24f2d784cdec87eaa66965b27017dbe5ce993daa829d667f5e22df298c31e3df4d73d120a3293f7d68a59b66b866015fa502afb5b6eae diff --git a/sci-electronics/gnucap/files/gnucap-20210107-fix-paths.patch b/sci-electronics/gnucap/files/gnucap-20210107-fix-paths.patch new file mode 100644 index 000000000000..455475fa7cde --- /dev/null +++ b/sci-electronics/gnucap/files/gnucap-20210107-fix-paths.patch @@ -0,0 +1,68 @@ +diff --git a/apps/Make1 b/apps/Make1 +index 43a2266..a29b29f 100644 +--- a/apps/Make1 ++++ b/apps/Make1 +@@ -23,7 +23,7 @@ TARGET = gnucap-default-plugins + #------------------------------------------------------------------------ + INSTALL_FILES = $(TARGET)$(TARGET_EXT) + #------------------------------------------------------------------------ +-INSTALL_DIR = $(PREFIX)/lib/gnucap ++INSTALL_DIR = $(PREFIX)/lib64/gnucap + #------------------------------------------------------------------------ + DELETED = + #------------------------------------------------------------------------ +diff --git a/lib/Make1 b/lib/Make1 +index 27f839f..bd9fbfb 100644 +--- a/lib/Make1 ++++ b/lib/Make1 +@@ -23,7 +23,7 @@ TARGET = libgnucap + #------------------------------------------------------------------------ + INSTALL_FILES = $(TARGET)$(TARGET_EXT) + #------------------------------------------------------------------------ +-INSTALL_DIR = $(PREFIX)/lib ++INSTALL_DIR = $(PREFIX)/lib64 + #------------------------------------------------------------------------ + DELETED = + #------------------------------------------------------------------------ +diff --git a/main/Make1 b/main/Make1 +index 14d44c7..2d92c1f 100644 +--- a/main/Make1 ++++ b/main/Make1 +@@ -24,7 +24,7 @@ TARGET = gnucap + INSTALL_DIR = $(PREFIX)/bin + INSTALL_FILES = $(TARGET)$(TARGET_EXT) ../gnucap-conf + #------------------------------------------------------------------------ +-INSTALL_SYSCONF_DIR = $(PREFIX)/etc ++INSTALL_SYSCONF_DIR = $(PREFIX)/../etc + INSTALL_SYSCONF_FILES = ../gnucap.conf + #------------------------------------------------------------------------ + DELETED = +diff --git a/main/configure b/main/configure +index b68d06a..47e43a2 100755 +--- a/main/configure ++++ b/main/configure +@@ -23,8 +23,8 @@ fi + + sed -e "s#/usr/local#$prefix#" ../Makefile.template > Makefile + #---------------------------------------------------------------- +-pkglibdir='${prefix}/lib/gnucap' +-pkglibdir_expanded="${prefix}/lib/gnucap" ++pkglibdir='${prefix}/lib64/gnucap' ++pkglibdir_expanded="${prefix}/lib64/gnucap" + + # bug. this is not implemented consistently. + CXX=${CXX-c++} +@@ -32,11 +32,11 @@ CXX=${CXX-c++} + fill_template() { + sed -e "s#@prefix@#$prefix#" \ + -e "s#@exec_prefix@#$prefix#" \ +- -e "s#@libdir@#$prefix/lib#" \ ++ -e "s#@libdir@#$prefix/lib64#" \ + -e "s#@includedir@#$\{prefix\}/include#" \ + -e "s#@datarootdir@#$\{prefix\}/share/gnucap#" \ + -e "s#@docdir@#$\{prefix\}/share/doc/gnucap#" \ +- -e "s#@sysconfdir@#$\{prefix\}/etc#" \ ++ -e "s#@sysconfdir@#$\{prefix\}/../etc#" \ + -e "s#@pkglibdir@#$pkglibdir#" \ + -e "s#@pkglibdir_expanded@#$pkglibdir_expanded#" \ + -e "s#@CXXFLAGS@#$CCFLAGS#" \ diff --git a/sci-electronics/gnucap/files/gnucap-20210107-respect-ldflags.patch b/sci-electronics/gnucap/files/gnucap-20210107-respect-ldflags.patch new file mode 100644 index 000000000000..5456373cda29 --- /dev/null +++ b/sci-electronics/gnucap/files/gnucap-20210107-respect-ldflags.patch @@ -0,0 +1,208 @@ +diff --git a/apps/Make2.Debug b/apps/Make2.Debug +index b35ac81..f437b76 100644 +--- a/apps/Make2.Debug ++++ b/apps/Make2.Debug +@@ -41,7 +41,7 @@ CCFLAGS = \ + + LIBS = \ + +-LDFLAGS = -shared ++LDFLAGS += -shared + + %.SUFFIXES: + .SUFFIXES: .o .cc +diff --git a/apps/Make2.g++ b/apps/Make2.g++ +index c7581c9..443c0e8 100644 +--- a/apps/Make2.g++ ++++ b/apps/Make2.g++ +@@ -32,7 +32,7 @@ CCFLAGS = \ + + LIBS = \ + +-LDFLAGS = -shared ++LDFLAGS += -shared + + .SUFFIXES: + .SUFFIXES: .o .cc +diff --git a/apps/Make2.mingw32 b/apps/Make2.mingw32 +index 8a9345e..df5f7f6 100644 +--- a/apps/Make2.mingw32 ++++ b/apps/Make2.mingw32 +@@ -30,7 +30,7 @@ CCFLAGS = \ + + LIBS = -lgnucap + +-LDFLAGS = -shared -L../../lib/MSW ++LDFLAGS += -shared -L../../lib/MSW + + .SUFFIXES: + .SUFFIXES: .o .cc +diff --git a/apps/configure b/apps/configure +index 1fbb987..6b684af 100755 +--- a/apps/configure ++++ b/apps/configure +@@ -38,7 +38,7 @@ VPATH = .:.. + CCC = c++ + TARGET_EXT = .so + +-LDFLAGS = -shared ++LDFLAGS += -shared + + .SUFFIXES: + .SUFFIXES: .o .cc +diff --git a/lib/Make2.Debug b/lib/Make2.Debug +index b0e180a..7cfe919 100644 +--- a/lib/Make2.Debug ++++ b/lib/Make2.Debug +@@ -43,7 +43,7 @@ LIBS = \ + -lreadline -ltermcap \ + -ldl + +-LDFLAGS = -shared ++LDFLAGS += -shared + + %.SUFFIXES: + .SUFFIXES: .o .cc +diff --git a/lib/Make2.g++ b/lib/Make2.g++ +index 7dd1598..a240c53 100644 +--- a/lib/Make2.g++ ++++ b/lib/Make2.g++ +@@ -35,7 +35,7 @@ LIBS = \ + -lreadline -ltermcap \ + -ldl + +-LDFLAGS = -shared ++LDFLAGS += -shared + + .SUFFIXES: + .SUFFIXES: .o .cc +diff --git a/lib/Make2.mingw32 b/lib/Make2.mingw32 +index 27a2c51..bf7c663 100644 +--- a/lib/Make2.mingw32 ++++ b/lib/Make2.mingw32 +@@ -31,7 +31,7 @@ CCFLAGS = \ + + LIBS = + +-LDFLAGS = -shared ++LDFLAGS += -shared + + .SUFFIXES: + .SUFFIXES: .o .cc +diff --git a/lib/configure b/lib/configure +index a10a76e..4a07543 100755 +--- a/lib/configure ++++ b/lib/configure +@@ -49,7 +49,7 @@ VPATH = .:.. + CCC = c++ + TARGET_EXT = .so + +-LDFLAGS = -shared ++LDFLAGS += -shared + + .SUFFIXES: + .SUFFIXES: .o .cc +diff --git a/main/Make2.Debug b/main/Make2.Debug +index e531639..31f7fa8 100644 +--- a/main/Make2.Debug ++++ b/main/Make2.Debug +@@ -39,7 +39,7 @@ CCFLAGS = \ + LIBS = \ + -lgnucap \ + +-LDFLAGS = -rdynamic \ ++LDFLAGS += -rdynamic \ + -L../../lib/O-DEBUG + + %.SUFFIXES: +diff --git a/main/Make2.g++ b/main/Make2.g++ +index 8991962..8add8f6 100644 +--- a/main/Make2.g++ ++++ b/main/Make2.g++ +@@ -31,7 +31,7 @@ CCFLAGS = \ + LIBS = \ + -lgnucap \ + +-LDFLAGS = -rdynamic \ ++LDFLAGS += -rdynamic \ + -L../../lib/O + + .SUFFIXES: +diff --git a/main/Make2.mingw32 b/main/Make2.mingw32 +index b6150e6..0175914 100644 +--- a/main/Make2.mingw32 ++++ b/main/Make2.mingw32 +@@ -30,7 +30,7 @@ CCFLAGS = \ + + LIBS = -lgnucap + +-LDFLAGS = -L../../lib/MSW ++LDFLAGS += -L../../lib/MSW + + .SUFFIXES: + .SUFFIXES: .o .cc +diff --git a/main/configure b/main/configure +index 9c43821..b68d06a 100755 +--- a/main/configure ++++ b/main/configure +@@ -65,7 +65,7 @@ VPATH = .:.. + CCC = c++ + TARGET_EXT = + +-LDFLAGS = -rdynamic \ ++LDFLAGS += -rdynamic \ + -L../../lib/O + + .SUFFIXES : .o .cc +diff --git a/modelgen/Make2.Debug b/modelgen/Make2.Debug +index e531639..31f7fa8 100644 +--- a/modelgen/Make2.Debug ++++ b/modelgen/Make2.Debug +@@ -39,7 +39,7 @@ CCFLAGS = \ + LIBS = \ + -lgnucap \ + +-LDFLAGS = -rdynamic \ ++LDFLAGS += -rdynamic \ + -L../../lib/O-DEBUG + + %.SUFFIXES: +diff --git a/modelgen/Make2.g++ b/modelgen/Make2.g++ +index 8991962..8add8f6 100644 +--- a/modelgen/Make2.g++ ++++ b/modelgen/Make2.g++ +@@ -31,7 +31,7 @@ CCFLAGS = \ + LIBS = \ + -lgnucap \ + +-LDFLAGS = -rdynamic \ ++LDFLAGS += -rdynamic \ + -L../../lib/O + + .SUFFIXES: +diff --git a/modelgen/Make2.mingw32 b/modelgen/Make2.mingw32 +index 63b9657..813c5f4 100644 +--- a/modelgen/Make2.mingw32 ++++ b/modelgen/Make2.mingw32 +@@ -30,7 +30,7 @@ CCFLAGS = \ + + LIBS = -lgnucap + +-LDFLAGS = -L../../lib/MSW ++LDFLAGS += -L../../lib/MSW + + .SUFFIXES: + .SUFFIXES: .o .cc +diff --git a/modelgen/configure b/modelgen/configure +index d11d07e..3193444 100755 +--- a/modelgen/configure ++++ b/modelgen/configure +@@ -39,7 +39,7 @@ VPATH = .:.. + CCC = c++ + TARGET_EXT = + +-LDFLAGS = -rdynamic \ ++LDFLAGS += -rdynamic \ + -L../../lib/O + + .SUFFIXES : .o .cc diff --git a/sci-electronics/gnucap/gnucap-20210107.ebuild b/sci-electronics/gnucap/gnucap-20210107.ebuild new file mode 100644 index 000000000000..f898c65a2a47 --- /dev/null +++ b/sci-electronics/gnucap/gnucap-20210107.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="GNUCap is the GNU Circuit Analysis Package" +SRC_URI="https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/${P}.tar.gz" +HOMEPAGE="http://www.gnucap.org/" + +IUSE="examples" +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~x86" + +RDEPEND="sys-libs/readline:=" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-respect-ldflags.patch" + "${FILESDIR}/${P}-fix-paths.patch" +) diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest index b1f3d0162fc8..9621b19c2a8d 100644 --- a/sci-electronics/kicad-footprints/Manifest +++ b/sci-electronics/kicad-footprints/Manifest @@ -1,6 +1,6 @@ DIST kicad-footprints-5.1.12.tar.bz2 3382783 BLAKE2B 6f7725bebd6099d86780ed2582aacfb3abff4db6065a6a17fcd7631782a0c2e1e8a23064f80cd95c79bbaca8da52003f01fce7e398e95596e45f15b144eeef7f SHA512 e717886dc742f37b626226065953a36829b50f9bf203efe1dbeab41d4dbe3a898bd65fbde9fa059ea9374ea92905faeb0ccd19dfb1a62f2d6a445c07f90b89a9 -DIST kicad-footprints-6.0.0.tar.gz 6151018 BLAKE2B f54b1e47e4eb575c2d7bbb7d009954ca12f1aad5c06e4b39c9fa55ba1450ed865d3528dec5d98fac558a183266a77fb58209fb1028a2e2f5f6bd4e1d14b5caf7 SHA512 919883ee3a422e03ec7e89c6859d85431965e2ba6a6ee0449c1c7349d190abc65e6e9ac85e083e0fa8ed5d5657fa0a00f4094cf1c56046af470a2b4300bac19b +DIST kicad-footprints-6.0.1.tar.gz 31372634 BLAKE2B 5cb451a9a69c926af1aa8e0b180a244b8e195a450c83c960d62125d3bfc35d6a8c0a07e1a54c207fe851198b83bbdc7e3a26d06bdd92afbb1637733898661159 SHA512 dbe8689a0f32a9b448c7aa37c673736d97163f8e3f23b1e5119a732926cfd635aaa7927f0bf77327ab824353fe431523ca10f4035a37ca4fa364c8a7e2e2805d EBUILD kicad-footprints-5.1.12.ebuild 435 BLAKE2B f8452914dfffb5c899cbf8e0112318f96f3833628f90ca48c208c26b6a558ce69eb1e90f390f686c88b51ecc194abcf1bbc87aaa1457ded6980af0b0e49ee5c4 SHA512 9945e466d7812e9c44f4481a077cb19162a7d2ce73425a12b5e6bd51a1ae7cf7fa8d7f91cde116d55665cb49585e4936f8a2d141f1f8a612f49c0b8a1c8a736d -EBUILD kicad-footprints-6.0.0.ebuild 862 BLAKE2B 2baa7e57061f5c3c0b9a28987d2c2c44a238d2f5a09343b7e3b283149523a264bb4c8f0974455713836ee147ff0083a04ebcfcec92e02c3334964ea294bc0cee SHA512 896c3f6c3df813454e9c01a4876e7561c8989d63a9a0a6eb2771a72ab2538aa0bd977e80ac3a757e17a95fde6fc7aa6111497be89b1a463c64065cea3199e5fd -EBUILD kicad-footprints-9999.ebuild 862 BLAKE2B e50a3295d86f5728ace846b6376b4dda394158626a868b5074d1c924595d403ce932eb703884f3783df05349a5feace6bed59eedb97998cd147cedee1fbf84e7 SHA512 513081cadf6fb841834ae813d67e358c8f8063af57c3ae5a4567d597c1fdd30046cfa4b58a07a549bd8514c9f0504509139f343cffeffae94ffb28a9f444fdf7 +EBUILD kicad-footprints-6.0.1.ebuild 863 BLAKE2B e7abdc6cc61b2fda88acd5618a0263bc8991dae6042b02172e1a31b559714fbff03b9b15846c99079ee9ba03a05d27d537983727baf9ffea3c8aa128904d5ccb SHA512 5ee5c0fce8ae9a38b51ca01bf7d4cd49ffb92d7230aa31b05a9e4c48a91734ec24c85669feb6b1ac675b8a5fc55e8c89944722b8f223abd2815800de828f0cd3 +EBUILD kicad-footprints-9999.ebuild 863 BLAKE2B e7abdc6cc61b2fda88acd5618a0263bc8991dae6042b02172e1a31b559714fbff03b9b15846c99079ee9ba03a05d27d537983727baf9ffea3c8aa128904d5ccb SHA512 5ee5c0fce8ae9a38b51ca01bf7d4cd49ffb92d7230aa31b05a9e4c48a91734ec24c85669feb6b1ac675b8a5fc55e8c89944722b8f223abd2815800de828f0cd3 MISC metadata.xml 766 BLAKE2B cba91a16d3b205f5f36dff3aba3afad956d98d23ac08ecb26bf3ef5471e5fdb7698c86cc1e245a34069f73a052eebdd37594941194b7f3f5d9c57a88718d7de0 SHA512 8d24ac5ad64aec5939be1244e417c2299353d6d618bea63ef949f6c82a865cee98ab11a3dd8c57e447e13203abc3a40da7070f585379c1ec54b0bd46c214d0ec diff --git a/sci-electronics/kicad-footprints/kicad-footprints-6.0.0.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-6.0.1.ebuild index e640cdac16e1..995b74bb1881 100644 --- a/sci-electronics/kicad-footprints/kicad-footprints-6.0.0.ebuild +++ b/sci-electronics/kicad-footprints/kicad-footprints-6.0.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -28,7 +28,7 @@ SLOT="0" IUSE="" DEPEND="" -RDEPEND=">=sci-electronics/kicad-5.99" +RDEPEND=">=sci-electronics/kicad-6.0.0" if [[ ${PV} == 9999 ]] ; then # x11-misc-util/macros only required on live ebuilds diff --git a/sci-electronics/kicad-footprints/kicad-footprints-9999.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-9999.ebuild index 965cbab236bb..995b74bb1881 100644 --- a/sci-electronics/kicad-footprints/kicad-footprints-9999.ebuild +++ b/sci-electronics/kicad-footprints/kicad-footprints-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -28,9 +28,9 @@ SLOT="0" IUSE="" DEPEND="" -RDEPEND=">=sci-electronics/kicad-5.99" +RDEPEND=">=sci-electronics/kicad-6.0.0" if [[ ${PV} == 9999 ]] ; then - # x11-misc-util/macros only required on live ebuilds +# x11-misc-util/macros only required on live ebuilds BDEPEND+=" >=x11-misc/util-macros-1.18" fi diff --git a/sci-electronics/kicad-meta/Manifest b/sci-electronics/kicad-meta/Manifest index 84b2098e5459..835d6bcded46 100644 --- a/sci-electronics/kicad-meta/Manifest +++ b/sci-electronics/kicad-meta/Manifest @@ -1,3 +1,3 @@ EBUILD kicad-meta-5.1.12.ebuild 620 BLAKE2B a4c802e020999a16be0b615bb2bb18d11330b041822a283f541f98d17b6d247c9ca835c5d177928fce26a638412c94de6fdf122f5eb3c5afdc8dd7365ff6a0f2 SHA512 aa7ff651a6cc3761f88b87462b91d3e125e69c8155a95676d77013a0a9824f454cc3fa276ea88e1ef2a2c7a5cccc89e0085b698354d145e3ce38a451018d50f0 -EBUILD kicad-meta-6.0.0.ebuild 610 BLAKE2B 076a001c4e2f7293d3cb459ce663b699404aabbc44ff646e3b65d2c65ee4660e19142fad23bfe7a18d3aef5c84f1834b92a7f421eba07078219ed8bebb4529cf SHA512 4331dc1c86b91e8a2f77d04bca014d88375a88d1c48367892553f3997ec16d357073adf6a5d98296b8e53380e25e5949891852fb7571b12cee9f4b0e48083de8 +EBUILD kicad-meta-6.0.1.ebuild 610 BLAKE2B 5c94697d9d8acf3491e1c175645e517591247467519010145389ed95c90bfcbf7ac0fd603df68971f11d8f9fb9099c9e71186f14c83cfefabde0444653dee608 SHA512 1021e21ad102ab9b4807b6294ef8a506cf7017cb9621f575c144208f05944ba3b0f88e85f5a6a07656c3eadda439bb028105c61c814fdd37f15849d52df4b50d MISC metadata.xml 625 BLAKE2B b85af17cbbc843d7d841344c73f0812457bf6ef209c44397bfcf5404175dc20a2525fb4b9501ca61ab686c7afb365bc7165b632ec71b907bcfbe7e651df54e0d SHA512 fdf916963a769a8b0f0d0f3ecf737c3e19a928ac3335d042fe9f57b700a9738f1e834a1f42a97efd9171fd3d218ac9f33337b30583516654efb03bc6902869c6 diff --git a/sci-electronics/kicad-meta/kicad-meta-6.0.0.ebuild b/sci-electronics/kicad-meta/kicad-meta-6.0.1.ebuild index 13ce06ce65fd..570479b87ece 100644 --- a/sci-electronics/kicad-meta/kicad-meta-6.0.0.ebuild +++ b/sci-electronics/kicad-meta/kicad-meta-6.0.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Electronic Schematic and PCB design tools (meta package)" HOMEPAGE="http://www.kicad.org" diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest index 9bffc115d31e..5afe042d5243 100644 --- a/sci-electronics/kicad-packages3d/Manifest +++ b/sci-electronics/kicad-packages3d/Manifest @@ -1,6 +1,6 @@ DIST kicad-packages3d-5.1.12.tar.bz2 727191578 BLAKE2B 534ba480de72ffbc8ac0968e5a7b04f2b7ccfb0ef8bb88bdad7e4e6d90536f9ae7bd101316512e1fa2e27b607fd0dd8e53d0729e48368362177b066c6bab3802 SHA512 eb4895e0c46448a74acf10e8c72dee6ea89fee9d53b93c0927d592f4ee944497b642ed575b1b5457ff0db731f654d054d539aff007a17b8d8366c03edb15b6d2 -DIST kicad-packages3d-6.0.0.tar.gz 943422281 BLAKE2B dcea4d4a323d021eba61dcab307e09e2bb8d39cdc38dc5ca64b7a19e93ffe1d0b6c4869dac47d81eca950a0c6db8c023758c66eb1a839fbb073529be02165c0b SHA512 5931309d9ed1fb78a0c9ef8eba80b68851749f369d4efe10f5fa02b6444fa7a3cfcfe1a8188127cbf15745f4e6d357e56f34ee5e6ff06560441937a8967495e0 +DIST kicad-packages3d-6.0.1.tar.gz 943455043 BLAKE2B 7d26b3f6eb9fe279343d9c43dfff875ba2f56b56ff1fe868a07fa43f9abe476f7b6c8e3e9122adf2bf5546b571f45573926055452bac9b5dc03618dd8ace245a SHA512 326ad5d3b4fea482921af2f69b21e7f36ad462632804c24c160b824e722d79050a2e7d81b499fad09c7e03381026a9d3d292a85ace79d7a7cc3a976454e8bb83 EBUILD kicad-packages3d-5.1.12.ebuild 602 BLAKE2B 62514efac88725f127605ddac5ddfed4abbb7e5972b6bf818785caacdcb6cb201b969fe55894ac74f2e67af4342c81482bff1892476528b7694460a2bdcce88d SHA512 9ee93e24de865787430eae1c7e4d1dbe50061f389929011b143abc627a398e8ed8f1ccfa097c8005ec969fb1a8b8e2914a0b17b5f31130c16231bd9e5d019c3c -EBUILD kicad-packages3d-6.0.0.ebuild 948 BLAKE2B aba3e55e129fad9feb303551a8ef5c04f9a5c78630b8bbc11219e7b55d8cb131f6fa33c3129b4a8f166a49b8f9333135b0e5817b2504b679757c4f976deb62d0 SHA512 b851cb00fd1ce776693027054a9b65f723081836b7bb6b8104fe953624a28ca357232b0d5e115ac3ea30953e4ea4d8a98d4b4a2fe7b23500872369ac3f51842b -EBUILD kicad-packages3d-9999.ebuild 932 BLAKE2B 7b1542d38004eb7adee38b55af0d2f0d70f67408e21defb2bbb517f63b7da46d9bd29847f956313c983e7f754b16dc408b01b787699b4d0a8440466397e6d665 SHA512 b1a4d9011e6e54b0cc9bb71dfb2a98459c67988c4eebc17a7ae02e36f4e59a0613d6ee8820f17a60fde8a1c723f1a17136e709f415359931877738e38e8aa79e +EBUILD kicad-packages3d-6.0.1.ebuild 948 BLAKE2B 3f971388bf7c023551a22595fcf990574b57646a71906baa8ebd4afec2d05bcb121b90dd1444229f365d2d3d9b90ddd748e94f36a7e6c40db95706d8a038dc5f SHA512 33eb6a6eefbb62abe85d3dd9c2932575a72cf038581ec936c2c8b6fbf74a3dda3b21792c1a812ddee0bacbd9898906c2e8e028e88545bb90047b52916f33097d +EBUILD kicad-packages3d-9999.ebuild 933 BLAKE2B 7c56da88187d74ceb63e88691e124a9083e61e7703650d63689e256eb4c7b456cf48dac4f958d92a2ff8128d930ee1c1b4dda22e9fcf5cfba3d78212c05fda12 SHA512 038c920d7cf33eaf085ab5b0859c7ff8c4b6e0306b09ec65c09e0e1d4502a8a055f32056be171092f68245828be1f61e640fd386449e93b42b82669e7d867613 MISC metadata.xml 976 BLAKE2B 70851f4db73dbf597cb669018fe27e4e1507cf4e86fa82488751a27fbdb8e85eb13d81ec42d62685c459a8c56cb1899579430132bc9ae4c0c0c2fdcb756bae1b SHA512 1e6512afe9ff98ee23c33bb339e1b6ad4b9da8d2bdf6ea52f40874ab77e4918aa565a550c384ecdc693a2f7b366cd07d4c5abae52dfc6177cf9262ad1a01d7b4 diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.1.ebuild index f5a45cc6b9cd..5bf36a30f654 100644 --- a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0.ebuild +++ b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit check-reqs cmake @@ -20,14 +20,14 @@ else KEYWORDS="~amd64 ~arm64 ~x86" fi - S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-1080b6e565e56bae9be46db2278a1542092d7a2d" + S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-530926da52f5226de6fc3167cf2e0671fb7f0cec" fi IUSE="+occ" LICENSE="CC-BY-SA-4.0" SLOT="0" -RDEPEND=">=sci-electronics/kicad-5.1.0[occ=]" +RDEPEND=">=sci-electronics/kicad-6.0.0[occ=]" if [[ ${PV} == 9999 ]] ; then # x11-misc-util/macros only required on live ebuilds diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild index 4ef1bc6b0f7e..75bc70ca8649 100644 --- a/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild +++ b/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit check-reqs cmake @@ -26,7 +26,7 @@ IUSE="+occ" LICENSE="CC-BY-SA-4.0" SLOT="0" -RDEPEND=">=sci-electronics/kicad-5.99[occ=]" +RDEPEND=">=sci-electronics/kicad-6.0.0[occ=]" if [[ ${PV} == 9999 ]] ; then # x11-misc-util/macros only required on live ebuilds diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest index 6985473056cf..45d5c8d0a4c9 100644 --- a/sci-electronics/kicad-symbols/Manifest +++ b/sci-electronics/kicad-symbols/Manifest @@ -1,6 +1,6 @@ DIST kicad-symbols-5.1.12.tar.bz2 1815145 BLAKE2B e3a74c0e2cb24f4286cdd7fa63b62c72c39575475305680ba8e19d5b3acb5c6cbff1e17d37d169043949ad89ffb9b94f0341e1faf7d063c1cf9872d31b863e21 SHA512 32e73b8a43e54779e4b95fc13505d603c7ef70600467a1e38f2685288aa9223ca29cc44a552d8c02e153cbf3048faa59610bc92e81dbbed7a432c16db0bd05f6 -DIST kicad-symbols-6.0.0.tar.gz 4809848 BLAKE2B ba96aac11c60ba590c23d3df56e0c3cb7fbea828833e0cd7874976f0ed93bf7e0dd21a3a367eff0e5086126c663eec075b45cb82f463c36289b780ecf1836e20 SHA512 9e223ba15e8c8d00d5f5889f4fc9f7677a290253121889dd162788af3bbf1400b39c6d41bb1167b53ea028c32016f8f465251a308f546ece69149a9e5b32e66c +DIST kicad-symbols-6.0.1.tar.gz 4809762 BLAKE2B 8133932edf7f480ea61c98838e0c7b0ed32c79ef8cc89d385192c7cd137bcfabdb9a4ed28cc10b2006dfc37729b070d286a5b29b94108da487c797fef1605b20 SHA512 0f62118118adff693bb127d229232cfeeb88f48d3d818d44c3d9d8d1db89de903587ed8cc9081914eec8233650dd0bac6dd5d4618b4417bdf06955ebd1b8923c EBUILD kicad-symbols-5.1.12.ebuild 429 BLAKE2B f05364cdfb4fc1e8e6a79722c374d2f260ab46c6e35c09d209e1121cb6f188177073c2ef05283dae3700f8c3c6767216666f9460044e6c9b1525766b0898b98f SHA512 7cf1cff346c6ce05516825d89d08c25a7af0903464e92cd0003fe212bb58fb870c26692dbcc932ef1a552729e6927ed08e291ff0a022dcd4403ddb632f02ccee -EBUILD kicad-symbols-6.0.0.ebuild 853 BLAKE2B 3dc1b33c750bf72c8d4cc4a3b74a343896821b2550c7f62da393780d76bf7cb9c58d2d77329af800e2831cc04219959a3a867e2346ebd21b205292ee3f74a427 SHA512 e2aae5d0b1deba924b15ec05b29c487f7b8afd50f69c33deaa0f5c484feedbda5a12f150e8224cea28cfc2dfcd7ec77c0e95f8b8919ba9af08dbb7d10a1542ef -EBUILD kicad-symbols-9999.ebuild 843 BLAKE2B 4820693e507a2640e27cd413fedd52037e1954ebd550dfe77076dc0bcd257a9badb716741432acd960226722b6f1cf2cd6a3e7a002bf39153a3a7f27e0b2a7c0 SHA512 473d4ca330a3b89acab1a7be55b3c986d68021f31d9b6e1368424c69b3c4c406cb9d881edb1c1500c155aa0572e41bdb872a779ce3e0910e0baf589e4be1f155 +EBUILD kicad-symbols-6.0.1.ebuild 854 BLAKE2B 0e054975aeef6ce0ed7c96e29835dc55c71a0b5662e164e418a91cc5f34529084ef719d784ae55a84b3c129da0650f05faf7f74e2ba013675302522c31293c2b SHA512 b6fc6e9883226a3567e58bbfdb8d40a9e7749e6bd16b0228b0f5f2a8ec4569fac8be526461f9ebf0edbf36470fdeafaa96c3b32473b93b1091da50a9b4053362 +EBUILD kicad-symbols-9999.ebuild 844 BLAKE2B 0105cb6e28b9f3b7426ddc4ffbacff06646d1c84d66a89d9dfc328511dd7c7339799ebadd24527e1120e6c4588fb7ff2b898749d19747088b3b722de36bd4a94 SHA512 90345c12a573d46121238ecb54678f86b5ce93cc1f80d66b137a9f220ed4865b550ceda56bf6b6eaca36e9b0fb8750fdb53c4837e02ef09a17f17e55ea1d4e72 MISC metadata.xml 724 BLAKE2B 10eccd33b4ca07e25e2b3ce44d30583671b33836f7fb7a9c68b063bb267529fb0e2988b71bc57d0d92967f583ae3ac4e0cdf0762da687a834f51620f45df5411 SHA512 76569f2955cf1db93bbac820d513aa4d58f4bf27089736a9adc98e1df4d21c0c80be6c894dc2eb024b2cb0271e37a479b15ce68d377bd028df2becf5166958a2 diff --git a/sci-electronics/kicad-symbols/kicad-symbols-6.0.0.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-6.0.1.ebuild index 985b0dfbfdba..911199e91fac 100644 --- a/sci-electronics/kicad-symbols/kicad-symbols-6.0.0.ebuild +++ b/sci-electronics/kicad-symbols/kicad-symbols-6.0.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -28,7 +28,7 @@ SLOT="0" IUSE="" DEPEND="" -RDEPEND=">=sci-electronics/kicad-5.99" +RDEPEND=">=sci-electronics/kicad-6.0.0" if [[ ${PV} == 9999 ]] ; then # x11-misc-util/macros only required on live ebuilds diff --git a/sci-electronics/kicad-symbols/kicad-symbols-9999.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-9999.ebuild index 261092ede9b0..2fcbfb8a9bca 100644 --- a/sci-electronics/kicad-symbols/kicad-symbols-9999.ebuild +++ b/sci-electronics/kicad-symbols/kicad-symbols-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -27,7 +27,7 @@ LICENSE="CC-BY-SA-4.0" SLOT="0" IUSE="" -RDEPEND=">=sci-electronics/kicad-5.99" +RDEPEND=">=sci-electronics/kicad-6.0.0" if [[ ${PV} == 9999 ]] ; then # x11-misc-util/macros only required on live ebuilds diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest index a1c089390ec3..d97c0cb64c20 100644 --- a/sci-electronics/kicad-templates/Manifest +++ b/sci-electronics/kicad-templates/Manifest @@ -1,6 +1,6 @@ DIST kicad-templates-5.1.12.tar.bz2 1552173 BLAKE2B 51791729e049aa835f15b80f783d07c099dd177783b1a78209e7c7db709a3b0a18bd22572227ab5193d4da955796bc4c78f502fdedd275f379f84fa49108a324 SHA512 4f44816fa78048c0db93ecd10ae980236bc5ef1ed5170270ac761dd5fc32d08a5c8bf733837e6dceecf736f75fa09780326af813de04cbd69345cf376815d430 -DIST kicad-templates-6.0.0.tar.gz 2248671 BLAKE2B f164b0788923e8cc314241127bc235513bfa04706548a080c0d83dfcce2087e5ce202545a7ce545da0d3e7c67299b712a1289188afe7ff27ae6509b23c6e33ff SHA512 fbe54dd90ce1cc913b406796952b1503fc7720e01a181880771df29ee0f7be1de062f71fccfb7d71ce1fc4a4044e12019d9e9a3cade100dfc021dbdbbd117ad4 +DIST kicad-templates-6.0.1.tar.gz 2248692 BLAKE2B fa9f1667958f25f965e1f41b50b009724b8b46960b55561048aca74f876196ac896ee72294f32ad815f7d7097dd4caba2a4fe8c5f6731e0e13322c48cf6df1a0 SHA512 ee0423949e63a17634c0abe3eb5184d16650cf702f37fa2f10af8f0e9377d4031b0b213cb8570af63d8ff8d5549f0b6f153287db9d8f64140273134ee2650a60 EBUILD kicad-templates-5.1.12.ebuild 438 BLAKE2B 245672d11e479bd59d83eae963c7606addb45d8202a7212034dc9d92f8eb27b2809844848722dccc2777dd4126e67b48049934a1077774f598a8ed9e1c1fc638 SHA512 e9e21e3a0b429a9f1d267f6d0f9dde8405ababdfb5cd81c8e3d8f6f7e1f136490c88238fbc699b296631cc75359f8c2205bd0f10f160cd15fcd1dcdce777c122 -EBUILD kicad-templates-6.0.0.ebuild 690 BLAKE2B a91c08077e54223fdf646bb8a28ef168da5d7df0525ebb23a2f527f5d1c94b292679cde75de8476f917e2279eaaf1b21246126ff072e3a08cda4a70c853e1bfe SHA512 9f6be9016a944498a8e8302bbb2e610f14c255f399b58564b68e04faf6f3d758823063d5b4c6400a8aac612768ba006657225b0f27d0abe30a5aebe2ea908e45 -EBUILD kicad-templates-9999.ebuild 690 BLAKE2B a91c08077e54223fdf646bb8a28ef168da5d7df0525ebb23a2f527f5d1c94b292679cde75de8476f917e2279eaaf1b21246126ff072e3a08cda4a70c853e1bfe SHA512 9f6be9016a944498a8e8302bbb2e610f14c255f399b58564b68e04faf6f3d758823063d5b4c6400a8aac612768ba006657225b0f27d0abe30a5aebe2ea908e45 +EBUILD kicad-templates-6.0.1.ebuild 691 BLAKE2B 44322a26e224d77803cc24cb73723e52c8abf5c0887b7c30504c5b9530ff2e38d134fece90cba308ea4c4105759ef1ac06fb5a212409f06f73ec938bf4ed74b3 SHA512 395279ec620a31c789dae437e192b13347a32dbb8b637a5c2aa8e9615842d9f51ba0ccc5426cc2c65bc23dae09984c9a4e4bdcae3ba9ba588f6729c3e20be5ed +EBUILD kicad-templates-9999.ebuild 691 BLAKE2B 44322a26e224d77803cc24cb73723e52c8abf5c0887b7c30504c5b9530ff2e38d134fece90cba308ea4c4105759ef1ac06fb5a212409f06f73ec938bf4ed74b3 SHA512 395279ec620a31c789dae437e192b13347a32dbb8b637a5c2aa8e9615842d9f51ba0ccc5426cc2c65bc23dae09984c9a4e4bdcae3ba9ba588f6729c3e20be5ed MISC metadata.xml 484 BLAKE2B 3542f585439e05e86fc86e11f524c15f10f835fe5419141b6361ae4503dc6dff5d0c9d7bb24134c3722e4ab11d6cad6d450625f7e5edc822b3d0ee82fd8bde48 SHA512 03468e0fa2d56c7241219eb07b1cddc225b5e18f6800a513005f76cd19110b4ad9d8f9b2895107695b6c62c8f276b38bbf544a7651b61f3e83878c94a40b8886 diff --git a/sci-electronics/kicad-templates/kicad-templates-6.0.0.ebuild b/sci-electronics/kicad-templates/kicad-templates-6.0.1.ebuild index c54c0c834164..4eb6a8bdae4c 100644 --- a/sci-electronics/kicad-templates/kicad-templates-6.0.0.ebuild +++ b/sci-electronics/kicad-templates/kicad-templates-6.0.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -25,4 +25,4 @@ fi LICENSE="CC-BY-SA-4.0" SLOT="0" -RDEPEND=">=sci-electronics/kicad-5.99" +RDEPEND=">=sci-electronics/kicad-6.0.0" diff --git a/sci-electronics/kicad-templates/kicad-templates-9999.ebuild b/sci-electronics/kicad-templates/kicad-templates-9999.ebuild index c54c0c834164..4eb6a8bdae4c 100644 --- a/sci-electronics/kicad-templates/kicad-templates-9999.ebuild +++ b/sci-electronics/kicad-templates/kicad-templates-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -25,4 +25,4 @@ fi LICENSE="CC-BY-SA-4.0" SLOT="0" -RDEPEND=">=sci-electronics/kicad-5.99" +RDEPEND=">=sci-electronics/kicad-6.0.0" diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest index 357acb711050..1536cab3bfff 100644 --- a/sci-electronics/kicad/Manifest +++ b/sci-electronics/kicad/Manifest @@ -3,8 +3,8 @@ AUX kicad-5.1.5-ldflags.patch 890 BLAKE2B 2c5436fccb50886faacd84102ba7bfefa84986 AUX kicad-5.1.5-strict-aliasing.patch 916 BLAKE2B e17c085d09d5b028424d72036e6306aecf19300fa5ecc38e0a3b4f7668ed8e41aa7c66f5f6dc68f6a66905fea8947647de90788fe2ca5439703b3fe2010b287e SHA512 1000ea7dd6fef283d144ccd9d6193a68a399177e06b1f45cae5642f7c2854d16d3cf4d789f8444c6aa36028f23b7d66c6de7596ffef57c4ecdc28747fac84636 AUX kicad-5.1.6-metainfo.patch 1740 BLAKE2B 26987940c5326d5fa27eb7a00bfec8af2bc7d4f61b937f4a12aaf08665c1d9a5d2816b154c76e954f80f7c8c620861e290988bafb3af071ae059bfb92113a2f2 SHA512 bf1b9d7adc23759e9b637f2d2f3d2843f1ef33a27c02f7e892a74a8743dfdcf635f918010f0bcc4a62ba0f7e939f89fa8c7786a761ffe709f670a0d6f63b3146 DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76 SHA512 c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea -DIST kicad-6.0.0.tar.gz 45037889 BLAKE2B 4ea4075cd8e860ed19ee051be3567400c57f8c1b51550d2da80525ef65cc0b6c0951bac8c306c4fc19bddd824e2b727f416817ea4006a67f949dbf70df673a37 SHA512 1cadf59cfa85c5bbeb86f968ced896eff16c330e498497bf58826a58a59dfb83989422d660f7230d7921eeeda709d1ff10b50d4f842a36e50d44bf9017360b50 +DIST kicad-6.0.1.tar.gz 44971453 BLAKE2B e9fcaf367efb544197fb2ce448b0d808bb79f166e73e5c6f4c7c0ef303ee1bed5697101883ad4945aea8a1a1cd3b868832ea1ebfb727dfc8bdf56ce4d177838e SHA512 a257c69e0515c6d0c709bb59f632daff6e1e2108e1b1d4553d0cde397d551c3bfd969471dc63efdb12d57202842e1f645026650e2a7ca2c8af8b7150ceaebb3d EBUILD kicad-5.1.12.ebuild 5198 BLAKE2B 3293a0a9b260c3a3bf635045a98977ae58b899402cb43e80c9d754df5d9d82859cefc6d56946e877ca10e32d1cde28b747c2fad43c52ae6e7997c8e510963abc SHA512 38c96f65d3f05610fefd77915d55619b86ebe5c508952138b28ac4da60dd3e98bb279a6d172d4b73466361aec16036cf96ff19af23a0555599e71c8c4e60bfc7 -EBUILD kicad-6.0.0-r1.ebuild 4160 BLAKE2B 9a4ac201beec0b3fad26b0400a02a3df0b51d8cbc91e261a0d2092706576815682cb04be0c81b8ae6c92cc798e73b95089d7cf6e8fa5d862b32fb16a8efca0bc SHA512 2a62ba808de89273879d4311d068db7cc99bb32d521df16a682492596fbad852953174eda04d1f70b1322651560488d502bffe2e411a7ae3bf1ca18f73f43bfb -EBUILD kicad-9999.ebuild 4160 BLAKE2B 9a4ac201beec0b3fad26b0400a02a3df0b51d8cbc91e261a0d2092706576815682cb04be0c81b8ae6c92cc798e73b95089d7cf6e8fa5d862b32fb16a8efca0bc SHA512 2a62ba808de89273879d4311d068db7cc99bb32d521df16a682492596fbad852953174eda04d1f70b1322651560488d502bffe2e411a7ae3bf1ca18f73f43bfb +EBUILD kicad-6.0.1.ebuild 4209 BLAKE2B 9f193aa3cf674656688480c7d9a0ccf29dee2773fc09535bb7cde1a212e20e9db2dbda1b61acd25051d1f67f3ec4badc8caa16020ac42c93c4bd738942eee2a1 SHA512 218dec868c50b64f21409f17c8ef3af90c180d737cd4c9feea49e66dba209bc6176dc92497a2efcab8a5995832e0eced0cf7342fc4486f8d80019b52dc39947a +EBUILD kicad-9999.ebuild 4199 BLAKE2B 9bbea2242664b97da6ea28557a430c0f4686b30d40295b53dd614fcec935fe4a091e5768c950d680dc7cf458887e4653fd656b9c6282067a378cfd8c5e06b9fa SHA512 d57ee12d1ffbd72153629e1ba1b875d3215c4a978b7b25c0b6ad1ca75b2026e803701fa29ea6217c9e7c2f197c9e6124e1c23fc5eed88a776188fcfd8dd13927 MISC metadata.xml 1140 BLAKE2B e7f0b293ca2a8304712fab8165dda2ed527dd93809748e562e56ef0a1a23e3703e56599551eb6a318304e9e0d74a30eb361f497cbc8809c2d82b42ff7f160c1a SHA512 7f4e1ec8886f042ce559d2401b3721b474b2e7c4799610419732aae228fe6583e99ec0b49f12df4ec4bcfd6c5238861c22a200a8f9712d4c5c7d91d0b74a60e5 diff --git a/sci-electronics/kicad/kicad-6.0.0-r1.ebuild b/sci-electronics/kicad/kicad-6.0.1.ebuild index ff3a92646a7e..4efd1ddc6a91 100644 --- a/sci-electronics/kicad/kicad-6.0.0-r1.ebuild +++ b/sci-electronics/kicad/kicad-6.0.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8,9} ) WX_GTK_VER="3.0-gtk3" @@ -28,7 +28,7 @@ fi # BSD for bundled pybind LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD" SLOT="0" -IUSE="doc examples +ngspice openmp +occ +pcm" +IUSE="doc examples +ngspice nls openmp +occ +pcm" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -52,6 +52,9 @@ COMMON_DEPEND=" ngspice? ( >sci-electronics/ngspice-27[shared] ) + nls? ( + sys-devel/gettext + ) occ? ( >=sci-libs/opencascade-7.3.0:= ) @@ -68,8 +71,7 @@ if [[ ${PV} == 9999 ]] ; then BDEPEND+=" >=x11-misc/util-macros-1.18" fi -CHECKREQS_DISK_BUILD="800M" -CAS_VERSION=7.5.3 +CHECKREQS_DISK_BUILD="900M" pkg_setup() { use openmp && tc-check-openmp @@ -91,13 +93,13 @@ src_configure() { xdg_environment_reset local mycmakeargs=( - -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}" + -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}" -DKICAD_SCRIPTING_WXPYTHON=ON # Merged from separate -i18n package, bug #830274 - -DKICAD_BUILD_I18N=ON - -DKICAD_I18N_UNIX_STRICT_PATH=ON + -DKICAD_BUILD_I18N="$(usex nls)" + -DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)" -DPYTHON_DEST="$(python_get_sitedir)" -DPYTHON_EXECUTABLE="${PYTHON}" diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild index ff3a92646a7e..129d19372060 100644 --- a/sci-electronics/kicad/kicad-9999.ebuild +++ b/sci-electronics/kicad/kicad-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8,9} ) WX_GTK_VER="3.0-gtk3" @@ -28,7 +28,7 @@ fi # BSD for bundled pybind LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD" SLOT="0" -IUSE="doc examples +ngspice openmp +occ +pcm" +IUSE="doc examples +ngspice nls openmp +occ +pcm" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -52,6 +52,9 @@ COMMON_DEPEND=" ngspice? ( >sci-electronics/ngspice-27[shared] ) + nls? ( + sys-devel/gettext + ) occ? ( >=sci-libs/opencascade-7.3.0:= ) @@ -68,8 +71,7 @@ if [[ ${PV} == 9999 ]] ; then BDEPEND+=" >=x11-misc/util-macros-1.18" fi -CHECKREQS_DISK_BUILD="800M" -CAS_VERSION=7.5.3 +CHECKREQS_DISK_BUILD="900M" pkg_setup() { use openmp && tc-check-openmp @@ -96,8 +98,8 @@ src_configure() { -DKICAD_SCRIPTING_WXPYTHON=ON # Merged from separate -i18n package, bug #830274 - -DKICAD_BUILD_I18N=ON - -DKICAD_I18N_UNIX_STRICT_PATH=ON + -DKICAD_BUILD_I18N="$(usex nls)" + -DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)" -DPYTHON_DEST="$(python_get_sitedir)" -DPYTHON_EXECUTABLE="${PYTHON}" diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest index 52767acc098f..a2323360dfa8 100644 --- a/sci-electronics/magic/Manifest +++ b/sci-electronics/magic/Manifest @@ -1,8 +1,5 @@ -AUX magic-7.5.202-include.patch 430 BLAKE2B c3b1837db33d05af3d258f1c514187c78ee63815731998f51729da4266af0cddbf4bb8615189965451d6bb8044c932c72672b065087c84cadca5f50cfe79b09c SHA512 0ff649589b65ac608586a425ca5d2b72e8608d513dae51be7b6e8fd5a2af494b2d186025777af2389358a3be6bd86efee312b4b1c3829d1eb3e9c28bef557e2f -AUX magic-7.5.202-install.patch 566 BLAKE2B db98035eea33960714f14825ce6c3512e6570e3961ff5173a3f83b5fbd21dae429f53864f933a1665478479a101fece51a4d2c8a6e6cdc54a21fb2e9a045ad1b SHA512 332882e4557d0b5fc9fd4d681edc74e501578a5e1d00c144b5d656b8f95a5c6497cff3a6b620305cde032f9628ae169ea478927820ea085dfb52507f5de7722d AUX magic-8.3.232-libdir.patch 525 BLAKE2B 5b85f02031d18299ae098b5ff45163d1c6d16f6bbd09996df6c669571ea82820175356c41b308f5055af874effa946f91baae90c43212e8e7adf40800799c8c3 SHA512 9b7018e05ab50db82996df57891642dfe4f00b74edd8f942912f750be91017a7d204fd0bf2271cee8082cfef9c903bdb4d8606979f6b2ef201b9d7ab1cdc523a AUX magic-8.3.232-verbose-build.patch 1041 BLAKE2B 80ab96d751ff2294e6d82f75e997ecc1ccc00588eae3a6c0d63d49a134567eae864f3a42c46c6a6e0f6b1a53473df30afefbc9a7e48385a4ea9b780523ee0ca0 SHA512 19f3b6c371efccebadb6fa85f479ec4fa32fb7a4e11af58630e7265f19f598fdfb6c0008cf500de601246a6316ccf173f96dafdcca28bbef4e09658989d67a3a -AUX magic-ldflags.patch 1767 BLAKE2B 644e2cd816f1763103612376c095bd00b375a129136937842a0fec068d9651e001f31aa7f5575ae999087c7376b8d35cf3d224cb0ac34e124d8f308a6996f5e1 SHA512 ba61218111b7484bb6e60f37a3bbf5696afc887766d8de0ae0e33f9dc18023ee7eecf4b6c7012376afbfb2d3caa0e0421e03b0abee0ad1b2d9032ce80c65e355 DIST magic-8.3.232.tgz 4093446 BLAKE2B 6b4b49c2b1f566b0173bead0e95e381a6632b049545dc3b26572f415ba0df3958bc5c3931b686718136185cf105e437fe70dc1f71a11707ad33afac80ddf8f2f SHA512 755b27b8f263d990ca86b3f043e1b8f8a2de75d72f1baf9c4de3a1d7cde28feecf093d8bf1497f2632327d09ce0ce0b17ccea46bdba01c5b53c52ea0f5cf5fdc DIST magic-tech-mosis-2002a.tar.gz 6601961 BLAKE2B e34bc281b3f1bc032ba14954b781c8b0055bb9125c57944a5b5f595f8b22feb455c60f3230cf04f06bc41aa807e909d900e3d3ab746076e2c99dcbbdf51a71df SHA512 cb8e30df77e58eb37f7ada775db8a8411612897b1cdbcb59b0c4bd814fa73c6cb10a5461e27e9eecb0fe452e194ee95fbb02b568b86848e501b9c37cc24de39e EBUILD magic-8.3.232.ebuild 2253 BLAKE2B c8bb1c559fc0e7eaf88dd5a7b7cca4cecf8d4f10e0c81390b9522eba17e17965ff6a3328554effcc80e4559ad6a9525f124a593a819b0277943301ac0b97c058 SHA512 bc078bf38985541a28aa0e9b229b9042eda5fad39d8091710541f26b8dc260a5ed0c7bc5a54b58ab6c30f6cf354233f0d872ba59d5a5fb2e4ffe182c6fb83dc1 diff --git a/sci-electronics/magic/files/magic-7.5.202-include.patch b/sci-electronics/magic/files/magic-7.5.202-include.patch deleted file mode 100644 index f1fc95a60b32..000000000000 --- a/sci-electronics/magic/files/magic-7.5.202-include.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- magic-7.5.202/textio/txInput.c -+++ magic-7.5.202/textio/txInput.c -@@ -21,6 +21,7 @@ - #endif /* not lint */ - - #include <stdio.h> -+#include <stdlib.h> - #include <string.h> - #include <sys/time.h> - #include <sys/types.h> ---- magic-8.0.131/graphics/grX11su3.c -+++ magic-8.0.131/graphics/grX11su3.c -@@ -20,6 +20,7 @@ - - #include <stdio.h> - #include <string.h> -+#include <math.h> - #include <X11/Xlib.h> - - #include "utils/magic.h" diff --git a/sci-electronics/magic/files/magic-7.5.202-install.patch b/sci-electronics/magic/files/magic-7.5.202-install.patch deleted file mode 100644 index 6e28b950c510..000000000000 --- a/sci-electronics/magic/files/magic-7.5.202-install.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- magic-7.5.202/rules.mak -+++ magic-7.5.202/rules.mak -@@ -43,9 +43,9 @@ - ${RM} ${MODULE} - ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} lib${MODULE}.o ${EXTRA_LIBS} -o ${MODULE} ${LIBS} - --${BINDIR}/${MODULE}${EXEEXT}: ${MODULE}${EXEEXT} -- ${RM} ${BINDIR}/${MODULE}${EXEEXT} -- ${CP} ${MODULE}${EXEEXT} ${BINDIR} -+${DESTDIR}${BINDIR}/${MODULE}${EXEEXT}: ${MODULE}${EXEEXT} -+ ${RM} ${DESTDIR}${BINDIR}/${MODULE}${EXEEXT} -+ ${CP} ${MODULE}${EXEEXT} ${DESTDIR}${BINDIR} - - ../database/database.h: ../database/database.h.in - @echo --- making header file database/database.h diff --git a/sci-electronics/magic/files/magic-ldflags.patch b/sci-electronics/magic/files/magic-ldflags.patch deleted file mode 100644 index 60d5891beee0..000000000000 --- a/sci-electronics/magic/files/magic-ldflags.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -r -u magic-7.5.202.orig/scripts/configure.in magic-7.5.202/scripts/configure.in ---- magic-7.5.202.orig/scripts/configure.in 2010-03-08 14:33:07.000000000 +0100 -+++ magic-7.5.202/scripts/configure.in 2010-07-02 22:15:50.814199319 +0200 -@@ -1350,7 +1350,6 @@ - if test "x${loader_run_path}" != "x" ; then - LD_RUN_PATH="${LD_RUN_PATH} -Wl,-rpath,${loader_run_path}" - fi -- LDFLAGS="" - EXTRA_LIB_SPECS="-ldl" - ;; - -diff -r -u magic-7.5.202.orig/scripts/defs.mak.in magic-7.5.202/scripts/defs.mak.in ---- magic-7.5.202.orig/scripts/defs.mak.in 2010-03-08 14:33:07.000000000 +0100 -+++ magic-7.5.202/scripts/defs.mak.in 2010-07-02 22:15:50.814199319 +0200 -@@ -53,7 +53,7 @@ - M4 = @M4@ - RANLIB = @RANLIB@ - SHDLIB_EXT = @SHDLIB_EXT@ --LDDL_FLAGS = @LDDL_FLAGS@ -+LDDL_FLAGS = ${LDFLAGS} @LDDL_FLAGS@ - LD_RUN_PATH = @LD_RUN_PATH@ - LIB_SPECS = @LIB_SPECS@ - WISH_EXE = @WISH_EXE@ -diff -r -u magic-7.5.202.orig/tcltk/Makefile magic-7.5.202/tcltk/Makefile ---- magic-7.5.202.orig/tcltk/Makefile 2009-05-29 15:54:55.000000000 +0200 -+++ magic-7.5.202/tcltk/Makefile 2010-07-02 22:16:30.916202298 +0200 -@@ -41,11 +41,11 @@ - (cd $(DESTDIR)${TCLDIR}; chmod 0755 tkcon.tcl tkshell.tcl) - - magicexec: magicexec.c -- ${CC} ${CFLAGS} -pg ${CPPFLAGS} ${DFLAGS} magicexec.c -o magicexec \ -+ ${CC} ${CFLAGS} -pg ${CPPFLAGS} ${DFLAGS} ${LDFLAGS} magicexec.c -o magicexec \ - ${LD_RUN_PATH} ${LIBS} ${LIB_SPECS} - - magicdnull: magicdnull.c -- ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} magicdnull.c -o magicdnull \ -+ ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${LDFLAGS} magicdnull.c -o magicdnull \ - ${LD_RUN_PATH} ${LIBS} ${LIB_SPECS} - - magic.tcl: magic.tcl.in ${MAGICDIR}/defs.mak diff --git a/sci-electronics/ngspice/Manifest b/sci-electronics/ngspice/Manifest index 0837e4b4f11a..2307b8661489 100644 --- a/sci-electronics/ngspice/Manifest +++ b/sci-electronics/ngspice/Manifest @@ -4,7 +4,10 @@ DIST ngspice-34-manual.pdf 2311221 BLAKE2B e8863bab8173980a825970b90b685d3d5a597 DIST ngspice-34.tar.gz 7800546 BLAKE2B a07a7266225b8c4e478e3240718aa1fce9a77003d58477a30a6178368e7826f288007f9111797ca1c426486911d4bedd847bdf0daa69232e59333304468a4fc3 SHA512 5e90727f3f6b8675b83f71e1961d33cd498081a7f3bea5d081521f12ecb3979775159f083f84a5856233529505262c399f75d305758af51894a1245603476cf8 DIST ngspice-35-manual.pdf 2347261 BLAKE2B 617462615525e5335f5795e625578324d2b173a8d69438e43c4007177e7ca0fdf8d37b1553a4c836a352523c310bbf23ef492a01ac0a7541ca8ac0794b588a66 SHA512 df3239c4798746534d12a489d80056d45d9f3cda60336aaeb2dd541526340715a180780b0e2ced1857e9c5cbe716c4b3f0c496598f8a3e8aa36a8cd1b6a022c7 DIST ngspice-35.tar.gz 8050668 BLAKE2B d67475b55e1e14974a78451175a08ec91be24708030e0da8fa6811b7df880c8082741ec08d92c314c53480271cc074e35ad0eca27a3b7601e33fb240c834e530 SHA512 2f9b0f951e3ca8d52692beadb895b352311f67b8760f99d0e2f4718fce4b497dd68e2b933029eeacb4ed57551e959bc6e3747e64feb4722a4f841e734f5a664b +DIST ngspice-36-manual.pdf 2397103 BLAKE2B 09dbfe4101b8e1752509caa37ba3a323da7d7391488c3245b3f614114d1666ee32ea1391ad4f39772ed950e270f028b7513115e0c13fde052bfdb5674f021b3b SHA512 bd31f99f7ec0acd2bdd24f008e22cb953bba98fd5cc1164ded0bdde3397bfffa0b0cae25dfeae6cf0e1dadd23c23faa5588010069b62392438296451347a5134 +DIST ngspice-36.tar.gz 8450071 BLAKE2B 51fa2c5998e96a05deb3764f56659ed0970d6362fcbec7367b04a5fbe76fc7dadb08e0d36b660b0e1f8e525079bedf71305877ab2de8e2ab2773c891808fb5a6 SHA512 d862097f465e92986e8d6644374d43249eebee0fb6d79b1404dbb7c11d14a058dfedd4bdb61baf5aa1ffd1d2e71167440db73eb417d4b1249a0a7b83bd39efc3 EBUILD ngspice-31-r1.ebuild 4393 BLAKE2B 97d73472447291f088d3a742781010a7dd40b0674c6a0059b15c592f4cb9f9919868b93486c2fd11f8896a0e8719b3378ff80a54ed2aa93b2b6fb67d13c7bcc5 SHA512 f450f605ee8630ce1c2f190ecbc287ef4a6b60ab72ba44e686670cf8a779b83e80d3e839434df9a4c88334907284d046d9e685aaf9ac45ed727ff5da54efca24 EBUILD ngspice-34.ebuild 4503 BLAKE2B 8b039ded83223c8945abb3868e7030bdfd577bffe37d17334daf21b51272ce86d23df64cc2b2dcc59d7c67237054131e34e9f4122d4ef27fa2aa803d5d904f15 SHA512 a5708e8de8b54cfad67ab1851b7e137c77d7719e4bf4128b943c3f103008405a9c1f14ba8669e0501dcfc2f2dc7afab878e5d94320f8b1a9dbf8b80ee6f8f9d2 EBUILD ngspice-35.ebuild 4470 BLAKE2B 6851ebc6600db725f58fa3ced540ea88fe807cb8b15b6d69735a74407bdc746686d7ba7b12e1fe0a1aa5601dd3109e89917c110f718ed3f10e6d8697da4c9b1b SHA512 949e38987af0b6ad157d20c71b8e0fdc6b533f6c5e24fc43b10e756ac8ece85a7d7d7d09b05b8a1bffb7d977dfb571d2e97b4fd927f93cd81be90b8ba49cc9bd +EBUILD ngspice-36.ebuild 4470 BLAKE2B f118645f2a78f70fe1d05d55a77b6671cba5e7ff1b3dff143aa990f3874a19c99476e8ad4041ec44f53cfbb70dfcfd04c259dae4feb4b8e476412765cb29cbd9 SHA512 2f67d164eb0becbac8edcc4db99bb88f770b8dd81fe369dbdfae44117b37b8105ba402c506f44c768a50b3819151f13f289cec6218fb11e0a8e2e5167381ce46 MISC metadata.xml 677 BLAKE2B 541ff3e8439b8e222916341bb9f973ea2189a5b2aceeb1bd83ca7a73af7161f38e272a93fdbab51aba4f14be53f556c10a5c10be2a807ef07bca9e39fa73b6ed SHA512 b439de3838f17c9c21e50cd80d74b733d0061f79a7e736c82295c3db433bb786cdab8dc73ca1b40f6a486288f29f82b677723ea1e13ca583b0456fcfa82de206 diff --git a/sci-electronics/ngspice/ngspice-36.ebuild b/sci-electronics/ngspice/ngspice-36.ebuild new file mode 100644 index 000000000000..607fec459334 --- /dev/null +++ b/sci-electronics/ngspice/ngspice-36.ebuild @@ -0,0 +1,198 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multibuild toolchain-funcs virtualx + +DESCRIPTION="The Next Generation Spice (Electronic Circuit Simulator)" +SRC_URI="mirror://sourceforge/ngspice/${P}.tar.gz + doc? ( mirror://sourceforge/ngspice/${P}-manual.pdf )" +HOMEPAGE="http://ngspice.sourceforge.net" +LICENSE="BSD GPL-2" + +SLOT="0" +IUSE="X debug deprecated doc examples fftw openmp +readline +shared tcl" +KEYWORDS="~amd64 ~arm64 ~ppc ~sparc ~x86 ~x64-macos" + +RESTRICT="!test? ( test )" + +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}" + +DOCS=( + ANALYSES + AUTHORS + BUGS + ChangeLog + DEVICES + FAQ + NEWS + README + README.vdmos + Stuarts_Poly_Notes +) + +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 -or -iname \*.sh | + 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 + multibuild_copy_sources +} + +src_configure() { + multibuild_foreach_variant ngspice_configure +} + +ngspice_configure() { + local myeconfargs + + pushd "${BUILD_DIR}" &>/dev/null || die + + if use debug; then + myeconfargs=( + --enable-debug + --enable-ftedebug + --enable-cpdebug + --enable-sensdebug + --enable-asdebug + --enable-stepdebug + --enable-pzdebug + ) + else + myeconfargs=( + --disable-debug + --disable-ftedebug + --disable-cpdebug + --disable-sensdebug + --disable-asdebug + --disable-stepdebug + --disable-pzdebug + ) + fi + + # As of March 2021, these do not compile + myeconfargs+=( + --disable-blktmsdebug + --disable-smltmsdebug + ) + + myeconfargs+=( + --enable-xspice + --enable-cider + --disable-rpath + $(use_enable openmp) + $(use_with fftw fftw3) + $(use_with readline) + ) + + if [[ "${MULTIBUILD_VARIANT}" == "shared" ]]; then + myeconfargs+=( --with-ngshared ) + elif [[ "${MULTIBUILD_VARIANT}" == "tcl" ]]; then + myeconfargs+=( --with-tcl="${EPREFIX}/usr/$(get_libdir)" ) + else + myeconfargs+=( + $(use_enable deprecated oldapps) + $(use_with X x) + ) + fi + + econf "${myeconfargs[@]}" + + popd &>/dev/null || die +} + +src_compile() { + multibuild_foreach_variant ngspice_compile +} + +ngspice_compile() { + pushd "${BUILD_DIR}" &>/dev/null || die + default + popd &>/dev/null || die +} + +src_install() { + multibuild_foreach_variant ngspice_install + + # merge the installations of all variants + local v + for v in "${MULTIBUILD_VARIANTS[@]}" ; do + cp -a "${ED}/tmp/${v}"/* "${ED}" || die "Failed to combine multibuild installations" + done + rm -rf "${ED}/tmp" || die + + use tcl && DOCS+=( README.tcl ) + use shared && DOCS+=( README.shared-xspice ) + use doc && DOCS+=( "${DISTDIR}"/${P}-manual.pdf ) + + default + + if use examples; then + if ! use tcl; then + rm -rf examples/tclspice || die + fi + + insinto /usr/share/${PN} + doins -r examples + fi +} + +ngspice_install() { + pushd "${BUILD_DIR}" &>/dev/null || die + + emake DESTDIR="${ED}/tmp/${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 "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/bin{,.debug} || die + rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/share || die + rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/*.la || die + rm -rf "${ED}/tmp/${MULTIBUILD_VARIANT}"/usr/$(get_libdir)/ngspice/*.cm{,.debug} || die + fi + + popd &>/dev/null || die +} + +src_test() { + if ! use debug; then + # tests can be only executed for the binaries variant + pushd "${WORKDIR}/${P}-binaries" &>/dev/null || die + echo "set ngbehavior=mc" > "${HOME}"/.spiceinit || die "Failed to configure ${PN} for running the test suite" + virtx default + popd &>/dev/null || die + else + # https://sourceforge.net/p/ngspice/bugs/353/ + ewarn + ewarn "Skipping tests because they are known to fail in debug mode" + ewarn + fi +} diff --git a/sci-electronics/spice/Manifest b/sci-electronics/spice/Manifest index 6dfcc2e53eb0..e94ff6a2c0e4 100644 --- a/sci-electronics/spice/Manifest +++ b/sci-electronics/spice/Manifest @@ -1,4 +1,4 @@ AUX spice-3.5.5-gcc-4.1.patch 2511 BLAKE2B d9bb215dfcaf595d9f62a4748507342c3b6242f551a8458965e37c13e34432d686f00b91ee27d80451261b8baa9d0bd9616b378b246fc895b0dc1fff0d4975c8 SHA512 9ae98c77d8a95b2ccac03e48d778b431a449f8383938ca2d71dc1d77254a0dade6c159f1723aa9a00ac921379ec210584c32ae7e63a849bd07691d34bd92d5c7 DIST spice3f5sfix.tar.gz 1377263 BLAKE2B bffc4ae307c8b02db998e412d09ae52cef1aea78ab28d0c0b040f2c253032d0f42978c2d3b0bb0500e78016a35e2064bd50d6f86abdeb1e885bc7f7f0978864c SHA512 a515dbfcf81b302667e4a39b0ee7f02715c2a6a3fb9b3d320d9a4bea81e557c85f14d1e9d01d598d8ad3a6a67a797c2096bc14acc8e5afb41bef51f56b400be8 -EBUILD spice-3.5.5-r3.ebuild 1924 BLAKE2B a3f2a6edb89fb478850d3608ece28a3b91df6b118436b93609d4d85166ba408ff693cb2737b9d803cd2accfc2e15247f269aafb50af4b12af1fda96b402a6e3f SHA512 5d5c4503009c28b883a95fec4b427776b85b360bff4f27a54ca76e0f4fbe81d1eab6b48c5399b76db02e3d61e090631560ea5269f76ce7dc87e4045aaa986f3d +EBUILD spice-3.5.5-r3.ebuild 1915 BLAKE2B d20197821ec5eccaa74ea8762d9ee8515aecb58dc591ca73733d0701e0f785bee64c9cbdbf7ac48bfb4ec8b94707da44bdd14583e74a823ed3b449934999de7a SHA512 aa78ed2b99c825fc5741854a79340572ea9b81d17c8c654b310097f9018f6ff8a3ddf39c3f52ba832cd573a242dafe95bfd69d4767f49ed1a22771ae8ed939a1 MISC metadata.xml 796 BLAKE2B 895d71188de1aa825622a54bc39894209e783a14bb7d611d08f54800c02cf42869d10e56827c864ebdd77599b1700a3814e72f24dd25beb162b8cff677f7699d SHA512 0c661364645513cc53a25ff0d292b86254c1dce6cf0336210980dea9c47f8ac5113b4760a61237da27a4f167c822452e3a227ef3a9023b33604732fe3acb7eae diff --git a/sci-electronics/spice/spice-3.5.5-r3.ebuild b/sci-electronics/spice/spice-3.5.5-r3.ebuild index e20171071a19..ed2fa12832f5 100644 --- a/sci-electronics/spice/spice-3.5.5-r3.ebuild +++ b/sci-electronics/spice/spice-3.5.5-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -41,7 +41,7 @@ src_prepare() { -e "s:/X11R6::" \ conf/linux || die sed -i -e "s:head -1:head -n 1:" util/build || die - epatch "${FILESDIR}"/${P}-gcc-4.1.patch + eapply "${FILESDIR}"/${P}-gcc-4.1.patch # fix possible buffer overflow (bug #339539) sed -i -e "s:fgets(buf, BSIZE_SP:fgets(buf, sizeof(buf):g" \ @@ -62,7 +62,7 @@ src_install() { # install binaries dobin obj/bin/{spice3,nutmeg,sconvert,multidec,proc2mod} newbin obj/bin/help spice.help - dosym /usr/bin/spice3 /usr/bin/spice + dosym spice3 /usr/bin/spice # install runtime stuff rm -f lib/make* dodir /usr/$(get_libdir)/spice |