Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: media-gfx/netgen/files/, media-gfx/netgen/
Date: Fri, 30 Dec 2022 10:53:14
Message-Id: 1672397345.4e2d42e618ade8e4d1f5043e4f3fe55343912711.andrewammerlaan@gentoo
1 commit: 4e2d42e618ade8e4d1f5043e4f3fe55343912711
2 Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
3 AuthorDate: Tue Dec 13 06:19:25 2022 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 30 10:49:05 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=4e2d42e6
7
8 media-gfx/netgen: drop 6.2.2105
9
10 Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
11 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
12
13 .../netgen/files/netgen-6.2.2105-find-tk.patch | 35 -------
14 media-gfx/netgen/netgen-6.2.2105.ebuild | 102 ---------------------
15 2 files changed, 137 deletions(-)
16
17 diff --git a/media-gfx/netgen/files/netgen-6.2.2105-find-tk.patch b/media-gfx/netgen/files/netgen-6.2.2105-find-tk.patch
18 deleted file mode 100644
19 index c638d83a7..000000000
20 --- a/media-gfx/netgen/files/netgen-6.2.2105-find-tk.patch
21 +++ /dev/null
22 @@ -1,35 +0,0 @@
23 -diff --git a/CMakeLists.txt b/CMakeLists.txt
24 -index dcc24af..24f444e 100644
25 ---- a/CMakeLists.txt
26 -+++ b/CMakeLists.txt
27 -@@ -246,7 +246,8 @@ if (USE_GUI)
28 -
29 - add_definitions(-DTCL -DOPENGL -DUSE_TOGL_2)
30 - include_directories(${TCL_INCLUDE_PATH})
31 -- include_directories(${TK_INCLUDE_PATH})
32 -+ include_directories(${TK_INCLUDE_PATH}/generic)
33 -+ include_directories(${TK_INCLUDE_PATH}/unix)
34 - set(LIBTOGL togl)
35 -
36 - if(WIN32)
37 -@@ -268,7 +269,7 @@ else()
38 - endif()
39 -
40 - if (USE_PYTHON)
41 -- add_subdirectory(external_dependencies/pybind11)
42 -+ find_package(pybind11)
43 - find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h HINTS ${PYTHON_INCLUDE_DIR})
44 - if( PYBIND_INCLUDE_DIR )
45 - message(STATUS "Found Pybind11: ${PYBIND_INCLUDE_DIR}")
46 -diff --git a/cmake/SuperBuild.cmake b/cmake/SuperBuild.cmake
47 -index c24b631..2354a09 100644
48 ---- a/cmake/SuperBuild.cmake
49 -+++ b/cmake/SuperBuild.cmake
50 -@@ -39,7 +39,6 @@ endif(NOT WIN32)
51 - #######################################################################
52 - if (USE_PYTHON)
53 - find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h PATHS ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies/pybind11/include NO_DEFAULT_PATH)
54 -- set(NG_INSTALL_PYBIND ON)
55 - if( NOT PYBIND_INCLUDE_DIR )
56 - # if the pybind submodule is missing, try to initialize and update all submodules
57 - execute_process(COMMAND git submodule update --init --recursive WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
58
59 diff --git a/media-gfx/netgen/netgen-6.2.2105.ebuild b/media-gfx/netgen/netgen-6.2.2105.ebuild
60 deleted file mode 100644
61 index ed85bcb69..000000000
62 --- a/media-gfx/netgen/netgen-6.2.2105.ebuild
63 +++ /dev/null
64 @@ -1,102 +0,0 @@
65 -# Copyright 1999-2022 Gentoo Authors
66 -# Distributed under the terms of the GNU General Public License v2
67 -
68 -EAPI=8
69 -
70 -PYTHON_COMPAT=( python3_{8..10} )
71 -inherit cmake desktop python-single-r1 xdg
72 -
73 -DESCRIPTION="Automatic 3d tetrahedral mesh generator"
74 -HOMEPAGE="https://ngsolve.org/ https://github.com/NGSolve/netgen"
75 -SRC_URI="https://github.com/NGSolve/netgen/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
76 -
77 -SLOT="0"
78 -LICENSE="LGPL-2.1"
79 -KEYWORDS="~amd64 ~x86"
80 -
81 -IUSE="ffmpeg jpeg mpi opencascade openmp python +gui"
82 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
83 -
84 -DEPEND="
85 - dev-lang/tcl:0/8.6
86 - dev-lang/tk:0/8.6
87 - dev-tcltk/tix
88 - dev-tcltk/togl:0
89 - gui? (
90 - virtual/opengl
91 - x11-libs/libX11
92 - x11-libs/libXmu
93 - )
94 - python? (
95 - ${PYTHON_DEPS}
96 - $(python_gen_cond_dep '
97 - dev-python/pybind11[${PYTHON_USEDEP}]
98 - dev-python/pybind11-stubgen[${PYTHON_USEDEP}]
99 - '
100 - )
101 - mpi? (
102 - $(python_gen_cond_dep 'dev-python/mpi4py[${PYTHON_USEDEP}]' )
103 - )
104 - )
105 - opencascade? ( sci-libs/opencascade:* )
106 - ffmpeg? ( media-video/ffmpeg )
107 - jpeg? ( media-libs/libjpeg-turbo:0= )
108 - mpi? ( virtual/mpi sci-libs/parmetis opencascade? ( sci-libs/hdf5[mpi] ) )
109 -"
110 -RDEPEND="${DEPEND}"
111 -BDEPEND="dev-vcs/git"
112 -
113 -PATCHES=( "${FILESDIR}/${P}-find-tk.patch" )
114 -
115 -src_prepare() {
116 - # https://github.com/NGSolve/netgen/issues/72
117 - git init -q || die
118 - git config --global user.email "you@×××××××.com" || die
119 - git config --global user.name "Your Name" || die
120 - git add . || die
121 - git commit -qm 'init' || die
122 - git tag "${PV}" || die
123 -
124 - cmake_src_prepare
125 -}
126 -
127 -src_configure() {
128 - local mycmakeargs=(
129 - -DUSE_MPI="$(usex mpi)"
130 - -DUSE_JPEG="$(usex jpeg)"
131 - -DUSE_MPEG="$(usex ffmpeg)"
132 - -DUSE_GUI="$(usex gui)"
133 - -DUSE_OCC="$(usex opencascade)"
134 - -DUSE_PYTHON="$(usex python)"
135 - -DTK_INCLUDE_PATH="/usr/$(get_libdir)/tk8.6/include"
136 - -DNG_INSTALL_DIR_LIB="$(get_libdir)"
137 - -DINSTALL_PROFILES=ON
138 - -DUSE_INTERNAL_TCL=OFF
139 - )
140 - if use python; then
141 - mycmakeargs+=(
142 - -DPYBIND_INCLUDE_DIR="/usr/lib/${EPYTHON}/site-packages/pybind11/include/"
143 - -DNG_INSTALL_PYBIND=OFF
144 - )
145 - fi
146 - if use mpi && use python; then
147 - mycmakeargs+=( -DUSE_MPI4PY=ON )
148 - else
149 - mycmakeargs+=( -DUSE_MPI4PY=OFF )
150 - fi
151 - cmake_src_configure
152 -}
153 -
154 -src_install() {
155 - cmake_src_install
156 - local NETGENDIR="/usr/share/netgen"
157 -
158 - echo -e "NETGENDIR=${NETGENDIR} \nLDPATH=/usr/$(get_libdir)/Togl2.0" > ./99netgen
159 - doenvd 99netgen
160 -
161 - mv "${D}"/usr/bin/{*.tcl,*.ocf} "${D}${NETGENDIR}" || die
162 -
163 - # Install icon and .desktop for menu entry
164 - doicon "${FILESDIR}"/${PN}.png
165 - domenu "${FILESDIR}"/${PN}.desktop
166 -}