use cmake-utils eclass

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc7 i686

3 files changed, 31 insertions, 31 deletions

diff --git a/media-gfx/aqsis/ChangeLog b/media-gfx/aqsis/ChangeLog
index bc40ee77823f..4c09c3199c64 100644
--- a/media-gfx/aqsis/ChangeLog
+++ b/media-gfx/aqsis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/aqsis
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/ChangeLog,v 1.12 2008/06/28 06:17:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/ChangeLog,v 1.13 2008/06/28 14:42:46 maekke Exp $
+
+  28 Jun 2008; Markus Meier <maekke@gentoo.org>
+  aqsis-1.3.0_p20080627.ebuild:
+  use cmake-utils eclass
 
 *aqsis-1.3.0_p20080627 (28 Jun 2008)
 
diff --git a/media-gfx/aqsis/Manifest b/media-gfx/aqsis/Manifest
index b5b96e11dbfe..2a1db65e7682 100644
--- a/media-gfx/aqsis/Manifest
+++ b/media-gfx/aqsis/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX aqsis-1.2.0-gcc43.patch 8195 RMD160 39bcbfb17b9393e8237500100152fac1462d1d6e SHA1 0ea69ffb7e83533e478e0113e15f7463471e019a SHA256 4bb5307cf1b350b6300b9628de9e76888559a61eb77c196b9fa92bbc63f0b0c2
 DIST aqsis-1.2.0.tar.gz 1013399 RMD160 73f73756585933d53f803d659bd98048770fc280 SHA1 0c13e87698522130b3e0c6a06da1192c1a720a54 SHA256 1c34522620dbedef1a1cd3fce73a409179addf4afc5d8da80b32e6e5fd2e6317
 DIST aqsis-1.3.0-2008-06-27.tar.gz 2389205 RMD160 f49430fcb86411ab43d592086daa49915d5ee783 SHA1 85153c9d153a26ceeb062eeef10490ce31f7b445 SHA256 45845d7986e106bd8c77c5accaa78c399d684fa3f588f8a827d28ec763a55b67
 EBUILD aqsis-1.2.0-r1.ebuild 2067 RMD160 552b3a6a96423aca981d03cfe6eba5837a6c4c3a SHA1 9d15cf5c9cc0705813afb0625787a037685400c3 SHA256 b8c2dc9297ef6bd65c7d6a9757f6ed9c26994413be86bca4ab71ab53beaa2f3f
 EBUILD aqsis-1.2.0.ebuild 1983 RMD160 48dd6468ed63631efacdc2539f19362be610b5f1 SHA1 37fa8464415027b031bda0b17e865395893704e3 SHA256 083498317fd2012bd215f6485e901847cdc95c9565b75e8322fe0edcbf833ff6
-EBUILD aqsis-1.3.0_p20080627.ebuild 2186 RMD160 11bbd9725e5de16d5a681aa551c2cf0dcf595d1f SHA1 de6f6df5c2358ff53414f825df737ac0e637ec67 SHA256 81f92a6295904a5e8ed1578a9642316996cfb58370c5c9a7d1228034a7e7cf64
-MISC ChangeLog 1843 RMD160 275d5f5bdb16d324d44cd18065588a12aab3e882 SHA1 abef0722b3f9404b64f75d1ef9b494a1812b95b5 SHA256 706d43f8cc93f1cb4a11e84794046d57a97f3018b8dc323bd3f763b4d44fbfcf
+EBUILD aqsis-1.3.0_p20080627.ebuild 1963 RMD160 90ae8f01589d443740024d8a66bf8400e04536ae SHA1 01369230c12f3a8faeb1589bf86c093123605c24 SHA256 34dd1155b7ff0166fbfcd784c4e8f83e3a45a5b1cce720368bbd82db78d4ebcf
+MISC ChangeLog 1949 RMD160 2c3b2584f41077c4151e566af7e9eea395e36d12 SHA1 fa3a7afade4f5ee396121932307f143b6a3d9a1e SHA256 956c6dfa9e0fbe2f56fef30ab1926eaa3fc3e2fab4a0b60b412e0eda593a3818
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhmTjEACgkQkKaRLQcq0GKckwCfRmWNMQvVOETHLANLeT54nSoN
+YLoAn1XKKrylZa7MIc4bPGkETd998JiL
+=bfGp
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/aqsis/aqsis-1.3.0_p20080627.ebuild b/media-gfx/aqsis/aqsis-1.3.0_p20080627.ebuild
index 67426fbdc077..82d68cc1f86b 100644
--- a/media-gfx/aqsis/aqsis-1.3.0_p20080627.ebuild
+++ b/media-gfx/aqsis/aqsis-1.3.0_p20080627.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/aqsis-1.3.0_p20080627.ebuild,v 1.2 2008/06/28 14:19:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/aqsis-1.3.0_p20080627.ebuild,v 1.3 2008/06/28 14:42:46 maekke Exp $
 
 EAPI="1"
 
-inherit versionator multilib eutils
+inherit versionator multilib eutils cmake-utils
 
 DESCRIPTION="Open source RenderMan-compliant 3D rendering solution"
 HOMEPAGE="http://www.aqsis.org"
@@ -41,41 +41,27 @@ src_compile() {
 		# (upstream doesn't autodetect the gentoo install path for fltk)
 		fltk_version="$(get_version_component_range 1-2 \
 			$(best_version x11-libs/fltk | sed -e 's/^x11-libs\/fltk//'))"
-		fltk_flags="
+		mycmakeargs="${mycmakeargs}
 			-DAQSIS_USE_FLTK:BOOL=ON
 			-DAQSIS_FLTK_INCLUDE_DIR:PATH=/usr/include/fltk-${fltk_version}
 			-DAQSIS_FLTK_LIBRARIES_DIR:PATH=/usr/$(get_libdir)/fltk-${fltk_version}"
 	else
-		fltk_flags="-DAQSIS_USE_FLTK:BOOL=OFF"
+		mycmakeargs="${mycmakeargs} -DAQSIS_USE_FLTK:BOOL=OFF"
 	fi
 
-	if use openexr ; then
-		exr_flags="-DAQSIS_USE_OPENEXR:BOOL=ON"
-	else
-		exr_flags="-DAQSIS_USE_OPENEXR:BOOL=OFF"
-	fi
-
-	# The aqsis build system prevents in-source builds, so we make a seperate
-	# directory inside ${S} to perform the build.
-	mkdir _build
-	cd _build
-
-	cmake -DAQSIS_BOOST_LIB_SUFFIX:STRING=-mt \
-		${fltk_flags} \
-		${exr_flags} \
-		-DAQSIS_USE_RPATH:BOOL=OFF \
-		-DLIBDIR:STRING=$(get_libdir) \
-		-DSYSCONFDIR:STRING=/etc \
-		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-		"${S}"
+	mycmakeargs="${mycmakeargs}
+		-DAQSIS_BOOST_LIB_SUFFIX:STRING=-mt
+		-DAQSIS_USE_OPENEXR:BOOL=$(use openexr && echo ON || echo OFF)
+		-DAQSIS_USE_RPATH:BOOL=OFF
+		-DLIBDIR:STRING=$(get_libdir)
+		-DSYSCONFDIR:STRING=/etc
+		-DCMAKE_INSTALL_PREFIX:PATH=/usr"
 
-	emake || die "Compilation failed"
+	cmake-utils_src_compile
 }
 
 src_install() {
-	cd _build
-	emake install DESTDIR="${D}"
-	cd ..
-	dodoc AUTHORS INSTALL README ReleaseNotes
+	DOCS="AUTHORS INSTALL README ReleaseNotes"
+	cmake-utils_src_install
 	# TODO: Make sure examples are installed.
 }