gentoo resync : 20.03.2022

6 files changed, 242 insertions, 77 deletions

diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index 8dd26172582a..f2f48d36c176 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -1,10 +1,15 @@
 AUX p4est-2.3-add_soname.patch 559 BLAKE2B 3a4037ef9f9343aa9ecadb4f5406821152f0d7c9d2fa461a5fa9c74a8a0088101fe6d374c38c52e489e6a1aee818733ed08f57d13f0d50497bc9edfd8f14a538 SHA512 2b16c58c2b897abe31f26cd128eb99716961369e3c41a411ac79b8a31f51864bd346a46d8c78e6ed2206073555237b647346afd475c40d5012c60dae890c839a
 AUX p4est-2.3-fix_aclocal.patch 289 BLAKE2B 9a361db45d08f9355cef4d33079a88ceec2e804d772c806a078e07d0174906ca5c2f24580efb346654806abb2fc329b9c78b9cecb857c8369fb937c1b96e9a5b SHA512 848e65b78abc5cd74a9458289d7376cd7bc9667e96fa2baaefe7b64d9bcf34326a6f6ac040e1229f639708eabd3bedc52ba82444632ecbbe0dd33ebdba216ff7
+AUX p4est-2.8.0-fix_build_system.patch 714 BLAKE2B 0807f4f896be0790fbeac3ab349abcbdf5c75f7eb57bc694f9c050772d9defe7e397c58a6b7d1da2e8c107dbd57489d971cd4ad7fa9dfedb4ee16509c5536cf3 SHA512 e2207974fc2df548a4f60e4233278641c6567aa909463de6ca61c5dc65b621b16d057735a404b73f39e0001233c800e27fae2c655a0a3c81d72d534ad04d8c0f
+AUX p4est-2.8.0-set_version.patch 2520 BLAKE2B fb3ac44167c9b9be7a38e85437792d41e379d155f7961f5733adab1e142f6669c1d53686963d349fc9da7dc4d46fd27097c9beb223c1ab7266a4c18854aabe4a SHA512 17d128884d05999a51c28a966c66eb5fbe89512d812baa732afe372bfaf8a7bc8edf5edf1b46f5ad60353d7ee76be112dc3a7b06b8fd8fd729f5c7fbc9ac50af
+AUX p4est-9999-set_version.patch 1517 BLAKE2B 64fecf32b07b37616ec6f80fbed0203df5a7291930aa246f35c3f4080cfc6bea0737e2caa63d85459e76d759fdab64713e01f9c2445e88c63cc1f1ab34616740 SHA512 e083574cdcfade51b9185617939ffb7e47b0cf415c215fee3452b9e5eb3234bf30ed2cc2217f5e019d00b21d98bc031974be06be2db3fad0806daed024d11845
 DIST libsc-2.3.1.tar.gz 344456 BLAKE2B cee44d07372162aecc8104257d1c5d4935d60030ceae4041ae4c5110f491b48b7709c55af0286b2a1fc5df2d7883b2ab4499c3884162b779fb9aaa86fbc5822c SHA512 02e160ad6fb4e674a9de2a41cfef6727d470a17c184e7b0310fe3e39f1112f4c643ca35a62377562caf1e8cc753cd5c0f5f996fba24b115498b01d16c140080a
 DIST libsc-2.3.3.tar.gz 345177 BLAKE2B c9077cfe7af3eb8bfb34cf655fa8e49658f1ce0b866b58398fc7bae305ac276b002c83d930a20df1bdf52a22645ebb1698d51a937ce56db993d36ef68d640e8a SHA512 b51d08a987d7c8a83eaae0be98a078a4a9160b9141b482015110534ddac075337c81f54f3efa4f8a8bce54e31565a6323aad37e35674c1d40686d4ab3747ed6b
 DIST p4est-2.3.1.tar.gz 2623681 BLAKE2B 426f15d27dd376b918e197adc46a8ef5555bd4765f53d7c98bc8f9b58e0a27125d38808503fd1c545e428e845635e2499ba27df22a989ed619ce264417d02908 SHA512 c691b39d140c2714a813dc45f721cf21a1e0f5d1a264a3d5733b09ec90cc3f8bcc9e5d799e41e91d2b994490c811287f8177bf6d7890ea4cd1cdfecb95cdbf23
 DIST p4est-2.3.3.tar.gz 2644849 BLAKE2B f39546d0583c4671f32814c3c1d297d903a4f7466f27049ef4e38d1138c83f57e991f6a702d0109e438337f98be13e8554a4dfef3e1c129f3d2690e0b4a54bbb SHA512 7f528a942438073c9f43242eae5383cdc1f64f0f26f96eccd01afc053e0454691160e7210dda2ad2bdd621fd3c17551dd205af417dd244642b1358cbe4aaa2fd
+DIST p4est-2.8.0.tar.gz 2655761 BLAKE2B 0637045bca3525d5d737010865c06d1273c6ecf848ab5ca55d1f19156550b7d7676c4f8d7c7a71b1fc70381dc7912cdca1e5405bb0af948180f75da1a3b1f343 SHA512 599faad177ce21f917e4ddfd969d6ef8c1f08b1e701cbdb9d4a1aa6dfd927176468afe757d018b9b7ded6a9ce165cd6fe78e0688b22cf6b9975cbd85d6f45d3c
 EBUILD p4est-2.3.1-r1.ebuild 2917 BLAKE2B cac667b2d40f920b9b48732ae4e503d30f391a44b080adc00545fa6eb09268aa6c36a882126a4cb78609eb4288131fbcbeee82e94b8487b8bdc9af99dacc90cc SHA512 0d2b661d46c9a0cc11b84cc941cc28c340fc5b0efbe8eab09e46fc1daef1dcbbcf099522cd2c08c890d09455151b055e92dc5cff137c78632ea7ab26ed3f91f9
 EBUILD p4est-2.3.3.ebuild 2917 BLAKE2B cac667b2d40f920b9b48732ae4e503d30f391a44b080adc00545fa6eb09268aa6c36a882126a4cb78609eb4288131fbcbeee82e94b8487b8bdc9af99dacc90cc SHA512 0d2b661d46c9a0cc11b84cc941cc28c340fc5b0efbe8eab09e46fc1daef1dcbbcf099522cd2c08c890d09455151b055e92dc5cff137c78632ea7ab26ed3f91f9
-EBUILD p4est-9999.ebuild 2917 BLAKE2B cac667b2d40f920b9b48732ae4e503d30f391a44b080adc00545fa6eb09268aa6c36a882126a4cb78609eb4288131fbcbeee82e94b8487b8bdc9af99dacc90cc SHA512 0d2b661d46c9a0cc11b84cc941cc28c340fc5b0efbe8eab09e46fc1daef1dcbbcf099522cd2c08c890d09455151b055e92dc5cff137c78632ea7ab26ed3f91f9
+EBUILD p4est-2.8.0-r1.ebuild 1564 BLAKE2B 470bc5bf133c6ec6c769300300dcf0bb0fed7882b7cbc96b34bdbf05b88bcbae4799e47f4e260cd7a6fda41c4e50d6aedcba913d2ccfe092bcf9d363f77e55af SHA512 aa766cf1368d2a3341ecb5f5cdf21467e82eef3b33e9d3bf7e666b19fdc072c1c154170927b4ad0b9051c63766f2cfc636a3aabac2d41bc15aa24f819021fecd
+EBUILD p4est-9999.ebuild 1508 BLAKE2B 18d08f6fcbc8ed6f16dd57e692e6de45c9da2407ede56ae8bc0b0c8ef74d74d272bcb70c6642b7bd8f3ca2a363e19adc69604317cf7b137dfc066221bece5f02 SHA512 a650059814c9c31ee6af07d2be9331c54455cfaba7932731efed20a8564a20f442bc3f82e35d34b6214f9146e6940d8c41ddc39dadd37217c43ab4ca8b35bcb5
 MISC metadata.xml 933 BLAKE2B dbebf4c49f70183487e695e63b78c412260956c197dce7471145c8eb150672fcd7223d1ab4b81c793c0147bc77c49f235fbf31949581d760d077c0ca61e72a0b SHA512 228cade7cf570c4e5f629ae64b8fef9cb3635556f2ad52bc31c34480cc148ace1d2ebcb59563d02f1cc94f21a863c6077e8acc9b58b01d0519962c1580d836c5
diff --git a/sci-libs/p4est/files/p4est-2.8.0-fix_build_system.patch b/sci-libs/p4est/files/p4est-2.8.0-fix_build_system.patch
new file mode 100644
index 000000000000..e1f86165d5f9
--- /dev/null
+++ b/sci-libs/p4est/files/p4est-2.8.0-fix_build_system.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3226f2e..8bc5074 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,6 +8,8 @@ HOMEPAGE_URL https://www.p4est.org/
+ DESCRIPTION "p4est manages a collection---a forest---of octrees in parallel."
+ VERSION ${PROJECT_VERSION})
+ 
++set(CMAKE_POSITION_INDEPENDENT_CODE ON)
++
+ include(CTest)
+ 
+ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
+@@ -76,8 +78,8 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ ${PROJECT_BINARY_DIR}/include/
+ 
+ install(TARGETS p4est
+   EXPORT ${PROJECT_NAME}Targets
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib)
++  ARCHIVE DESTINATION ${library_reldir}
++  LIBRARY DESTINATION ${library_reldir})
+ 
+ #--- p8est
+ 
diff --git a/sci-libs/p4est/files/p4est-2.8.0-set_version.patch b/sci-libs/p4est/files/p4est-2.8.0-set_version.patch
new file mode 100644
index 000000000000..b24f265f496b
--- /dev/null
+++ b/sci-libs/p4est/files/p4est-2.8.0-set_version.patch
@@ -0,0 +1,77 @@
+diff --git a/cmake/git.cmake b/cmake/git.cmake
+index dd6009e..7c5c8f3 100644
+--- a/cmake/git.cmake
++++ b/cmake/git.cmake
+@@ -1,36 +1,3 @@
+ # --- extract version from Git
+ 
+-set(PROJECT_VERSION 0.0.0)
+-find_program(GIT_VERSION_GEN NAMES git-version-gen
+-             PATHS ${CMAKE_SOURCE_DIR}/build-aux NO_DEFAULT_PATH)
+-if(GIT_VERSION_GEN)
+-  execute_process(COMMAND ${GIT_VERSION_GEN} .tarball_version
+-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-    RESULT_VARIABLE _err
+-    OUTPUT_VARIABLE git_version
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-endif()
+-if(_err EQUAL 0)
+-  if(git_version MATCHES
+-                 "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*")
+-    set(_major "${CMAKE_MATCH_1}")
+-    set(_minor "${CMAKE_MATCH_2}")
+-    set(_patch "${CMAKE_MATCH_3}")
+-    set(PROJECT_VERSION ${_major}.${_minor}.${_patch}.999)
+-  elseif(git_version MATCHES
+-                 "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)")
+-    set(_major "${CMAKE_MATCH_1}")
+-    set(_minor "${CMAKE_MATCH_2}")
+-    set(_patch "${CMAKE_MATCH_3}")
+-    set(PROJECT_VERSION ${_major}.${_minor}.${_patch})
+-  elseif(git_version MATCHES
+-                 "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)")
+-    set(_major "${CMAKE_MATCH_1}")
+-    set(_minor "${CMAKE_MATCH_2}")
+-    set(PROJECT_VERSION ${_major}.${_minor})
+-  elseif(git_version MATCHES
+-                 "^(0|[1-9][0-9]*)")
+-    set(_major "${CMAKE_MATCH_1}")
+-    set(PROJECT_VERSION ${_major})
+-  endif()
+-endif()
++set(PROJECT_VERSION 2.8.3)
+
+diff --git a/cmake/p4est_config.h.in b/cmake/p4est_config.h.in
+index 72645dd..7560dcc 100644
+--- a/cmake/p4est_config.h.in
++++ b/cmake/p4est_config.h.in
+@@ -135,7 +135,7 @@
+ #define P4EST_PACKAGE_NAME "p4est"
+ 
+ /* Define to the full name and version of this package. */
+-#define P4EST_PACKAGE_STRING "p4est 2.0.94-00da"
++#define P4EST_PACKAGE_STRING "p4est 2.8.0"
+ 
+ /* Define to the one symbol short name of this package. */
+ #define P4EST_PACKAGE_TARNAME "p4est"
+@@ -144,16 +144,16 @@
+ #define P4EST_PACKAGE_URL ""
+ 
+ /* Define to the version of this package. */
+-#define P4EST_PACKAGE_VERSION "2.0.94-00da"
++#define P4EST_PACKAGE_VERSION "2.8.0"
+ 
+ /* Version number of package */
+-#define P4EST_VERSION "2.0.94-00da"
++#define P4EST_VERSION "2.8.0"
+ 
+ /* Package major version */
+ #define P4EST_VERSION_MAJOR 2
+ 
+ /* Package minor version */
+-#define P4EST_VERSION_MINOR 0
++#define P4EST_VERSION_MINOR 8
+ 
+ /* Package point version */
+-#define P4EST_VERSION_POINT 94-00da
++#define P4EST_VERSION_POINT 0
diff --git a/sci-libs/p4est/files/p4est-9999-set_version.patch b/sci-libs/p4est/files/p4est-9999-set_version.patch
new file mode 100644
index 000000000000..0820b001d8cd
--- /dev/null
+++ b/sci-libs/p4est/files/p4est-9999-set_version.patch
@@ -0,0 +1,44 @@
+diff --git a/cmake/git.cmake b/cmake/git.cmake
+index dd6009e..7c5c8f3 100644
+--- a/cmake/git.cmake
++++ b/cmake/git.cmake
+@@ -1,36 +1,3 @@
+ # --- extract version from Git
+ 
+-set(PROJECT_VERSION 0.0.0)
+-find_program(GIT_VERSION_GEN NAMES git-version-gen
+-             PATHS ${CMAKE_SOURCE_DIR}/build-aux NO_DEFAULT_PATH)
+-if(GIT_VERSION_GEN)
+-  execute_process(COMMAND ${GIT_VERSION_GEN} .tarball_version
+-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-    RESULT_VARIABLE _err
+-    OUTPUT_VARIABLE git_version
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-endif()
+-if(_err EQUAL 0)
+-  if(git_version MATCHES
+-                 "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.].*")
+-    set(_major "${CMAKE_MATCH_1}")
+-    set(_minor "${CMAKE_MATCH_2}")
+-    set(_patch "${CMAKE_MATCH_3}")
+-    set(PROJECT_VERSION ${_major}.${_minor}.${_patch}.999)
+-  elseif(git_version MATCHES
+-                 "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)[.](0|[1-9][0-9]*)")
+-    set(_major "${CMAKE_MATCH_1}")
+-    set(_minor "${CMAKE_MATCH_2}")
+-    set(_patch "${CMAKE_MATCH_3}")
+-    set(PROJECT_VERSION ${_major}.${_minor}.${_patch})
+-  elseif(git_version MATCHES
+-                 "^(0|[1-9][0-9]*)[.](0|[1-9][0-9]*)")
+-    set(_major "${CMAKE_MATCH_1}")
+-    set(_minor "${CMAKE_MATCH_2}")
+-    set(PROJECT_VERSION ${_major}.${_minor})
+-  elseif(git_version MATCHES
+-                 "^(0|[1-9][0-9]*)")
+-    set(_major "${CMAKE_MATCH_1}")
+-    set(PROJECT_VERSION ${_major})
+-  endif()
+-endif()
++set(PROJECT_VERSION 9999.0.0)
+
+
diff --git a/sci-libs/p4est/p4est-2.8.0-r1.ebuild b/sci-libs/p4est/p4est-2.8.0-r1.ebuild
new file mode 100644
index 000000000000..2e803199a24b
--- /dev/null
+++ b/sci-libs/p4est/p4est-2.8.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic toolchain-funcs
+
+DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
+HOMEPAGE="http://www.p4est.org/"
+
+LIBSC_VERSION="2.8.3"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/cburstedde/${PN}/archive/v2.8.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+# TODO petsc
+IUSE="debug doc examples mpi openmp threads +vtk-binary"
+
+RDEPEND="
+	~sci-libs/libsc-${LIBSC_VERSION}[mpi=,openmp=,threads=]
+	sys-apps/util-linux
+	virtual/blas
+	virtual/lapack
+	mpi? ( virtual/mpi[romio] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix_build_system.patch
+	"${FILESDIR}"/${P}-set_version.patch
+)
+
+S="${WORKDIR}/${PN}-2.8"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Dmpi="$(usex mpi)"
+		-Dopenmp="$(usex openmp)"
+		-Dlibrary_reldir="$(get_libdir)"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	rm "${ED}"/usr/lib/cmake/Modules/FindSC.cmake || die "rm failed"
+	mkdir -p "${ED}"/usr/share/doc/${P}
+	mv "${ED}"/usr/share/docs/P4EST/* "${ED}"/usr/share/doc/${P}/ || die "mv failed"
+	rm -r "${ED}"/usr/share/docs || die "rm failed"
+}
diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
index c7756fee11c5..d27a0814359b 100644
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -1,24 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit autotools flag-o-matic lua-single toolchain-funcs
+inherit cmake flag-o-matic toolchain-funcs
 
 DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
 HOMEPAGE="http://www.p4est.org/"
 
+LIBSC_VERSION="2.8.3"
+
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
 else
-	SRC_URI="
-		https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/cburstedde/libsc/archive/v${PV}.tar.gz -> libsc-${PV}.tar.gz"
+	SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -26,22 +24,20 @@ LICENSE="GPL-2+"
 SLOT="0"
 
 # TODO petsc
-IUSE="debug doc examples mpi openmp romio threads +vtk-binary"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	romio? ( mpi )"
+IUSE="debug doc examples mpi openmp threads +vtk-binary"
 
-RDEPEND="${LUA_DEPS}
-	~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,threads=]
+RDEPEND="
+	~sci-libs/libsc-${LIBSC_VERSION}[mpi=,openmp=,threads=]
 	sys-apps/util-linux
 	virtual/blas
 	virtual/lapack
-	mpi? ( virtual/mpi[romio=] )"
+	mpi? ( virtual/mpi[romio] )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.3-fix_aclocal.patch
-	"${FILESDIR}"/${PN}-2.3-add_soname.patch
+	"${FILESDIR}"/${PN}-2.8-fix_build_system.patch
+	"${FILESDIR}"/${P}-set_version.patch
 )
 
 pkg_pretend() {
@@ -50,73 +46,22 @@ pkg_pretend() {
 
 pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Inject libsc to get  all parts of the build system...
-	if ! [[ ${PV} = *9999* ]]; then
-		rmdir "${S}/sc" || die "rmdir failed"
-		mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed"
-	fi
-
-	# Inject a version number into the build system
-	echo "${PV}" > ${S}/.tarball-version
-
-	AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config"
-	eautoreconf
-
-	sed -i \
-		"s/P4EST_SC_DIR\/etc/P4EST_SC_DIR\/share\/libsc/" \
-		"${S}"/configure || die "sed failed"
-
-	sed -i \
-		"s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \
-		"${S}"/configure || die "sed failed"
 }
 
 src_configure() {
-	# avoid underlinkage
-	append-libs -lsc
-
-	local myeconfargs=(
-		--disable-static
-		$(use_enable debug)
-		$(use_enable mpi)
-		$(use_enable openmp)
-		$(use_enable romio mpiio)
-		$(use_enable threads pthread)
-		$(use_enable vtk-binary)
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-		--with-sc="${ESYSROOT}/usr"
+	local mycmakeargs=(
+		-Dmpi="$(usex mpi)"
+		-Dopenmp="$(usex openmp)"
+		-Dlibrary_reldir="$(get_libdir)"
 	)
-	econf "${myeconfargs[@]}"
+
+	cmake_src_configure
 }
 
 src_install() {
-	default
-
-	use doc && dodoc -r doc/*
-
-	if use examples
-	then
-		docinto examples
-		dodoc -r example/*
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-		# Remove compiled example binaries in case of -examples:
-		rm -r "${ED}"/usr/bin || die "rm failed"
-	fi
-
-	# Fix wrong installation paths:
-	dodir /usr/share/p4est
-	mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed"
-	mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed"
-	rmdir "${ED}"/etc/ || die "rmdir failed"
+	cmake_src_install
 
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
+	rm "${ED}"/usr/lib/cmake/Modules/FindSC.cmake || die "rm failed"
+	mv "${ED}"/usr/share/docs/P4EST/* "${ED}"/usr/share/doc/${P}/ || die "mv failed"
+	rm -r "${ED}"/usr/share/docs || die "rm failed"
 }