diff options
| -rw-r--r-- | sci-chemistry/massxpert/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-chemistry/massxpert/massxpert-1.7.6.ebuild | 38 |
2 files changed, 15 insertions, 30 deletions
diff --git a/sci-chemistry/massxpert/ChangeLog b/sci-chemistry/massxpert/ChangeLog index 39471d4772dc..0ba2479d8488 100644 --- a/sci-chemistry/massxpert/ChangeLog +++ b/sci-chemistry/massxpert/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-chemistry/massxpert -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/massxpert/ChangeLog,v 1.5 2008/07/20 14:22:03 loki_val Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/massxpert/ChangeLog,v 1.6 2009/09/18 20:59:44 wired Exp $ + + 18 Sep 2009; Alex Alexander <wired@gentoo.org> massxpert-1.7.6.ebuild: + updated Qt deps, switched to EAPI 2 20 Jul 2008; Peter Alfredsen <loki_val@gentoo.org> massxpert-1.7.6.ebuild: Keyword x86, fix to build with gcc-4.3 and fixup build-deps. diff --git a/sci-chemistry/massxpert/massxpert-1.7.6.ebuild b/sci-chemistry/massxpert/massxpert-1.7.6.ebuild index e5efaa448f73..93d8ba03d3b2 100644 --- a/sci-chemistry/massxpert/massxpert-1.7.6.ebuild +++ b/sci-chemistry/massxpert/massxpert-1.7.6.ebuild @@ -1,24 +1,24 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/massxpert/massxpert-1.7.6.ebuild,v 1.3 2008/07/20 14:22:03 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/massxpert/massxpert-1.7.6.ebuild,v 1.4 2009/09/18 20:59:44 wired Exp $ -EAPI=1 +EAPI=2 inherit base eutils flag-o-matic cmake-utils DESCRIPTION="A software suite to predict/analyze mass spectrometric data on (bio)polymers." HOMEPAGE="http://massxpert.org/wiki/" -SRC_URI="http://download.tuxfamily.org/massxpert/source/${PF}.tar.gz" +SRC_URI="http://download.tuxfamily.org/massxpert/source/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~x86 ~amd64" IUSE="" -RDEPEND="|| ( - ( x11-libs/qt-gui:4 x11-libs/qt-svg:4 x11-libs/qt-xmlpatterns:4 x11-libs/qt-core:4 ) - =x11-libs/qt-4.3*:4 - ) +RDEPEND=" + x11-libs/qt-gui[accessibility] + x11-libs/qt-svg + x11-libs/qt-xmlpatterns x11-libs/libSM x11-libs/libICE x11-libs/libXi @@ -37,31 +37,13 @@ RDEPEND="|| ( media-libs/nas media-libs/libpng dev-libs/libxml2" -DEPEND="${RDEPEND} - >=dev-util/cmake-2.4.7" +DEPEND="${RDEPEND}" -S="${WORKDIR}/${P}" +S="${WORKDIR}"/"${P}" CMAKE_IN_SOURCE_BUILD="true" PATCHES=( "${FILESDIR}/${P}-gcc43.patch" ) -pkg_setup() { - if has_version '=x11-libs/qt-4.3*' - then - if ! built_with_use '>x11-libs/qt-4.3' accessibility - then - eerror "qt-4 must be built with the accessibility USE flag." - die "qt-4 must be built with the accessibility USE flag.." - fi - else - if ! built_with_use '>x11-libs/qt-gui-4.4' accessibility - then - eerror "qt-gui must be built with the accessibility USE flag." - die "qt-gui must be built with the accessibility USE flag.." - fi - fi -} - src_compile() { sed -i \ -e "s:/lib/:/$(get_libdir)/:g" \ |