bump to 2.2

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

3 files changed, 66 insertions, 6 deletions

diff --git a/media-gfx/openmesh/ChangeLog b/media-gfx/openmesh/ChangeLog
index f6f44c60513f..47f85f9f6b4b 100644
--- a/media-gfx/openmesh/ChangeLog
+++ b/media-gfx/openmesh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/openmesh
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v 1.22 2012/06/08 02:55:55 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v 1.23 2012/06/28 19:35:06 jsbronder Exp $
+
+*openmesh-2.2 (28 Jun 2012)
+
+  28 Jun 2012; Justin Bronder <jsbronder@gentoo.org> +openmesh-2.2.ebuild:
+  bump to 2.2
 
   08 Jun 2012; Zac Medico <zmedico@gentoo.org> openmesh-2.0_rc5.ebuild:
   inherit flag-o-matic for append-cppflags
diff --git a/media-gfx/openmesh/Manifest b/media-gfx/openmesh/Manifest
index 369e303d886e..76ea73ae65b5 100644
--- a/media-gfx/openmesh/Manifest
+++ b/media-gfx/openmesh/Manifest
@@ -6,15 +6,17 @@ AUX openmesh-1.0.0-gcc41.patch 3925 RMD160 ab4ed625667063776307d04c3a0fc5107459c
 DIST OpenMesh-1.9.6.tar.bz2 498618 RMD160 ebb24758242ebf9e8c0b853a78631fd5542318ea SHA1 2d337bf558c74a3a004f246b5d92f74b569fc78b SHA256 07ed3a915b567831f2d0433b09767f80abd789fbc76dd6390231c60e3eeadd4a
 DIST OpenMesh-2.0-RC5.tar.bz2 18205712 RMD160 5d1f5704cba8ac75d8a03d0d26e8c8ad5325b2b4 SHA1 106ffca2e86691e768c4d2fb30f72eba503e16cb SHA256 346410d96866f855bda2e52bb70eb477098c3f9211302ce52830913935987c3f
 DIST OpenMesh-2.1.tar.bz2 16841917 RMD160 e7519f0e10ae4c7279563ae4bbf4b64247176651 SHA1 8ff4aa05c2d9bfd243ef4cb0427eb7064a16827b SHA256 a14960c8ae60fc679462315109ae0174c935586e784520a2b39741f624d44828
+DIST OpenMesh-2.2.tar.bz2 17489613 RMD160 d76020f29a88f6edd37799cba5334c639990a10c SHA1 dc6b9ccc5e4d71397690b214add9204aa3e9d908 SHA256 eccccc9b5c42ef5bcf68428aa0c31f8e827762a349bc7f86204a9385e7016818
 EBUILD openmesh-1.9.6-r2.ebuild 1656 RMD160 0af3cf9f869111d02a85a25ecf72bb43e20f5640 SHA1 ce428d9a36628eb3282648b328c9fc551de9a29f SHA256 48600ea7c87ad3c47d56d5c7fdf7b0e0ce10ad13f92b3261fae8064626760194
 EBUILD openmesh-2.0_rc5.ebuild 1634 RMD160 56ded28b2e905c7a413a46e90a21ccddb4299f15 SHA1 80b5e427574f78eff979f294edf1c6ac3acbbf82 SHA256 5ad0a640f441d8524d474facc8aa134928d65a3279924f40429b91982d3d48d4
 EBUILD openmesh-2.1.ebuild 1508 RMD160 3ddf29bc0c8a8771f5b30554e7603a2005b27ea7 SHA1 dfc431efdf76610150d54c2990261f0b4a253097 SHA256 8f0c0cee03bdd44ac81917606ac4ae2a2f6e278d73ef83514cb72b7b75841393
-MISC ChangeLog 3619 RMD160 db2df52d37bcedd0e7a0df23b8dd9083b75c4867 SHA1 a943868a8ec99ced984004f13cb7d27d4d5ddec7 SHA256 791642864ebc72f63a5ea2b9f29f11aa4593287a9cbe9b3d40dc053f3490b500
+EBUILD openmesh-2.2.ebuild 1508 RMD160 4aa6c7b9d3527539ce0d5e148193c6336830b3a8 SHA1 1b6c9da64768a539c7b4857a6266ab50a9ae04b0 SHA256 ebf96379c7c582b2aa47832cd1e3a7597ad4b6b5386b9aadd428e382563975db
+MISC ChangeLog 3740 RMD160 396c2c162b915ac1dda58e6f4566645fd3019bbd SHA1 8c2d54f1c3ed6a4597cc2800fbd9ae75d1a6e7d9 SHA256 eb2ad02c691dacb76e7f3e1508d577aeb20eca3a0ddadadc7ec492f1ae9fc025
 MISC metadata.xml 699 RMD160 42933b520b9de9cd5c354bb743fd51f54a0eb1d2 SHA1 52274f777adefee0892982ce75672796025e756f SHA256 e0a2a5f273b3b1694e1546b74a8752c86b793734691e9ad948f10b40eb6aa4da
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk/RacIACgkQ/ejvha5XGaNaEQCgha9uaI1Bmd1pAcF3/gWIQNku
-SmQAoJJ0FnjP4fLqHkKrG8ljvscclDg/
-=jo+T
+iEYEARECAAYFAk/ssjgACgkQ4MrvBE1wQ8mFkwCfW2fnUmvOAXEUDVjznDlsVqrF
+bU4An1Fja6Fal9VtOIaAWrOAablzV3DU
+=88/B
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/openmesh/openmesh-2.2.ebuild b/media-gfx/openmesh/openmesh-2.2.ebuild
new file mode 100644
index 000000000000..ed9d696df9b1
--- /dev/null
+++ b/media-gfx/openmesh/openmesh-2.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-2.2.ebuild,v 1.1 2012/06/28 19:35:06 jsbronder Exp $
+
+EAPI="3"
+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/fileadmin/${PN}-files/${MY_PV/-RC/RC}/${MY_PN}-${MY_PV}.tar.bz2"
+
+# See COPYING.EXCEPTIONS
+LICENSE="LGPL-3 as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt4 static-libs"
+
+RDEPEND="qt4? ( x11-libs/qt-gui:4
+	x11-libs/qt-opengl:4
+	media-libs/freeglut )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Fix libdir and remove rpath.
+	sed -i \
+		-e "s|\(set (ACG_PROJECT_LIBDIR \"\).*|\1$(get_libdir)/\")|" \
+		-e "s|\(set (ACG_PROJECT_PLUGINDIR \"\)lib\(.*\)|\1$(get_libdir)\2|" \
+		-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="$(cmake-utils_use_build "qt4" "APPS")"
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc LICENSE/* README CHANGELOG || die
+}