[gentoo-commits] proj/sci:master commit in: sci-biology/genepop/

["Justin Lecher" <jlec@gentoo.org>]

commit:     2d443cdf793ac3a5ae7f3b1fb8eb0df7a3579a5b
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 15:55:16 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 15:55:16 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2d443cdf

sci-biology/genepop: Punt base.eclass: version bump

Package-Manager: portage-2.2.8

---
 sci-biology/genepop/ChangeLog                      |  6 ++++-
 ...{genepop-4.0.10.ebuild => genepop-4.2.1.ebuild} | 31 +++++++++-------------
 sci-biology/genepop/metadata.xml                   | 10 +++----
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/sci-biology/genepop/ChangeLog b/sci-biology/genepop/ChangeLog
index 7490dc2..9eee0f1 100644
--- a/sci-biology/genepop/ChangeLog
+++ b/sci-biology/genepop/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-biology/genepop
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> -genepop-4.0.10.ebuild,
+  +genepop-4.2.1.ebuild, metadata.xml:
+  Punt base.eclass: version bump
+
   26 Sep 2009; Andrey Kislyuk <weaver@gentoo.org> ChangeLog:
   New package, ebuild written by me
 

diff --git a/sci-biology/genepop/genepop-4.0.10.ebuild b/sci-biology/genepop/genepop-4.2.1.ebuild
similarity index 50%
rename from sci-biology/genepop/genepop-4.0.10.ebuild
rename to sci-biology/genepop/genepop-4.2.1.ebuild
index d034a34..ef61b20 100644
--- a/sci-biology/genepop/genepop-4.0.10.ebuild
+++ b/sci-biology/genepop/genepop-4.2.1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ncbi-tools++-2009.05.15-r1.ebuild,v 1.2 2009/08/19 08:00:26 weaver Exp $
 
-EAPI="2"
+EAPI=5
 
-inherit base toolchain-funcs
+inherit cmake-utils
 
 DESCRIPTION="Population genetics analysis"
 HOMEPAGE="http://genepop.curtin.edu.au/ http://kimura.univ-montp2.fr/~rousset/Genepop.htm"
-SRC_URI="mirror://gentoo/${P}.zip"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.gz"
 
 LICENSE="CeCILL-2"
 SLOT="0"
@@ -20,20 +20,15 @@ RDEPEND=""
 
 S="${WORKDIR}"
 
-src_unpack() {
-	base_src_unpack
-	unzip -d "${S}" sources.zip
-	mkdir "${S}/examples"
-	unzip -d "${S}/examples" examples.zip
-}
+src_prepare() {
+	cat >> CMakeLists.txt <<- EOF
+	cmake_minimum_required (VERSION 2.6)
+	project (${PN} CXX)
 
-src_compile() {
-	$(tc-getCXX) ${CFLAGS} -DNO_MODULES -o Genepop GenepopS.cpp -O3 || die
-}
+	set(CMAKE_CXX_FLAGS "\${CMAKE_CXX_FLAGS} -DNO_MODULES")
 
-src_install() {
-	dobin Genepop || die
-	insinto /usr/share/${PN}
-	doins -r examples || die
-	dodoc Genepop.pdf
+	add_executable(Genepop GenepopS.cpp)
+	install(TARGETS Genepop DESTINATION bin)
+	EOF
+	cmake-utils_src_prepare
 }

diff --git a/sci-biology/genepop/metadata.xml b/sci-biology/genepop/metadata.xml
index 3302123..fc7c769 100644
--- a/sci-biology/genepop/metadata.xml
+++ b/sci-biology/genepop/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>weaver@gentoo.org</email>
-		<name>Andrey Kislyuk</name>
-	</maintainer>
-	<herd>sci-biology</herd>
+  <maintainer>
+    <email>weaver@gentoo.org</email>
+    <name>Andrey Kislyuk</name>
+  </maintainer>
+  <herd>sci-biology</herd>
 </pkgmetadata>