sci-libs/libmems: Merge changes through all revisions

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

3 files changed, 22 insertions, 29 deletions

diff --git a/sci-libs/libmems/ChangeLog b/sci-libs/libmems/ChangeLog
index e2d5880fd243..23a156971de6 100644
--- a/sci-libs/libmems/ChangeLog
+++ b/sci-libs/libmems/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/libmems
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libmems/ChangeLog,v 1.4 2012/11/08 09:09:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libmems/ChangeLog,v 1.5 2012/11/08 09:11:51 jlec Exp $
+
+  08 Nov 2012; Justin Lecher <jlec@gentoo.org> libmems-1.6.ebuild,
+  libmems-9999.ebuild:
+  Merge changes through all revisions
 
 *libmems-1.6_p1 (08 Nov 2012)
 
diff --git a/sci-libs/libmems/libmems-1.6.ebuild b/sci-libs/libmems/libmems-1.6.ebuild
index 46974de609ba..d55e98ac33e7 100644
--- a/sci-libs/libmems/libmems-1.6.ebuild
+++ b/sci-libs/libmems/libmems-1.6.ebuild
@@ -1,34 +1,28 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libmems/libmems-1.6.ebuild,v 1.3 2012/10/31 20:40:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libmems/libmems-1.6.ebuild,v 1.4 2012/11/08 09:11:51 jlec Exp $
 
 EAPI="2"
 
-MY_TAG="mauve-2-2-0-release"
-#ESVN_REPO_URI="https://mauve.svn.sourceforge.net/svnroot/mauve/libMems/tags/${MY_TAG}"
-
-#inherit subversion autotools
 inherit autotools
 
 DESCRIPTION="Library for sci-biology/mauve"
 HOMEPAGE="http://gel.ahabs.wisc.edu/mauve/"
-#SRC_URI=""
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-LICENSE="GPL-2"
 SLOT="0"
+LICENSE="GPL-2"
 IUSE="doc"
 KEYWORDS="~amd64 ~x86"
 
-CDEPEND=">=sci-libs/libgenome-1.3
-	>=sci-libs/libmuscle-3.7
-	dev-libs/boost"
+CDEPEND="
+	dev-libs/boost
+	sci-libs/libgenome
+	sci-libs/libmuscle"
 DEPEND="${CDEPEND}
 	doc? ( app-doc/doxygen )"
 RDEPEND="${CDEPEND}"
 
-#S="${WORKDIR}"
-
 src_prepare() {
 	eautoreconf
 }
diff --git a/sci-libs/libmems/libmems-9999.ebuild b/sci-libs/libmems/libmems-9999.ebuild
index e6fc0b1d6214..62de69c0885c 100644
--- a/sci-libs/libmems/libmems-9999.ebuild
+++ b/sci-libs/libmems/libmems-9999.ebuild
@@ -1,35 +1,30 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libmems/libmems-9999.ebuild,v 1.1 2009/04/03 16:36:24 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libmems/libmems-9999.ebuild,v 1.2 2012/11/08 09:11:51 jlec Exp $
 
-EAPI="2"
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=yes
 
 ESVN_REPO_URI="https://mauve.svn.sourceforge.net/svnroot/mauve/libMems/trunk"
 
-inherit subversion autotools
+inherit autotools-utils subversion
 
 DESCRIPTION="Library for sci-biology/mauve"
 HOMEPAGE="http://gel.ahabs.wisc.edu/mauve/"
 SRC_URI=""
 
-LICENSE="GPL-2"
 SLOT="0"
+LICENSE="GPL-2"
 IUSE="doc"
 KEYWORDS=""
 
-CDEPEND=">=sci-libs/libgenome-1.3
-	>=sci-libs/libmuscle-3.7
-	dev-libs/boost"
+CDEPEND="
+	dev-libs/boost
+	sci-libs/libgenome
+	sci-libs/libmuscle"
 DEPEND="${CDEPEND}
 	doc? ( app-doc/doxygen )"
 RDEPEND="${CDEPEND}"
 
 S="${WORKDIR}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-}