gentoo resync : 07.07.2018

3 files changed, 92 insertions, 25 deletions

diff --git a/media-gfx/openmesh/Manifest b/media-gfx/openmesh/Manifest
index 10429beb5ef3..c5e6602cd211 100644
--- a/media-gfx/openmesh/Manifest
+++ b/media-gfx/openmesh/Manifest
@@ -1,3 +1,5 @@
 DIST OpenMesh-4.1.tar.bz2 24728164 BLAKE2B 6be9876fccc8dbf53b6dddbaac09a3f241b2cffbcd98473f0f7caca23b634bdb0a0a8af808a178531c61e5d533597a4fd467b8b2928d9947a7f126990a4ee42a SHA512 064a4d5cb467589869baf4a302e6c620bd84de874b24019252b97ef863b59e83f2fe23ea45e4a5162a7765847da19f75f563f084cf2b3ae77c7e704b4c859b71
-EBUILD openmesh-4.1.ebuild 1733 BLAKE2B 1b9e8bd512ab3f2618d0d5d5540632cf8caba9f13d6eb2beabbaae3a3c10c28e8014049c88b64c976036b15bb525cc8e04b9eb2156c8674e31c49699b88c12dd SHA512 b46ef104b2581798f5e49e94f2369e07389523d9cc6b5455fd82f92efb5ab5524c1c080d5c7bfdd223cca0ffe1a28150f693492d48d4dffe2611c9fe3af70136
+DIST OpenMesh-7.1.tar.bz2 22855582 BLAKE2B 778b3a40c2e476cdb2f50b5b4a90f8b6ae7852f166087426ff1db25c829cb4172cd7ed14db1a22229f7b4447e7ebeb0d6116647d929b7dab43d565192a8ac48e SHA512 bca0f937e08fe512efb436f5b96b83a1ff7945640e18fb1bb083956f04609560e29b1c1f7e058840791df77df6859fdd20ff6f49d80b908e8c1c5542b8615e6d
+EBUILD openmesh-4.1-r1.ebuild 1626 BLAKE2B 990da5a6c25fba6128088b29f7aa91e86c5e71a7c9765a9a58289995981134c45ad0d3f0064c02614284f639caaa45bdc0fa4f17010c4950087c39680f5d6d41 SHA512 ebf1e6ae7690859c09871da00e0a6fba8492baf6af3cda654ef2032bab705185d33bb617c60b2ef28d798d95246f5f2e870c66e68e247b1ba2b6a4241185b30a
+EBUILD openmesh-7.1.ebuild 1440 BLAKE2B f4e59b2cbf50699f594dc958d9b02f5123c1aad2928807197dfe654faa0e76afb4208ddc42a89897f27c46c93e6a3eeb19606d196af70dd6ee9998afcc832e84 SHA512 2e0f3e49e0129f749260b4fc163cdc5d1b193d35b04976cf7d911e72de91b3a5927877fdafb563abe2859a4aad22b88819ae7d957c75550ed24dd3adfc456788
 MISC metadata.xml 648 BLAKE2B 12598229d6cae71dae7cb87eac84679289994134848466d94c81d241db642f880c386a3ae65b0a5da939ae96cdd01eb19052ccf887f4df87edd3806526a3e225 SHA512 24e414a301d38d43961c5de285fc2fe2638a5a7c1d606d3f89efb5f701399d743382a0761f72f4aaf1d143755349a5a0f0cd49171a36137f65c1b7b8d3ccdcef
diff --git a/media-gfx/openmesh/openmesh-4.1.ebuild b/media-gfx/openmesh/openmesh-4.1-r1.ebuild
index 212d2d93cb76..b72c8c6a8d1a 100644
--- a/media-gfx/openmesh/openmesh-4.1.ebuild
+++ b/media-gfx/openmesh/openmesh-4.1-r1.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-inherit eutils cmake-utils
+EAPI=6
+
+inherit cmake-utils
 
 MY_PN="OpenMesh"
 MY_PV="${PV/_rc/-RC}"
 S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
 DESCRIPTION="A generic data structure to represent and manipulate polygonal meshes"
-HOMEPAGE="http://www.openmesh.org/"
-SRC_URI="http://openmesh.org/media/Releases/${MY_PV/-RC/RC}/${MY_PN}-${MY_PV}.tar.bz2"
+HOMEPAGE="https://www.openmesh.org/"
+SRC_URI="https://openmesh.org/media/Releases/${MY_PV/-RC/RC}/${MY_PN}-${MY_PV}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="4"
@@ -18,11 +19,19 @@ KEYWORDS="~amd64 ~ia64 ~x86"
 IUSE="qt5 static-libs test"
 
 RDEPEND="
-	qt5? ( dev-qt/qtgui:5
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
 		dev-qt/qtopengl:5
-		media-libs/freeglut )"
+		dev-qt/qtwidgets:5
+		media-libs/freeglut
+	)
+"
 DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
+	test? ( dev-cpp/gtest )
+"
+
+DOCS=( LICENSE/{LICENSE,README.txt} README CHANGELOG )
 
 src_prepare() {
 	cmake-utils_src_prepare
@@ -44,26 +53,17 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=""
-
-	mycmakeargs="${mycmakeargs} -DOPENMESH_BUILD_UNIT_TESTS=TRUE"
-
-	# Disable python bindings until someone wants them.
-	mycmakeargs="${mycmakeargs} -DOPENMESH_BUILD_PYTHON_BINDINGS=FALSE"
-	mycmakeargs="${mycmakeargs} -DOPENMESH_BUILD_PYTHON_UNIT_TESTS=FALSE"
-
-	if ! use qt5; then
-		mycmakeargs="${mycmakeargs} -DBUILD_APPS=OFF"
-	fi
+	local mycmakeargs=(
+		-DOPENMESH_BUILD_UNIT_TESTS=TRUE
+		# Disable python bindings until someone wants them.
+		-DOPENMESH_BUILD_PYTHON_BINDINGS=FALSE
+		-DOPENMESH_BUILD_PYTHON_UNIT_TESTS=FALSE
+		-DBUILD_APPS=$(usex qt5)
+	)
 
 	cmake-utils_src_configure
 }
 
-src_install() {
-	cmake-utils_src_install
-	dodoc LICENSE/* README CHANGELOG
-}
-
 src_test() {
 	cd "${BUILD_DIR}" || die
 	LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${BUILD_DIR}/Build/$(get_libdir) ctest --verbose
diff --git a/media-gfx/openmesh/openmesh-7.1.ebuild b/media-gfx/openmesh/openmesh-7.1.ebuild
new file mode 100644
index 000000000000..9cc6fc78dcce
--- /dev/null
+++ b/media-gfx/openmesh/openmesh-7.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+MY_PN="OpenMesh"
+MY_PV="${PV/_rc/-RC}"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+DESCRIPTION="A generic data structure to represent and manipulate polygonal meshes"
+HOMEPAGE="https://www.openmesh.org/"
+SRC_URI="https://openmesh.org/media/Releases/${MY_PV/-RC/RC}/${MY_PN}-${MY_PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="qt5 static-libs test"
+
+RDEPEND="
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+		media-libs/freeglut
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Fix libdir and remove rpath.
+	sed -i \
+		-e "s|\(set (ACG_PROJECT_LIBDIR \"\).*|\1$(get_libdir)/\")|" \
+		-e "s|\(BUILD_WITH_INSTALL_RPATH \)1|\1 0|" \
+		-e "s|\(SKIP_BUILD_RPATH\) 0|\1 1|" \
+		-e '/^ *INSTALL_RPATH/d' \
+		cmake/ACGCommon.cmake || die
+
+	if ! use static-libs; then
+		sed -i "s|\(SHARED\)ANDSTATIC|\1|" \
+			src/${MY_PN}/{Core,Tools}/CMakeLists.txt || die
+		sed -i '/OpenMeshCoreStatic/d' \
+			src/${MY_PN}/Tools/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_APPS=$(usex qt5)
+		-DOPENMESH_BUILD_UNIT_TESTS=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${BUILD_DIR}/Build/$(get_libdir) ctest --verbose
+}