[gentoo-commits] proj/sci:master commit in: sci-chemistry/votca-csg/

[Christoph Junghans]

commit:     2204b05f8fb25b1a98092f8eec008efffb18b4f4
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  1 00:21:20 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=2204b05f

sync with gx86

Package-Manager: portage-2.2.8-r1

---
 sci-chemistry/votca-csg/ChangeLog             |  5 ++++-
 sci-chemistry/votca-csg/votca-csg-9999.ebuild | 14 ++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index c290cab..9fff6d4 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-chemistry/votca-csg
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Sep 2014; Christoph Junghans <ottxor@g.o> votca-csg-9999.ebuild:
+  sync with gx86
+
   09 Mar 2013; Christoph Junghans <ottxor@g.o> votca-csg-9999.ebuild:
   fix doc build on darwin
 

diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
index 31fa847..6fc1afe 100644
--- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild
@@ -4,19 +4,22 @@
 
 EAPI=5
 
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
 inherit bash-completion-r1 cmake-utils multilib
 
 IUSE="doc examples extras +gromacs"
 PDEPEND="extras? ( =sci-chemistry/${PN}apps-${PV} )"
 if [ "${PV}" != "9999" ]; then
-	SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz
-		doc? ( http://votca.googlecode.com/files/${PN}-manual-${PV}.pdf )
-		examples? (	http://votca.googlecode.com/files/${PN}-tutorials-${PV}.tar.gz )"
-	RESTRICT="primaryuri"
+	SRC_URI="http://downloads.votca.googlecode.com/hg/${P}.tar.gz
+		doc? ( http://downloads.votca.googlecode.com/hg/${PN}-manual-${PV}.pdf )
+		examples? (	http://downloads.votca.googlecode.com/hg/${PN}-tutorials-${PV}.tar.gz )"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
 else
 	SRC_URI=""
 	inherit mercurial
 	EHG_REPO_URI="https://code.google.com/p/votca.csg/"
+	KEYWORDS=""
 fi
 
 DESCRIPTION="Votca coarse-graining engine"
@@ -24,7 +27,6 @@ HOMEPAGE="http://www.votca.org"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
 
 RDEPEND="=sci-libs/votca-tools-${PV}
 	gromacs? ( sci-chemistry/gromacs:= )
@@ -98,7 +100,7 @@ src_install() {
 			dodoc "${DISTDIR}/${PN}-manual-${PV}.pdf"
 		fi
 		cd "${CMAKE_BUILD_DIR}" || die
-		emake html
+		cmake-utils_src_make html
 		dohtml -r share/doc/html/*
 	fi
 	if use examples; then