version bump, bug 284344

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 152 insertions, 2 deletions

diff --git a/sci-chemistry/massxpert/ChangeLog b/sci-chemistry/massxpert/ChangeLog
index 0ba2479d8488..9c116623609f 100644
--- a/sci-chemistry/massxpert/ChangeLog
+++ b/sci-chemistry/massxpert/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/massxpert
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/massxpert/ChangeLog,v 1.7 2009/09/19 18:09:41 wired Exp $
+
+*massxpert-2.0.4 (19 Sep 2009)
+
+  19 Sep 2009; Alex Alexander <wired@gentoo.org> +massxpert-2.0.4.ebuild,
+  +files/massxpert-2.0.4-gentoo.patch:
+  version bump, bug 284344
 
   18 Sep 2009; Alex Alexander <wired@gentoo.org> massxpert-1.7.6.ebuild:
   updated Qt deps, switched to EAPI 2
diff --git a/sci-chemistry/massxpert/Manifest b/sci-chemistry/massxpert/Manifest
index bcbf301ed487..d048111cc456 100644
--- a/sci-chemistry/massxpert/Manifest
+++ b/sci-chemistry/massxpert/Manifest
@@ -1,5 +1,8 @@
 AUX massxpert-1.7.6-gcc43.patch 616 RMD160 4a9c443b4885294738d83e6f2daec43b17a48ef3 SHA1 27ee3a82a274d6ee5c254c1c14702b7ab1926757 SHA256 274f24117d6008e13fee642751f1bc74bb1559b699e2c255f300de2bca4a86d1
+AUX massxpert-2.0.4-gentoo.patch 2751 RMD160 d5237d773818bfd0233ae24fb41420cb5bb68037 SHA1 4bbcd914876df75883c7984b13891cb5e29c83f5 SHA256 10e3a50334915c15f932948f35fac195e7231423ac8f5914ad6037b78f0924ce
 DIST massxpert-1.7.6.tar.gz 19676075 RMD160 6c4d302114a8f7623bb2d9c8a531eccbc2399778 SHA1 41043885255a512a74212371b4ecd5f8c9812117 SHA256 d6a939981d19772b2c6e2b9e2b2df69817ef8f60e706bd94cb6e2b5f67740eef
+DIST massxpert-2.0.4.tar.gz 13602582 RMD160 b6cc49d31f7c1e8f9c8a9e835e14d1d5eba17214 SHA1 249ddfc1062be48aadad1290693c8b201c8407df SHA256 76b05a48abd51c4870c40cdcc0b19f36ebba966d31854bd6a4972ce8dafac57a
 EBUILD massxpert-1.7.6.ebuild 1399 RMD160 5e47b27dc567921b6eb636d1122ee8ea5c61a824 SHA1 680f6f67d3842e4d540147cddb7821d62ef62dba SHA256 5c77dfeef7c2b0889407feaee42279d38efc6254e144ab477198abe16757fd00
-MISC ChangeLog 996 RMD160 cb60d4adfe07b539352f017077d4889c6d763821 SHA1 ed24d79d8e97edca1c4dbadd3d9739caf65ceca7 SHA256 2bcdde2931ac54a81844091c098e10bf7192c5f84551492a88b2430dcaadb7b9
+EBUILD massxpert-2.0.4.ebuild 1371 RMD160 b1c5efe79d1c3c752d57a16aca45a1e667a0c813 SHA1 9439a7eaa12b79453c0a47f78ada2c2059dbd812 SHA256 a08cc5e51220c34b7384794e681ce9d41af14f14b478a0e04498ac54f45b66db
+MISC ChangeLog 1169 RMD160 53a9244d6af3bc7030bced51dfda2b14cf7048f6 SHA1 19c2d5aab7f0491dd23551cfae1d3195cc6ff6bd SHA256 88323c954ed6765bffe525d6f6533a37140701e99f557f9a214d52f281f4d4d3
 MISC metadata.xml 365 RMD160 f819adbd1efea7dd2d1fba08f3fb01e4960e792d SHA1 e9d9957e1c508402c18c973cf71a7df0bdd2db4b SHA256 323186d59527262058a473eab30e1c4b52ca6ac1a5c75b216b7bb167d2f0a014
diff --git a/sci-chemistry/massxpert/files/massxpert-2.0.4-gentoo.patch b/sci-chemistry/massxpert/files/massxpert-2.0.4-gentoo.patch
new file mode 100644
index 000000000000..63cbe2340008
--- /dev/null
+++ b/sci-chemistry/massxpert/files/massxpert-2.0.4-gentoo.patch
@@ -0,0 +1,84 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8085e0a..eaae8ce 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,10 +23,10 @@ SET (CMAKE_VERBOSE_MAKEFILE ON)
+ 
+ #############################################################
+ # Enable warnings and treat them as errors
+-SET (PEDANTIC TRUE CACHE BOOL "Should we compile with -Wall -Werror.")
++SET (PEDANTIC TRUE CACHE BOOL "Should we compile with -Wall.")
+ 
+ IF (PEDANTIC)
+-  ADD_DEFINITIONS (-Wall -Werror)
++  ADD_DEFINITIONS (-Wall)
+ ENDIF (PEDANTIC)
+ 
+ #############################################################
+@@ -51,9 +51,9 @@ ENDIF (WIN32)
+ IF (UNIX AND NOT APPLE)
+   SET (MASSXPERT_BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
+   SET (MASSXPERT_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/massxpert)
+-  SET (MASSXPERT_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib/massxpert/plugins)
++  SET (MASSXPERT_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/massxpert/plugins)
+   SET (MASSXPERT_LOCALE_DIR ${CMAKE_INSTALL_PREFIX}/share/massxpert/locales)
+-  SET (MASSXPERT_DOC_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/massxpert)
++  SET (MASSXPERT_DOC_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/massxpert-${VERSION})
+   SET (MASSXPERT_USERMAN_DIR ${MASSXPERT_DOC_DIR}/usermanual)
+ ENDIF (UNIX AND NOT APPLE)
+ 
+@@ -122,10 +122,6 @@ IF (${BUILD_PROGRAM})
+   ###############
+   # install stuff
+ 
+-  # The license file
+-  INSTALL (FILES COPYING
+-    DESTINATION ${MASSXPERT_DOC_DIR})
+-
+   # The desktop file
+   IF (UNIX AND NOT APPLE)
+     INSTALL (FILES massxpert.desktop
+@@ -165,10 +161,6 @@ IF (${BUILD_DATA})
+   ###############
+   # install stuff
+   
+-  # The license file
+-  INSTALL (FILES COPYING
+-    DESTINATION ${MASSXPERT_DOC_DIR})
+-  
+   # The manual pages (data)
+   IF (UNIX AND NOT APPLE)
+     INSTALL (FILES massxpert-data.7
+@@ -201,10 +193,6 @@ IF (${BUILD_USERMANUAL})
+   ###############
+   # install stuff
+   
+-  # The license file
+-  INSTALL (FILES COPYING
+-    DESTINATION ${MASSXPERT_DOC_DIR})
+-  
+   # The manual pages (user manual)
+   IF (UNIX AND NOT APPLE)
+     INSTALL (FILES massxpert-doc.7
+diff --git a/gui/configurationSettingsDlg.cpp b/gui/configurationSettingsDlg.cpp
+index bf595d5..82cad21 100644
+--- a/gui/configurationSettingsDlg.cpp
++++ b/gui/configurationSettingsDlg.cpp
+@@ -309,13 +309,11 @@ namespace massXpert
+   bool 
+   ConfigurationSettingsDlg::checkLocalizationDir(const QDir &dir)
+   {
+-    // At the moment there is the french translation: massxpert_fr.qm
++    // Gentoo provides optional installing of translations.
++    // If you decide not to have translations, then this check
++    // would fail.
+ 
+-    QString filePath(dir.absolutePath() +
+-		      QDir::separator() +
+-		      "massxpert_fr.qm");
+-    
+-    return QFile::exists(filePath);
++    return true;
+   }
+   
+ 
diff --git a/sci-chemistry/massxpert/massxpert-2.0.4.ebuild b/sci-chemistry/massxpert/massxpert-2.0.4.ebuild
new file mode 100644
index 000000000000..4b3e35685c38
--- /dev/null
+++ b/sci-chemistry/massxpert/massxpert-2.0.4.ebuild
@@ -0,0 +1,57 @@
+# 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-2.0.4.ebuild,v 1.1 2009/09/19 18:09:41 wired Exp $
+
+EAPI="2"
+
+inherit cmake-utils
+
+DESCRIPTION="A software suite to predict/analyze mass spectrometric data on (bio)polymers."
+HOMEPAGE="http://massxpert.org"
+SRC_URI="http://download.tuxfamily.org/${PN}/source/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc"
+
+RDEPEND="x11-libs/qt-svg:4[debug?]"
+DEPEND="${DEPEND}
+	doc? ( virtual/latex-base )"
+
+MASSXPERT_LANGS="fr"
+
+for L in ${MASSXPERT_LANGS}; do
+	IUSE="${IUSE} linguas_${L}"
+done
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	local langs=
+	for lingua in ${LINGUAS}; do
+		if has ${lingua} ${MASSXPERT_LANGS}; then
+			langs="${langs} ${PN}_${lingua}.qm"
+		fi
+	done
+
+	sed -i -e "s/\(SET (massxpert_TRANSLATIONS \).*/\1${langs})/" \
+		gui/CMakeLists.txt || die "setting up translations failed"
+}
+
+src_configure() {
+	filter-ldflags -Wl,--as-needed --as-needed
+
+	mycmakeargs="
+		-DBUILD_PROGRAM=1
+		-DBUILD_DATA=1"
+	use doc && mycmakeargs="${mycmakeargs} -DBUILD_USERMANUAL=1"
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doicon "gui/images/${PN}-icon-32.xpm" || die "installing icon failed"
+	dodoc TODO || die "dodoc failed"
+}