diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-28 14:22:35 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-28 14:22:35 +0000 |
commit | b0454d31fa5499500c44cedccc2623156b6869c8 (patch) | |
tree | afbeaa886887393bd91b75f25e10d0626e4514d4 /sci-chemistry/avogadro | |
parent | Add more linguas that are availible in the tarball. (diff) | |
download | gentoo-2-b0454d31fa5499500c44cedccc2623156b6869c8.tar.gz gentoo-2-b0454d31fa5499500c44cedccc2623156b6869c8.tar.bz2 gentoo-2-b0454d31fa5499500c44cedccc2623156b6869c8.zip |
Cleanup the cmake-utils usage.
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry/avogadro')
-rw-r--r-- | sci-chemistry/avogadro/ChangeLog | 5 | ||||
-rw-r--r-- | sci-chemistry/avogadro/avogadro-1.0.3.ebuild | 36 |
2 files changed, 21 insertions, 20 deletions
diff --git a/sci-chemistry/avogadro/ChangeLog b/sci-chemistry/avogadro/ChangeLog index 25d528f4e688..8d5c88710f99 100644 --- a/sci-chemistry/avogadro/ChangeLog +++ b/sci-chemistry/avogadro/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-chemistry/avogadro # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.37 2011/04/27 07:26:04 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.38 2011/04/28 14:22:35 scarabeus Exp $ + + 28 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> avogadro-1.0.3.ebuild: + Cleanup the cmake-utils usage. 27 Apr 2011; Justin Lecher <jlec@gentoo.org> avogadro-1.0.0.ebuild, avogadro-1.0.1.ebuild, avogadro-1.0.3.ebuild: diff --git a/sci-chemistry/avogadro/avogadro-1.0.3.ebuild b/sci-chemistry/avogadro/avogadro-1.0.3.ebuild index 2cbe8062a211..2a402977f4b3 100644 --- a/sci-chemistry/avogadro/avogadro-1.0.3.ebuild +++ b/sci-chemistry/avogadro/avogadro-1.0.3.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-1.0.3.ebuild,v 1.2 2011/04/27 07:26:04 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-1.0.3.ebuild,v 1.3 2011/04/28 14:22:35 scarabeus Exp $ -EAPI=2 +EAPI=3 PYTHON_DEPEND="python? 2:2.5" -inherit cmake-utils eutils python +inherit base cmake-utils eutils python DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL" -HOMEPAGE="http://avogadro.sourceforge.net/" +HOMEPAGE="http://avogadro.openmolecules.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" @@ -22,7 +22,7 @@ RDEPEND=" >=x11-libs/qt-gui-4.5.3:4 >=x11-libs/qt-opengl-4.5.3:4 x11-libs/gl2ps - glsl? ( >=media-libs/glew-1.5.0 ) + glsl? ( >=media-libs/glew-1.5.0 ) python? ( >=dev-libs/boost-1.35 >=dev-libs/boost-1.35.0-r5[python] @@ -30,27 +30,25 @@ RDEPEND=" dev-python/sip )" DEPEND="${RDEPEND} - dev-cpp/eigen:2 - >=dev-util/cmake-2.6.2" + dev-cpp/eigen:2" + +PATCHES=( + "${FILESDIR}"/1.0.1-gl2ps.patch +) pkg_setup() { python_set_active_version 2 } -src_prepare() { - epatch \ - "${FILESDIR}"/1.0.1-gl2ps.patch -} - src_configure() { - local mycmakeargs - mycmakeargs="${mycmakeargs} - -DENABLE_THREADGL=FALSE - -DENABLE_RPATH=OFF - -DENABLE_UPDATE_CHECKER=OFF - $(cmake-utils_use_enable glsl GLSL) + local mycmakeargs=( + "-DENABLE_THREADGL=FALSE" + "-DENABLE_RPATH=OFF" + "-DENABLE_UPDATE_CHECKER=OFF" + $(cmake-utils_use_enable glsl) $(cmake-utils_use_with sse2 SSE2) - $(cmake-utils_use_enable python PYTHON)" + $(cmake-utils_use_enable python) + ) cmake-utils_src_configure } |