diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
| commit | d99093fb4bb5652015c06274d64083daa2439e4f (patch) | |
| tree | cf61513204d97974179580065e85df5c8009087c /sci-electronics | |
| parent | 463397cf1e064185110fe57c568d73f99a06f5d1 (diff) | |
gentoo resync : 03.03.2021
Diffstat (limited to 'sci-electronics')
39 files changed, 283 insertions, 390 deletions
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz Binary files differindex 5afd4b23f4d8..34b490456122 100644 --- a/sci-electronics/Manifest.gz +++ b/sci-electronics/Manifest.gz diff --git a/sci-electronics/drahnr-oregano/Manifest b/sci-electronics/drahnr-oregano/Manifest index ab819d8511fd..071ee8e6241c 100644 --- a/sci-electronics/drahnr-oregano/Manifest +++ b/sci-electronics/drahnr-oregano/Manifest @@ -1,3 +1,3 @@ DIST drahnr-oregano-0.84.40.tar.gz 1879082 BLAKE2B 8b8e0ffc6af0205018bb1a415f1f0e067d30f8c86681f145b8000a71d414c540c32cfb99af48b9e7c4a1b1e71cebbe76b22c05ccd511797ba7db2efdc8de2079 SHA512 f4e38ccf09f148cbe609ccfebe3d3476e6b385f4d002cb951ed0d488d84f65557c0fcac986c6e7657684a07d7f7dac4dda663278ed85363de0dcf48f8d02f73e -EBUILD drahnr-oregano-0.84.40.ebuild 1773 BLAKE2B 013e87108ed5758019fa9e413d876c8211c551a2df068871323f9ab13e8749fe918556a198bf21207f2b121d7855392250c72d657f3b3da4595c2004ada8c547 SHA512 cbe15c8184acebc46c9a6346ad5f750144685419ac6a071a63bd69606a75d245d988e4ceefc42b34fc9ce28c9b8d897ce5510e16ba68bd077331fdc852336fbe +EBUILD drahnr-oregano-0.84.40.ebuild 1441 BLAKE2B 8a500110cd04d5b70a150f776aabe65869fff83ae836ea00bb24df3b2f69bc620447ba6bdd81ecb40df321dee9c0cc1eaf203e512e3ebc5b0c1f14202c5543e1 SHA512 672a4a332677459a0309e474c8d1f0f78955162c6858ce67bacde1705e5b3c41b20385bd4f5c3f513413d3931a2c67cab706e40bbf4e00529ae5ff796f9771f0 MISC metadata.xml 697 BLAKE2B 33ffc4e10380de68a45856ab50a4b3dafdcbfa11c9695a039c6f0ce2cfa74b287f3c130f7273def9e02d27d011aad88e866be369b7e75cbc80281bdf40c64dd5 SHA512 d534f45e3427d45837bf59465e5aa4141a1c2a005c1815a50c081b14b2cb622e8eae8614d878e79489bd7d46b874dff235c53b0b4af507ef6c7722285b36267a diff --git a/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild b/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild index a432282c92f1..d07c379b648f 100644 --- a/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild +++ b/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python3_7 ) +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) PYTHON_REQ_USE='threads(+)' -inherit gnome2-utils python-any-r1 waf-utils xdg-utils +inherit python-any-r1 waf-utils xdg DESCRIPTION="Application for the schematic capturing and simulation of electrical circuits" HOMEPAGE="https://github.com/drahnr/oregano" @@ -17,29 +18,28 @@ KEYWORDS="amd64 ppc x86" S="${WORKDIR}/oregano-${PV}" -COMMON_DEP="dev-libs/glib:2 +DEPEND=" + dev-libs/glib:2 dev-libs/libxml2:2 x11-libs/goocanvas:2.0 x11-libs/gtk+:3 x11-libs/gtksourceview:3.0" -DEPEND="${COMMON_DEP} - ${PYTHON_DEPS} +BDEPEND="${PYTHON_DEPS} dev-util/glib-utils virtual/pkgconfig" -RDEPEND="${COMMON_DEP} - || ( gnome-base/dconf gnome-base/gconf ) +RDEPEND="${DEPEND} + || ( + gnome-base/dconf + gnome-base/gconf + ) sci-electronics/electronics-menu" -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]] ; then - python-any-r1_pkg_setup - fi +src_configure() { + waf-utils_src_configure } -src_configure() { waf-utils_src_configure; } - src_install() { waf-utils_src_install --no-xdg --no-install-gschema docompress -x /usr/share/doc/${PF}/{dev-docs,sequence} @@ -49,10 +49,7 @@ src_install() { } pkg_postinst() { - gnome2_icon_cache_update - gnome2_schemas_update - xdg_desktop_database_update - xdg_mimeinfo_database_update + xdg_pkg_postinst elog "Note: You'll need to emerge your prefered simulation backend" elog "such as sci-electronics/ngspice (preferred) or sci-electronics/gnucap" @@ -60,10 +57,3 @@ pkg_postinst() { elog "As an alternative generate a netlist and use sci-electronics/spice" elog "from the command line for simulation." } - -pkg_postrm() { - gnome2_icon_cache_update - gnome2_schemas_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/sci-electronics/espresso-ab/Manifest b/sci-electronics/espresso-ab/Manifest index bba128c1504b..682a3f1d50d4 100644 --- a/sci-electronics/espresso-ab/Manifest +++ b/sci-electronics/espresso-ab/Manifest @@ -1,4 +1,3 @@ DIST espresso-ab-1.0.tar.gz 146662 BLAKE2B 216a32ba234d1410ec1a391231700fd9846dc1ee7beda126d5221ae41967810ebf55d4b9fa6e74162d466c1e51a766bb24acb3cc32252cfebedaafd7a9f1aa13 SHA512 360bdf3c9d2cc552e9af6e9e0ac543e96c496f182a1f8eadf8925aed878425a158a10672feaa50e970c0df5fe7a754b0c7496c5d7f6f729b27f34a7cdf0ca12f -EBUILD espresso-ab-1.0-r1.ebuild 406 BLAKE2B ed3d068a0f06d2608c9ac1c0156908446e3b4952e1dee1d534a0277c39f7b03fbc89107c01e8a90d8b991aef1988fb795d76c800e33ccdd140f506083f69372a SHA512 a1ce2f3cdac57bb4f9a090b27e413c9c003330b365a2985986fe98c690bbcd1424724fa6fc18e38a8f61a137ed3aa83e7db58955bdb30d6403ff59e2d7cb8e9b -EBUILD espresso-ab-1.0-r2.ebuild 462 BLAKE2B c9eba57ee73ea9822e6c7a0690c0a3701ad3a0820a1ca57149244f7ba7bd048521a3fead16a26d5e00ea90d4d2f9e69e691928ca8c0eb1eaa10d044a35ac749c SHA512 e9685512f5ac2e9b348b05b6b6d636f334980b2069b2651f5aa1589fe492a9a8f3afe1eee0a744c26cb3a5d1ade1c08ba246765c57878d8a3ad2d1d3cd4e0372 +EBUILD espresso-ab-1.0-r2.ebuild 460 BLAKE2B 0b0a91b45422977d988b95912d59060ab331896fd6cd434836c12ac3b065c52cc0c9a5f48fe037708b4ee81d0b70dd202ae035681172743088b896a5e9803ca5 SHA512 b4bf656fb67f1163e7a842c0687720731b99c8242d6c3c73e9b0e9d4717a8383b54945b31d176227a8672c7edf3c9857d1747f6937ef8bc1bdc8f20510df15a2 MISC metadata.xml 275 BLAKE2B 9881119cf5c31889f750c01cbf8f3db4b26cf0c92ae29ccd45c42032ea9454b0d9c1193e42692d88abdaff067171bb00927d2c291922932a7f38b484b8ed89a1 SHA512 8e06b994ef5f02a1e192c3d5a91244012f1c2f0cc29d8cd5ed7ccc7adc178d3a9b61abcb7b4dfa96ad616bf45447ff463357d0b5640606d48f70cdd0def1968d diff --git a/sci-electronics/espresso-ab/espresso-ab-1.0-r1.ebuild b/sci-electronics/espresso-ab/espresso-ab-1.0-r1.ebuild deleted file mode 100644 index b15eaf028a86..000000000000 --- a/sci-electronics/espresso-ab/espresso-ab-1.0-r1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="POSIX compliant version of the espresso logic minimization tool" -HOMEPAGE="http://www.cs.man.ac.uk/apt/projects/balsa/" -SRC_URI="ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/other-software/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~ppc ~sparc x86" -IUSE="" - -DOCS="README" diff --git a/sci-electronics/espresso-ab/espresso-ab-1.0-r2.ebuild b/sci-electronics/espresso-ab/espresso-ab-1.0-r2.ebuild index 602ad9df2dba..cd0bd9019c95 100644 --- a/sci-electronics/espresso-ab/espresso-ab-1.0-r2.ebuild +++ b/sci-electronics/espresso-ab/espresso-ab-1.0-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/other-software/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~ppc ~sparc x86" src_configure() { append-cflags "-std=gnu89" diff --git a/sci-electronics/fritzing/Manifest b/sci-electronics/fritzing/Manifest index c610df9550c4..caa41d1497e4 100644 --- a/sci-electronics/fritzing/Manifest +++ b/sci-electronics/fritzing/Manifest @@ -1,6 +1,7 @@ AUX fritzing-0.9.4-fix-libgit2-version.patch 818 BLAKE2B 559efc56933460e541850e73eec1f872e3c83757e6e5e6edb8a9adf120f9e1988024d32af92d80eeedad9bce9f8f954caa5bd2c08da6c5fb7a3b6fd8a2110c01 SHA512 344597d2a1d95909bffabd852a199219d1112ec020c5f1b4bc7a46c3ed522ce931f5abef54b68dcd53dbbb52eb890262fcd67dea1947b56ef9b9d7eaebedd6e3 AUX fritzing-0.9.4-move-parts-db-path.patch 2345 BLAKE2B c95d68d115614152817bd3905a2d0b9efdd5a358bfa242455b626d670c2382affe5ef42bcef71446c567dba28be1fed7b66102d6d82db66d86154e8374f3283d SHA512 851f4e049564a488502a93d2730484a258b042147a6645ce40195a31c97cb92b7d79e7c03751cf6337b4d9558c263f5149e7e969ecedd97abcd0e8824adb551b +AUX fritzing-0.9.4-quazip1.patch 645 BLAKE2B 2f0fe077ab6c880479be0d9682a9812e93cccf71e4c5879bd3a3270799cc1db82ad3836d6714c79e6e553cc31463c30dc4a93c2f86d4c98057db019579fed5dc SHA512 af588ea11e1bb8695ff37166a4ac5972c4e6302e44f09db24645d8b34005c14773293d4899f2b3d9ddba713a5ff6d3fcfab0c122d6016c43e5c3c1e3439ab853 DIST fritzing-0.9.4.tar.gz 11430102 BLAKE2B 20232b3c33308edcab188c61597f87d8a21d9b786eeab4e398c1add6e263562d1b0df95634850d5271decfa380d7b2b0c18c7f19f8b8544f330687e4cffa3700 SHA512 b148d8b93d2e452c975ca3acfd2ad5de4259f99da69c5890ebeea30730674526d480ee3830f61f6057e83b7720f07fce80ef3a74d4b718be691a92d656b755e0 DIST fritzing-parts-0.9.4.tar.gz 17662003 BLAKE2B a67f4f1297793131d25e6b9c853e987fc0c5ecebd5f57b3675b7f9c4539f867ad18fc6e854c7a2bef1669e05dbc13dcc93df9b9befb8991ca64b2bc3e2a71b84 SHA512 f6f6c396eaf0b61dd56ece22f6bb8fce4369503729fd8f5550643e74a60aaad75abce9e391d63d52f12e4f3420296791fdf9832f7c8507dad2cf623e1bd8340f -EBUILD fritzing-0.9.4-r1.ebuild 2032 BLAKE2B 3e0d0a7aee78e3671c88339da9db47aa3878c01348277f64e7a4ee734ea0b25b5ffa1d185986bce9f231a3defcb052850c3736cf2f08913ec94bda8e0de2c6d2 SHA512 9ab0db399ba1bd9572e893b9716458330a3a4f83b7e44bb54a15f836c8f8422fddd3d3052fdbb70b52283441e517953c0869e598d6bf9a9963ad3315c68491fd +EBUILD fritzing-0.9.4-r2.ebuild 1994 BLAKE2B 3a3b9a5bd329df66279c1bef6bd0364bd339e13837d5e18ed530668d142d476ec26bf0ea122f2ebed657766ff5dbc6405d75065d6c06f4191a4cc7aff1366311 SHA512 8f6bf52bfcd502810746312d3fc60e30e6e6c203a1de6b2ffec43e4621d82b0f105b02d63d1b7de69f4059418ad703b613f0c6a85c4f21f05764b9753bf46e42 MISC metadata.xml 253 BLAKE2B a86bd7fc6589eb44b2b6a4e64f250eedc4cb069c0a0b59ca015f85f482e706304ac2ac00632eac9d39f2015a5fa19dc21c758bc69eaa9f736a1cae97c7bb1a09 SHA512 2a945da80f439b52e18112fa5d1dea6a1bb2f7d39d46c7c4ab8a1a7722c954ff3d859bb7d4e12e6f682289c025350a1353af39a12a8bbb8aa2124834cf667028 diff --git a/sci-electronics/fritzing/files/fritzing-0.9.4-quazip1.patch b/sci-electronics/fritzing/files/fritzing-0.9.4-quazip1.patch new file mode 100644 index 000000000000..d218c10d90a0 --- /dev/null +++ b/sci-electronics/fritzing/files/fritzing-0.9.4-quazip1.patch @@ -0,0 +1,28 @@ +Fix build with QuaZip-1.0. + +--- a/phoenix.pro ++++ b/phoenix.pro +@@ -194,8 +194,8 @@ + include(pri/qtsysteminfo.pri) + + contains(DEFINES, QUAZIP_INSTALLED) { +- INCLUDEPATH += /usr/include/quazip +- LIBS += -lquazip ++ CONFIG += link_pkgconfig ++ PKGCONFIG += quazip1-qt5 + } else { + include(pri/quazip.pri) + } +--- a/src/utils/folderutils.cpp ++++ b/src/utils/folderutils.cpp +@@ -35,8 +35,8 @@ + + #include "../debugdialog.h" + #ifdef QUAZIP_INSTALLED +-#include <quazip/quazip.h> +-#include <quazip/quazipfile.h> ++#include <quazip.h> ++#include <quazipfile.h> + #else + #include "../lib/quazip/quazip.h" + #include "../lib/quazip/quazipfile.h" diff --git a/sci-electronics/fritzing/fritzing-0.9.4-r1.ebuild b/sci-electronics/fritzing/fritzing-0.9.4-r2.ebuild index 09faeeae4604..8a0a7c564b1e 100644 --- a/sci-electronics/fritzing/fritzing-0.9.4-r1.ebuild +++ b/sci-electronics/fritzing/fritzing-0.9.4-r2.ebuild @@ -20,6 +20,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND=" + dev-libs/quazip:0= + dev-libs/libgit2:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -30,27 +32,27 @@ RDEPEND=" dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 - dev-libs/quazip:0 - dev-libs/libgit2:= " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND} dev-libs/boost " S="${WORKDIR}/${PN}-app-${MY_PV}" -DOCS=( "README.md" ) +DOCS=( README.md ) PATCHES=( "${FILESDIR}/${P}-fix-libgit2-version.patch" "${FILESDIR}/${P}-move-parts-db-path.patch" + "${FILESDIR}/${P}-quazip1.patch" ) src_prepare() { - # fix build with newer quazip - bug #597988 - sed -i -e "s/#include <quazip/&5/" src/utils/folderutils.cpp || die - sed -i -e "s|/usr/include/quazip|&5|" -e "s/-lquazip/&5/" phoenix.pro || die + xdg_src_prepare + + if has_version "<dev-libs/quazip-1.0"; then + sed -e "/PKGCONFIG/s/quazip1-qt5/quazip/" -i phoenix.pro || die + fi # Get a rid of the bundled libs # Bug 412555 and @@ -65,8 +67,6 @@ src_prepare() { # Add correct git version sed -i -e "s:GIT_VERSION = \$\$system.*$:GIT_VERSION = ${MY_PV}:" pri/gitversion.pri || die - - default } src_configure() { diff --git a/sci-electronics/iverilog/Manifest b/sci-electronics/iverilog/Manifest index 078c3e3c124a..31fdd0001096 100644 --- a/sci-electronics/iverilog/Manifest +++ b/sci-electronics/iverilog/Manifest @@ -1,10 +1,9 @@ AUX iverilog-10.3-file-missing.patch 8849 BLAKE2B 2cb72c6d2b769ae0ac601f950b62dd0c3ad460df593a6a033794a5bfa482d1aa18e74502a8f54456c96df86ba12fe61827e0439764d05e0b5d5b00ae1d71d870 SHA512 bb954e9669fdfaea30a9bf711a2d7b5cf38906dc3665752746a9e0d8738dc07a79d90b33ba82dfe665a8181910b3b3083a78d06607562d684f6d9b8bc1741368 AUX iverilog-10.3-fno-common.patch 777 BLAKE2B 99ce15739f0d86dd838e652542152cc7b2301a3dee605b7aff299ef3588576b21ed21ae19468a3dcca200cee4b6cd3271125837d75e83dbed770d07cd2eeb83a SHA512 2e10fbb03649da90e97977b18922fb74527d0256fdd6b819ba69cafe64c3a38f09cf47619448fd34a47a2ebf72af406c18d276885189f2381157ba99c1994319 -AUX iverilog-10.3-gen-bison-header.patch 3125 BLAKE2B 75bd40007237491571e0bbac19cd9d007db5b18b491882f52ca9889ead097189371906a62cebae2176ea822572984f58c97ac6abbef7ee89f2397a06a4580c1f SHA512 ebc835c28456498787a82ff446c606a6713343e4421465a17afeb1266b1dc445c760707059b217ee9efc7e79d00a119fb2173c1adbf3270cdd0ed720e3436d17 AUX iverilog-11.0-autoconf-2.70.patch 11616 BLAKE2B f753698b8dfc21914ac68d09251515f71890e5164252173b020987b1387cccc23ac9d621cb27b5073d654f87cf003a75b9a35d075437201b565f32220e14fc18 SHA512 1a57dfd29799ff2aeeb27632325b9522b9764faaecf223ff7120bf224ebae8cda2beffb5f2b04bfc148e518332680272cc32491e0bcd103c2d0dffd46a37aa0e DIST iverilog-10.3.tar.gz 1600835 BLAKE2B 107c57c61fb27c18f4020f7853bf6ca83d1a86fdc73c57ea207828baf6b7a26d42e43ce7b33580f050a4c0b8f63bca6accecf678323a3bbbee1eb9c1d8fa2caa SHA512 67076e19a208576c21a0462ff7d15d00a9d47740c47518a5523bd928b3118360d85eb84c317963717d15e5246ece3727259f6ff3baf59e195340530cc9086a1d DIST iverilog-11.0.tar.gz 1682457 BLAKE2B ba90574e1453a095143e76e5dc79bb2357a721fc62c24f0fb23d220458819cb3b8ea8494410ce956e68831b682b61f27f64e94e9c166a69e5f6d5d30a8269a11 SHA512 5d6a65e1c3b6b62e99af708cd5a259cc69c6b789dd6eff69e225903d9b8c115d9e5d6f7635b30c6558197cd0ee6fd8196a163fbd98956e24c211d97328b85056 -EBUILD iverilog-10.3-r2.ebuild 1785 BLAKE2B 058c19a7d97a4dd06ddae74f5f52d8455b967ca62897ce1306174de02068e20dae8b9fa886d6d9931c448fe38e4e9530d1aac761b1a656403084f0755106025f SHA512 89c9086635765151fbf23c2d1c11c5daca8100d9fef52db681f4124aca10f51cdd8a94885479f98dc541bea583357744952d8ee859c103fcbba48b517acb4442 -EBUILD iverilog-11.0.ebuild 1546 BLAKE2B 86377320cab16df1f7124687dcfd6393035b840709281fd21158acc99ae72a9c4abdd6ef71650dbb9675b327043c295c135e96c0a530a6889807850995cb94ed SHA512 f7a3fb99bac2e1b9e6132e88be42157cd435d5bcb7ab471a42778eead9f068662207e612553b652751f0bb6ea8f8593b25b22a2dae9073f5623ccdb99ab317d6 +EBUILD iverilog-10.3.ebuild 1865 BLAKE2B f3d3828e9d6d5afd7457dbe620450713e7e8e32ed18ee41f36d07eb474bfd979dd5c27b71fdd3a9847cdcec03229586bfd14c170354905573293137ede1853f8 SHA512 4d6d589df25c6f1139f0f24d3d3074c9b7251972d38828d97989806d6f80784049b0b84eaa93f92f24ba3d60499fd612ba32d6443967a7154a197e4a933f3c2d +EBUILD iverilog-11.0.ebuild 1542 BLAKE2B b8d33c4fbb5e68728005012fa1c3b4463fe8d27a5a0c4faa84093a8729d7e2d3a485d7bc768f468f90c8ae549caeae7ee958bbce142e90bd4b8a5ad9827c94bb SHA512 bfacbf85d2a5d75d8f21fd43a788c8915039d6189a0c56d2b1e5d3015d5f998784627b32bd422042421b0d052c767955dd64ca54d0db9aa1243fbf480896c019 EBUILD iverilog-9999.ebuild 1485 BLAKE2B dd0bc0d262210b821ec7499876d249610762c10f42960f42cf1e4cda3c31d7a65628c2289fff894e5863952415829b940cdcf0031c1bdb61bc65e970cbe2064a SHA512 5a141f14d7752380371ceb40177884e213e0fac779f3cfb358a93d8a5c691c3d2b947d91f394c5365bdce402b611d990d79c7879f6884520f6d96f6806702941 MISC metadata.xml 904 BLAKE2B 92e78cfceee82ffb4feaee92810d496bf78c3321a81c97fbcc0038244e2ea58e87fec57254ebd90852a4d308bd08d944659ce59b339b2762ba26843c8ad59cb3 SHA512 8c3633d7bea101dc771c26355b40d309eb5b0b3ea7bbf3538faaa9c7098253eb623aac3f9e312aed25a9262116d013784adf02d9f2a3943a5fbec3733dab250f diff --git a/sci-electronics/iverilog/files/iverilog-10.3-gen-bison-header.patch b/sci-electronics/iverilog/files/iverilog-10.3-gen-bison-header.patch deleted file mode 100644 index 0027184c8338..000000000000 --- a/sci-electronics/iverilog/files/iverilog-10.3-gen-bison-header.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 5b699c1be73e789831db01e779a41478c0c62309 Mon Sep 17 00:00:00 2001 -From: Henner Zeller <h.zeller@acm.org> -Date: Wed, 29 Jul 2020 15:29:08 -0700 -Subject: [PATCH] Bison includes its generated header in *.cc. Generate with - correct name. - -The current bison (3.7) generates a *.cc file that includes the header -it generated. For parse.cc this would be parse.hh. Right now, we rename -this header to have a common name used in other files, but this results -in a compile error for the parse.cc file: - -parse.cc:462:10: fatal error: parse.hh: No such file or directory - 462 | #include "parse.hh" - | ^~~~~~~~~~ - -Fix this by telling bison to output the header file to the correct -filename in the first place so that we don't have to rename it. -(using the --defines instead of -d option). - -This looks like a bison specific option not available in Posix yacc; -but looks like we're requiring bison anyway. - -Signed-off-by: Henner Zeller <h.zeller@acm.org> ---- - Makefile.in | 4 +--- - tgt-pcb/Makefile.in | 4 +--- - vhdlpp/Makefile.in | 4 +--- - vvp/Makefile.in | 4 +--- - 4 files changed, 4 insertions(+), 12 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 5ac5515a..cc8cac46 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -256,10 +256,8 @@ parse.o: parse.cc - - # Build this in two steps to avoid parallel build issues (see pr3462585) - parse.cc: $(srcdir)/parse.y -- $(YACC) --verbose -t -p VL -d -o $@ $< -+ $(YACC) --verbose -t -p VL --defines=parse.h -o $@ $< - parse.h: parse.cc -- mv parse.cc.h $@ 2>/dev/null || mv parse.hh $@ -- touch $@ - - syn-rules.cc: $(srcdir)/syn-rules.y - $(YACC) --verbose -t -p syn_ -o $@ $< -diff --git a/tgt-pcb/Makefile.in b/tgt-pcb/Makefile.in -index a5f9b7d5..7345e195 100644 ---- a/tgt-pcb/Makefile.in -+++ b/tgt-pcb/Makefile.in -@@ -89,10 +89,8 @@ fp_lex.cc: $(srcdir)/fp.lex - $(LEX) -s -ofp_lex.cc $(srcdir)/fp.lex - - fp.cc: $(srcdir)/fp.y -- $(YACC) --verbose -t -p fp -d -o $@ $< -+ $(YACC) --verbose -t -p fp --defines=fp.h -o $@ $< - fp.h: fp.cc -- mv fp.cc.h $@ 2>/dev/null || mv fp.hh $@ -- touch $@ - - ifeq (@WIN32@,yes) - TGTLDFLAGS=-L.. -livl -diff --git a/vhdlpp/Makefile.in b/vhdlpp/Makefile.in -index 53ae140a..458178bd 100644 ---- a/vhdlpp/Makefile.in -+++ b/vhdlpp/Makefile.in -@@ -117,10 +117,8 @@ lexor.cc: $(srcdir)/lexor.lex - - # Build this in two steps to avoid parallel build issues (see pr3462585) - parse.cc: $(srcdir)/parse.y -- $(YACC) --verbose -t -d -o $@ $< -+ $(YACC) --verbose -t --defines=parse.h -o $@ $< - parse.h: parse.cc -- mv parse.cc.h $@ 2>/dev/null || mv parse.hh $@ -- touch $@ - - lexor_keyword.o: lexor_keyword.cc parse.h - -diff --git a/vvp/Makefile.in b/vvp/Makefile.in -index 8ccdb1d2..cdd940f5 100644 ---- a/vvp/Makefile.in -+++ b/vvp/Makefile.in -@@ -142,10 +142,8 @@ tables.o: tables.cc - - # Build this in two steps to avoid parallel build issues (see pr3462585) - parse.cc: $(srcdir)/parse.y -- $(YACC) --verbose -t -d -o $@ $< -+ $(YACC) --verbose -t --defines=parse.h -o $@ $< - parse.h: parse.cc -- mv parse.cc.h $@ 2>/dev/null || mv parse.hh $@ -- touch $@ - - lexor.cc: $(srcdir)/lexor.lex - $(LEX) -s -olexor.cc $(srcdir)/lexor.lex --- -2.26.2 - diff --git a/sci-electronics/iverilog/iverilog-10.3-r2.ebuild b/sci-electronics/iverilog/iverilog-10.3.ebuild index be0e76900950..a2dea488d4fd 100644 --- a/sci-electronics/iverilog/iverilog-10.3-r2.ebuild +++ b/sci-electronics/iverilog/iverilog-10.3.ebuild @@ -18,27 +18,31 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git" else SRC_URI="https://github.com/steveicarus/${PN}/archive/v${GITHUB_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86" S="${WORKDIR}/${PN}-${GITHUB_PV}" fi LICENSE="LGPL-2.1" SLOT="0" +IUSE="examples" -DEPEND=" - sys-libs/readline:= +# If you are building from git, you will also need gperf to generate +# the configure scripts. +RDEPEND=" + sys-libs/readline:0 sys-libs/zlib " -RDEPEND="${DEPEND}" -BDEPEND="dev-util/gperf + +DEPEND=" + dev-util/gperf sys-devel/bison sys-devel/flex + ${RDEPEND} " PATCHES=( "${FILESDIR}"/${PN}-10.3-file-missing.patch #705412 "${FILESDIR}"/${PN}-10.3-fno-common.patch #706366 - "${FILESDIR}"/${PN}-10.3-gen-bison-header.patch #734760 ) src_prepare() { @@ -49,8 +53,7 @@ src_prepare() { # > sh autoconf.sh # Autoconf in root ... - eautoconf - + eautoconf --force # Precompiling lexor_keyword.gperf gperf -o -i 7 -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc || die # Precompiling vhdlpp/lexor_keyword.gperf @@ -60,12 +63,13 @@ src_prepare() { src_install() { local DOCS=( *.txt ) - # Default build fails with parallel jobs, # https://github.com/steveicarus/iverilog/pull/294 - emake installdirs DESTDIR="${ED}" + emake installdirs DESTDIR="${D}" default - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples + if use examples; then + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi } diff --git a/sci-electronics/iverilog/iverilog-11.0.ebuild b/sci-electronics/iverilog/iverilog-11.0.ebuild index 158257d7f0e6..bf530fda8300 100644 --- a/sci-electronics/iverilog/iverilog-11.0.ebuild +++ b/sci-electronics/iverilog/iverilog-11.0.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git" else SRC_URI="https://github.com/steveicarus/${PN}/archive/v${GITHUB_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86" S="${WORKDIR}/${PN}-${GITHUB_PV}" fi diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest index de45930418cd..1e73aa1c1d40 100644 --- a/sci-electronics/kicad-footprints/Manifest +++ b/sci-electronics/kicad-footprints/Manifest @@ -1,3 +1,3 @@ DIST kicad-footprints-5.1.9.tar.bz2 3387238 BLAKE2B 8c8873a7feb72228fcc92ab5e8950f63fcb09b4b1b16b6f8da5aa3caa30985ceb02e326ebe8ba96fcae07fae71a6233a7d8009fbe6541f2e7c6807ea67c7046a SHA512 28030a750b806be664cb91b3b3e4c0bf2b9efa0518ec55b1ff433633c2f69ab99bedbbdd3264b50cbe80a182e3f97343f5dfdd25e073abe1563231a8318b4155 -EBUILD kicad-footprints-5.1.9.ebuild 428 BLAKE2B eee43802fc531d1b0c91f56981c08f47c02676d3a955f609034c100577e313bffe86d000e85a573ab2bbf1ed8b03252be32cec5d22680deea095e82a12c665cc SHA512 7bf40ac39263d9d9c5a2a524027899305594701cd752add4319063aa6bd3eece6d9d5e087c3a4b5e0601d1ae04fa94b510fcdaf364295722f78dacf189516ebb +EBUILD kicad-footprints-5.1.9.ebuild 435 BLAKE2B c9beff3509330723d542a89eb2c011eb63be5bbcde98c351108d010fefdcd63acdbb62449801596858d71114f8a15b153b0db13c439e53c4a0003758f2c76225 SHA512 89d12bc654c80f6541b5f769042f93c5ed64861eb9541697b6b7c8909d8f18885cdd00233b71436fe5626a122ed1a1e447c5d7ad82ff8a2dfa96352cfc8417ff MISC metadata.xml 735 BLAKE2B 4799a945980798d07f6cd74cfe47f3e054ed5c149887247a92c191414f06c4d3a5740542624bee3e96a4482a6bcce9ef52294426075cb16ce8d85cf027d8d6bd SHA512 07adadb06d293a535f7b3ee1601120c6caa36a3d119f330f0ad9e9df39ea9c30e582d4fd97abb44d23a6ce2e73c3e3dbb86bfeab46c2bc3a8f547d1abca4dea2 diff --git a/sci-electronics/kicad-footprints/kicad-footprints-5.1.9.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-5.1.9.ebuild index f8f652eff266..01e320ed9a00 100644 --- a/sci-electronics/kicad-footprints/kicad-footprints-5.1.9.ebuild +++ b/sci-electronics/kicad-footprints/kicad-footprints-5.1.9.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 @@ -11,6 +11,6 @@ SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2" LICENSE="CC-BY-SA-4.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" RDEPEND=">=sci-electronics/kicad-5.1.0" diff --git a/sci-electronics/kicad-i18n/Manifest b/sci-electronics/kicad-i18n/Manifest index ecf4891a3584..cef99521a161 100644 --- a/sci-electronics/kicad-i18n/Manifest +++ b/sci-electronics/kicad-i18n/Manifest @@ -1,3 +1,3 @@ DIST kicad-i18n-5.1.9.tar.bz2 2934490 BLAKE2B 391cd9b8a23f5dd723884704ce231f79d8bf57b7f2852a97b08228e887226f75714c6515c335122f9f34d13a033e9039423b8bbfb281e4f6396ac158bea5f4e8 SHA512 d41359464e3504263bb964af4f14db027f9b55861098f29d0fa97eb2fb26205d49c00cbda4795317a46b54157f2fda67a94be412cfab80ce81846e173bf1a14d -EBUILD kicad-i18n-5.1.9.ebuild 453 BLAKE2B 306a5d0daaa3c078053c6681e441d3324c83ead5486f0ce41bd5d2b86378431f9042d85aaa6d71d6c33454326e248307d3a99e101c9ad259033f4884ffba07ae SHA512 5852351bf53a61ff2074a2ce945c83b8cbbe93965d9ccfabd160ae52846cc9bc81cb4ac23293fed932eae4be363cc34e281a9fe0115d55e8d51d1d5cee6e2205 +EBUILD kicad-i18n-5.1.9.ebuild 460 BLAKE2B b4090cb8b86e3dea31620c8532e3ea5367fea3cbbff5b9f50b9d65d1a29c13a2e990c2b4d7beb3631f87ff7d87abfee3f62c8df2c86fbe83240a88f08ef0d6ca SHA512 962cdb1369df1d10e05271c01af34bb1affd281e3971de9b5bccdadfdf47a17f063a8d31d3c7788a85f1ec6254b768579d7b747d987ae1538b2c68ae67549aeb MISC metadata.xml 448 BLAKE2B ce544749e7aedb4f4643feeaea90298bce866d9750a4d1edaec7f8d9248520266a8534a936ee76da3fb1e4072b08cbcfb487b87defbfc921defe8ae193ca8e57 SHA512 0ea5cc77902187b805ca9894e31efbaaedae623bd4ebdc41944e0e57b399e5f7bc7209067fc126d8b9b65e75a9d6c718d41c8cdfed12775f3bd35c6d8cae6647 diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.1.9.ebuild b/sci-electronics/kicad-i18n/kicad-i18n-5.1.9.ebuild index 581556469ff2..3a3a991dcd71 100644 --- a/sci-electronics/kicad-i18n/kicad-i18n-5.1.9.ebuild +++ b/sci-electronics/kicad-i18n/kicad-i18n-5.1.9.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 @@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2" LICENSE="CC-BY-SA-4.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" BDEPEND="sys-devel/gettext" RDEPEND=">=sci-electronics/kicad-5.1.6" diff --git a/sci-electronics/kicad-meta/Manifest b/sci-electronics/kicad-meta/Manifest index 22f42e7bf309..4b6b2955f3da 100644 --- a/sci-electronics/kicad-meta/Manifest +++ b/sci-electronics/kicad-meta/Manifest @@ -1,2 +1,2 @@ -EBUILD kicad-meta-5.1.9.ebuild 613 BLAKE2B c3d8e395671a385d27dc40ad324940811bec1045457b73a28279c4ffd7f6ff5955ec765a5e625ef251afe6da60bcca3b352f699baf53846ea2a4dad08bcbbb62 SHA512 8f064747c4b37155925e1c897d3af9ab1c5762118e5bf1e96bd6eabd5a58816838706c2bd804425fd645729a8dbc91b7752175b5ed82255ba0e62a643d6d2c30 +EBUILD kicad-meta-5.1.9.ebuild 620 BLAKE2B 65e0125c6b6d1c9d608dc80fc1a90094f34e653dc36d967f33eb6177042bc5fa7848cb14086911de3aa15be2816b67a019cdda326f1fde22ec55f2f2cf0f16b7 SHA512 0c7976d70ea6965aa6472257a16b81811b85129e155781a491d809c0b2e456a83cd2a0cc9e71f67ed894d1d26e037985c073618bec59083f3a268b5c85ba65b7 MISC metadata.xml 594 BLAKE2B f9fa7bf50bca85e78a51d280c8d040c0be2aa6c4384b9577e24d02518e7c21af352590c774129fd7cdac6ae9de6557e3f4e115be8d7996e12dc66946729dd9d7 SHA512 ce90535f2ca5a5e33fe577c4cc2ea8a345cf708bd2a223e8922354d73d9aa7e7b4be557f5f4e021f48f8d5f34bca34ed01e192094edc7764779630331463fadf diff --git a/sci-electronics/kicad-meta/kicad-meta-5.1.9.ebuild b/sci-electronics/kicad-meta/kicad-meta-5.1.9.ebuild index 62c2a5a2f8ac..8ff9f5fb6d71 100644 --- a/sci-electronics/kicad-meta/kicad-meta-5.1.9.ebuild +++ b/sci-electronics/kicad-meta/kicad-meta-5.1.9.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 @@ -9,7 +9,7 @@ SRC_URI="" LICENSE="metapackage" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" IUSE="doc minimal nls" RDEPEND=" diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest index 840129295080..e271d7cf18a7 100644 --- a/sci-electronics/kicad-packages3d/Manifest +++ b/sci-electronics/kicad-packages3d/Manifest @@ -1,3 +1,3 @@ DIST kicad-packages3d-5.1.9.tar.bz2 727202241 BLAKE2B 2f80b2e1bbc6b5c5d5c7baf77af187dac07d8c9ebc47d99419378f20b3a8eb9eb00da106810f0a3042a90c4bec44b467e78bc9c60b71c2b85e017342766f9101 SHA512 f5bfb9793d204f8f1bf46fe18897d59775fe7805299fd6af0215b8b9e28ce99d5183930120bfa7b5ee8b7599ae3be76f598b42b74db44ee50b7838fada860dd0 -EBUILD kicad-packages3d-5.1.9.ebuild 592 BLAKE2B b353ce155200f95b0ef7499ff069f754dca3c6aba9472712542a1414f44f0aac1f94c11b58b9c407e436d3226851728860f56185efb026c89b676f5111f4bb30 SHA512 f9d86a768977340b5d1e8d7008c98f44367278dc8d0a2db4156642987717425844ff262f488a232673f612552cf6d1f2c3908c160ca9cfe95b9f3101b5bb3b74 +EBUILD kicad-packages3d-5.1.9.ebuild 599 BLAKE2B ab86a7c3fa587e6c61a926b7dd24b3e18aaa151c45e4998a343b2c47a02f8ba0fc0cd86dab494e5f79185213520fa1673eece58c6c069348e349a22b980a7745 SHA512 c6d335f511e39a9732cf84c006e53c761c01c131efa826280a323b22db7c6168707d76b5d764899a7b3e0b86eddd67b72d76e455cc6e56b597f5931826f50b90 MISC metadata.xml 945 BLAKE2B 31ec093af697452fee944b3d8fab75e50604f5a243e265bbe355410e976bb420094fe2801e737195d3746bb6c3044a6f6730b7b673cd7c24ac264fab47f29024 SHA512 436f8220e032f2b08d7ec5217aa13e501547022bf61155728ccc3230684768de63d2a9fba823e2c166bda612648649f296abb6ae8a0cf362e0589af350f95146 diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.9.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.9.ebuild index 67a41a58de5d..ce0d62fefa15 100644 --- a/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.9.ebuild +++ b/sci-electronics/kicad-packages3d/kicad-packages3d-5.1.9.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 @@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${PV}/kic LICENSE="CC-BY-SA-4.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" IUSE="occ +oce" REQUIRED_USE="|| ( occ oce )" diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest index c72d027b9b31..0566191da566 100644 --- a/sci-electronics/kicad-symbols/Manifest +++ b/sci-electronics/kicad-symbols/Manifest @@ -1,3 +1,3 @@ DIST kicad-symbols-5.1.9.tar.bz2 1814966 BLAKE2B 5c66513c276434410fcd8f9a8c1478fce8182bee3c92c4fff42d2cf13c416ddc5f8c25618725f2f9eb54b216557d346eff4ebea78aeb7ebb3ed960baa3137138 SHA512 21bd0308723cf7dba8ab2294d70714160db6c64e5ebdad1c9344df0b6cd56fb9216d64977de68bd7ca8be190a89809576b71d21486c3e85fe077cceac54aabb3 -EBUILD kicad-symbols-5.1.9.ebuild 422 BLAKE2B 791497e59d77ba606cfdbb486106db4b38997b7e6566b68b25e003e32c200a756a25178c9eeb8b9002279b7010c2633b5f1b0f85b6b4d07ca70bbee418cb4fb3 SHA512 fd5838962dfda45a526123c2642fbfeab539dcfe55192d262d505817d141164aefc5adca00f2e58ffd69db0cd8fca80b228318e5c359024e525f60e9d1361d27 +EBUILD kicad-symbols-5.1.9.ebuild 429 BLAKE2B d9f18913bda85462cfeb321b03ca36c8cece223c7ad00233e3d1ddd81a09c33072dea13d19b1babc2a1b6263e593af4163cbe6e2845a9aca28f1aeeee3f7366d SHA512 4d5fb02b38b7cbd944f675b8be69fd9a2f6b4838ca4d535dd37eff4304d7227da15f9d860622552f7e46992fe909eac24a7e0f63af982805c525e3e4e861644a MISC metadata.xml 693 BLAKE2B a3b93ce0fcc955588ebcf3e3104c1b7af572e714ba255cacca945d130623e5fb1fb621169b728f9fb24e4d90b4776913220cd8b068f3e176b5dc7be9d6b9cd25 SHA512 e0f2002922b08d0ca4abfd39779def493aeb0870701a255b606da86ce9adbdf39f78ac9b80a885e9fc9186f59e7f77caf8cc4273bc64003715338e30833fd174 diff --git a/sci-electronics/kicad-symbols/kicad-symbols-5.1.9.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-5.1.9.ebuild index 4baf883551d0..85dbde951ce9 100644 --- a/sci-electronics/kicad-symbols/kicad-symbols-5.1.9.ebuild +++ b/sci-electronics/kicad-symbols/kicad-symbols-5.1.9.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 @@ -11,6 +11,6 @@ SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2" LICENSE="CC-BY-SA-4.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" RDEPEND=">=sci-electronics/kicad-5.1.0" diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest index 070510161213..cf04d392b9f6 100644 --- a/sci-electronics/kicad-templates/Manifest +++ b/sci-electronics/kicad-templates/Manifest @@ -1,3 +1,3 @@ DIST kicad-templates-5.1.9.tar.bz2 1552087 BLAKE2B d6637fc8acb2906ed2b07dceabb00982b4b9d8d4bb9703f8c3aadc174d3f7945748b80fe5a7c0b40a4f2340c4af7ed04cf82b775a5fbd4d807949c5c12aa67de SHA512 284676c7bd2c4bc1b1867e73da4827fca0df965a43850641f1836c0cac71b6270984af4fdd75fe25bd7f638f4b08ee115e84038390855d15c089f074ee4cff4e -EBUILD kicad-templates-5.1.9.ebuild 431 BLAKE2B 526c92f9c32bc4b5989641a5c1d2c746dd18077c27a3aeb33550ed77f151f360d327f147cfd5d2e3145a07744a810256f58f0b85aa8df42bb229ecb0c97da622 SHA512 7df0045f7b30af7dc990423c4429712cd53e9ab9c1bc1d024652804bf7433d0cde76ceeedd50932fcc2257958ef0b80c712fe42f41ab85e2b9438a000e75ad4a +EBUILD kicad-templates-5.1.9.ebuild 438 BLAKE2B 4c32d3f7a0231ac4333f90cb64e36ef336e3af2c3cad57fac2a8a92bc946d136f7905a4fa8272a5e4ee11013561f230f1a6e7c6041a264ba62947b24fb3387fb SHA512 c82e3e3e366f60478598e26524767de65302f241da8d368f2278ff81cfb3b1384fdfc84dba2f4b2b77a2bf405c081462ef68f80a353a6cf8056d9c103041da2a MISC metadata.xml 453 BLAKE2B 56db0c51d13c0cc2b65536b09e23714f53951c9f25ee716c6ceaaa65e12b2a6c85bed8dfca279364641e1b346bb70ac25c693ab9a0bd17b06d5dc732a0164a73 SHA512 f15055be34911712c68e6500d5f94a17bb21ec4c82eebdbbeb98053bc3daebd6d33c1626389cac8fab0834235f621d078dc89cf0f37f1126b03f6dbccefcae4b diff --git a/sci-electronics/kicad-templates/kicad-templates-5.1.9.ebuild b/sci-electronics/kicad-templates/kicad-templates-5.1.9.ebuild index 6bc0cb273a29..dce1272e1a77 100644 --- a/sci-electronics/kicad-templates/kicad-templates-5.1.9.ebuild +++ b/sci-electronics/kicad-templates/kicad-templates-5.1.9.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 @@ -11,6 +11,6 @@ SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2" LICENSE="CC-BY-SA-4.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" RDEPEND=">=sci-electronics/kicad-5.1.0" diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest index 8808b9b934f9..5c6ff1be5227 100644 --- a/sci-electronics/klayout/Manifest +++ b/sci-electronics/klayout/Manifest @@ -1,8 +1,4 @@ -DIST klayout-0.26.5.tar.gz 52335763 BLAKE2B b1ab39c378ce23c28f5a58191dbf43c5b8c165e9df241b00573c8f8b72a5a7251cddd41bf62a7e37f59cad68024c52ab99f8d0f10bf1bf45dba975bf37ba80db SHA512 b80dff34a9dd538921f6863fc94eb8a2160b989468ec0493a7ecfdfccea0e4f0441aa1ee860d000b150b0a0bc0b831dcb849ab77e9eb1304e9ed6fcced94689c -DIST klayout-0.26.8.tar.gz 54423228 BLAKE2B 5839e77a7910b0a838b6d1f436fe697ea445e968044f7102ab71d3d485ea4631194bf002d4440771e73c77359b673372662506a9cc6e2d4a3b5dc8df171783c7 SHA512 a37b324194ed523ee70a1d63034db9ba48cf55d44d3a9d1bc612803cde2425f6909fd0571ad4a66318fc2c6735e19ba11a26ab153e1200adec405c16fc05f144 DIST klayout-0.26.9.tar.gz 54223809 BLAKE2B 3800b0f49a77a73d4310485ba8539698b72c4a8f953723f4caee43a8c189aa044f7c8e617bc67640071e81d94e9edadbba11114b6d6edd4fcd67d02df33ec7d9 SHA512 1a163a055806fb9555aaf6253cb63d6ebe9648f6e165dfd1cbaa6d199652fa98363f6ddae32843cde5f768a8c2f42c8b06fb4691ed64e40979a22a96bd73874b -EBUILD klayout-0.26.5.ebuild 1853 BLAKE2B 7fb855d86f549d56da047a30592797f30cd488a57a9876169c9372085843b163e089554408b1c996072feaf3ba1451bdbf24b9be66c3390112f7932788e02544 SHA512 d15d68f288468e569b2eafea532c9f90dd68421e03ed4d2055b911def8f078e34179a53bdb0e1fa0c432b0e423366ce900b7dc8d96d7c5de59061e872eeff64a -EBUILD klayout-0.26.8.ebuild 1853 BLAKE2B ab37bb70c7837205c0b9145782071d1ba47846a7fd5188e4adf869806b3070f336f6890f279f4db2b27fd2d41a73b186c6f3c5fd001db571a28d435b9ce2c7c8 SHA512 f14b7386f2a0b0db78e0ab5334509ac245e790b3f4b88f09e8b5a293976ac8ed75c41283feeea32adf99c3b98ccaa376dfb61fd5be821707728be437dc340479 -EBUILD klayout-0.26.9.ebuild 1854 BLAKE2B c7e6ef82c00408221421f53dd0dc171f4ce019611785be6b6025af3a3cdca0ea86fa18cfe1e5f23e3b24b556caf1792a08c5b5f553d7fb6dc50806893424d963 SHA512 a5868823d60bdc8135219e36bac929808a1436ca4152a6cee6145c8d7ab8201a5950213c13fcb1419a7303b59b2aca76259c019c9cb7db06627b69253f8c9083 +EBUILD klayout-0.26.9.ebuild 1853 BLAKE2B ab37bb70c7837205c0b9145782071d1ba47846a7fd5188e4adf869806b3070f336f6890f279f4db2b27fd2d41a73b186c6f3c5fd001db571a28d435b9ce2c7c8 SHA512 f14b7386f2a0b0db78e0ab5334509ac245e790b3f4b88f09e8b5a293976ac8ed75c41283feeea32adf99c3b98ccaa376dfb61fd5be821707728be437dc340479 EBUILD klayout-9999.ebuild 1854 BLAKE2B 1fc9b5871daf08ae15e217b9b7125748d4eb4d1650ab6da8d1dccdc019399aca15d842bca70e28bbfc284e117b47db2cdfabb8e46e81b76ee41a269fc293d41e SHA512 ec8666f6dd29e5176212ccbb431c7c4b87666ddfdc871a1251878cd67a1351ca936d73fc3790ec95fafc05af7e47f604560716e28eda0d86f6b5a0fc6a2d661d MISC metadata.xml 380 BLAKE2B 3961dc3b4b0a6f3de5460e01e434f8ba1e4504247aac8cb40553d0752ece4f4be7e9d5fefee9d61e85681631eb200959b341c6aeda60b89c14119f95a40f4aa6 SHA512 92ee6b53a7dfed04d5a2aef510e0f2f0dcc70903258d5d4cb6ee497521cbb41214b7a45000693a0ecb66029767a48988c45b9b7fb78a09dc813710a9283d2f7d diff --git a/sci-electronics/klayout/klayout-0.26.5.ebuild b/sci-electronics/klayout/klayout-0.26.5.ebuild deleted file mode 100644 index 6c6d8ac25eaa..000000000000 --- a/sci-electronics/klayout/klayout-0.26.5.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -RUBY_OPTIONAL=no -USE_RUBY="ruby25" -# note: define maximally ONE implementation here - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit toolchain-funcs python-single-r1 ruby-ng - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/klayoutmatthias/${PN}.git" - inherit git-r3 - EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P} -else - SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz" - KEYWORDS="amd64 ~x86" -fi - -DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts" -HOMEPAGE="https://www.klayout.de/" -LICENSE="GPL-2" -SLOT="0" -IUSE="" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -RDEPEND=" - dev-qt/designer:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5[widgets] - dev-qt/qtnetwork:5[ssl] - dev-qt/qtprintsupport:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qttest:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5 - sys-libs/zlib - ${PYTHON_DEPS} - $(ruby_implementations_depend) -" -DEPEND="${RDEPEND}" - -pkg_setup() { - python-single-r1_pkg_setup - ruby-ng_pkg_setup -} - -each_ruby_configure() { - tc-export CC CXX AR LD RANLIB - export CFLAGS CXXFLAGS - ./build.sh \ - -expert \ - -dry-run \ - -qmake "/usr/$(get_libdir)/qt5/bin/qmake" \ - -ruby "${RUBY}" \ - -python "${PYTHON}" \ - -build . \ - -bin "${T}/bin" \ - -rpath "/usr/$(get_libdir)/klayout" \ - -option "${MAKEOPTS}" \ - -with-qtbinding \ - -without-64bit-coord \ - -qt5 || die "Configuration failed" -} - -each_ruby_compile() { - emake all -} - -each_ruby_install() { - emake install - - cd "${T}/bin" || die - - dodir "/usr/$(get_libdir)/klayout" - mv lib* lay_plugins db_plugins "${ED}/usr/$(get_libdir)/klayout/" || die - - mkdir -p "${D}/$(python_get_sitedir)" || die - mv pymod/* "${D}/$(python_get_sitedir)/" || die - rmdir pymod || die - - dobin * - - python_optimize -} diff --git a/sci-electronics/klayout/klayout-0.26.8.ebuild b/sci-electronics/klayout/klayout-0.26.8.ebuild deleted file mode 100644 index 20fa38ada7f9..000000000000 --- a/sci-electronics/klayout/klayout-0.26.8.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# 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_{7,8} ) - -inherit toolchain-funcs python-single-r1 ruby-ng - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/klayoutmatthias/${PN}.git" - inherit git-r3 - EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P} -else - SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz" - KEYWORDS="amd64 ~x86" -fi - -DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts" -HOMEPAGE="https://www.klayout.de/" -LICENSE="GPL-2" -SLOT="0" -IUSE="" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -RDEPEND=" - dev-qt/designer:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5[widgets] - dev-qt/qtnetwork:5[ssl] - dev-qt/qtprintsupport:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qttest:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5 - sys-libs/zlib - ${PYTHON_DEPS} - $(ruby_implementations_depend) -" -DEPEND="${RDEPEND}" - -pkg_setup() { - python-single-r1_pkg_setup - ruby-ng_pkg_setup -} - -each_ruby_configure() { - tc-export CC CXX AR LD RANLIB - export CFLAGS CXXFLAGS - ./build.sh \ - -expert \ - -dry-run \ - -qmake "/usr/$(get_libdir)/qt5/bin/qmake" \ - -ruby "${RUBY}" \ - -python "${PYTHON}" \ - -build . \ - -bin "${T}/bin" \ - -rpath "/usr/$(get_libdir)/klayout" \ - -option "${MAKEOPTS}" \ - -with-qtbinding \ - -without-64bit-coord \ - -qt5 || die "Configuration failed" -} - -each_ruby_compile() { - emake all -} - -each_ruby_install() { - emake install - - cd "${T}/bin" || die - - dodir "/usr/$(get_libdir)/klayout" - mv lib* lay_plugins db_plugins "${ED}/usr/$(get_libdir)/klayout/" || die - - mkdir -p "${D}/$(python_get_sitedir)" || die - mv pymod/* "${D}/$(python_get_sitedir)/" || die - rmdir pymod || die - - dobin * - - python_optimize -} diff --git a/sci-electronics/klayout/klayout-0.26.9.ebuild b/sci-electronics/klayout/klayout-0.26.9.ebuild index e1dc3269e5f9..20fa38ada7f9 100644 --- a/sci-electronics/klayout/klayout-0.26.9.ebuild +++ b/sci-electronics/klayout/klayout-0.26.9.ebuild @@ -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/ngspice/Manifest b/sci-electronics/ngspice/Manifest index 385bb79b729e..1a6a7e44ff2a 100644 --- a/sci-electronics/ngspice/Manifest +++ b/sci-electronics/ngspice/Manifest @@ -1,4 +1,4 @@ DIST ngspice-31-manual.pdf 2149244 BLAKE2B 155f7299cbb6d7c7953d8488e11f0bffc3c18097f02194c491174a9af387cda9e87cb79b13a37f402616386e7e82230eb4d41909fe37d900792e48f2f49c71dd SHA512 3322df92791718979a275f2640f82c3417f394a76d27ebf06b46f29a40a1ee3ef57c65a75a7ba67e697b55bd435f81e9ee61c78532f991a2dd6844b4f325eb55 DIST ngspice-31.tar.gz 7250057 BLAKE2B dabc8e1084eba957d6dad06e74f878b51e97dc8bc49b04ee612a6f9eaadde7302450c9ab93e943c4af42197b6bbdca7cae534464ccd2fcd4869b8a48b6f3140d SHA512 448024f398d267911d5d2a48da03eb0d87ba1133ce39d5132bd318dde8ad359d19c7f85f6b4ec88c08b081c9140f7b931334d84173019a22aa2ac98482bd7d5d -EBUILD ngspice-31-r1.ebuild 4386 BLAKE2B 3d544f5195dd18e9b7d2ec94518157189a6fb4378b3ccf70865a02cecd69d2b43cea643792153fc8f8e25bdb423cd51ab023fe9a99c4e97bd845875e52932b8e SHA512 1397b9bdd333ced89c244b65d3b1d584b8d3ca1974bb74901dd7339bb20a45e0b96154a09e8b4ec346e13a2521d491a15be3dae4accd9b8cd9984e8063e260da +EBUILD ngspice-31-r1.ebuild 4393 BLAKE2B 97d73472447291f088d3a742781010a7dd40b0674c6a0059b15c592f4cb9f9919868b93486c2fd11f8896a0e8719b3378ff80a54ed2aa93b2b6fb67d13c7bcc5 SHA512 f450f605ee8630ce1c2f190ecbc287ef4a6b60ab72ba44e686670cf8a779b83e80d3e839434df9a4c88334907284d046d9e685aaf9ac45ed727ff5da54efca24 MISC metadata.xml 676 BLAKE2B 9f7a12febdcf08bf12af50524f20250fdb253888ff12045d6033f957f9c6d81fd21ce47a1e6694d9aa48d28fa2b5f9e3cbabc8e54f4e810ea10e5f251ebf3165 SHA512 3a92c343662ecec1091a9bc8e5b4c9569c783e3ddd78027925487a93446d43c863f918de67a8738eea463994ba6c590e693245d36ed4e05e62312cf100a1f2a7 diff --git a/sci-electronics/ngspice/ngspice-31-r1.ebuild b/sci-electronics/ngspice/ngspice-31-r1.ebuild index 88d439335b18..7195c9e60379 100644 --- a/sci-electronics/ngspice/ngspice-31-r1.ebuild +++ b/sci-electronics/ngspice/ngspice-31-r1.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 @@ -14,7 +14,7 @@ LICENSE="BSD GPL-2" SLOT="0" IUSE="X debug deprecated doc examples fftw openmp +readline +shared tcl" RESTRICT="!test? ( test )" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x64-macos" +KEYWORDS="~amd64 ~arm64 ~ppc ~sparc ~x86 ~x64-macos" DEPEND="sys-libs/ncurses:0= X? ( x11-libs/libXaw diff --git a/sci-electronics/osqoop/Manifest b/sci-electronics/osqoop/Manifest index 051b1ab5c8fc..bc4abf653546 100644 --- a/sci-electronics/osqoop/Manifest +++ b/sci-electronics/osqoop/Manifest @@ -1,3 +1,4 @@ +AUX osqoop-1.2.0_pre20170131-cmake-add_library-static.patch 491 BLAKE2B c424cd0a4061b7d7461f6aebfd87fcec888d8d1447d9e9b5418bcfdafebfeea1747ebc49c3026be43835c7edeb30d7cf06c8a1c881ef2696f7221e0e4a76dba4 SHA512 21b0906555d558872fa0128d16a3c4b1d81b3565b19afd9b2f4cddcf867eb25b8c2095b8943953fbe3042aad4fb89122fb58685851b4efe4ea74aa65b9c577c1 DIST osqoop-1.2.0_pre20170131.tar.gz 426915 BLAKE2B 18b1e6df5b76f7a9691c991a431cc1147c67c771cd7a44757bfd6f458f8c8edc6ce707a9adb1c5ed8d674b289c9d228745045929b09771fcf14d440f0431c79f SHA512 e2ced1195c2dda0164761b5f4a928db2bcdff566d3cc05a11460ff570dbd2b7696a30545dd1252930b9544794879d9c89cf7ddf784ddfdbd5e2a0754478f7d60 -EBUILD osqoop-1.2.0_pre20170131.ebuild 761 BLAKE2B e9f666808f3749d3c447a417018f553435a8b0f71c6a24e17065bb14e376cbef880a6723d4715d9336c8ab7e1319acce526ef6bed21495b07fdb0a5d0a2678f9 SHA512 aff1f50d6db85796c6c43d9b0cd54261df4e1fc785c34aef85dbf5112a360cf976365b95841170ff10880b75ba6a3bf681308b095b8de3fc38cf9c8e42e54609 +EBUILD osqoop-1.2.0_pre20170131.ebuild 884 BLAKE2B fc3e69000e168f09678c9837afd8482394edd2ec08d9d171619d4650ceb08b257e8eedb309c09b6ea03283e3225dc45ab6f7a9ae296f50fb0f93b7e348bc5f03 SHA512 1447a630db190119c47ab5c3ef235f143356d04cb34556f9f75b8ef93d54319f4058f1526afee03b66b4c0e685f3afa214a79450b371f15f53a034f032199492 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/sci-electronics/osqoop/files/osqoop-1.2.0_pre20170131-cmake-add_library-static.patch b/sci-electronics/osqoop/files/osqoop-1.2.0_pre20170131-cmake-add_library-static.patch new file mode 100644 index 000000000000..8b315cf0c0f1 --- /dev/null +++ b/sci-electronics/osqoop/files/osqoop-1.2.0_pre20170131-cmake-add_library-static.patch @@ -0,0 +1,11 @@ +--- a/processing/lib/CMakeLists.txt 2017-02-12 19:13:31.000000000 +0100 ++++ b/processing/lib/CMakeLists.txt 2021-02-28 11:30:50.812028355 +0100 +@@ -4,7 +4,7 @@ + FeedForwardNeuralNetwork.cpp + ) + include_directories (${CMAKE_BINARY_DIR}/processing/lib) +-add_library(processing ${processing_SRCS}) ++add_library(processing STATIC ${processing_SRCS}) + target_link_libraries(processing Qt5::Core) + if (CMAKE_COMPILER_IS_GNUCC) + set_target_properties(processing PROPERTIES COMPILE_FLAGS "-fPIC") diff --git a/sci-electronics/osqoop/osqoop-1.2.0_pre20170131.ebuild b/sci-electronics/osqoop/osqoop-1.2.0_pre20170131.ebuild index 9bac71de0ad4..9e14ed9013bb 100644 --- a/sci-electronics/osqoop/osqoop-1.2.0_pre20170131.ebuild +++ b/sci-electronics/osqoop/osqoop-1.2.0_pre20170131.ebuild @@ -1,15 +1,16 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 COMMIT=b5bd459dd5c2a180a9a3e5a706ed5039159d7286 -inherit cmake-utils vcs-snapshot +inherit cmake DESCRIPTION="Multi-platform open source software oscilloscope based on Qt" HOMEPAGE="https://github.com/stephanemagnenat/osqoop https://github.com/sandsmark/osqoop" # sandsmark/osqoop: PR-branch on top of last commit in stephanemagnenat/osqoop (17-01-31) SRC_URI="https://github.com/sandsmark/osqoop/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" LICENSE="GPL-2" SLOT="0" @@ -25,3 +26,8 @@ RDEPEND=" virtual/libusb:0 x11-libs/libXtst" DEPEND="${RDEPEND}" + +# downstream fix for BUILD_SHARED_LIBS=ON default +PATCHES=( + "${FILESDIR}"/${P}-cmake-add_library-static.patch +) diff --git a/sci-electronics/qelectrotech/Manifest b/sci-electronics/qelectrotech/Manifest index 60d2cdb696ee..9196388f89ff 100644 --- a/sci-electronics/qelectrotech/Manifest +++ b/sci-electronics/qelectrotech/Manifest @@ -1,5 +1,9 @@ AUX qelectrotech-0.3-fix-paths.patch 2304 BLAKE2B 113afe4cd025baecc3ddd4060179d3b81da32ac172eb452bb74215cc9a2e227bd7f31474452fb4055cc9d4cbda5cd0eea856929b191917a263a7e9ac20de9483 SHA512 3d57c172bf63faa3bd5ead082be1c3143330bae8ebdde580a5b5a860d5419371a05082f4b69e39054629e9f39f258b26ec65f773238b8b7b4b892176ad998c31 +AUX qelectrotech-0.80-fix-paths.patch 2412 BLAKE2B 66ec413d1f69f1621dc9776afa91f78b7fa0d17aece0ea0a122616503319ec98df653b166f81196b8d891f327e024a8e19207e3c9ef8567038d186b1440babb2 SHA512 828d0677b1d5a0ef4049d3fc7c9fbc47dfa810252c881a5f1c7e2841f9676710b69ce1a001cd6b44e28980445782affd948cd8626e43e37f020a2247ac31f3e5 +AUX qelectrotech-0.80-nomancompress.patch 436 BLAKE2B 9f8d5491c4076e8cf1fea993180cddaf7a1f6d34556a75131c2a4799bd54228ce5936145c30f0edf33626c90eb9fcb3134ccde0685ce6091706617ccd408dd99 SHA512 6de49a59a605bff6f9eb3d375f698adbb15deec77a3d2283ba53fe63e73ec23098baa6dc5530f0f2c9f92de8f400d66e71c6024d7929f1b2a343720afe54597a DIST qelectrotech-0.70.tar.gz 10870717 BLAKE2B 21af2000080526cc75e67d80d514286a294a805073beb97d142758449e1290db56e741b70eeb9c38adbdb770fc548eb0fba18429bceaa8cd88bcba5335c3fca9 SHA512 db5b74ce9ac64e55a463c821ee43a2cde8cc4dc4a7be79c8a39512e54dfb85653e20981b5879ecc6e5949c1c1196ad5b7cae9780bf16de0b4d7b2381731173bd +DIST qelectrotech-0.80.tar.gz 13835653 BLAKE2B 1efb22c9683c01c3cc449a3c1deef1990825b16f11dc15d93e2d7c0afd026486ee9772e0d8637efcb576fb20a8dc79235cdcabc94d293b9bf8c2028818645734 SHA512 732101130e77849ed0a56bcc7b519a1ca032e8f203951a50e1dd5fd488e96f1ab69ed0854176604f1947636b3d8fda1ac8aebbcfe01e63dfa263d8f646224f53 EBUILD qelectrotech-0.70.ebuild 1148 BLAKE2B f815517770d377e6488137a0e013cc012608a27ede5e7fdd02b2f6d7e624e38c263cbbd38190f9040dc7fd6a84c205d16e1d02daddf383a2cbe7c52494312ee4 SHA512 b96df75832dacb6e02b5affbd75bb6dc3c45c6a4a77fb22722d1d3fc051e20a6229cd988eb0045d56bc408a24e0a2f4d78415f465e5fa704b899f59f3912aeb4 -EBUILD qelectrotech-9999.ebuild 1139 BLAKE2B 827b5184d0117228521a770808c2f00aafeec19e5bfc5623d7ba23bbee6ebb2f81b80be2b4c85ec5599613ba903725dd54f011c1e16de9a9d3b886dd2e6692a6 SHA512 0b8e91434bfec88cf0a0822fc8085a8d9eadc3277a955c06df2a59a37d395d43e6e6ed84ee0cdeba9191271d9569eda6012b01245fea1573fe4453bd8ea7b808 +EBUILD qelectrotech-0.80.ebuild 1425 BLAKE2B 67b317692aeb9d48882736cea9c85738474121d00259c35e8880f187b7af8eb6627736630d0876c2e606984d3360e8841cb8f0d91a1d6cbc5ab0098cb588062b SHA512 665b0922358d5f1cd8ef8eb87d38015e06bf67b74927cf4757f1bc88b1d60985a980f34d4ee2927570db91f797ee9f54557a1ce7c9dcc93a80a99cc8323f0250 +EBUILD qelectrotech-9999.ebuild 1437 BLAKE2B 3ee887677a71db332885adb0b8e5ba8065b7bf771cba3820bc028aa9354ff6cc5bb9c85342d2a0fc30d233913a112737a028f3d7bff0251d2297995432fcf796 SHA512 1c1a5125793c5122ff1cc1df095bbc06ab32616375c4fbc5fabc1a070e5e7d873b14ccb2eb5ce88f1866d9a6b86ee02939cdbde0c4f866f8d88b709c207bda61 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2 diff --git a/sci-electronics/qelectrotech/files/qelectrotech-0.80-fix-paths.patch b/sci-electronics/qelectrotech/files/qelectrotech-0.80-fix-paths.patch new file mode 100644 index 000000000000..30ef9b6089b9 --- /dev/null +++ b/sci-electronics/qelectrotech/files/qelectrotech-0.80-fix-paths.patch @@ -0,0 +1,50 @@ +--- a/qelectrotech.pro 2021-02-21 10:15:38.000000000 +0100 ++++ b/qelectrotech.pro 2021-02-28 21:12:15.934876464 +0100 +@@ -5,21 +5,21 @@ + # Chemins utilises pour la compilation et l'installation de QET + unix { + # Chemins UNIX +- COMPIL_PREFIX = '/usr/local/' +- INSTALL_PREFIX = '/usr/local/' ++ COMPIL_PREFIX = '/usr/' ++ INSTALL_PREFIX = '/usr/' + QET_BINARY_PATH = 'bin/' + QET_COMMON_COLLECTION_PATH = 'share/qelectrotech/elements/' + QET_COMMON_TBT_PATH = 'share/qelectrotech/titleblocks/' + QET_LANG_PATH = 'share/qelectrotech/lang/' + QET_EXAMPLES_PATH = 'share/qelectrotech/examples/' + QET_LICENSE_PATH = 'doc/qelectrotech/' +- QET_MIME_XML_PATH = '../share/mime/application/' +- QET_MIME_DESKTOP_PATH = '../share/mimelnk/application/' +- QET_MIME_PACKAGE_PATH = '../share/mime/packages/' ++ QET_MIME_XML_PATH = 'share/mime/application/' ++ QET_MIME_DESKTOP_PATH = 'share/mimelnk/application/' ++ QET_MIME_PACKAGE_PATH = 'share/mime/packages/' + QET_DESKTOP_PATH = 'share/applications/' + QET_ICONS_PATH = 'share/icons/hicolor/' +- QET_MAN_PATH = 'man/' +- QET_APPDATA_PATH = 'share/appdata' ++ QET_MAN_PATH = 'share/man/' ++ QET_APPDATA_PATH = 'share/metainfo' + } + win32 { + # Chemins Windows +@@ -252,9 +252,6 @@ + examples.path = $$join(INSTALL_PREFIX,,,$${QET_EXAMPLES_PATH}) + examples.files = examples/* + +-copyright.path = $$join(INSTALL_PREFIX,,,$${QET_LICENSE_PATH}) +-copyright.files = LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog +- + mime_xml.path = $$join(INSTALL_PREFIX,,,$${QET_MIME_XML_PATH}) + mime_xml.files = misc/x-qet-*.xml + +@@ -284,7 +281,7 @@ + man.extra = sh man/compress_man_pages.sh + + # L'installation comprend la copie du binaire, des elements, des fichiers de langue et du fichier LICENSE +-INSTALLS += target elements tbt lang copyright ++INSTALLS += target elements tbt lang + # Sous Unix, on installe egalement l'icone, un fichier .desktop, des fichiers mime et les pages de manuel + unix { + INSTALLS += desktop mime_xml mime_desktop mime_package icons man examples appdata diff --git a/sci-electronics/qelectrotech/files/qelectrotech-0.80-nomancompress.patch b/sci-electronics/qelectrotech/files/qelectrotech-0.80-nomancompress.patch new file mode 100644 index 000000000000..9e63a4512892 --- /dev/null +++ b/sci-electronics/qelectrotech/files/qelectrotech-0.80-nomancompress.patch @@ -0,0 +1,10 @@ +--- a/qelectrotech.pro 2021-02-21 10:15:38.000000000 +0100 ++++ b/qelectrotech.pro 2021-02-28 21:41:02.221285171 +0100 +@@ -278,7 +278,6 @@ + + man.path = $$join(INSTALL_PREFIX,,,$${QET_MAN_PATH}) + man.files = man/files/* +-man.extra = sh man/compress_man_pages.sh + + # L'installation comprend la copie du binaire, des elements, des fichiers de langue et du fichier LICENSE + INSTALLS += target elements tbt lang diff --git a/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild b/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild new file mode 100644 index 000000000000..135799c10bea --- /dev/null +++ b/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild @@ -0,0 +1,74 @@ +# Copyright 2001-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit qmake-utils xdg + +DESCRIPTION="Qt5 application to design electric diagrams" +HOMEPAGE="https://qelectrotech.org/" + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://git.tuxfamily.org/qet/qet.git/" + inherit git-r3 +else + MY_P=qet-${PV/%0/.0} + SRC_URI="https://git.tuxfamily.org/qet/qet.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}"/${MY_P} +fi + +LICENSE="CC-BY-3.0 GPL-2+" +SLOT="0" +IUSE="doc" + +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" +RDEPEND=" + dev-db/sqlite:3 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/kwidgetsaddons:5 +" +DEPEND="${RDEPEND}" + +DOCS=( CREDIT ChangeLog README ) + +PATCHES=( + "${FILESDIR}/${P}-fix-paths.patch" + "${FILESDIR}/${P}-nomancompress.patch" +) + +src_prepare() { + xdg_src_prepare + + if [[ ${PV} != *9999* ]]; then + sed -e "/^DEFINES.*GIT_COMMIT_SHA/s/^/#DONT /" -i ${PN}.pro || die + sed -e "/qInfo.*GIT_COMMIT_SHA/d" -i sources/machine_info.cpp || die + fi +} + +src_configure() { + eqmake5 ${PN}.pro +} + +src_install() { + emake INSTALL_ROOT="${D}" install + + if use doc; then + doxygen Doxyfile || die + local HTML_DOCS=( doc/html/. ) + fi + + einstalldocs +} diff --git a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild b/sci-electronics/qelectrotech/qelectrotech-9999.ebuild index bd14b719e6f5..17b3beea6240 100644 --- a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild +++ b/sci-electronics/qelectrotech/qelectrotech-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2001-2020 Gentoo Authors +# Copyright 2001-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,12 +8,12 @@ inherit qmake-utils xdg DESCRIPTION="Qt5 application to design electric diagrams" HOMEPAGE="https://qelectrotech.org/" -if [[ ${PV} = *9999* ]]; then - inherit subversion - ESVN_REPO_URI="svn://svn.tuxfamily.org/svnroot/qet/qet/trunk" +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://git.tuxfamily.org/qet/qet.git/" + inherit git-r3 else - MY_P=${PN}-${PV%0}-src - SRC_URI="https://download.tuxfamily.org/qet/tags/20180823/${MY_P}.tar.gz" + MY_P=qet-${PV/%0/.0} + SRC_URI="https://git.tuxfamily.org/qet/qet.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" S="${WORKDIR}"/${MY_P} fi @@ -23,9 +23,11 @@ SLOT="0" IUSE="doc" BDEPEND=" + virtual/pkgconfig doc? ( app-doc/doxygen ) " RDEPEND=" + dev-db/sqlite:3 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -42,7 +44,19 @@ DEPEND="${RDEPEND}" DOCS=( CREDIT ChangeLog README ) -PATCHES=( "${FILESDIR}/${PN}-0.3-fix-paths.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-0.80-fix-paths.patch" + "${FILESDIR}/${PN}-0.80-nomancompress.patch" +) + +src_prepare() { + xdg_src_prepare + + if [[ ${PV} != *9999* ]]; then + sed -e "/^DEFINES.*GIT_COMMIT_SHA/s/^/#DONT /" -i ${PN}.pro || die + sed -e "/qInfo.*GIT_COMMIT_SHA/d" -i sources/machine_info.cpp || die + fi +} src_configure() { eqmake5 ${PN}.pro |