Version BUmp, blocking sci-libs/libmuscle, #308707

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 79 insertions, 8 deletions

diff --git a/sci-biology/muscle/ChangeLog b/sci-biology/muscle/ChangeLog
index 98d26dd5e515..ca47dac333cc 100644
--- a/sci-biology/muscle/ChangeLog
+++ b/sci-biology/muscle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/muscle
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/muscle/ChangeLog,v 1.9 2008/03/21 21:23:44 dberkholz Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/muscle/ChangeLog,v 1.10 2010/06/24 19:03:18 jlec Exp $
+
+*muscle-3.8.31 (24 Jun 2010)
+
+  24 Jun 2010; Justin Lecher <jlec@gentoo.org> +files/3.8.31-make.patch,
+  muscle-3.6.ebuild, muscle-3.7.ebuild, +muscle-3.8.31.ebuild:
+  Version BUmp, blocking sci-libs/libmuscle, #308707
 
 *muscle-3.7 (21 Mar 2008)
 
diff --git a/sci-biology/muscle/files/3.8.31-make.patch b/sci-biology/muscle/files/3.8.31-make.patch
new file mode 100644
index 000000000000..7c0e7308df54
--- /dev/null
+++ b/sci-biology/muscle/files/3.8.31-make.patch
@@ -0,0 +1,26 @@
+diff --git a/src/mk b/src/mk
+index 475d25a..d4b7e83 100755
+--- a/src/mk
++++ b/src/mk
+@@ -5,17 +5,14 @@ ObjNames='aligngivenpath.o aligngivenpathsw.o aligntwomsas.o aligntwoprofs.o aln
+ rm -f *.o muscle.make.stdout.txt muscle.make.stderr.txt
+ for CPPName in $CPPNames
+ do
+-  echo $CPPName >> /dev/tty
+-  g++ $ENV_GCC_OPTS -c -O3 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 $CPPName.cpp -o $CPPName.o  >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt
++  echo "${CXX} ${CXXFLAGS} -c -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 $CPPName.cpp -o $CPPName.o"
++  ${CXX} ${CXXFLAGS} -c -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 $CPPName.cpp -o $CPPName.o
+ done
+ 
+ LINK_OPTS=
+ if [ `uname -s` == Linux ] ; then
+     LINK_OPTS=-static
+ fi
+-g++ $LINK_OPTS $ENV_LINK_OPTS -g -o muscle $ObjNames  >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt
+-tail muscle.make.stderr.txt
+ 
+-strip muscle
+-ls -lh muscle
+-sum muscle
++echo "${CXX} ${LDFLAGS} -o muscle $ObjNames"
++${CXX} ${LDFLAGS} -o muscle $ObjNames
diff --git a/sci-biology/muscle/muscle-3.6.ebuild b/sci-biology/muscle/muscle-3.6.ebuild
index e181a618246b..f4fedf84f566 100644
--- a/sci-biology/muscle/muscle-3.6.ebuild
+++ b/sci-biology/muscle/muscle-3.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/muscle/muscle-3.6.ebuild,v 1.5 2007/12/26 10:25:01 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/muscle/muscle-3.6.ebuild,v 1.6 2010/06/24 19:03:18 jlec Exp $
 
 inherit toolchain-funcs
 
@@ -9,11 +9,14 @@ DESCRIPTION="Multiple sequence comparison by log-expectation"
 HOMEPAGE="http://www.drive5.com/muscle/"
 SRC_URI="http://www.drive5.com/muscle/downloads${PV}/${MY_P}.tar.gz"
 LICENSE="public-domain"
+
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
-RDEPEND=""
+
+RDEPEND="!sci-libs/libmuscle"
 DEPEND="${RDEPEND}"
+
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
diff --git a/sci-biology/muscle/muscle-3.7.ebuild b/sci-biology/muscle/muscle-3.7.ebuild
index 346ccedb1ae5..64ee5b1820a4 100644
--- a/sci-biology/muscle/muscle-3.7.ebuild
+++ b/sci-biology/muscle/muscle-3.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/muscle/muscle-3.7.ebuild,v 1.1 2008/03/21 21:23:44 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/muscle/muscle-3.7.ebuild,v 1.2 2010/06/24 19:03:18 jlec Exp $
 
 inherit toolchain-funcs
 
@@ -8,12 +8,15 @@ MY_P="${PN}${PV}_src"
 DESCRIPTION="Multiple sequence comparison by log-expectation"
 HOMEPAGE="http://www.drive5.com/muscle/"
 SRC_URI="http://www.drive5.com/muscle/downloads${PV}/${MY_P}.tar.gz"
+
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
-RDEPEND=""
+
+RDEPEND="!sci-libs/libmuscle"
 DEPEND="${RDEPEND}"
+
 S="${WORKDIR}"
 
 src_unpack() {
diff --git a/sci-biology/muscle/muscle-3.8.31.ebuild b/sci-biology/muscle/muscle-3.8.31.ebuild
new file mode 100644
index 000000000000..cfd0d79ac4c2
--- /dev/null
+++ b/sci-biology/muscle/muscle-3.8.31.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/muscle/muscle-3.8.31.ebuild,v 1.1 2010/06/24 19:03:18 jlec Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+MY_P="${PN}${PV}_src"
+
+DESCRIPTION="Multiple sequence comparison by log-expectation"
+HOMEPAGE="http://www.drive5.com/muscle/"
+SRC_URI="http://www.drive5.com/muscle/downloads${PV}/${MY_P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="!sci-libs/libmuscle"
+DEPEND=""
+
+S="${WORKDIR}"/${PN}${PV}/src
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-make.patch
+	tc-export CXX
+}
+
+src_install() {
+	dobin "${PN}" || die
+	dodoc *.txt || die
+}