[gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/

[Christoph Junghans]

commit:     ab8ca179a44ab1b6feafc4c53e358dfaff876fa0
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 31 23:56:27 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Sep  1 00:21:28 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ab8ca179

sync with gx86

Package-Manager: portage-2.2.8-r1

---
 sci-libs/votca-tools/ChangeLog               |  5 ++++-
 sci-libs/votca-tools/votca-tools-9999.ebuild | 12 +++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index 5de32cc..fb3e7d8 100644
--- a/sci-libs/votca-tools/ChangeLog
+++ b/sci-libs/votca-tools/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-libs/votca-tools
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Aug 2014; Christoph Junghans <ottxor@g.o> votca-tools-9999.ebuild:
+  sync with gx86
+
   31 Dec 2012; Christoph Junghans <ottxor@g.o> votca-tools-9999.ebuild:
   update EHG_REPO_URI
 

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index 90f87a8..9d964a0 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -2,17 +2,20 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit cmake-utils eutils multilib
 
 if [ "${PV}" != "9999" ]; then
-	SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz"
-	RESTRICT="primaryuri"
+	SRC_URI="http://downloads.votca.googlecode.com/hg/${P}_pristine.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
 else
 	SRC_URI=""
 	inherit mercurial
 	EHG_REPO_URI="https://code.google.com/p/votca.tools/"
+	KEYWORDS=""
 fi
 
 DESCRIPTION="Votca tools library"
@@ -20,7 +23,6 @@ HOMEPAGE="http://www.votca.org"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
 IUSE="doc +fftw +gsl sqlite"
 
 RDEPEND="fftw? ( sci-libs/fftw:3.0 )
@@ -51,7 +53,7 @@ src_install() {
 	cmake-utils_src_install
 	if use doc; then
 		cd "${CMAKE_BUILD_DIR}"
-		emake html
+		cmake-utils_src_make html
 		dohtml -r share/doc/html/*
 	fi
 }