diff options
| -rw-r--r-- | sci-chemistry/massxpert/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-chemistry/massxpert/Manifest | 4 | ||||
| -rw-r--r-- | sci-chemistry/massxpert/massxpert-1.7.6.ebuild | 38 |
3 files changed, 17 insertions, 32 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/Manifest b/sci-chemistry/massxpert/Manifest index f50ae6f290c5..bcbf301ed487 100644 --- a/sci-chemistry/massxpert/Manifest +++ b/sci-chemistry/massxpert/Manifest @@ -1,5 +1,5 @@ AUX massxpert-1.7.6-gcc43.patch 616 RMD160 4a9c443b4885294738d83e6f2daec43b17a48ef3 SHA1 27ee3a82a274d6ee5c254c1c14702b7ab1926757 SHA256 274f24117d6008e13fee642751f1bc74bb1559b699e2c255f300de2bca4a86d1 DIST massxpert-1.7.6.tar.gz 19676075 RMD160 6c4d302114a8f7623bb2d9c8a531eccbc2399778 SHA1 41043885255a512a74212371b4ecd5f8c9812117 SHA256 d6a939981d19772b2c6e2b9e2b2df69817ef8f60e706bd94cb6e2b5f67740eef -EBUILD massxpert-1.7.6.ebuild 1930 RMD160 58d0f190bed1b5eda76f6166a505deb73091bad5 SHA1 328ea08cbe7cffa0edb1d78f2540c7fe4cda9d1d SHA256 97d27642607dabae76956d01529911043f042c1394899a0c8eab5be8d6bdc892 -MISC ChangeLog 887 RMD160 5ade7ad140b1ff285ff80b592e7a401bcf38667d SHA1 13f2608e970eb468bb55cd96ec2e34d6945d891b SHA256 e86543345b50487a160037e709790076bb0d2df4c4c5b45d876d2b149a17624b +EBUILD massxpert-1.7.6.ebuild 1399 RMD160 5e47b27dc567921b6eb636d1122ee8ea5c61a824 SHA1 680f6f67d3842e4d540147cddb7821d62ef62dba SHA256 5c77dfeef7c2b0889407feaee42279d38efc6254e144ab477198abe16757fd00 +MISC ChangeLog 996 RMD160 cb60d4adfe07b539352f017077d4889c6d763821 SHA1 ed24d79d8e97edca1c4dbadd3d9739caf65ceca7 SHA256 2bcdde2931ac54a81844091c098e10bf7192c5f84551492a88b2430dcaadb7b9 MISC metadata.xml 365 RMD160 f819adbd1efea7dd2d1fba08f3fb01e4960e792d SHA1 e9d9957e1c508402c18c973cf71a7df0bdd2db4b SHA256 323186d59527262058a473eab30e1c4b52ca6ac1a5c75b216b7bb167d2f0a014 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" \ |