From a3f343fa0395f8b9628bcc7ec19222eea4194d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Mon, 8 Mar 2021 19:30:57 +0100 Subject: [PATCH 01/14] www-apps/code-server-bin: bump to 3.9.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Maciej Barć --- www-apps/code-server-bin/Manifest | 2 + .../code-server-bin-3.9.1.ebuild | 90 +++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 www-apps/code-server-bin/code-server-bin-3.9.1.ebuild diff --git a/www-apps/code-server-bin/Manifest b/www-apps/code-server-bin/Manifest index 95b20ea427..01229225d0 100644 --- a/www-apps/code-server-bin/Manifest +++ b/www-apps/code-server-bin/Manifest @@ -2,3 +2,5 @@ DIST code-server-3.8.1-linux-amd64.tar.gz 78975468 BLAKE2B d4f6424108b0cd4cb46ba DIST code-server-3.8.1-linux-arm64.tar.gz 78056961 BLAKE2B 0311b5a07d6047f8ff795a0001f04ad824a940e79d87b23d58cc0fa27d04e1653f33a19016406ffcabbd3dabe4df512ee27ad58b7b6dc341517cd7e6845540b7 SHA512 a08308531ff8665f3b83dd6f37a9d668aa73b08ae7652193dc8e842c76982864701989b1713246e3d64a87b0b942a1b426da0170841da17d6ca6782a78850111 DIST code-server-3.9.0-linux-amd64.tar.gz 79632197 BLAKE2B cc0aa63cbeb5ff4d5a524c44554f72cdb4e0a8c48d6be8ac0942736994481fed3a5d30970091f1790b47edbae8e91a4c5ce50055761654f4129c583b0b930ea4 SHA512 46f9e24bdaef075f06ab487ada24910a6fdd7b68a23beddefd049ae4735e8cb16a6bccd014ac7227fe70df95aaf83e1e7a271a01c5b1efa0677f872c7484322e DIST code-server-3.9.0-linux-arm64.tar.gz 78939000 BLAKE2B fef14756b2d55cad2899dad7ec7332f753e18134f92c199f3e4d403880577c85a7772bdd56f71a0e8c3c38541e44a618fa9926b428a90f39f06c80ee6a5c4720 SHA512 e3f06076f70ceddd5a350e384c5fe1a8b23845a0ab6c6469ffabc2fe781cefd0bdbda6426196bee4e7cd6a2902b780b22aaae69fe25cf49b8e98374515ae055c +DIST code-server-3.9.1-linux-amd64.tar.gz 69783057 BLAKE2B 0008d5967cb9b58129e4ab21e1fa0c10f72611652f50991ff6657870a5e6c315872c05f6612d108454b5ca4dd5c9848470ff34846f06181ff1b6ac98a05496e3 SHA512 66a38c12b4a0c2494195f8e233942c49be23b3586140e901ff50cd6b507a092ca39a09b77fed3723710ea4099b6489f8d23b3a680b028e4bf920095bf314aa1d +DIST code-server-3.9.1-linux-arm64.tar.gz 69101049 BLAKE2B 57f1b32f8b4385bb7c749d701ded90a7cb82ab1f6ceb052e589720221bd41a2620a63c9f88517de9962771c858d6aca12273c3e70fad56e3b247e2c5f6178375 SHA512 1e5629ec3f7ffe9279d89099ae5c111358e41e481eb2df659e45a7ad4b6c340ed5b59b9f818df8857cdfe2b4c2d509d193c6c5f1f15217e6b8aaa5b21a7af1f9 diff --git a/www-apps/code-server-bin/code-server-bin-3.9.1.ebuild b/www-apps/code-server-bin/code-server-bin-3.9.1.ebuild new file mode 100644 index 0000000000..543e268b91 --- /dev/null +++ b/www-apps/code-server-bin/code-server-bin-3.9.1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN="${PN/-bin/}" +MY_P="${MY_PN}-${PV}" +BASE_URI="https://github.com/cdr/${MY_PN}/releases/download/v${PV}/${MY_P}-linux" + +inherit systemd + +DESCRIPTION="VS Code in the browser (binary version with unbundled node and ripgrep)" +HOMEPAGE="https://coder.com/" +SRC_URI=" + amd64? ( ${BASE_URI}-amd64.tar.gz ) + arm64? ( ${BASE_URI}-arm64.tar.gz ) +" + +RESTRICT="test" +LICENSE="MIT" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm64" +IUSE="gnome-keyring" + +# In case we ever make a non-"-binary" pkg +DEPEND=" + !www-apps/code-server +" +RDEPEND=" + ${DEPEND} + >=net-libs/nodejs-12.16.1:0/12[ssl] + sys-apps/ripgrep + gnome-keyring? ( + app-crypt/libsecret + ) +" + +S="${WORKDIR}/${MY_P}-linux-${ARCH}" + +PATCHES=( + "${FILESDIR}/${PN}-node.patch" +) + +DOCS=( README.md ThirdPartyNotices.txt ) + +src_prepare() { + default + + # We remove as much precompiled code as we can, + # node modules not written in JS cannot be removed + # thus "-bin". + + # use system node + rm ./node ./lib/node \ + || die "failed to remove bundled nodejs" + + # remove bundled ripgrep binary + rm ./lib/vscode/node_modules/vscode-ripgrep/bin/rg \ + || die "failed to remove bundled ripgrep" + + # not needed + rm ./code-server || die + rm ./postinstall.sh || die + + # already in /usr/portage/licenses/MIT + rm ./LICENSE.txt || die + + if ! use gnome-keyring; then + rm -r ./lib/vscode/node_modules/keytar \ + || die "failed to remove bundled keytar" + fi +} + +src_install() { + einstalldocs + + insinto "/usr/lib/${MY_PN}" + doins -r . + fperms +x "${EPREFIX}/usr/lib/${MY_PN}/bin/${MY_PN}" + dosym "${EPREFIX}/usr/lib/${MY_PN}/bin/${MY_PN}" "${EPREFIX}/usr/bin/${MY_PN}" + + dosym "${EPREFIX}/usr/bin/rg" "${EPREFIX}/usr/lib/${MY_PN}/lib/vscode/node_modules/vscode-ripgrep/bin/rg" + + systemd_dounit "${FILESDIR}/${MY_PN}.service" +} + +pkg_postinst() { + elog "When using code-server systemd service run it as a user" + elog "For example: 'systemctl --user enable --now code-server'" +} From cdad97b8e0077bde07d9a43f381d2546dab91eed Mon Sep 17 00:00:00 2001 From: Denis Reva Date: Tue, 9 Mar 2021 08:24:36 +0500 Subject: [PATCH 02/14] sys-fs/dwarfs: new version 0.4.0 Key features: * Up to twice as fast and up to 10% better compression * New dwarfsextract tool Allow extracting dwarfs images as archives. * Bugfixes. Fixed bug with revdep-rebuild. Package now proper use system libraries. Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Denis Reva --- sys-fs/dwarfs/Manifest | 1 + sys-fs/dwarfs/dwarfs-0.4.0.ebuild | 98 +++++++++++++++++++++ sys-fs/dwarfs/files/dwarfs-0.4.0-link.patch | 20 +++++ 3 files changed, 119 insertions(+) create mode 100644 sys-fs/dwarfs/dwarfs-0.4.0.ebuild create mode 100644 sys-fs/dwarfs/files/dwarfs-0.4.0-link.patch diff --git a/sys-fs/dwarfs/Manifest b/sys-fs/dwarfs/Manifest index 4a31b8772e..76f32318dc 100644 --- a/sys-fs/dwarfs/Manifest +++ b/sys-fs/dwarfs/Manifest @@ -1,4 +1,5 @@ DIST dwarfs-0.2.4.tar.gz 131125 BLAKE2B 06dd11a90d203882a6b2398d6a3e763a269746a57394444e67913bbb66176305e3d6d606a7f35b4c3692d1d761e90d853b268f876004be1e8274b5b16174dcde SHA512 2136f1159eaf80afd6f5a1edda65c7a7f2cb147c7b14a5d19981fbd417e8785c2d7f986df3787587b4b5157bfd299159f4015a017d289bb0c9fba77b337ed3b5 DIST dwarfs-0.3.1.tar.bz2 8704811 BLAKE2B f7f5a2affae5da78d526891017ac66ed16f73919c7b990b558413c028590e3e3efa2f7e8cc70d97cbad2a0332d91458444898611ea86343a5978bcdf2ed1bf3b SHA512 5776f5da14a5ccbe0e1cf11acec1c9360aa23e2f6751f54a5df200d4625ffc1892658bd4d987ae15fb08ec1f97d7db2a8c42ed80bb6aae062a45e50513e09f51 +DIST dwarfs-0.4.0.tar.bz2 11634383 BLAKE2B a401e891f5453bd8cccbc664066f759c5ffa60568305b44d57fbcc239d6759ff2e6d5fb1450c7424be14e9eb7ab4f9996dce54a78de6e6e5d8b1cbe2d15dc4eb SHA512 b815c4bdb1ac61798ead817f27d8fbfaf234d2698d9f72427b7cd55fd334214f595baf286c979fee344b34c7589d5859df8c6e8259473bf13d7461f1f63d90a6 DIST fbthrift-2020.11.30.00.tar.gz 5274706 BLAKE2B ad13eb7b66f804c7a667746d72298e05726d1f78a49523a10f2712cc4dbea71999590a2c420e8081d32dc24a7d203e11d5c7e5c15f2627594295cd5533096dd9 SHA512 33b4c1a4cfc8783f99d5da8ae113f877e1f23586f5a854833107805fe35834604e677d7abe690cefeb70baed20cb3cc14449cfae35a9af89594974377bbe0329 DIST folly-2020.11.30.00.tar.gz 3261437 BLAKE2B 5070819f1f8bac2030e761a8d2330379e8e5ba242d21330b98dcd598cb18e12046a9ad3fb6462f82dbc47c53cf0905c330e707201bfbbedb81f203ef1b30731e SHA512 e7e06bd8c8e38af345d20a04886b4497c4f0c9877263dbcb5a3f2d17c7a3252a2529086a5a04d07c2d3a457ca3930c43672fc4f74b7bdbc2ec0d07abdf1ed425 diff --git a/sys-fs/dwarfs/dwarfs-0.4.0.ebuild b/sys-fs/dwarfs/dwarfs-0.4.0.ebuild new file mode 100644 index 0000000000..2f42f9242c --- /dev/null +++ b/sys-fs/dwarfs/dwarfs-0.4.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit cmake check-reqs python-single-r1 + +DESCRIPTION="A fast very high compression read-only FUSE file system" +HOMEPAGE="https://github.com/mhx/dwarfs" + +SRC_URI="https://github.com/mhx/dwarfs/releases/download/v${PV}/dwarfs-${PV}.tar.bz2 -> ${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="python +jemalloc" + +#test IUSE disabled because there is no googletest in portage tree at this moment +#-DWITH_TESTS=$(usex test ON OFF) + +PYTHON_REQ_USE="python" + +DEPEND="sys-devel/flex + sys-devel/binutils:*" +RDEPEND="dev-libs/boost[context,threads,python?] + dev-libs/double-conversion + dev-libs/libfmt + dev-libs/libevent + dev-libs/xxhash + jemalloc? ( >=dev-libs/jemalloc-5.2.1 ) + app-arch/libarchive + app-arch/zstd + app-arch/lz4 + app-arch/xz-utils + app-arch/snappy + dev-cpp/sparsehash + dev-cpp/gflags + dev-cpp/glog[gflags] + sys-fs/fuse:3 + sys-libs/binutils-libs + sys-libs/zlib + sys-libs/libunwind + !dev-cpp/folly" +BDEPEND="app-text/ronn + dev-util/cmake + sys-apps/sed + sys-devel/bison + virtual/pkgconfig" + +CHECKREQS_DISK_BUILD="1.2G" + +PATCHES=( ${FILESDIR}/dwarfs-0.4.0-link.patch ) + +DOCS=( "README.md" "CHANGES.md" "TODO" ) + +CMAKE_IN_SOURCE_BUILD=1 +CMAKE_WARN_UNUSED_CLI=0 + +src_prepare(){ + cmake_src_prepare + einfo "setting library path to $(get_libdir)" + sed "s/DESTINATION lib/DESTINATION $(get_libdir)/" -i CMakeLists.txt || die +} + +src_configure(){ + einfo "setting configuration flags to:" + mycmakeargs=( + -DUSE_JEMALLOC=$(usex jemalloc ON OFF) + -DWITH_PYTHON=$(usex python ON OFF) + -DPREFER_SYSTEM_ZSTD=1 + -DPREFER_SYSTEM_XXHASH=1 + -DWITH_LEGACY_FUSE=0 + ) + if use python; then mycmakeargs+=( -DWITH_PYTHON_VERSION=${EPYTHON#python} ); fi + einfo ${mycmakeargs} + cmake_src_configure +} + +src_install(){ + cmake_src_install + dolib.so libmetadata_thrift.so libthrift_light.so + dolib.so folly/libfolly.so.0.58.0-dev folly/libfolly.so +} + +pkg_postinst(){ + elog "Test shows that dwarfs compiled with Clang is substantially faster than GCC ones" + elog "See https://github.com/mhx/dwarfs/issues/14" + elog "So you may want to compile it independently with Clang by the" + elog "https://wiki.gentoo.org/wiki/Clang" + elog "And with the per-package settings:" + elog "https://wiki.gentoo.org/wiki/Handbook:AMD64/Portage/Advanced#Per-package_environment_variables" + elog "Also you may find more information in the" + elog "${HOMEPAGE}" + elog "About creating: ${HOMEPAGE}/blob/main/doc/mkdwarfs.md" + elog "About mounting: ${HOMEPAGE}/blob/main/doc/dwarfs.md" +} diff --git a/sys-fs/dwarfs/files/dwarfs-0.4.0-link.patch b/sys-fs/dwarfs/files/dwarfs-0.4.0-link.patch new file mode 100644 index 0000000000..93c4b4f2f7 --- /dev/null +++ b/sys-fs/dwarfs/files/dwarfs-0.4.0-link.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 18fa5cd..36fc0b3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -258,8 +258,6 @@ add_executable(dwarfsextract src/dwarfsextract.cpp) + + list(APPEND BINARY_TARGETS mkdwarfs dwarfsck dwarfsbench dwarfsextract) + +-target_link_libraries(dwarfsextract PkgConfig::LIBARCHIVE) +- + if(FUSE3_FOUND) + add_executable(dwarfs-bin src/dwarfs.cpp) + target_compile_definitions(dwarfs-bin PRIVATE _FILE_OFFSET_BITS=64 +@@ -482,6 +480,7 @@ target_link_libraries( + thrift_light + folly + ${Boost_LIBRARIES} ++ PkgConfig::LIBARCHIVE + PkgConfig::LIBLZ4 + PkgConfig::LIBLZMA) From 6faaecf13f448a2c13d3f949d26066d742e37660 Mon Sep 17 00:00:00 2001 From: Hans Fredrik Nordhaug Date: Tue, 9 Mar 2021 16:52:12 +0100 Subject: [PATCH 03/14] app-editors/featherpad: version bump 0.18.0 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Hans Fredrik Nordhaug --- app-editors/featherpad/Manifest | 1 + .../featherpad/featherpad-0.18.0.ebuild | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 app-editors/featherpad/featherpad-0.18.0.ebuild diff --git a/app-editors/featherpad/Manifest b/app-editors/featherpad/Manifest index 3709d6e9bd..e5df9fdc08 100644 --- a/app-editors/featherpad/Manifest +++ b/app-editors/featherpad/Manifest @@ -1 +1,2 @@ DIST featherpad-0.17.2.tar.gz 921192 BLAKE2B 38d0520c918dbae0b46f2a6d1a3f553f28ef0351b017600d4cc21cce61eb69bf08a80c118dfb794af3489cbb10c93d59c2b8effc049eccbd57aaefc403bddb29 SHA512 39721faa4c0b5c0920c9fdcbfaafe864b6e649145ec8b51ea1f3ca3ec038119caaf0a812362e226fd4e699d0f385508f1fb12992b2219f995b8486779d06b872 +DIST featherpad-0.18.0.tar.gz 967643 BLAKE2B a8a84fa71232bdd9448ec4a9c921f8f452212dfb52ec518c3f340e9b600858a9cfca2d7729a0f58c9d1465b77bd28c836de78026c58ff94297de704e7bf670d8 SHA512 3e0d008792dd55bc5e57654f9b032f0a66a60c682499c684cfc3b182fdc57a654bb5fb195b458af66ddd8db929b31e7bfa789bd9bdf33d32454fbbcb090bcd91 diff --git a/app-editors/featherpad/featherpad-0.18.0.ebuild b/app-editors/featherpad/featherpad-0.18.0.ebuild new file mode 100644 index 0000000000..179b3541a2 --- /dev/null +++ b/app-editors/featherpad/featherpad-0.18.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit xdg qmake-utils + +MY_P="${P/featherpad/FeatherPad}" + +DESCRIPTION="Lightweight Qt5 Plain-Text Editor for Linux" +HOMEPAGE="https://github.com/tsujan/FeatherPad" +SRC_URI="https://github.com/tsujan/FeatherPad/archive/V${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="app-text/hunspell + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5" + +S="${WORKDIR}/${MY_P}" + +src_configure() { + eqmake5 +} + +src_install() { + emake INSTALL_ROOT="${ED}" install +} From d11e81ddc7fdf9ddc5dc5746915c97ad1ef780c9 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Wed, 10 Mar 2021 11:51:09 +0800 Subject: [PATCH 04/14] sci-electronics/verilator: bump to 4.110 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Huang Rui --- sci-electronics/verilator/Manifest | 1 + .../verilator/verilator-4.110.ebuild | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 sci-electronics/verilator/verilator-4.110.ebuild diff --git a/sci-electronics/verilator/Manifest b/sci-electronics/verilator/Manifest index b2d561ac89..f8dbe97bcb 100644 --- a/sci-electronics/verilator/Manifest +++ b/sci-electronics/verilator/Manifest @@ -1 +1,2 @@ DIST verilator-4.108.tar.gz 2217541 BLAKE2B 52321477102f3762f3881b7b8ca38b7ffc6a19903f9f8091909d0bbe003fcb86c2bc0075249044b6483705d97fd2e85998e0d6b7b7c64c362a5224a4dc2ccbaf SHA512 a2e2f279f08c0781e3fa158923376574244052dc87a2d72ecd48d63efac3743e264a79f2121175a1766c7fb2fb56104e919baee75879a1e5c4c4a96dd22bfd91 +DIST verilator-4.110.tar.gz 2227322 BLAKE2B 2032f70771fbb2a6f93f504d6b1a01ed5c5fa1f752d3834d8a5acf29190bd614ad3200452fa2ac7cfdc3f6d3baaf1c2e6b9cb32fdf23e43bca5beb19c86ac85b SHA512 c424650dac9ea15ff0d6387614e9a8b5b5a87514c92541af6838ef5a3d22f32d23cc339a9274ff7122d32f4aa368c773cf2dc4e1178dada6a34bad02103d237d diff --git a/sci-electronics/verilator/verilator-4.110.ebuild b/sci-electronics/verilator/verilator-4.110.ebuild new file mode 100644 index 0000000000..d8ccd0c016 --- /dev/null +++ b/sci-electronics/verilator/verilator-4.110.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit autotools + +DESCRIPTION="The fast free Verilog/SystemVerilog simulator" +HOMEPAGE=" + https://verilator.org + https://github.com/verilator/verilator +" + +if [[ "${PV}" == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="|| ( Artistic-2 LGPL-3 )" +SLOT="0" + +RDEPEND=" + dev-lang/perl + sys-libs/zlib +" + +DEPEND=" + ${RDEPEND} +" + +BDEPEND=" + sys-devel/bison + sys-devel/flex +" + +src_prepare() { + default + eautoconf --force +} From 5bdbacaec6802c1ea637248afb5b4b84064619b9 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Wed, 10 Mar 2021 11:52:34 +0800 Subject: [PATCH 05/14] sci-electronics/verilator: drop 4.108 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Huang Rui --- sci-electronics/verilator/Manifest | 1 - .../verilator/verilator-4.108.ebuild | 42 ------------------- 2 files changed, 43 deletions(-) delete mode 100644 sci-electronics/verilator/verilator-4.108.ebuild diff --git a/sci-electronics/verilator/Manifest b/sci-electronics/verilator/Manifest index f8dbe97bcb..17fa217eca 100644 --- a/sci-electronics/verilator/Manifest +++ b/sci-electronics/verilator/Manifest @@ -1,2 +1 @@ -DIST verilator-4.108.tar.gz 2217541 BLAKE2B 52321477102f3762f3881b7b8ca38b7ffc6a19903f9f8091909d0bbe003fcb86c2bc0075249044b6483705d97fd2e85998e0d6b7b7c64c362a5224a4dc2ccbaf SHA512 a2e2f279f08c0781e3fa158923376574244052dc87a2d72ecd48d63efac3743e264a79f2121175a1766c7fb2fb56104e919baee75879a1e5c4c4a96dd22bfd91 DIST verilator-4.110.tar.gz 2227322 BLAKE2B 2032f70771fbb2a6f93f504d6b1a01ed5c5fa1f752d3834d8a5acf29190bd614ad3200452fa2ac7cfdc3f6d3baaf1c2e6b9cb32fdf23e43bca5beb19c86ac85b SHA512 c424650dac9ea15ff0d6387614e9a8b5b5a87514c92541af6838ef5a3d22f32d23cc339a9274ff7122d32f4aa368c773cf2dc4e1178dada6a34bad02103d237d diff --git a/sci-electronics/verilator/verilator-4.108.ebuild b/sci-electronics/verilator/verilator-4.108.ebuild deleted file mode 100644 index d8ccd0c016..0000000000 --- a/sci-electronics/verilator/verilator-4.108.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools - -DESCRIPTION="The fast free Verilog/SystemVerilog simulator" -HOMEPAGE=" - https://verilator.org - https://github.com/verilator/verilator -" - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" -else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -LICENSE="|| ( Artistic-2 LGPL-3 )" -SLOT="0" - -RDEPEND=" - dev-lang/perl - sys-libs/zlib -" - -DEPEND=" - ${RDEPEND} -" - -BDEPEND=" - sys-devel/bison - sys-devel/flex -" - -src_prepare() { - default - eautoconf --force -} From b63c82cd36a8cde5b0929fb5ad28275d9a4365ce Mon Sep 17 00:00:00 2001 From: Aisha Tammy Date: Wed, 10 Mar 2021 07:37:57 -0500 Subject: [PATCH 06/14] gui-apps/wdisplays: fix dependencies Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Aisha Tammy --- gui-apps/wdisplays/wdisplays-1.0-r3.ebuild | 35 ++++++++++++++++++++++ gui-apps/wdisplays/wdisplays-9999.ebuild | 28 ++++++++++------- 2 files changed, 53 insertions(+), 10 deletions(-) create mode 100644 gui-apps/wdisplays/wdisplays-1.0-r3.ebuild diff --git a/gui-apps/wdisplays/wdisplays-1.0-r3.ebuild b/gui-apps/wdisplays/wdisplays-1.0-r3.ebuild new file mode 100644 index 0000000000..e9c017e2e0 --- /dev/null +++ b/gui-apps/wdisplays/wdisplays-1.0-r3.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson xdg + +DESCRIPTION="GUI display configurator for wlroots compositors" +HOMEPAGE="https://cyclopsian.github.io/wdisplays https://github.com/cyclopsian/wdisplays" + +if [[ "${PV}" == 9999 ]] +then + inherit git-r3 + EGIT_REPO_URI="https://github.com/cyclopsian/wdisplays.git" +else + SRC_URI="https://github.com/cyclopsian/wdisplays/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +RDEPEND=" + dev-libs/glib + media-libs/libepoxy + x11-libs/gtk+:3[wayland] + x11-libs/cairo + x11-libs/pango +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/wayland-protocols +" + +LICENSE="GPL-3+" +SLOT="0" + +PATCHES=( "${FILESDIR}/${PN}-1.0-pull20.patch" ) diff --git a/gui-apps/wdisplays/wdisplays-9999.ebuild b/gui-apps/wdisplays/wdisplays-9999.ebuild index 3959f430e9..e9c017e2e0 100644 --- a/gui-apps/wdisplays/wdisplays-9999.ebuild +++ b/gui-apps/wdisplays/wdisplays-9999.ebuild @@ -1,27 +1,35 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit meson xdg + +DESCRIPTION="GUI display configurator for wlroots compositors" +HOMEPAGE="https://cyclopsian.github.io/wdisplays https://github.com/cyclopsian/wdisplays" + if [[ "${PV}" == 9999 ]] then inherit git-r3 EGIT_REPO_URI="https://github.com/cyclopsian/wdisplays.git" else SRC_URI="https://github.com/cyclopsian/wdisplays/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64 ~x86" fi -inherit meson xdg -DESCRIPTION="GUI display configurator for wlroots compositors" -HOMEPAGE="https://cyclopsian.github.io/wdisplays https://github.com/cyclopsian/wdisplays" - -BDEPEND=" +RDEPEND=" + dev-libs/glib + media-libs/libepoxy x11-libs/gtk+:3[wayland] - gui-libs/wlroots" -DEPEND="${BDEPEND}" + x11-libs/cairo + x11-libs/pango +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/wayland-protocols +" LICENSE="GPL-3+" SLOT="0" -PATCHES=("${FILESDIR}/${PN}-1.0-pull20.patch") +PATCHES=( "${FILESDIR}/${PN}-1.0-pull20.patch" ) From 6aac220a1ac48e9bb3144af6707ec95ffaf914f8 Mon Sep 17 00:00:00 2001 From: Aisha Tammy Date: Wed, 10 Mar 2021 07:38:21 -0500 Subject: [PATCH 07/14] gui-apps/wdisplays: drop old revision Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Aisha Tammy --- gui-apps/wdisplays/wdisplays-1.0-r2.ebuild | 27 ---------------------- 1 file changed, 27 deletions(-) delete mode 100644 gui-apps/wdisplays/wdisplays-1.0-r2.ebuild diff --git a/gui-apps/wdisplays/wdisplays-1.0-r2.ebuild b/gui-apps/wdisplays/wdisplays-1.0-r2.ebuild deleted file mode 100644 index 3959f430e9..0000000000 --- a/gui-apps/wdisplays/wdisplays-1.0-r2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ "${PV}" == 9999 ]] -then - inherit git-r3 - EGIT_REPO_URI="https://github.com/cyclopsian/wdisplays.git" -else - SRC_URI="https://github.com/cyclopsian/wdisplays/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi -inherit meson xdg - -DESCRIPTION="GUI display configurator for wlroots compositors" -HOMEPAGE="https://cyclopsian.github.io/wdisplays https://github.com/cyclopsian/wdisplays" - -BDEPEND=" - x11-libs/gtk+:3[wayland] - gui-libs/wlroots" -DEPEND="${BDEPEND}" - -LICENSE="GPL-3+" -SLOT="0" - -PATCHES=("${FILESDIR}/${PN}-1.0-pull20.patch") From 9ae1019ee4e64113279f8b47830e7389944ff17c Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Wed, 10 Mar 2021 23:00:19 +0300 Subject: [PATCH 08/14] sci-physics/SU2: 7.1.1 version bump Signed-off-by: Sergey Torokhov --- sci-physics/SU2/Manifest | 3 + sci-physics/SU2/SU2-7.1.1.ebuild | 127 +++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+) create mode 100644 sci-physics/SU2/SU2-7.1.1.ebuild diff --git a/sci-physics/SU2/Manifest b/sci-physics/SU2/Manifest index dbfba89b5e..c5fb9ec1cc 100644 --- a/sci-physics/SU2/Manifest +++ b/sci-physics/SU2/Manifest @@ -5,4 +5,7 @@ DIST SU2-7.0.8.tar.gz 20554206 BLAKE2B ac291eeae696197f5875839defa98bde550c5250b DIST SU2-7.1.0-TestCases.tar.gz 449701778 BLAKE2B 8a7cb400d330b4bbf62023525e6009a8c05af5a375b7479087b3b579d7f3162a11091f09294381fcd11d7bc358e77f10f69efc0999a304135f8850e3fe005000 SHA512 a0e354b073b4cfaeb47a9bd33ac66a636b12a065ca7caff4bd50c54e2b191809fd463f980568e0b7d4d559714d2dca99fe9a3e5854aa345be24010cd1239e772 DIST SU2-7.1.0-Tutorials.tar.gz 66570840 BLAKE2B fdbc23503abd7a250464ca8da52ab87f67069d2a3fca130038c1ea83c3b18aa476fed3a21f725b142a97923b101d7906a720f6dff28341a13915ed6216660d7f SHA512 7843a7ed5b3c606ea9821745390c70bbfd3cb66a17494360b4139e8735a8e83546acd0912462b7fc3b63ff9f2097610294c1c9af25d104962f727f599cdb8ae9 DIST SU2-7.1.0.tar.gz 20542933 BLAKE2B e6e6d82a990bf4043d1c6c58a5fe7a100a923b2c6ae6a29f7bb969e02279eeb5587f7930b2372cf67e26f451c598cf81e2515eeb7e516d6ab060ac7e986a0110 SHA512 309b4e06c5fc084ea2a06797ae400392b924c3654d354170c3159327c9e022081745bee28b1537ed3ad4e7c1333afb8c38a1ca033ff28662b8d5f5badfdc8465 +DIST SU2-7.1.1-TestCases.tar.gz 453640460 BLAKE2B 661349f1690eda1f9c4438a0c03c59d4bab7a1e49965a94d1e3ba6fe54ab5f14c9eae0ae93d5027068d5d02465af72cc39e8a4319de6b888d01b0e353a2bf296 SHA512 8a30160b9c6d7f2d23c7cd88e089bcefa98b1fdeeef43060da4fe4840a7061e790f250c656b44f2e491108cf5c2701fd0dbad67e651db3d59a79f8e521c2e36d +DIST SU2-7.1.1-Tutorials.tar.gz 71446250 BLAKE2B 30d4f9dda28958da80617d5ddcf635304c19f7de68a1bd5dd52ac7df84bf643d028c2ee8d2e3425f4d8a4faa06e8ed95150c51293629453c0b27101c33278a1f SHA512 7f38588effa471f705c297c5a9fb6bca344932224453cb46021a715b58f9a0d45e16edb73df9a2a079dd7bd7909bbf0236fc0dc2df11b88bfb6f3a6c7769fdfe +DIST SU2-7.1.1.tar.gz 20553973 BLAKE2B a8c7f851cf570c08c345725e6660fc84683a4a7b6982edc586661847dc0b0db06f1825170afc34d85adced512c5272a0632005838ae6952be4265eb05c921bab SHA512 5980c2a24821d5e8cc83a953377d2779a158da30b6c1d2ef5db8a2b4f7a2ba555d5a35d755216a5c860e48e97b325f9687f3b2bd0c741b2d21bbcfcd31689ea9 DIST mutationpp-1.0.1.tar.gz 4021945 BLAKE2B caae3ca155541a36822a950047efb867aab098bc9db311d675acca272d7f317ff35524086a0ea5eda524bbe125e4874f41dc1dbad92bfee4387e3a0c649bbd0a SHA512 ba8beeb7cdaf1b526571e27f745d8d53c1e20a96bd194a5949acb8b6d5f75553867158a63bfc7198502177a9e8a91bf82a67d450a3ba72b21f8490539f45ef01 diff --git a/sci-physics/SU2/SU2-7.1.1.ebuild b/sci-physics/SU2/SU2-7.1.1.ebuild new file mode 100644 index 0000000000..f4ad34dd96 --- /dev/null +++ b/sci-physics/SU2/SU2-7.1.1.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit meson python-single-r1 + +DESCRIPTION="SU2: An Open-Source Suite for Multiphysics Simulation and Design" +HOMEPAGE="https://su2code.github.io/" +SRC_URI=" + https://github.com/su2code/SU2/archive/v${PV}.tar.gz -> ${P}.tar.gz + mpp? ( https://github.com/mutationpp/Mutationpp/archive/v1.0.1.tar.gz -> mutationpp-1.0.1.tar.gz ) + test? ( https://github.com/su2code/TestCases/archive/v${PV}.tar.gz -> ${P}-TestCases.tar.gz ) + tutorials? ( https://github.com/su2code/Tutorials/archive/v${PV}.tar.gz -> ${P}-Tutorials.tar.gz ) +" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64" + +# cgns, metis, parmetis are bundled; +# omp is disable as it's experimental; +# pastix is disabled as it's try to find bundled libs; +IUSE="cgns -mkl +mpi mpp openblas tecio test tutorials" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + mkl? ( !openblas ) +" + +RDEPEND=" + ${PYTHON_DEPS} + mpi? ( virtual/mpi[cxx] ) + mkl? ( sci-libs/mkl ) + openblas? ( sci-libs/openblas ) +" +DEPEND=" + ${RDEPEND} + tecio? ( dev-libs/boost:= ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-7.0.4-unbundle_boost.patch" + "${FILESDIR}/${PN}-7.1.0-fix-env.patch" +) + +DOCS=( "README.md" "SU2_PY/documentation.txt" ) + +src_unpack() { + unpack "${P}.tar.gz" + if use mpp ; then + einfo "Unpacking mutationpp-1.0.1.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}/subprojects/Mutationpp" + tar -C "${P}"/subprojects/Mutationpp --strip-components=1 -xzf "${DISTDIR}/mutationpp-1.0.1.tar.gz" || die + fi + if use test ; then + einfo "Unpacking ${P}-TestCases.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}/TestCases" + tar -C "${P}"/TestCases --strip-components=1 -xzf "${DISTDIR}/${P}-TestCases.tar.gz" || die + fi + if use tutorials ; then + einfo "Unpacking ${P}-Tutorials.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}" + mkdir "${P}"/Tutorials || die + tar -C "${P}"/Tutorials --strip-components=1 -xzf "${DISTDIR}/${P}-Tutorials.tar.gz" || die + fi +} + +src_prepare(){ + default + # boost Geometry requires c++14 since >=boost-1.75 + if has_version ">=dev-libs/boost-1.75.0" ; then + sed -i -e 's:cpp_std=c++11:cpp_std=c++14:' meson.build || die + fi +} + +src_configure() { + local emesonargs=( + -Denable-autodiff=false + -Denable-directdiff=false + -Denable-pastix=false + -Denable-pywrapper=false + -Dwith-omp=false + $(meson_feature mpi with-mpi) + $(meson_use cgns enable-cgns) + $(meson_use mkl enable-mkl) + $(meson_use mpp enable-mpp) + $(meson_use openblas enable-openblas) + $(meson_use tecio enable-tecio) + $(meson_use test enable-tests) + ) + meson_src_configure +} + +src_test() { + ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD + ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF + ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT + ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO + ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL + + export SU2_RUN="${S}/SU2_PY" + export SU2_HOME="${S}" + export PATH=$PATH:$SU2_RUN + export PYTHONPATH=$PYTHONPATH:$SU2_RUN + + einfo "Running UnitTests ..." + ../${P}-build/UnitTests/test_driver + + pushd TestCases/ + use mpi && python parallel_regression.py + use mpi || python serial_regression.py + use tutorials && use mpi && python tutorials.py + popd +} + +src_install() { + meson_src_install + mkdir -p "${ED}$(python_get_sitedir)" || die + mv "${ED}"/usr/bin/{FSI_tools,SU2,SU2_Nastran,*.py} -t "${ED}$(python_get_sitedir)" || die + python_optimize "${D}/$(python_get_sitedir)" + + if use tutorials ; then + insinto "/usr/share/${P}" + doins -r Tutorials + fi +} From 4f6a6e7e7832087550137e56580251d7e3f7ca58 Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Wed, 10 Mar 2021 23:02:19 +0300 Subject: [PATCH 09/14] sci-physics/SU2: drop old 7.0.8 Signed-off-by: Sergey Torokhov --- sci-physics/SU2/Manifest | 4 - sci-physics/SU2/SU2-7.0.8-r1.ebuild | 115 ------------------ sci-physics/SU2/files/SU2-7.0.8-fix-env.patch | 12 -- 3 files changed, 131 deletions(-) delete mode 100644 sci-physics/SU2/SU2-7.0.8-r1.ebuild delete mode 100644 sci-physics/SU2/files/SU2-7.0.8-fix-env.patch diff --git a/sci-physics/SU2/Manifest b/sci-physics/SU2/Manifest index c5fb9ec1cc..9fc1700396 100644 --- a/sci-physics/SU2/Manifest +++ b/sci-physics/SU2/Manifest @@ -1,7 +1,3 @@ -DIST SU2-7.0.7-TestCases.tar.gz 448969006 BLAKE2B 6c886824b55d7f8516d2ea69e2f7bef36a40986f4f715da46d91f851eb59390329433c6941a280eca34ad675633b2f1b01a897d1db8d177a5c4f770b286d0625 SHA512 0884b4f750dbcfd3f2cb0e71d6005932e4edd90a50fa84eb484f6c0c523930ddebfb3ed4315161b8fdeff911a52fa72b6d79739c8e19cd634b9823e007520213 -DIST SU2-7.0.7-Tutorials.tar.gz 64282235 BLAKE2B 7a6b780ee6f01d26a7a7d4751ca39798af56cfd7b99ca3e13fdff61aecd631a3aa4c98a487f48a8b2593c711ee25bd1ddc90a316bde2c287e95a383321f1d5e9 SHA512 189b5da96f08689b62ba3c42ee349edd2e145f371112895587e53497f16de3d6fdbf17308af39961775d76e3169c40872ced8e267146b6da5ae12d31a4c70fa9 -DIST SU2-7.0.8-fix-python-optimize.patch 104379 BLAKE2B e2cb9f58af5f600f25d01a082b55a344d3b05c455d44cfcb3370fc77546b6821d616e80f577b7af4b19ad519f086495eb6f6bde1f1712451ac477d6dd538fa0e SHA512 f21ed5fc1e61b78f3858a162a899c552777143118f05db009247c6224b06b922b6280de5725726afe21a3283a18ad9c38fc1c65dadb709d440e10cf3fe754d8c -DIST SU2-7.0.8.tar.gz 20554206 BLAKE2B ac291eeae696197f5875839defa98bde550c5250b5a5cff8049e0d1c8184c5ec6d225b77618d079a8fb3d5a7f4d0531a0b2931fd15e045299fa55c7dd03d9fd1 SHA512 26ed8c39d2dfcdb3fc4e1c986c64f683f44cd4123ce5f7a482c4557a82b04b4bd8ef1f04332ab36ad0f987cfb98053fb8b30ef81faf51c7c56aebc1a30467df9 DIST SU2-7.1.0-TestCases.tar.gz 449701778 BLAKE2B 8a7cb400d330b4bbf62023525e6009a8c05af5a375b7479087b3b579d7f3162a11091f09294381fcd11d7bc358e77f10f69efc0999a304135f8850e3fe005000 SHA512 a0e354b073b4cfaeb47a9bd33ac66a636b12a065ca7caff4bd50c54e2b191809fd463f980568e0b7d4d559714d2dca99fe9a3e5854aa345be24010cd1239e772 DIST SU2-7.1.0-Tutorials.tar.gz 66570840 BLAKE2B fdbc23503abd7a250464ca8da52ab87f67069d2a3fca130038c1ea83c3b18aa476fed3a21f725b142a97923b101d7906a720f6dff28341a13915ed6216660d7f SHA512 7843a7ed5b3c606ea9821745390c70bbfd3cb66a17494360b4139e8735a8e83546acd0912462b7fc3b63ff9f2097610294c1c9af25d104962f727f599cdb8ae9 DIST SU2-7.1.0.tar.gz 20542933 BLAKE2B e6e6d82a990bf4043d1c6c58a5fe7a100a923b2c6ae6a29f7bb969e02279eeb5587f7930b2372cf67e26f451c598cf81e2515eeb7e516d6ab060ac7e986a0110 SHA512 309b4e06c5fc084ea2a06797ae400392b924c3654d354170c3159327c9e022081745bee28b1537ed3ad4e7c1333afb8c38a1ca033ff28662b8d5f5badfdc8465 diff --git a/sci-physics/SU2/SU2-7.0.8-r1.ebuild b/sci-physics/SU2/SU2-7.0.8-r1.ebuild deleted file mode 100644 index f7e5b83f19..0000000000 --- a/sci-physics/SU2/SU2-7.0.8-r1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit meson python-single-r1 - -DESCRIPTION="SU2: An Open-Source Suite for Multiphysics Simulation and Design" -HOMEPAGE="https://su2code.github.io/" -SRC_URI=" - https://github.com/su2code/SU2/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/band-a-prend/gentoo-overlay/raw/master/sci-physics/${PN}/files/${P}-fix-python-optimize.patch - test? ( https://github.com/su2code/TestCases/archive/v7.0.7.tar.gz -> ${PN}-7.0.7-TestCases.tar.gz ) - tutorials? ( https://github.com/su2code/Tutorials/archive/v7.0.7.tar.gz -> ${PN}-7.0.7-Tutorials.tar.gz ) -" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64" - -# cgns, metis, parmetis are bundled; -# omp is disable as it's experimental; -# pastix is disabled as it's try to find bundled libs; -IUSE="cgns -mkl +mpi openblas tecio test tutorials" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - mkl? ( !openblas ) -" - -RDEPEND=" - ${PYTHON_DEPS} - mpi? ( virtual/mpi[cxx] ) - mkl? ( sci-libs/mkl ) - openblas? ( sci-libs/openblas ) -" -DEPEND=" - ${RDEPEND} - tecio? ( dev-libs/boost:= ) -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-7.0.4-unbundle_boost.patch" - "${FILESDIR}/${P}-fix-env.patch" - "${DISTDIR}/${P}-fix-python-optimize.patch" -) - -DOCS=( "README.md" "SU2_PY/documentation.txt" ) - -src_unpack() { - unpack "${P}.tar.gz" - if use test ; then - einfo "Unpacking ${PN}-7.0.7-TestCases.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}/TestCases" - tar -C "${P}"/TestCases --strip-components=1 -xzf "${DISTDIR}/${PN}-7.0.7-TestCases.tar.gz" || die - fi - if use tutorials ; then - einfo "Unpacking ${PN}-7.0.7-Tutorials.tar.gz to /var/tmp/portage/sci-physics/${P}/work/${P}" - mkdir "${P}"/Tutorials || die - tar -C "${P}"/Tutorials --strip-components=1 -xzf "${DISTDIR}/${PN}-7.0.7-Tutorials.tar.gz" || die - fi -} - -src_configure() { - local emesonargs=( - -Denable-autodiff=false - -Denable-directdiff=false - -Denable-pastix=false - -Denable-pywrapper=false - -Dwith-omp=false - $(meson_feature mpi with-mpi) - $(meson_use cgns enable-cgns) - $(meson_use mkl enable-mkl) - $(meson_use openblas enable-openblas) - $(meson_use tecio enable-tecio) - $(meson_use test enable-tests) - ) - meson_src_configure -} - -src_test() { - ln -s ../../${P}-build/SU2_CFD/src/SU2_CFD SU2_PY/SU2_CFD - ln -s ../../${P}-build/SU2_DEF/src/SU2_DEF SU2_PY/SU2_DEF - ln -s ../../${P}-build/SU2_DOT/src/SU2_DOT SU2_PY/SU2_DOT - ln -s ../../${P}-build/SU2_GEO/src/SU2_GEO SU2_PY/SU2_GEO - ln -s ../../${P}-build/SU2_SOL/src/SU2_SOL SU2_PY/SU2_SOL - - export SU2_RUN="${S}/SU2_PY" - export SU2_HOME="${S}" - export PATH=$PATH:$SU2_RUN - export PYTHONPATH=$PYTHONPATH:$SU2_RUN - - einfo "Running UnitTests ..." - ../${P}-build/UnitTests/test_driver - - pushd TestCases/ - use mpi && python parallel_regression.py - use mpi || python serial_regression.py - use tutorials && use mpi && python tutorials.py - popd -} - -src_install() { - meson_src_install - mkdir -p "${ED}$(python_get_sitedir)" || die - mv "${ED}"/usr/bin/{FSI,SU2,*.py} -t "${ED}$(python_get_sitedir)" || die - python_optimize "${D}/$(python_get_sitedir)" - - if use tutorials ; then - insinto "/usr/share/${P}" - doins -r Tutorials - fi -} diff --git a/sci-physics/SU2/files/SU2-7.0.8-fix-env.patch b/sci-physics/SU2/files/SU2-7.0.8-fix-env.patch deleted file mode 100644 index baf7955d00..0000000000 --- a/sci-physics/SU2/files/SU2-7.0.8-fix-env.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur old_env/UnitTests/meson.build new_env/UnitTests/meson.build ---- old_env/UnitTests/meson.build 2020-06-15 17:03:43.000000000 +0300 -+++ new_env/UnitTests/meson.build 2020-06-15 17:04:35.000000000 +0300 -@@ -26,7 +26,7 @@ - test_driver = executable( - 'test_driver', - unit_test_files, -- install : true, -+ install : false, - dependencies : [su2_cfd_dep, common_dep, su2_deps, catch2_dep], - cpp_args: ['-fPIC', default_warning_flags, su2_cpp_args] - ) From 33a251e2414eec93a3738a583f83183a7d03a8b4 Mon Sep 17 00:00:00 2001 From: Aisha Tammy Date: Wed, 10 Mar 2021 23:17:21 -0500 Subject: [PATCH 10/14] gui-libs/libcprime: add live ebuild moves to using cmake Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Aisha Tammy --- gui-libs/libcprime/libcprime-9999.ebuild | 35 ++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 gui-libs/libcprime/libcprime-9999.ebuild diff --git a/gui-libs/libcprime/libcprime-9999.ebuild b/gui-libs/libcprime/libcprime-9999.ebuild new file mode 100644 index 0000000000..46af395d64 --- /dev/null +++ b/gui-libs/libcprime/libcprime-9999.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Library for managing settings of CoreApps" +HOMEPAGE="https://gitlab.com/cubocore/libcprime" + +if [[ "${PV}" == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/cubocore/libcprime.git" +else + SRC_URI="https://gitlab.com/cubocore/libcprime/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/${PN}-v${PV}" +fi + +LICENSE="GPL-3" +SLOT="0" + +QTMIN="5.15.1" + +DEPEND=" + x11-libs/libnotify + >=dev-qt/qtcore-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 +" +RDEPEND=" + ${DEPEND} +" From 8aad2ca5fae7c763bcbdfd1611d2bba157f3c2bd Mon Sep 17 00:00:00 2001 From: Aisha Tammy Date: Wed, 10 Mar 2021 23:22:02 -0500 Subject: [PATCH 11/14] gui-libs/libcsys: move live ebuild to cmake Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Aisha Tammy --- gui-libs/libcsys/libcsys-9999.ebuild | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/gui-libs/libcsys/libcsys-9999.ebuild b/gui-libs/libcsys/libcsys-9999.ebuild index 8a61858340..ae8b937118 100644 --- a/gui-libs/libcsys/libcsys-9999.ebuild +++ b/gui-libs/libcsys/libcsys-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 QTMIN="5.15.1" -inherit multilib qmake-utils +inherit cmake DESCRIPTION="Library for managing the device" HOMEPAGE="https://gitlab.com/cubocore/libcsys" @@ -19,10 +19,8 @@ else S="${WORKDIR}/${PN}-v${PV}" fi -RESTRICT="test" LICENSE="GPL-3" SLOT="0" -IUSE="udisks" DEPEND=" >=dev-qt/qtcore-${QTMIN}:5 @@ -31,22 +29,5 @@ DEPEND=" " RDEPEND=" ${DEPEND} - udisks? ( - sys-fs/udisks:2 - ) + sys-fs/udisks:2 " - -PATCHES=( - "${FILESDIR}/${PN}-lib.patch" -) - -src_configure() { - local lib="$(get_libdir)" - # '^^' because we need to upcase the definition - eqmake5 DEFINES+="${lib^^}" -} - -src_install() { - einstalldocs - emake INSTALL_ROOT="${D}" install -} From 41b505beb2afd78bf5c271a447a4e195d431ca49 Mon Sep 17 00:00:00 2001 From: Aisha Tammy Date: Wed, 10 Mar 2021 23:36:40 -0500 Subject: [PATCH 12/14] gui-apps/paperdesktop: move live ebuild to cmake also add dated ebuild Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Aisha Tammy --- gui-apps/paperdesktop/Manifest | 1 + .../paperdesktop-0_p20210310.ebuild | 53 +++++++++++++++++++ .../paperdesktop/paperdesktop-9999.ebuild | 39 ++++++-------- 3 files changed, 70 insertions(+), 23 deletions(-) create mode 100644 gui-apps/paperdesktop/paperdesktop-0_p20210310.ebuild diff --git a/gui-apps/paperdesktop/Manifest b/gui-apps/paperdesktop/Manifest index 423304b588..05351da25d 100644 --- a/gui-apps/paperdesktop/Manifest +++ b/gui-apps/paperdesktop/Manifest @@ -1 +1,2 @@ DIST paperdesktop-0_p20201107.tar.gz 200672 BLAKE2B d2c7807cd23294521ada75bfbae2f841e72a399a8bfc94e2f507c15eeda00d5fef90826225ae3d531d0b33f82ce2e0aa06b5081778e8354e87ccea30daf310c6 SHA512 940f0aba34fc8d03a3dc716ca921991ce3aa22eb0afcb601c23f3dd8ada2f15e22c5f0dbc83e58c003a3c43a0955e0b3634824d34fea1b2ce97bc3c2dfd28475 +DIST paperdesktop-0_p20210310.tar.gz 2239536 BLAKE2B c1b5c296d36db9687e8e106d2608da057238e91c607443d4cb28725fc90b6c35e2ae14d178ad79be525d6262574a2d0f0b54ee71f3de02de25d3a3aa31465b03 SHA512 77f26cb61e9cd2d02eb7dfe2eab12d17a10d96007bc8d4dda8b30e9327d3036c9ad3341268df2f5151ed48e96a9facc4d66abc7ae10dcd04e284a20b3e29cea9 diff --git a/gui-apps/paperdesktop/paperdesktop-0_p20210310.ebuild b/gui-apps/paperdesktop/paperdesktop-0_p20210310.ebuild new file mode 100644 index 0000000000..e802fe3d04 --- /dev/null +++ b/gui-apps/paperdesktop/paperdesktop-0_p20210310.ebuild @@ -0,0 +1,53 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg + +DESCRIPTION="Simple, sleek QT based DE for wayland using wayfire" + +HOMEPAGE="https://gitlab.com/cubocore/paper/paperdesktop" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/cubocore/paper/paperdesktop" +else + COMMIT=65c755306688203ddc32bbc099ba1de03166cde9 + SRC_URI="https://gitlab.com/cubocore/paper/paperdesktop/-/archive/${COMMIT}/paperdesktop-${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}"/paperdesktop-${COMMIT} + KEYWORDS="~amd64" +fi + +LICENSE="GPL-3" +SLOT="0" + +DEPEND=" + dev-libs/libdbusmenu-qt + dev-libs/wayland + dev-qt/designer:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5[wayland,X] + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5[X] + dev-qt/qtsvg:5 + gui-libs/libcprime + gui-libs/libcsys +" +RDEPEND="${DEPEND} + gui-wm/wayfire[X] + x11-misc/qt5ct +" + +src_prepare() { + cmake_src_prepare + xdg_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DPKGSHAREDPATH="${EPREFIX}/usr/share/paperde" + -DPKGCONFPATH="${EPREFIX}/etc/xdg/paperde" + ) + cmake_src_configure +} diff --git a/gui-apps/paperdesktop/paperdesktop-9999.ebuild b/gui-apps/paperdesktop/paperdesktop-9999.ebuild index ee7ec14c53..e802fe3d04 100644 --- a/gui-apps/paperdesktop/paperdesktop-9999.ebuild +++ b/gui-apps/paperdesktop/paperdesktop-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit qmake-utils +inherit cmake xdg -DESCRIPTION="simple, sleek QT based DE for wayland using wayfire" +DESCRIPTION="Simple, sleek QT based DE for wayland using wayfire" HOMEPAGE="https://gitlab.com/cubocore/paper/paperdesktop" @@ -13,10 +13,10 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/cubocore/paper/paperdesktop" else - COMMIT=960ff1e31a48e96e10afa0459183e52fbea8f2de + COMMIT=65c755306688203ddc32bbc099ba1de03166cde9 SRC_URI="https://gitlab.com/cubocore/paper/paperdesktop/-/archive/${COMMIT}/paperdesktop-${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/paperdesktop-${COMMIT} - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64" fi LICENSE="GPL-3" @@ -25,36 +25,29 @@ SLOT="0" DEPEND=" dev-libs/libdbusmenu-qt dev-libs/wayland + dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5[wayland,X] dev-qt/qtnetwork:5 dev-qt/qtwidgets:5[X] dev-qt/qtsvg:5 + gui-libs/libcprime + gui-libs/libcsys " RDEPEND="${DEPEND} gui-wm/wayfire[X] x11-misc/qt5ct " -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( "${FILESDIR}"/${PN}-0_p20201107-build.patch ) src_prepare() { - default - sed -e "s:/lib/:/$(get_libdir)/:" \ - -i libpaperdesktop/core/core.pro \ - -i libpaperdesktop/gui/gui.pro \ - -i libpapershell-wl/libpapershell-wl.pro \ - -i libpaperprime/libpaperprime.pro || die + cmake_src_prepare + xdg_src_prepare } -src_compile() { - eqmake5 paperdesktop.pro - emake -} - -src_install() { - emake INSTALL_ROOT="${ED}" install +src_configure() { + local mycmakeargs=( + -DPKGSHAREDPATH="${EPREFIX}/usr/share/paperde" + -DPKGCONFPATH="${EPREFIX}/etc/xdg/paperde" + ) + cmake_src_configure } From 3c234d9a445005beeb577dd21bf0154ef955d935 Mon Sep 17 00:00:00 2001 From: Aisha Tammy Date: Wed, 10 Mar 2021 23:36:56 -0500 Subject: [PATCH 13/14] gui-apps/paperdesktop: drop old version Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Aisha Tammy --- gui-apps/paperdesktop/Manifest | 1 - .../paperdesktop-0_p20201107.ebuild | 60 ------------------- 2 files changed, 61 deletions(-) delete mode 100644 gui-apps/paperdesktop/paperdesktop-0_p20201107.ebuild diff --git a/gui-apps/paperdesktop/Manifest b/gui-apps/paperdesktop/Manifest index 05351da25d..126361b8f6 100644 --- a/gui-apps/paperdesktop/Manifest +++ b/gui-apps/paperdesktop/Manifest @@ -1,2 +1 @@ -DIST paperdesktop-0_p20201107.tar.gz 200672 BLAKE2B d2c7807cd23294521ada75bfbae2f841e72a399a8bfc94e2f507c15eeda00d5fef90826225ae3d531d0b33f82ce2e0aa06b5081778e8354e87ccea30daf310c6 SHA512 940f0aba34fc8d03a3dc716ca921991ce3aa22eb0afcb601c23f3dd8ada2f15e22c5f0dbc83e58c003a3c43a0955e0b3634824d34fea1b2ce97bc3c2dfd28475 DIST paperdesktop-0_p20210310.tar.gz 2239536 BLAKE2B c1b5c296d36db9687e8e106d2608da057238e91c607443d4cb28725fc90b6c35e2ae14d178ad79be525d6262574a2d0f0b54ee71f3de02de25d3a3aa31465b03 SHA512 77f26cb61e9cd2d02eb7dfe2eab12d17a10d96007bc8d4dda8b30e9327d3036c9ad3341268df2f5151ed48e96a9facc4d66abc7ae10dcd04e284a20b3e29cea9 diff --git a/gui-apps/paperdesktop/paperdesktop-0_p20201107.ebuild b/gui-apps/paperdesktop/paperdesktop-0_p20201107.ebuild deleted file mode 100644 index ee7ec14c53..0000000000 --- a/gui-apps/paperdesktop/paperdesktop-0_p20201107.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils - -DESCRIPTION="simple, sleek QT based DE for wayland using wayfire" - -HOMEPAGE="https://gitlab.com/cubocore/paper/paperdesktop" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/cubocore/paper/paperdesktop" -else - COMMIT=960ff1e31a48e96e10afa0459183e52fbea8f2de - SRC_URI="https://gitlab.com/cubocore/paper/paperdesktop/-/archive/${COMMIT}/paperdesktop-${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}"/paperdesktop-${COMMIT} - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" - -DEPEND=" - dev-libs/libdbusmenu-qt - dev-libs/wayland - dev-qt/qtcore:5 - dev-qt/qtgui:5[wayland,X] - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5[X] - dev-qt/qtsvg:5 -" -RDEPEND="${DEPEND} - gui-wm/wayfire[X] - x11-misc/qt5ct -" -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( "${FILESDIR}"/${PN}-0_p20201107-build.patch ) - -src_prepare() { - default - sed -e "s:/lib/:/$(get_libdir)/:" \ - -i libpaperdesktop/core/core.pro \ - -i libpaperdesktop/gui/gui.pro \ - -i libpapershell-wl/libpapershell-wl.pro \ - -i libpaperprime/libpaperprime.pro || die -} - -src_compile() { - eqmake5 paperdesktop.pro - emake -} - -src_install() { - emake INSTALL_ROOT="${ED}" install -} From f36c78d57cd71f9b35285ac37506675ac8bf9a88 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Thu, 11 Mar 2021 10:03:11 +0100 Subject: [PATCH 14/14] =?UTF-8?q?media-fonts/unscii:=20pelulamu.net=20?= =?UTF-8?q?=E2=86=92=20viznut.fi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is also mirrored at http://low.fi/~pelulamu/unscii/ Closes: https://bugs.gentoo.org/775173 Signed-off-by: Haelwenn (lanodan) Monnier --- media-fonts/unscii/unscii-2.0.ebuild | 4 ++-- media-fonts/unscii/unscii-2.1.ebuild | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/media-fonts/unscii/unscii-2.0.ebuild b/media-fonts/unscii/unscii-2.0.ebuild index 0dcab14755..1d3703a450 100644 --- a/media-fonts/unscii/unscii-2.0.ebuild +++ b/media-fonts/unscii/unscii-2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ FONT_SUFFIX="otf pcf ttf" inherit toolchain-funcs font DESCRIPTION="Set of bitmapped Unicode fonts based on classic system fonts" -HOMEPAGE="http://pelulamu.net/${PN}/" +HOMEPAGE="http://viznut.fi/${PN}/" SRC_URI="${HOMEPAGE}${P}-src.tar.gz" LICENSE=" diff --git a/media-fonts/unscii/unscii-2.1.ebuild b/media-fonts/unscii/unscii-2.1.ebuild index 6b699616b5..5acbfb6c6c 100644 --- a/media-fonts/unscii/unscii-2.1.ebuild +++ b/media-fonts/unscii/unscii-2.1.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 @@ -8,8 +8,8 @@ FONT_SUFFIX="otf pcf ttf" inherit toolchain-funcs font DESCRIPTION="Set of bitmapped Unicode fonts based on classic system fonts" -HOMEPAGE="http://pelulamu.net/${PN}/" -SRC_URI="http://pelulamu.net/unscii/${P}-src.tar.gz -> ${P}.tar.gz" +HOMEPAGE="http://viznut.fi/${PN}/" +SRC_URI="http://viznut.fi/unscii/${P}-src.tar.gz -> ${P}.tar.gz" LICENSE=" public-domain