media-gfx/openmesh: bump 4.1

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x4D7043C9

3 files changed, 88 insertions, 5 deletions

diff --git a/media-gfx/openmesh/ChangeLog b/media-gfx/openmesh/ChangeLog
index 7af488db0908..d6c503b920dc 100644
--- a/media-gfx/openmesh/ChangeLog
+++ b/media-gfx/openmesh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/openmesh
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v 1.38 2015/08/05 15:32:21 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v 1.39 2015/08/05 16:42:41 jsbronder Exp $
+
+*openmesh-4.1 (05 Aug 2015)
+
+  05 Aug 2015; Justin Bronder <jsbronder@gentoo.org> +openmesh-4.1.ebuild:
+  bump
 
 *openmesh-3.3 (05 Aug 2015)
 
diff --git a/media-gfx/openmesh/Manifest b/media-gfx/openmesh/Manifest
index b1de3187029b..f8268fc56d79 100644
--- a/media-gfx/openmesh/Manifest
+++ b/media-gfx/openmesh/Manifest
@@ -6,15 +6,17 @@ AUX openmesh-1.0.0-gcc41.patch 3925 SHA256 9514b94f4f55e9ec7c73675dcd57e0f13d7aa
 DIST OpenMesh-2.3.1.tar.bz2 18203577 SHA256 5cd6537c64e1ff3f451e19328a70c02d283d06705e96698c19dde75c3749e4f8 SHA512 5d0822032111f07dc23751edebc7efa6e98d7e729ee020cfa6b5cf78b4c5e1a9f0ea1ca4a5cf3b1fe1cb1fc4389260f834b9e1c682a4f4c68cdc84035eef6c67 WHIRLPOOL 398fd2ae94e3927024fdc8489801480b9c27449e1ac5559f0e8c890ebee3d61b66207c6909f4b3ef73ec16829fee877e57e434a77c9dde2c0d22ec80a987e968
 DIST OpenMesh-3.2.tar.bz2 23766435 SHA256 c74890539846c8222aae93ad63316132e84bf4b2080c9b8321790767723f32e5 SHA512 40b346a6c7b141c284183ca66a489d20b668e3c3c0fb5b4e4185b86ea4552f031ea3106e918b2c3cf8e1bc713f3aac325dd17b50ec4d29f6446cf2cbde9a3dd9 WHIRLPOOL 93d8a2d2443f3de8938bf02836f1e1af92fc5adcd0c8c8fbc404a489d566d8d0e4dc4ed86665a8de0c94b171c045713497a7ef6fdb2aa83e04c5a3e2c18a79d5
 DIST OpenMesh-3.3.tar.bz2 24797682 SHA256 4eff6fff5685c57e2e7cdbf5b4b1ef183b3806db822eb01f74c8895e0fbe7a1d SHA512 3bed1f6a3d7db9b67d6c17647bf6c5efa26aca394763d14f5106f70573660329618d99287a51bea23c3a34b495117e38d5756d6d5bf49ea1add711d9e68bab8d WHIRLPOOL 3e6469940dd0ea5c6b83f79841faae8917c25558ea2bc43d78b7576c070fb8ab14b0280c1900e7d871f30a305ab42791a5498373a8869674179b0fd73dc626d5
+DIST OpenMesh-4.1.tar.bz2 24728164 SHA256 3e30cd7325db6367175e2e88c7516c23b7f90c9e1ff739c7d62e7de21228bb8e SHA512 064a4d5cb467589869baf4a302e6c620bd84de874b24019252b97ef863b59e83f2fe23ea45e4a5162a7765847da19f75f563f084cf2b3ae77c7e704b4c859b71 WHIRLPOOL 6989d0ff9dd24bf5b8252e6fc0a416258015d1b5a6202b4e7583c1f2eefe59826a5e2aaa6d50f105083f43680431a67e1cab5b81ace06b119d4e3737267f79ee
 EBUILD openmesh-2.3.1.ebuild 1488 SHA256 708561cdf4487e65180a10fd66486b24562e49cb958a1e82c7071ab586531e11 SHA512 53e244ef1b4f4171f361b1074b4f5441e3378d070e91af2e324c74c61a81cc3fd71ecefdbaed4561b264c74e3c7477c3619dadb17a427f11cc64abe4f2689d4f WHIRLPOOL 1d8a71030488ca0c6cababba3158abe8c7de28b8561180c4206fe3f99f59029938c4d41114fa6447b54d4f51bf400e6b7b76541b08c97c07f407aad54fdc5835
 EBUILD openmesh-3.2.ebuild 1689 SHA256 13be8f5d2ef311828925eca4f20ae15a29c74af64c497343e97787f48b5feb2f SHA512 4aa0e258b949a37f6ea5091e39771876c2451a02f6f2a9f1f23e9d017bf322c677174821e58230fc1fd35c73a48f313bbdc80167c1a19cfbfc47a8db8e303c07 WHIRLPOOL 61cb5bcd88116d16e04d7c8ba7fdb08d4f687fdad431094dad23213df3bb9986c9fd0aeb17b4572baff6ae179c9c97f93aa867f0f386607d34923bce0e7b656b
 EBUILD openmesh-3.3.ebuild 1981 SHA256 c56f420fa9b76392e77e6d2545bcd8f720c4523027aef64e2bf1cc42f6c78d6c SHA512 0eb58ddcba9c046ea5f74afe0cdaf3b04c9e22a387752ea40766be4c621a3bca0fc880005ec3005ebe4cb09e2751221193a41b68dbebe5b9d702c0c677bc78d4 WHIRLPOOL 5f7655c6e76989721021ab8ad24b94016fafb43b0e612665cdd7c0e737f7ad9a92c238438a3b956ada30ed1629eea1d47f0086240146d16db6bc6b696dd7c87a
-MISC ChangeLog 5695 SHA256 77ce0ea4396c639eff5bba6d6fc11cb981dddf9c9a1462f2d970d71c339ebd4a SHA512 4513b3602922bb42b931a670474b7059569c90a1fb1d9e0faeb85a28daacdcf168eeae2570aebe111a62f8ee86b1b736e4d64a892437f3285f392cd5b66580ed WHIRLPOOL 2d46ec93a734bcb49f6c69f4d20081dc10d245c3ec4c2d88c88f806d9c0ef06670e07dc3b23de1ca4a999024a1221d61a34cd7b3885d39d3bb4bc60117ca2674
+EBUILD openmesh-4.1.ebuild 2009 SHA256 be0938a14d16e551c44e8dedd8f3a4b3a52ff77c01045a1cb84e5a6b17049bad SHA512 e305388a263ccc89192256ab0c00ea5ab9c79399f5f23076f130b41f8f23df8810ea779b7714358c2ec30feac32b120a74ba2f9dd98bb5f5050de3c846ec3bef WHIRLPOOL 4b79eb1ef12b6d5b574dc71c49e2c02b203e2d6f230378871de5e470eb78c54aca0b4bcf355903bd74984f7975d2a6af6fa20c9b9951f0156e973f18fd1fd038
+MISC ChangeLog 5807 SHA256 9d69315ed137dda3a86388dfc927bef051e1a61a4123571255c903e0505111ab SHA512 91069a1a91748a3cf87769cb4b1c3e029c9e9f17a8d0bea4ea8468824661bfc47cbf70f37ce5ef803d68a04ef5adbf3eed81dc72ce8ef089deaa3aec649543ad WHIRLPOOL 154c33bf8efcb287bde4f352093eb5f4007eaa085e407dd9d557dd5bfc29ee77738ac3ec4ee3ceda96c5f0c99b79d7905de0ff9853620c620907147edd257571
 MISC metadata.xml 699 SHA256 e0a2a5f273b3b1694e1546b74a8752c86b793734691e9ad948f10b40eb6aa4da SHA512 62e7ce72864ed47ab09bce795b0b10c6e256223f0953988388f0d7d6a7d8a930765e728e4ca2e257b048668289d3983c871f97f397e7b41855788b3ca558f435 WHIRLPOOL d051d5a17a1496f20f145f8b9c1a040e7f280072ec5ebb61d1b499fd8ca06ca6b4fc81a7f36d5f3e25f10235e718566df0dd84f22542e67db212f30569bbd11a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlXCLIoACgkQ4MrvBE1wQ8kc9gCgkYW1b3cQmeNx8z/tLNFFBrvk
-KMwAn25PYC08XqN280MJU4Is1lpUyIJH
-=Zd9q
+iEYEAREIAAYFAlXCPQIACgkQ4MrvBE1wQ8mxcQCffhUOIH3GI5oz9/45+pcckxzh
+vvMAn01AGBPkB/RPwE2wGVv9tBU9YPcI
+=r2ac
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/openmesh/openmesh-4.1.ebuild b/media-gfx/openmesh/openmesh-4.1.ebuild
new file mode 100644
index 000000000000..78bfcc1d667b
--- /dev/null
+++ b/media-gfx/openmesh/openmesh-4.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-4.1.ebuild,v 1.1 2015/08/05 16:42:41 jsbronder Exp $
+
+EAPI="5"
+inherit eutils cmake-utils
+
+MY_PN="OpenMesh"
+MY_PV="${PV/_rc/-RC}"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+DESCRIPTION="A generic and efficient data structure for representing and manipulating polygonal meshes"
+HOMEPAGE="http://www.openmesh.org/"
+SRC_URI="http://openmesh.org/media/Releases/${MY_PV/-RC/RC}/${MY_PN}-${MY_PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="qt4 qt5 static-libs test"
+
+RDEPEND="
+	qt4? ( dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+		media-libs/freeglut )
+	qt5? ( dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		media-libs/freeglut )"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+
+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() {
+	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 qt4 && ! use qt5; then
+		mycmakeargs="${mycmakeargs} -DBUILD_APPS=OFF"
+	fi
+
+	if use qt4 && ! use qt5; then
+		mycmakeargs="${mycmakeargs} -DFORCE_QT4=ON"
+	fi
+
+	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
+}