From 59d04db01b67f38d3af1f550f74452f8e2a94e3d Mon Sep 17 00:00:00 2001 From: layman Date: Mon, 7 Feb 2022 17:07:41 +0100 Subject: [PATCH] Updates --- dev-embedded/stlink/Manifest | 2 + dev-embedded/stlink/metadata.xml | 8 ++ dev-embedded/stlink/stlink-9999.ebuild | 36 +++++++++ dev-python/kikit/Manifest | 2 +- dev-python/kikit/kikit-9999.ebuild | 2 +- media-gfx/openscad/Manifest | 3 +- ...nscad-9999-0001-fix-to-find-lib3mf-2.patch | 17 ---- media-gfx/openscad/openscad-9999.ebuild | 9 +-- sci-electronics/pulseview/Manifest | 3 - .../files/pulseview-0.4.2-glib-2.68.patch | 25 ------ sci-electronics/pulseview/metadata.xml | 11 --- .../pulseview/pulseview-9999.ebuild | 78 ------------------- sci-mathematics/cgal/Manifest | 4 + sci-mathematics/cgal/cgal-5.3.1.ebuild | 77 ++++++++++++++++++ .../files/cgal-4.11.1-fix-buildsystem.patch | 15 ++++ 15 files changed, 146 insertions(+), 146 deletions(-) create mode 100644 dev-embedded/stlink/Manifest create mode 100644 dev-embedded/stlink/metadata.xml create mode 100644 dev-embedded/stlink/stlink-9999.ebuild delete mode 100644 media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch delete mode 100644 sci-electronics/pulseview/Manifest delete mode 100644 sci-electronics/pulseview/files/pulseview-0.4.2-glib-2.68.patch delete mode 100644 sci-electronics/pulseview/metadata.xml delete mode 100644 sci-electronics/pulseview/pulseview-9999.ebuild create mode 100644 sci-mathematics/cgal/Manifest create mode 100644 sci-mathematics/cgal/cgal-5.3.1.ebuild create mode 100644 sci-mathematics/cgal/files/cgal-4.11.1-fix-buildsystem.patch diff --git a/dev-embedded/stlink/Manifest b/dev-embedded/stlink/Manifest new file mode 100644 index 0000000..f7aa689 --- /dev/null +++ b/dev-embedded/stlink/Manifest @@ -0,0 +1,2 @@ +EBUILD stlink-9999.ebuild 835 BLAKE2B 35bcb3ca6902eaee5955c1181e1a59ce5c610441398e7ee08225ebdb14ab103e060d7a68210e6ad888cc1beda4878e6cca7d73e210a5aae2399da9f5dc2c00e0 SHA512 d7b805cb0fdcd6fe52d2cc02f46119cb4b74ff8a30f14e4f6f785ffa05b944cbaead3b6a39a822dd603d295378070f57f24b74c75072122191f4ee798695bd9e +MISC metadata.xml 249 BLAKE2B 0d8c6b8e9873180a796f77c5194270389ae642d0d888d7fa1bbada89861dc1ba1bd9f238acd76f7a07a3eb694ac8bdb19927012814a03ed8d3e87f40676979d1 SHA512 1ac8ddbe837cb8db85bb6e4ee59a6e98554c04231c54cb5158fbe7dda3230aaeb02ab66ff374f5bb348e84159588b0740c43acd99ed590939db70bbd2f15d265 diff --git a/dev-embedded/stlink/metadata.xml b/dev-embedded/stlink/metadata.xml new file mode 100644 index 0000000..34f42ec --- /dev/null +++ b/dev-embedded/stlink/metadata.xml @@ -0,0 +1,8 @@ + + + + + alexxy@gentoo.org + Alexey Shvetsov + + diff --git a/dev-embedded/stlink/stlink-9999.ebuild b/dev-embedded/stlink/stlink-9999.ebuild new file mode 100644 index 0000000..341b5f4 --- /dev/null +++ b/dev-embedded/stlink/stlink-9999.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit udev xdg cmake + +DESCRIPTION="stm32 discovery line linux programmer" +HOMEPAGE="https://github.com/stlink-org/stlink" +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/stlink-org/stlink.git" + inherit git-r3 +else + SRC_URI="https://github.com/stlink-org/stlink/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="BSD" +SLOT="0" + +RDEPEND="virtual/libusb:1 + >=dev-libs/glib-2.32.0:2 + x11-libs/gtk+:3" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_configure() { + local mycmakeargs=( + -DSTLINK_UDEV_RULES_DIR="$(get_udevdir)"/rules.d + -DSTLINK_MODPROBED_DIR="${EPREFIX}/etc/modprobe.d" + -DSTLINK_STATIC_LIB=OFF + -DLIB_INSTALL_DIR:PATH="$(get_libdir)" + ) + + cmake_src_configure +} diff --git a/dev-python/kikit/Manifest b/dev-python/kikit/Manifest index 89a8d6a..055d098 100644 --- a/dev-python/kikit/Manifest +++ b/dev-python/kikit/Manifest @@ -1 +1 @@ -EBUILD kikit-9999.ebuild 1083 BLAKE2B 8195e47d5fb1ffeac2775eaa43e415be36a2de71e3c36564397316903c3710d26f9247a31fa862091d534e54d5d29310b4521f9f73608c0d3cd9f9fe3eeb3764 SHA512 593d03c9f7ab62afd602d982c6382e0da59cfd9348851010374bdff41f855afdc0dff931b1c28e02cb822386b8f99b0a130acd2fcade7aae17465ececff6de8c +EBUILD kikit-9999.ebuild 1086 BLAKE2B 7c7272bb0a0a95f6b5a73503e17b86b3f3883f5115b28b1835666e0cf4c797d215e7f0bf7d5a9bc6f4b8204ff7963200d874ec7c735b2d2496883084a6a82cb1 SHA512 39ab45fd5d3c556be560cd9a5687c3b889239a8db00a9ee01a07e55cc60afe281d0e6dc24748eca1d93bd90f4fb3ab44406914162a23f4fc6b673bcc169d86ef diff --git a/dev-python/kikit/kikit-9999.ebuild b/dev-python/kikit/kikit-9999.ebuild index 159828d..95559d4 100644 --- a/dev-python/kikit/kikit-9999.ebuild +++ b/dev-python/kikit/kikit-9999.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7,8,9,10} ) DISTUTILS_USE_SETUPTOOLS=rdepend MY_PN="KiKit" diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest index 753347c..47b1522 100644 --- a/media-gfx/openscad/Manifest +++ b/media-gfx/openscad/Manifest @@ -1,3 +1,2 @@ -AUX openscad-9999-0001-fix-to-find-lib3mf-2.patch 766 BLAKE2B 00f9dd15b1245631e38510c225bccdafa33dc76825b0f329b4c6697daf6e4d6c0934f19ecc4c003a0174d16bf7102a8b0f45c768d502353a2ca6521a3f247d3e SHA512 362732d790ba887e3ccd9f46993e592d5bb46f236ac27b437d789c32958ffce7b96086d4aa0c5c7187e2f2e672c0906f03a57ffc248a7460d21a1bec17ffaa9d -EBUILD openscad-9999.ebuild 2640 BLAKE2B 942028762b2519d0a70d2c4a8feb1495da864a8c04e9574efc85c5240878b48eadb0e3baaa30a9ecfde39257eb28bb113270d1b73d9a50640305e584ff6ee3d0 SHA512 d707c6fc2446279b747d816fa24254805c579d262c01c1666e39ebe24beaa058f2f74b8e2059a4040da77b53ccbae6c69e7e187122bf983fc2d92429f0643636 +EBUILD openscad-9999.ebuild 2489 BLAKE2B e073d8eecb56895c3886177abd346cf19d6215462dd0a6a15a5b9b1adddee17853fa2b808c6e8f03908647bf518e3bd7a77a5f69cd640cb8c701c894594e0764 SHA512 751617f4f6b1164cc1cb42f61665a6f10c47f18e8693b6451e9ea87cf45ee25d26892ac2c72321c234a943befe0e707f5cc7d08535461e478c3c392d28ce9e77 MISC metadata.xml 1348 BLAKE2B b15a74a20ef94a6a47de57826c5279a4e8c388a52bf9d1058a1ba0b347fcd77e0c8b79a42515f5411d0991fb8fb71c604f792dd2a2addaaca78bc85dbfc7a611 SHA512 fea109a00324f0bdcaae855e18fba456a449bb8192e633cfd5806fa1040fe3bba24f75493e0012d54afe8828073fc4d02ae01533b45648e05c575777b23572d1 diff --git a/media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch b/media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch deleted file mode 100644 index c108620..0000000 --- a/media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -urN openscad-9999.orig/cmake/Modules/FindLib3MF.cmake openscad-9999/cmake/Modules/FindLib3MF.cmake ---- openscad-9999.orig/cmake/Modules/FindLib3MF.cmake 2021-10-11 10:49:12.257231123 +0200 -+++ openscad-9999/cmake/Modules/FindLib3MF.cmake 2021-10-11 10:50:22.037900144 +0200 -@@ -14,11 +14,11 @@ - # Travis CI Ubuntu Trusty environment has some issue with pkg-config - # not finding the version. - find_package(PkgConfig REQUIRED QUIET) --pkg_check_modules(PC_LIB3MF lib3MF) -+pkg_check_modules(PC_LIB3MF lib3mf) - set(LIB3MF_VERSION ${PC_LIB3MF_VERSION}) - - find_path(LIB3MF_INCLUDE_DIRS -- NAMES Model/COM/NMR_DLLInterfaces.h -+ NAMES lib3mf_implicit.hpp - HINTS $ENV{LIB3MF_INCLUDEDIR} - ${PC_LIB3MF_INCLUDEDIR} - ${PC_LIB3MF_INCLUDE_DIRS} diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild index d615e98..d67534a 100644 --- a/media-gfx/openscad/openscad-9999.ebuild +++ b/media-gfx/openscad/openscad-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake elisp-common git-r3 xdg @@ -71,13 +71,6 @@ DOCS=( doc/testing.txt ) -src_prepare() { -# if has_version ">=media-libs/lib3mf-2"; then -# eapply "${FILESDIR}/${P}-0001-fix-to-find-lib3mf-2.patch" -# fi - cmake_src_prepare -} - src_configure() { local mycmakeargs=( -DCLANG_TIDY=OFF diff --git a/sci-electronics/pulseview/Manifest b/sci-electronics/pulseview/Manifest deleted file mode 100644 index 1045aaf..0000000 --- a/sci-electronics/pulseview/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -AUX pulseview-0.4.2-glib-2.68.patch 579 BLAKE2B 1feab8b80bbfd158bc445fe32e72327451791e461a4f85129f125cb3fb3d247f581a54c517f9b26c6493d4536e412c245805583a998fb44d3ee6f43904c34888 SHA512 a8fccfe78c6ba09687db9b26bdb7c28ba8912098d7b4b41c62afdcc312462159bfe6f5f6055171f0e38fb96c64ad09dce66ed509286bc268bd785f8025ff7403 -EBUILD pulseview-9999.ebuild 1456 BLAKE2B 80df68e3e2f56eae0ea47ea03138d55e0e0c6cb47a38e4f7c94612d36daf7abcf416b7cc375c02af5dd9f8ed198b9cc76191b3571bebe5fa1e06178708f51783 SHA512 1b899dfade2842baedefb94ac64a8d8fe35dc9bcdcb088313666b17a7e66366a28941b036a7a5d8585ce07dbb7fb36096df37b587a082e83f40ca1a92007efc2 -MISC metadata.xml 333 BLAKE2B b4981e29ae436b82875daf955c31085e4bade0ce53b9de677c68f4fed6ef63cd8610ae995989eb659f1d205a072d3f87c8aac02b422b3e30a3baac9eda92dfa2 SHA512 f7f0484072e7c2486a176c29814d7a390d8e44d01593d75ed51231e5c67e7226e576da17410da01281b16ed31361c1724e60026d7df06b580e29901a3f89d2dd diff --git a/sci-electronics/pulseview/files/pulseview-0.4.2-glib-2.68.patch b/sci-electronics/pulseview/files/pulseview-0.4.2-glib-2.68.patch deleted file mode 100644 index 1353f63..0000000 --- a/sci-electronics/pulseview/files/pulseview-0.4.2-glib-2.68.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://bugs.gentoo.org/777660 ---- a/pv/data/decode/annotation.cpp -+++ b/pv/data/decode/annotation.cpp -@@ -17,9 +17,7 @@ - * along with this program; if not, see . - */ - --extern "C" { - #include --} - - #include - #include ---- a/pv/views/trace/decodetrace.cpp -+++ b/pv/views/trace/decodetrace.cpp -@@ -17,9 +17,7 @@ - * along with this program; if not, see . - */ - --extern "C" { - #include --} - - #include - #include diff --git a/sci-electronics/pulseview/metadata.xml b/sci-electronics/pulseview/metadata.xml deleted file mode 100644 index ab921d7..0000000 --- a/sci-electronics/pulseview/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - embedded@gentoo.org - Embedded Gentoo - - - Enable decoding of protocols while capturing - - diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild b/sci-electronics/pulseview/pulseview-9999.ebuild deleted file mode 100644 index 36c61f9..0000000 --- a/sci-electronics/pulseview/pulseview-9999.ebuild +++ /dev/null @@ -1,78 +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 cmake python-single-r1 xdg-utils - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="git://sigrok.org/${PN}" - inherit git-r3 -else - SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Qt based logic analyzer GUI for sigrok" -HOMEPAGE="https://sigrok.org/wiki/PulseView" - -LICENSE="GPL-3" -SLOT="0" -IUSE="+decode static" -REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" -RDEPEND=" - >=dev-cpp/glibmm-2.28.0:2 - >=dev-libs/boost-1.55:= - >=dev-libs/glib-2.28.0:2 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - >=sci-libs/libsigrok-0.6.0:=[cxx] - decode? ( - ${PYTHON_DEPS} - >=sci-libs/libsigrokdecode-0.6.0:=[${PYTHON_SINGLE_USEDEP}] - ) -" -DEPEND="${RDEPEND}" - -DOCS=( HACKING NEWS README ) - -#PATCHES=( -# "${FILESDIR}"/${PN}-0.4.2-glib-2.68.patch -#) - -pkg_setup() { - use decode && python_setup -} - -src_prepare() { - cmake_src_prepare - cmake_comment_add_subdirectory manual -} - -src_configure() { - local mycmakeargs=( - -DDISABLE_WERROR=TRUE - -DENABLE_DECODE=$(usex decode) - -DSTATIC_PKGDEPS_LIBS=$(usex static) - ) - cmake_src_configure -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest new file mode 100644 index 0000000..32531c2 --- /dev/null +++ b/sci-mathematics/cgal/Manifest @@ -0,0 +1,4 @@ +AUX cgal-4.11.1-fix-buildsystem.patch 840 BLAKE2B e1179b2721e52b2edf305e2cb434a914f0b46b6aa694fd1766a8622b65ed8e8209a06bc134bfab97f07b789af45f74605fc7ed2b6c45ed5f5574a0a801c479dd SHA512 5e6315dfa64c58ea88d473b3513ec0817e6d212c325dd70b523d2dca2817fed2cdb0791686b7353c410e42ff8b1ee228a045bd6f002b591672066b33ce6f09ad +DIST CGAL-5.3.1-doc_html.tar.xz 49574000 BLAKE2B 66b098b5fc190468ca9be2892ed57695a3c62b02e2168c7791bcaefa3b51a61f260109658d0ba374f2d253b07cbdb015876b1b1c23df4753cebcee027d0cc663 SHA512 792b8d7652b3dc33f922812b28a4a5ce55647f3a7661fc62ef0420f80e1f82971235ef69b74996eac260ec12d6e893acc40b06c27ecce7ad7c63a46f8e52799a +DIST CGAL-5.3.1.tar.xz 23295932 BLAKE2B f97dec0e634e3284779db9229612049a4934a643d8194fa510f167460d64bb2dfa7c8cc09d5193a96550de64c81e04f7649886687df331f252b30140c0251692 SHA512 f51f0ce574fb654ee1358f0d864365c795965eb2e2961dd1216483e53f0fad5eca414437ec38ee4ca144b92da363cbd0138a79f3f023d2308640d1708fe4d7d6 +EBUILD cgal-5.3.1.ebuild 1696 BLAKE2B bc92a6f33cb9fdfa12adadf9205ef6861a3ad9bbd71e5e1b392aefe10a93c8857320df5e31d756eb99aeb8996d4769f16fda1bd29dc53df665cf6837fa5fded1 SHA512 d1023cc35bdff8ad375de67d844de5052c23ab581089ee1929b1483ab237b7d58d59717a6c2cc84cdf2f3ab0e5c0d5052af21462c749abaab7d115f077374c6c diff --git a/sci-mathematics/cgal/cgal-5.3.1.ebuild b/sci-mathematics/cgal/cgal-5.3.1.ebuild new file mode 100644 index 0000000..599cffa --- /dev/null +++ b/sci-mathematics/cgal/cgal-5.3.1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +MY_P=CGAL-${PV} +DESCRIPTION="C++ library for geometric algorithms and data structures" +HOMEPAGE="https://www.cgal.org/" +SRC_URI=" + https://github.com/CGAL/cgal/releases/download/v${PV}/${MY_P}.tar.xz + doc? ( https://github.com/CGAL/cgal/releases/download/v${PV}/${MY_P}-doc_html.tar.xz )" +S="${WORKDIR}/${MY_P}" + +LICENSE="LGPL-3 GPL-3 Boost-1.0" +SLOT="0/14" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc examples +gmp mpfi ntl qt5 shared" + +RDEPEND=" + dev-cpp/eigen + dev-libs/boost:=[threads(+)] + dev-libs/mpfr:= + sys-libs/zlib + x11-libs/libX11:= + virtual/glu:= + virtual/opengl:= + gmp? ( dev-libs/gmp:=[cxx] ) + mpfi? ( sci-libs/mpfi ) + ntl? ( dev-libs/ntl ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}"/${PN}-4.11.1-fix-buildsystem.patch ) + +src_prepare() { + cmake_src_prepare + # modules provided by dev-cpp/eigen + rm cmake/modules/FindEigen3.cmake || die +} + +src_configure() { + local mycmakeargs=( + -DCGAL_INSTALL_LIB_DIR="$(get_libdir)" + -DCGAL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/CGAL" + -DCGAL_HEADER_ONLY=$(usex shared OFF ON) + -DWITH_LEDA=OFF + -DWITH_Eigen3=ON + -DWITH_ZLIB=ON + -DWITH_GMP=$(usex gmp) + -DWITH_GMPXX=$(usex gmp) + -DWITH_MPFI=$(usex mpfi) + -DWITH_NTL=$(usex ntl) + -DWITH_CGAL_Qt5=$(usex qt5) + ) + cmake_src_configure +} + +src_install() { + use doc && local HTML_DOCS=( "${WORKDIR}"/doc_html/. ) + cmake_src_install + if use examples; then + dodoc -r examples demo + fi +} diff --git a/sci-mathematics/cgal/files/cgal-4.11.1-fix-buildsystem.patch b/sci-mathematics/cgal/files/cgal-4.11.1-fix-buildsystem.patch new file mode 100644 index 0000000..e6c9cd9 --- /dev/null +++ b/sci-mathematics/cgal/files/cgal-4.11.1-fix-buildsystem.patch @@ -0,0 +1,15 @@ +diff -urEbwB CGAL-4.11.1/cmake/modules/CGAL_SetupFlags.cmake CGAL-4.11.1.new/cmake/modules/CGAL_SetupFlags.cmake +--- CGAL-4.11.1/cmake/modules/CGAL_SetupFlags.cmake 2018-02-24 21:00:36.000000000 +0100 ++++ CGAL-4.11.1.new/cmake/modules/CGAL_SetupFlags.cmake 2018-03-05 12:13:47.233411449 +0100 +@@ -61,11 +61,6 @@ + add_definitions(-DCGAL_TEST_SUITE) + endif() + +-if ( NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" +- AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "MinSizeRel" ) +- message( FATAL_ERROR "${CMAKE_BUILD_TYPE} is not a valid build type: only Release, Debug, RelWithDebInfo or MinSizeRel is allowed" ) +-endif() +- + message( STATUS "Build type: ${CMAKE_BUILD_TYPE}" ) + + string( TOUPPER "${CMAKE_BUILD_TYPE}" CGAL_BUILD_TYPE_UPPER )