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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2011-02-12 13:54 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2011-02-12 13:54 UTC (permalink / raw
  To: gentoo-commits

commit:     33ef80d5033a5e8c39978cd7911ad1efe8b4aede
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 13:59:54 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat Feb 12 14:05:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=33ef80d5

[sci-libs/votca-tools] version bump

(Portage version: 2.1.9.25/git/Linux i686, signed Manifest commit with key C2000586)

---
 sci-libs/votca-tools/ChangeLog                     |    8 +++++++-
 ...ools-9999.ebuild => votca-tools-1.1_rc1.ebuild} |   12 +++++++-----
 sci-libs/votca-tools/votca-tools-9999.ebuild       |   12 +++++++-----
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index 603c4b7..b335a8b 100644
--- a/sci-libs/votca-tools/ChangeLog
+++ b/sci-libs/votca-tools/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-libs/votca-tools
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*votca-tools-1.1_rc1 (12 Feb 2011)
+
+  12 Feb 2011; Christoph Junghans <kleiner_otti@gmx.de>
+  +votca-tools-1.1_rc1.ebuild:
+  Version bump
+
   17 Dec 2010; Christoph Junghans <kleiner_otti@gmx.de> 
   votca-tools-9999.ebuild:
   using autotools-utils eclass

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-1.1_rc1.ebuild
similarity index 84%
copy from sci-libs/votca-tools/votca-tools-9999.ebuild
copy to sci-libs/votca-tools/votca-tools-1.1_rc1.ebuild
index dc396ee..ad2a6d6 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.1_rc1.ebuild
@@ -8,6 +8,7 @@ inherit eutils autotools-utils
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz"
+	RESTRICT="primaryuri"
 else
 	SRC_URI=""
 	inherit mercurial
@@ -29,7 +30,7 @@ RDEPEND="fftw? ( sci-libs/fftw:3.0 )
 	boost? ( dev-libs/boost )"
 
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
+	doc? ( app-doc/doxygen[-nodot] )
 	>=app-text/txt2tags-2.5
 	dev-util/pkgconfig"
 
@@ -43,10 +44,11 @@ src_prepare() {
 		rm -rf src/libboost
 	else
 		#fix a qa issue ../../config is not support as m4 dir
-		mkdir -p src/libboost/config
+		mkdir -p src/libboost/config || die
 		sed -i 's@\.\./\.\./config@config@' \
 			src/libboost/configure.ac \
-			src/libboost/Makefile.am
+			src/libboost/Makefile.am || \
+			die "sed of libboost configure.ac and Makefile.am failed"
 	fi
 	eautoreconf || die "eautoreconf failed"
 }
@@ -59,12 +61,12 @@ src_configure() {
 		$(use_with gsl)
 		$(use_with fftw)
 	)
-	autotools-utils_src_configure
+	autotools-utils_src_configure || die
 }
 
 src_install() {
 	DOCS=(${AUTOTOOLS_BUILD_DIR}/CHANGELOG NOTICE)
-	autotools-utils_src_install
+	autotools-utils_src_install || die
 	if use doc; then
 		cd share/doc
 		doxygen || die

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index dc396ee..ad2a6d6 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -8,6 +8,7 @@ inherit eutils autotools-utils
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz"
+	RESTRICT="primaryuri"
 else
 	SRC_URI=""
 	inherit mercurial
@@ -29,7 +30,7 @@ RDEPEND="fftw? ( sci-libs/fftw:3.0 )
 	boost? ( dev-libs/boost )"
 
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
+	doc? ( app-doc/doxygen[-nodot] )
 	>=app-text/txt2tags-2.5
 	dev-util/pkgconfig"
 
@@ -43,10 +44,11 @@ src_prepare() {
 		rm -rf src/libboost
 	else
 		#fix a qa issue ../../config is not support as m4 dir
-		mkdir -p src/libboost/config
+		mkdir -p src/libboost/config || die
 		sed -i 's@\.\./\.\./config@config@' \
 			src/libboost/configure.ac \
-			src/libboost/Makefile.am
+			src/libboost/Makefile.am || \
+			die "sed of libboost configure.ac and Makefile.am failed"
 	fi
 	eautoreconf || die "eautoreconf failed"
 }
@@ -59,12 +61,12 @@ src_configure() {
 		$(use_with gsl)
 		$(use_with fftw)
 	)
-	autotools-utils_src_configure
+	autotools-utils_src_configure || die
 }
 
 src_install() {
 	DOCS=(${AUTOTOOLS_BUILD_DIR}/CHANGELOG NOTICE)
-	autotools-utils_src_install
+	autotools-utils_src_install || die
 	if use doc; then
 		cd share/doc
 		doxygen || die



^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2011-02-12 16:16 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2011-02-12 16:16 UTC (permalink / raw
  To: gentoo-commits

commit:     9d34c83cee2c6aeb955e315cea726b90a50faee6
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 16:26:38 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat Feb 12 16:26:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9d34c83c

[sci-libs/votca-tools] 1.0.1 moved to the main tree

(Portage version: 2.1.9.25/git/Linux i686, signed Manifest commit with key C2000586)

---
 sci-libs/votca-tools/metadata.xml             |   10 ++--
 sci-libs/votca-tools/votca-tools-1.0.1.ebuild |   65 -------------------------
 2 files changed, 5 insertions(+), 70 deletions(-)

diff --git a/sci-libs/votca-tools/metadata.xml b/sci-libs/votca-tools/metadata.xml
index d416b00..046b8b5 100644
--- a/sci-libs/votca-tools/metadata.xml
+++ b/sci-libs/votca-tools/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+	<herd>sci-chemistry</herd>
 	<maintainer>
-		<email>kleiner_otti@gmx.de</email>
+		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
-<use>
-	<flag name='boost'>Compile against external boost headers (dev-libs/boost)</flag>
-</use>
+	<use>
+		<flag name='boost'>Compile against external boost headers (dev-libs/boost)</flag>
+	</use>
 </pkgmetadata>

diff --git a/sci-libs/votca-tools/votca-tools-1.0.1.ebuild b/sci-libs/votca-tools/votca-tools-1.0.1.ebuild
deleted file mode 100644
index 941085d..0000000
--- a/sci-libs/votca-tools/votca-tools-1.0.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils autotools
-
-if [ "${PV}" != "9999" ]; then
-	SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz"
-else
-	SRC_URI=""
-	inherit mercurial
-	EHG_REPO_URI="https://tools.votca.googlecode.com/hg"
-	S="${WORKDIR}/${EHG_REPO_URI##*/}"
-fi
-
-DESCRIPTION="Votca tools library"
-HOMEPAGE="http://www.votca.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="-boost doc +fftw +gsl static-libs"
-
-RDEPEND="fftw? ( sci-libs/fftw:3.0 )
-	dev-libs/expat
-	gsl? ( sci-libs/gsl )
-	boost? ( dev-libs/boost )
-	doc? ( >=app-text/txt2tags-2.5 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	use gsl || ewarn "Disabling gsl will lead to reduced functionality"
-	use fftw || ewarn "Disabling fftw will lead to reduced functionality"
-
-	#remove bundled libs
-	rm -rf src/libexpat
-	use boost && rm -rf src/libboost
-
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_configure() {
-	local myconf="--disable-la-files --disable-rc-files"
-
-	use boost \
-		&&  myconf="${myconf} $(use_with boost) --disable-votca-boost" \
-		||  myconf="${myconf} $(use_with boost) --enable-votca-boost"
-
-	myconf="${myconf} $(use_with gsl) $(use_with fftw) $(use_enable static-libs	static)"
-
-	econf ${myconf} || die "econf failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc NOTICE
-	if use doc; then
-		emake CHANGELOG || die "emake CHANGELOG failed"
-		dodoc CHANGELOG
-	fi
-}



^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2011-02-13 17:27 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2011-02-13 17:27 UTC (permalink / raw
  To: gentoo-commits

commit:     18063055ce9af5da4497183852680f8dfb504c56
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 17:29:33 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sun Feb 13 17:29:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=18063055

[sci-libs/votca-tools] version bump

(Portage version: 2.1.9.25/git/Linux i686, signed Manifest commit with key C2000586)

---
 ...s-1.1_rc1.ebuild => votca-tools-1.1_rc2.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/sci-libs/votca-tools/votca-tools-1.1_rc1.ebuild b/sci-libs/votca-tools/votca-tools-1.1_rc2.ebuild
similarity index 100%
rename from sci-libs/votca-tools/votca-tools-1.1_rc1.ebuild
rename to sci-libs/votca-tools/votca-tools-1.1_rc2.ebuild



^ permalink raw reply	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2011-02-19 17:03 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2011-02-19 17:03 UTC (permalink / raw
  To: gentoo-commits

commit:     0be3f56f5620eae5b4eeaaaa74db57d532e6f333
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 16:20:59 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat Feb 19 17:13:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0be3f56f

[sci-libs/votca-tools] version bump

(Portage version: 2.1.9.25/git/Linux i686, signed Manifest commit with key C2000586)

---
 sci-libs/votca-tools/ChangeLog                     |    6 ++++++
 ...tools-1.1_rc2.ebuild => votca-tools-1.1.ebuild} |    7 ++++---
 sci-libs/votca-tools/votca-tools-9999.ebuild       |    7 ++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index b335a8b..1b5a402 100644
--- a/sci-libs/votca-tools/ChangeLog
+++ b/sci-libs/votca-tools/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*votca-tools-1.1 (19 Feb 2011)
+
+  19 Feb 2011; Christoph Junghans <ottxor@gentoo.org>
+  -votca-tools-1.1_rc2.ebuild, +votca-tools-1.1.ebuild:
+  Version bump
+
 *votca-tools-1.1_rc1 (12 Feb 2011)
 
   12 Feb 2011; Christoph Junghans <kleiner_otti@gmx.de>

diff --git a/sci-libs/votca-tools/votca-tools-1.1_rc2.ebuild b/sci-libs/votca-tools/votca-tools-1.1.ebuild
similarity index 89%
rename from sci-libs/votca-tools/votca-tools-1.1_rc2.ebuild
rename to sci-libs/votca-tools/votca-tools-1.1.ebuild
index ad2a6d6..55d421c 100644
--- a/sci-libs/votca-tools/votca-tools-1.1_rc2.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.1.ebuild
@@ -7,7 +7,8 @@ EAPI="3"
 inherit eutils autotools-utils
 
 if [ "${PV}" != "9999" ]; then
-	SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz"
+	SRC_URI="boost? ( http://votca.googlecode.com/files/${PF}_pristine.tar.gz )
+		!boost? ( http://votca.googlecode.com/files/${PF}.tar.gz )"
 	RESTRICT="primaryuri"
 else
 	SRC_URI=""
@@ -68,8 +69,8 @@ src_install() {
 	DOCS=(${AUTOTOOLS_BUILD_DIR}/CHANGELOG NOTICE)
 	autotools-utils_src_install || die
 	if use doc; then
-		cd share/doc
+		cd share/doc || die
 		doxygen || die
-		dohtml -r html/*
+		dohtml -r html/* || die
 	fi
 }

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index ad2a6d6..55d421c 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -7,7 +7,8 @@ EAPI="3"
 inherit eutils autotools-utils
 
 if [ "${PV}" != "9999" ]; then
-	SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz"
+	SRC_URI="boost? ( http://votca.googlecode.com/files/${PF}_pristine.tar.gz )
+		!boost? ( http://votca.googlecode.com/files/${PF}.tar.gz )"
 	RESTRICT="primaryuri"
 else
 	SRC_URI=""
@@ -68,8 +69,8 @@ src_install() {
 	DOCS=(${AUTOTOOLS_BUILD_DIR}/CHANGELOG NOTICE)
 	autotools-utils_src_install || die
 	if use doc; then
-		cd share/doc
+		cd share/doc || die
 		doxygen || die
-		dohtml -r html/*
+		dohtml -r html/* || die
 	fi
 }



^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2011-03-03 21:43 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2011-03-03 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     287bc76ebeae533ec400901045a33dc29e9fcafd
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  3 20:56:17 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Thu Mar  3 21:54:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=287bc76e

[sci-libs/votca-tools] version bump

(Portage version: 2.1.9.25/git/Linux i686, signed Manifest commit with key C2000586)

---
 sci-libs/votca-tools/ChangeLog                     |    6 ++++++
 ...a-tools-1.1.ebuild => votca-tools-1.1.1.ebuild} |    0
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index 1b5a402..f2835b3 100644
--- a/sci-libs/votca-tools/ChangeLog
+++ b/sci-libs/votca-tools/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*votca-tools-1.1.1 (03 Mar 2011)
+
+  03 Mar 2011; Christoph Junghans <ottxor@gentoo.org> -votca-tools-1.1.ebuild,
+  +votca-tools-1.1.1.ebuild:
+  version bump
+
 *votca-tools-1.1 (19 Feb 2011)
 
   19 Feb 2011; Christoph Junghans <ottxor@gentoo.org>

diff --git a/sci-libs/votca-tools/votca-tools-1.1.ebuild b/sci-libs/votca-tools/votca-tools-1.1.1.ebuild
similarity index 100%
rename from sci-libs/votca-tools/votca-tools-1.1.ebuild
rename to sci-libs/votca-tools/votca-tools-1.1.1.ebuild



^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2011-03-03 21:43 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2011-03-03 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     dbaf344447b7e7cd37add120d394eff57cc4c099
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  3 21:26:08 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Thu Mar  3 21:54:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=dbaf3444

[sci-libs/votca-tools] switched to cmake

(Portage version: 2.1.9.25/git/Linux i686, signed Manifest commit with key C2000586)

---
 sci-libs/votca-tools/votca-tools-9999.ebuild |   31 +++++++++----------------
 1 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index 55d421c..283d825 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="3"
 
-inherit eutils autotools-utils
+inherit eutils cmake-utils
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="boost? ( http://votca.googlecode.com/files/${PF}_pristine.tar.gz )
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.votca.org"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="-boost doc +fftw +gsl static-libs"
+IUSE="-boost doc +fftw +gsl"
 
 RDEPEND="fftw? ( sci-libs/fftw:3.0 )
 	dev-libs/expat
@@ -40,35 +40,26 @@ src_prepare() {
 	use fftw || ewarn "Disabling fftw will lead to reduced functionality"
 
 	#remove bundled libs
-	rm -rf src/libexpat
 	if use boost; then
 		rm -rf src/libboost
-	else
-		#fix a qa issue ../../config is not support as m4 dir
-		mkdir -p src/libboost/config || die
-		sed -i 's@\.\./\.\./config@config@' \
-			src/libboost/configure.ac \
-			src/libboost/Makefile.am || \
-			die "sed of libboost configure.ac and Makefile.am failed"
 	fi
-	eautoreconf || die "eautoreconf failed"
 }
 
 src_configure() {
-	local myconf
-	use boost && myconf="--disable-votca-boost" || myconf="--enable-votca-boost"
-
-	myeconfargs=( ${myconf} --disable-rc-files
-		$(use_with gsl)
-		$(use_with fftw)
+	mycmakeargs=(
+		$(cmake-utils_use boost EXTERNAL_BOOST)
+		$(cmake-utils_use_with gsl GSL)
+		$(cmake-utils_use_with fftw FFTW)
+		-DWITH_RC_FILES=OFF
 	)
-	autotools-utils_src_configure || die
+	cmake-utils_src_configure || die
 }
 
 src_install() {
-	DOCS=(${AUTOTOOLS_BUILD_DIR}/CHANGELOG NOTICE)
-	autotools-utils_src_install || die
+	DOCS=(${CMAKE_BUILD_DIR}/CHANGELOG NOTICE)
+	cmake-utils_src_install || die
 	if use doc; then
+		cd "${CMAKE_BUILD_DIR}" || die
 		cd share/doc || die
 		doxygen || die
 		dohtml -r html/* || die



^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2011-03-08 21:40 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2011-03-08 21:40 UTC (permalink / raw
  To: gentoo-commits

commit:     d93b36fe0f5b9682c04df2901d658c69f1aca9e8
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  8 21:50:51 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Tue Mar  8 21:50:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d93b36fe

[sci-libs/votca-tools] 1.1.1 InCVS

(Portage version: 2.1.9.25/git/Linux i686, signed Manifest commit with key C2000586)

---
 sci-libs/votca-tools/ChangeLog                |    4 +
 sci-libs/votca-tools/votca-tools-1.1.1.ebuild |   76 -------------------------
 2 files changed, 4 insertions(+), 76 deletions(-)

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index f2835b3..441b83f 100644
--- a/sci-libs/votca-tools/ChangeLog
+++ b/sci-libs/votca-tools/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Mar 2011; Christoph Junghans <ottxor@gentoo.org>
+  -votca-tools-1.1.1.ebuild:
+  InCVS
+
 *votca-tools-1.1.1 (03 Mar 2011)
 
   03 Mar 2011; Christoph Junghans <ottxor@gentoo.org> -votca-tools-1.1.ebuild,

diff --git a/sci-libs/votca-tools/votca-tools-1.1.1.ebuild b/sci-libs/votca-tools/votca-tools-1.1.1.ebuild
deleted file mode 100644
index 55d421c..0000000
--- a/sci-libs/votca-tools/votca-tools-1.1.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils autotools-utils
-
-if [ "${PV}" != "9999" ]; then
-	SRC_URI="boost? ( http://votca.googlecode.com/files/${PF}_pristine.tar.gz )
-		!boost? ( http://votca.googlecode.com/files/${PF}.tar.gz )"
-	RESTRICT="primaryuri"
-else
-	SRC_URI=""
-	inherit mercurial
-	EHG_REPO_URI="https://tools.votca.googlecode.com/hg"
-	S="${WORKDIR}/${EHG_REPO_URI##*/}"
-fi
-
-DESCRIPTION="Votca tools library"
-HOMEPAGE="http://www.votca.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="-boost doc +fftw +gsl static-libs"
-
-RDEPEND="fftw? ( sci-libs/fftw:3.0 )
-	dev-libs/expat
-	gsl? ( sci-libs/gsl )
-	boost? ( dev-libs/boost )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[-nodot] )
-	>=app-text/txt2tags-2.5
-	dev-util/pkgconfig"
-
-src_prepare() {
-	use gsl || ewarn "Disabling gsl will lead to reduced functionality"
-	use fftw || ewarn "Disabling fftw will lead to reduced functionality"
-
-	#remove bundled libs
-	rm -rf src/libexpat
-	if use boost; then
-		rm -rf src/libboost
-	else
-		#fix a qa issue ../../config is not support as m4 dir
-		mkdir -p src/libboost/config || die
-		sed -i 's@\.\./\.\./config@config@' \
-			src/libboost/configure.ac \
-			src/libboost/Makefile.am || \
-			die "sed of libboost configure.ac and Makefile.am failed"
-	fi
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_configure() {
-	local myconf
-	use boost && myconf="--disable-votca-boost" || myconf="--enable-votca-boost"
-
-	myeconfargs=( ${myconf} --disable-rc-files
-		$(use_with gsl)
-		$(use_with fftw)
-	)
-	autotools-utils_src_configure || die
-}
-
-src_install() {
-	DOCS=(${AUTOTOOLS_BUILD_DIR}/CHANGELOG NOTICE)
-	autotools-utils_src_install || die
-	if use doc; then
-		cd share/doc || die
-		doxygen || die
-		dohtml -r html/* || die
-	fi
-}



^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2011-06-02 13:03 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2011-06-02 13:03 UTC (permalink / raw
  To: gentoo-commits

commit:     64ad109f2afa063f5086f621bf8ce8d28f4166d2
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  2 13:01:44 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Thu Jun  2 13:03:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=64ad109f

[sci-libs/votca-tools] added sqlite3 support

(Portage version: 2.1.9.42/git/Linux i686, signed Manifest commit with key C2000586)

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

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index 441b83f..277d7a8 100644
--- a/sci-libs/votca-tools/ChangeLog
+++ b/sci-libs/votca-tools/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Jun 2011; Christoph Junghans <ottxor@gentoo.org> votca-tools-9999.ebuild:
+  added sqlite3 support
+
   08 Mar 2011; Christoph Junghans <ottxor@gentoo.org>
   -votca-tools-1.1.1.ebuild:
   InCVS

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index 283d825..ccf39a9 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -23,12 +23,13 @@ HOMEPAGE="http://www.votca.org"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="-boost doc +fftw +gsl"
+IUSE="-boost doc +fftw +gsl sqlite"
 
 RDEPEND="fftw? ( sci-libs/fftw:3.0 )
 	dev-libs/expat
 	gsl? ( sci-libs/gsl )
-	boost? ( dev-libs/boost )"
+	boost? ( dev-libs/boost )
+	sqlite? ( dev-db/sqlite:3 )"
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[-nodot] )
@@ -50,6 +51,7 @@ src_configure() {
 		$(cmake-utils_use boost EXTERNAL_BOOST)
 		$(cmake-utils_use_with gsl GSL)
 		$(cmake-utils_use_with fftw FFTW)
+		$(cmake-utils_use_with sqlite SQLITE3)
 		-DWITH_RC_FILES=OFF
 	)
 	cmake-utils_src_configure || die



^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2011-06-03 21:59 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2011-06-03 21:59 UTC (permalink / raw
  To: gentoo-commits

commit:     2a0252b078bd2e34eb3f8b82c587d5adee43433b
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  3 21:52:20 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Fri Jun  3 21:52:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2a0252b0

[sci-libs/votca-tools] use default instead of tip

(Portage version: 2.1.9.42/git/Linux i686, signed Manifest commit with key C2000586)

---
 sci-libs/votca-tools/ChangeLog               |    3 +++
 sci-libs/votca-tools/votca-tools-9999.ebuild |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index 277d7a8..a374af1 100644
--- a/sci-libs/votca-tools/ChangeLog
+++ b/sci-libs/votca-tools/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Jun 2011; Christoph Junghans <ottxor@gentoo.org> votca-tools-9999.ebuild:
+  use default instead of tip
+
   02 Jun 2011; Christoph Junghans <ottxor@gentoo.org> votca-tools-9999.ebuild:
   added sqlite3 support
 

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index ccf39a9..931a919 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -14,6 +14,7 @@ else
 	SRC_URI=""
 	inherit mercurial
 	EHG_REPO_URI="https://tools.votca.googlecode.com/hg"
+	EHG_REVISION="default"
 	S="${WORKDIR}/${EHG_REPO_URI##*/}"
 fi
 



^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2011-06-24 17:09 Justin Lecher
  0 siblings, 0 replies; 23+ messages in thread
From: Justin Lecher @ 2011-06-24 17:09 UTC (permalink / raw
  To: gentoo-commits

commit:     eeb3c297b75035547a30daf00cfa215895baaca4
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 12:37:49 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 12:37:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=eeb3c297

Sort inherit and/or USE

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

---
 sci-libs/votca-tools/ChangeLog               |    3 +++
 sci-libs/votca-tools/votca-tools-9999.ebuild |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index a374af1..7c03d65 100644
--- a/sci-libs/votca-tools/ChangeLog
+++ b/sci-libs/votca-tools/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Jun 2011; Justin Lecher <jlec@gentoo.org> votca-tools-9999.ebuild:
+  Sort inherit and/or USE
+
   03 Jun 2011; Christoph Junghans <ottxor@gentoo.org> votca-tools-9999.ebuild:
   use default instead of tip
 

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index 931a919..94d99d5 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="3"
 
-inherit eutils cmake-utils
+inherit cmake-utils eutils
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="boost? ( http://votca.googlecode.com/files/${PF}_pristine.tar.gz )



^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2011-08-14 15:04 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2011-08-14 15:04 UTC (permalink / raw
  To: gentoo-commits

commit:     3940b107f8ad18379fd2b7ddf557f82427afa33c
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 14 14:58:41 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sun Aug 14 14:58:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3940b107

[sci-libs/votca-tools] renamed boost useflag

(Portage version: 2.1.10.3/git/Linux i686, signed Manifest commit with key C2000586)

---
 sci-libs/votca-tools/ChangeLog               |    4 ++++
 sci-libs/votca-tools/metadata.xml            |    2 +-
 sci-libs/votca-tools/votca-tools-9999.ebuild |   12 ++++++------
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index 7c03d65..da3aa0f 100644
--- a/sci-libs/votca-tools/ChangeLog
+++ b/sci-libs/votca-tools/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Aug 2011; Christoph Junghans <ottxor@gentoo.org> votca-tools-9999.ebuild,
+  metadata.xml:
+  renamed boost useflag to system-boost
+
   24 Jun 2011; Justin Lecher <jlec@gentoo.org> votca-tools-9999.ebuild:
   Sort inherit and/or USE
 

diff --git a/sci-libs/votca-tools/metadata.xml b/sci-libs/votca-tools/metadata.xml
index 046b8b5..378b412 100644
--- a/sci-libs/votca-tools/metadata.xml
+++ b/sci-libs/votca-tools/metadata.xml
@@ -7,6 +7,6 @@
 		<name>Christoph Junghans</name>
 	</maintainer>
 	<use>
-		<flag name='boost'>Compile against external boost headers (dev-libs/boost)</flag>
+		<flag name='system-boost'>Use system boost (<pkg>dev-libs/boost</pkg>) instead of bundled one</flag>
 	</use>
 </pkgmetadata>

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index 94d99d5..48c7f4f 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -7,8 +7,8 @@ EAPI="3"
 inherit cmake-utils eutils
 
 if [ "${PV}" != "9999" ]; then
-	SRC_URI="boost? ( http://votca.googlecode.com/files/${PF}_pristine.tar.gz )
-		!boost? ( http://votca.googlecode.com/files/${PF}.tar.gz )"
+	SRC_URI="system-boost? ( http://votca.googlecode.com/files/${PF}_pristine.tar.gz )
+		!system-boost? ( http://votca.googlecode.com/files/${PF}.tar.gz )"
 	RESTRICT="primaryuri"
 else
 	SRC_URI=""
@@ -24,12 +24,12 @@ HOMEPAGE="http://www.votca.org"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="-boost doc +fftw +gsl sqlite"
+IUSE="doc +fftw +gsl sqlite +system-boost"
 
 RDEPEND="fftw? ( sci-libs/fftw:3.0 )
 	dev-libs/expat
 	gsl? ( sci-libs/gsl )
-	boost? ( dev-libs/boost )
+	system-boost? ( dev-libs/boost )
 	sqlite? ( dev-db/sqlite:3 )"
 
 DEPEND="${RDEPEND}
@@ -42,14 +42,14 @@ src_prepare() {
 	use fftw || ewarn "Disabling fftw will lead to reduced functionality"
 
 	#remove bundled libs
-	if use boost; then
+	if use system-boost; then
 		rm -rf src/libboost
 	fi
 }
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use boost EXTERNAL_BOOST)
+		$(cmake-utils_use system-boost EXTERNAL_BOOST)
 		$(cmake-utils_use_with gsl GSL)
 		$(cmake-utils_use_with fftw FFTW)
 		$(cmake-utils_use_with sqlite SQLITE3)



^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2011-11-03 23:51 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2011-11-03 23:51 UTC (permalink / raw
  To: gentoo-commits

commit:     5a6982b0e0461fe605b14f254203e9c02b1fc5f6
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  3 23:35:28 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Thu Nov  3 23:35:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5a6982b0

live ebuild update

(Portage version: 2.2.0_alpha72/git/Linux i686, signed Manifest commit with key C2000586)

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

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index da3aa0f..2eef863 100644
--- a/sci-libs/votca-tools/ChangeLog
+++ b/sci-libs/votca-tools/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Nov 2011; Christoph Junghans <ottxor@gentoo.org> votca-tools-9999.ebuild:
+  live ebuild update
+
   14 Aug 2011; Christoph Junghans <ottxor@gentoo.org> votca-tools-9999.ebuild,
   metadata.xml:
   renamed boost useflag to system-boost

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index 48c7f4f..97ee2fa 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -37,6 +37,8 @@ DEPEND="${RDEPEND}
 	>=app-text/txt2tags-2.5
 	dev-util/pkgconfig"
 
+DOCS=( NOTICE )
+
 src_prepare() {
 	use gsl || ewarn "Disabling gsl will lead to reduced functionality"
 	use fftw || ewarn "Disabling fftw will lead to reduced functionality"
@@ -59,7 +61,6 @@ src_configure() {
 }
 
 src_install() {
-	DOCS=(${CMAKE_BUILD_DIR}/CHANGELOG NOTICE)
 	cmake-utils_src_install || die
 	if use doc; then
 		cd "${CMAKE_BUILD_DIR}" || die



^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2011-11-05  2:33 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2011-11-05  2:33 UTC (permalink / raw
  To: gentoo-commits

commit:     16d9a40433142d529a9642364ce8a42c8822753e
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  5 02:24:50 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat Nov  5 02:24:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=16d9a404

EAPI bump + multilib support

(Portage version: 2.2.0_alpha72/git/Linux i686, signed Manifest commit with key C2000586)

---
 sci-libs/votca-tools/ChangeLog               |    3 +++
 sci-libs/votca-tools/votca-tools-9999.ebuild |   16 ++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index 2eef863..1c72cc1 100644
--- a/sci-libs/votca-tools/ChangeLog
+++ b/sci-libs/votca-tools/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Nov 2011; Christoph Junghans <ottxor@gentoo.org> votca-tools-9999.ebuild:
+  EAPI bump + multilib support
+
   03 Nov 2011; Christoph Junghans <ottxor@gentoo.org> votca-tools-9999.ebuild:
   live ebuild update
 

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index 97ee2fa..ccda981 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI=4
 
-inherit cmake-utils eutils
+inherit cmake-utils eutils multilib
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="system-boost? ( http://votca.googlecode.com/files/${PF}_pristine.tar.gz )
@@ -56,16 +56,16 @@ src_configure() {
 		$(cmake-utils_use_with fftw FFTW)
 		$(cmake-utils_use_with sqlite SQLITE3)
 		-DWITH_RC_FILES=OFF
+		-DLIB=$(get_libdir)
 	)
-	cmake-utils_src_configure || die
+	cmake-utils_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install || die
+	cmake-utils_src_install
 	if use doc; then
-		cd "${CMAKE_BUILD_DIR}" || die
-		cd share/doc || die
-		doxygen || die
-		dohtml -r html/* || die
+		cd "${CMAKE_BUILD_DIR}"
+		emake html
+		dohtml -r share/doc/html/*
 	fi
 }



^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2012-03-24 22:46 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2012-03-24 22:46 UTC (permalink / raw
  To: gentoo-commits

commit:     db55b7cbf9fc8bddd2f7e562eecab0e2adacaa9e
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 24 22:45:12 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat Mar 24 22:45:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=db55b7cb

Fixes bug #405455, again

(Portage version: 2.2.0_alpha95/git/Linux i686, unsigned Manifest commit)

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

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index 1c72cc1..2b6ae69 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-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Mar 2012; Christoph Junghans <ottxor@gentoo.org> votca-tools-9999.ebuild:
+  Fixes bug #405455, again
+
   05 Nov 2011; Christoph Junghans <ottxor@gentoo.org> votca-tools-9999.ebuild:
   EAPI bump + multilib support
 

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index ccda981..4004aee 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -33,7 +33,7 @@ RDEPEND="fftw? ( sci-libs/fftw:3.0 )
 	sqlite? ( dev-db/sqlite:3 )"
 
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[-nodot] )
+	doc? ( || ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot]	) )
 	>=app-text/txt2tags-2.5
 	dev-util/pkgconfig"
 



^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2012-07-18  2:53 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2012-07-18  2:53 UTC (permalink / raw
  To: gentoo-commits

commit:     a4134af48ab83a2b4a05beab1afcaafe4751c85d
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 18 02:41:53 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Wed Jul 18 02:41:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a4134af4

live ebuild update

(Portage version: 2.2.0_alpha118/git/Linux i686, unsigned Manifest commit)

---
 sci-libs/votca-tools/ChangeLog               |    5 ++++-
 sci-libs/votca-tools/metadata.xml            |    3 ---
 sci-libs/votca-tools/votca-tools-9999.ebuild |   20 ++++----------------
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index 2b6ae69..69bcc00 100644
--- a/sci-libs/votca-tools/ChangeLog
+++ b/sci-libs/votca-tools/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Jul 2012; Christoph Junghans <ottxor@gentoo.org> metadata.xml,
+  votca-tools-9999.ebuild:
+  live ebuild update
+
   24 Mar 2012; Christoph Junghans <ottxor@gentoo.org> votca-tools-9999.ebuild:
   Fixes bug #405455, again
 
@@ -119,4 +123,3 @@
   13 Dec 2009; Christoph Junghans <kleiner_otti@gmx.de>
   +votca-tools-1.0_rc1.ebuild, +metadata.xml:
   initial add bug #296707
-

diff --git a/sci-libs/votca-tools/metadata.xml b/sci-libs/votca-tools/metadata.xml
index 378b412..266f600 100644
--- a/sci-libs/votca-tools/metadata.xml
+++ b/sci-libs/votca-tools/metadata.xml
@@ -6,7 +6,4 @@
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
-	<use>
-		<flag name='system-boost'>Use system boost (<pkg>dev-libs/boost</pkg>) instead of bundled one</flag>
-	</use>
 </pkgmetadata>

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index 4004aee..d02f699 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -7,8 +7,7 @@ EAPI=4
 inherit cmake-utils eutils multilib
 
 if [ "${PV}" != "9999" ]; then
-	SRC_URI="system-boost? ( http://votca.googlecode.com/files/${PF}_pristine.tar.gz )
-		!system-boost? ( http://votca.googlecode.com/files/${PF}.tar.gz )"
+	SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz"
 	RESTRICT="primaryuri"
 else
 	SRC_URI=""
@@ -24,34 +23,23 @@ HOMEPAGE="http://www.votca.org"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="doc +fftw +gsl sqlite +system-boost"
+IUSE="doc +fftw +gsl sqlite"
 
 RDEPEND="fftw? ( sci-libs/fftw:3.0 )
 	dev-libs/expat
 	gsl? ( sci-libs/gsl )
-	system-boost? ( dev-libs/boost )
+	dev-libs/boost
 	sqlite? ( dev-db/sqlite:3 )"
 
 DEPEND="${RDEPEND}
 	doc? ( || ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot]	) )
 	>=app-text/txt2tags-2.5
-	dev-util/pkgconfig"
+	virtual/pkgconfig"
 
 DOCS=( NOTICE )
 
-src_prepare() {
-	use gsl || ewarn "Disabling gsl will lead to reduced functionality"
-	use fftw || ewarn "Disabling fftw will lead to reduced functionality"
-
-	#remove bundled libs
-	if use system-boost; then
-		rm -rf src/libboost
-	fi
-}
-
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use system-boost EXTERNAL_BOOST)
 		$(cmake-utils_use_with gsl GSL)
 		$(cmake-utils_use_with fftw FFTW)
 		$(cmake-utils_use_with sqlite SQLITE3)



^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2012-07-25  1:24 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2012-07-25  1:24 UTC (permalink / raw
  To: gentoo-commits

commit:     7394290711b46f5504b526e2f931d09b79652054
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 25 01:07:56 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Wed Jul 25 01:07:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=73942907

sync with gx86

(Portage version: 2.2.0_alpha120/git/Linux i686, unsigned Manifest commit)

---
 sci-libs/votca-tools/ChangeLog               |    3 +++
 sci-libs/votca-tools/votca-tools-9999.ebuild |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index 69bcc00..6d24c3c 100644
--- a/sci-libs/votca-tools/ChangeLog
+++ b/sci-libs/votca-tools/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Jul 2012; Christoph Junghans <ottxor@gentoo.org> votca-tools-9999.ebuild:
+  sync with gx86
+
   18 Jul 2012; Christoph Junghans <ottxor@gentoo.org> metadata.xml,
   votca-tools-9999.ebuild:
   live ebuild update

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index d02f699..a2805a0 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.votca.org"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
 IUSE="doc +fftw +gsl sqlite"
 
 RDEPEND="fftw? ( sci-libs/fftw:3.0 )


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2012-12-31  3:17 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2012-12-31  3:17 UTC (permalink / raw
  To: gentoo-commits

commit:     e7d169a3e47de9889a9684ee05531f1a430f822d
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 31 02:11:43 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Mon Dec 31 02:11:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e7d169a3

update EHG_REPO_URI

Package-Manager: portage-2.2.0_alpha149

---
 sci-libs/votca-tools/ChangeLog               |    3 +++
 sci-libs/votca-tools/votca-tools-9999.ebuild |    4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index 6d24c3c..5de32cc 100644
--- a/sci-libs/votca-tools/ChangeLog
+++ b/sci-libs/votca-tools/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Dec 2012; Christoph Junghans <ottxor@gentoo.org> votca-tools-9999.ebuild:
+  update EHG_REPO_URI
+
   25 Jul 2012; Christoph Junghans <ottxor@gentoo.org> votca-tools-9999.ebuild:
   sync with gx86
 

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index a2805a0..22447d6 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -12,9 +12,7 @@ if [ "${PV}" != "9999" ]; then
 else
 	SRC_URI=""
 	inherit mercurial
-	EHG_REPO_URI="https://tools.votca.googlecode.com/hg"
-	EHG_REVISION="default"
-	S="${WORKDIR}/${EHG_REPO_URI##*/}"
+	EHG_REPO_URI="https://code.google.com/p/votca.tools/"
 fi
 
 DESCRIPTION="Votca tools library"


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2014-02-27 23:01 Sebastien Fabbro
  0 siblings, 0 replies; 23+ messages in thread
From: Sebastien Fabbro @ 2014-02-27 23:01 UTC (permalink / raw
  To: gentoo-commits

commit:     0c8b6c52282f0c1bb2d1fad316cbf84bde7687d2
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 27 22:42:05 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 22:42:05 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0c8b6c52

removed keywords for live ebuild

---
 sci-libs/votca-tools/votca-tools-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index d1f665a..90f87a8 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.votca.org"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+KEYWORDS=""
 IUSE="doc +fftw +gsl sqlite"
 
 RDEPEND="fftw? ( sci-libs/fftw:3.0 )


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2014-09-01  0:21 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2014-09-01  0:21 UTC (permalink / raw
  To: gentoo-commits

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@gentoo.org> votca-tools-9999.ebuild:
+  sync with gx86
+
   31 Dec 2012; Christoph Junghans <ottxor@gentoo.org> 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
 }


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2014-11-13 15:37 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2014-11-13 15:37 UTC (permalink / raw
  To: gentoo-commits

commit:     ede14b62dd32c9325a816ed0a4097d80f799ad87
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 13 04:41:17 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Nov 13 15:36:51 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ede14b62

deps on boost:=

Package-Manager: portage-2.2.8-r2

---
 sci-libs/votca-tools/ChangeLog               | 3 +++
 sci-libs/votca-tools/votca-tools-9999.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index fb3e7d8..aa842b4 100644
--- a/sci-libs/votca-tools/ChangeLog
+++ b/sci-libs/votca-tools/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Nov 2014; Christoph Junghans <ottxor@gentoo.org> votca-tools-9999.ebuild:
+  deps on boost:=
+
   31 Aug 2014; Christoph Junghans <ottxor@gentoo.org> votca-tools-9999.ebuild:
   sync with gx86
 

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index 9d964a0..7816879 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -28,7 +28,7 @@ IUSE="doc +fftw +gsl sqlite"
 RDEPEND="fftw? ( sci-libs/fftw:3.0 )
 	dev-libs/expat
 	gsl? ( sci-libs/gsl )
-	dev-libs/boost
+	dev-libs/boost:=
 	sqlite? ( dev-db/sqlite:3 )"
 
 DEPEND="${RDEPEND}


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2015-09-22  8:19 Justin Lecher
  0 siblings, 0 replies; 23+ messages in thread
From: Justin Lecher @ 2015-09-22  8:19 UTC (permalink / raw
  To: gentoo-commits

commit:     1b0c25241ca4c6e0b61478b04e508832d97623fb
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 07:37:38 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 07:37:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=1b0c2524

sci-libs/votca-tools: Fix unknown deps

Package-Manager: portage-2.2.21
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/votca-tools/votca-tools-9999.ebuild | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index db416df..e724f4e 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,14 +25,15 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="doc +fftw +gsl sqlite"
 
-RDEPEND="fftw? ( sci-libs/fftw:3.0 )
+RDEPEND="
+	dev-libs/boost:=
 	dev-libs/expat
+	fftw? ( sci-libs/fftw:3.0 )
 	gsl? ( sci-libs/gsl )
-	dev-libs/boost:=
 	sqlite? ( dev-db/sqlite:3 )"
 
 DEPEND="${RDEPEND}
-	doc? ( || ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot]	) )
+	doc? ( >=app-doc/doxygen-1.7.6.1[dot] )
 	>=app-text/txt2tags-2.5
 	virtual/pkgconfig"
 


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2015-09-24  5:20 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2015-09-24  5:20 UTC (permalink / raw
  To: gentoo-commits

commit:     3bc86599c97f44eecddaaa1c66535563ce914db2
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 24 05:00:23 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Sep 24 05:21:14 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=3bc86599

sci-libs/votca-tools: sync with gx86

Package-Manager: portage-2.2.20.1

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

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index 3fef99a..c5ce237 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-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  24 Sep 2015; Christoph Junghans <ottxor@gentoo.org> votca-tools-9999.ebuild:
+  sci-libs/votca-tools: sync with gx86
+
   13 Nov 2014; Christoph Junghans <ottxor@gentoo.org> votca-tools-9999.ebuild:
   deps on boost:=
 

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index e724f4e..4dae0bf 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -9,12 +9,12 @@ CMAKE_MAKEFILE_GENERATOR="ninja"
 inherit cmake-utils eutils multilib
 
 if [ "${PV}" != "9999" ]; then
-	SRC_URI="http://downloads.votca.googlecode.com/hg/${P}_pristine.tar.gz"
+	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	S="${WORKDIR}/${P#votca-}"
 else
-	SRC_URI=""
-	inherit mercurial
-	EHG_REPO_URI="https://code.google.com/p/votca.tools/"
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN/-//}.git https://github.com/${PN/-//}.git"
 	KEYWORDS=""
 fi
 


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/
@ 2016-07-14 17:31 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2016-07-14 17:31 UTC (permalink / raw
  To: gentoo-commits

commit:     8a8468fd5bc39db7d5e0c617161debbb6d795e1f
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 17:18:44 2016 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 17:18:44 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=8a8468fd

sci-libs/votca-tools: moved to gx86

 sci-libs/votca-tools/metadata.xml            | 12 ------
 sci-libs/votca-tools/votca-tools-9999.ebuild | 60 ----------------------------
 2 files changed, 72 deletions(-)

diff --git a/sci-libs/votca-tools/metadata.xml b/sci-libs/votca-tools/metadata.xml
deleted file mode 100644
index 6f0f3dc..0000000
--- a/sci-libs/votca-tools/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>ottxor@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-<maintainer type="project">
-		<email>sci-chemistry@gentoo.org</email>
-		<name>Gentoo Chemistry Project</name>
-	</maintainer>
-</pkgmetadata>

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
deleted file mode 100644
index 6a9b5be..0000000
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils eutils multilib
-
-if [ "${PV}" != "9999" ]; then
-	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
-	S="${WORKDIR}/${P#votca-}"
-else
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN/-//}.git https://github.com/${PN/-//}.git"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="Votca tools library"
-HOMEPAGE="http://www.votca.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc +fftw +gsl sqlite"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	fftw? ( sci-libs/fftw:3.0 )
-	gsl? ( sci-libs/gsl )
-	sqlite? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.7.6.1[dot] )
-	>=app-text/txt2tags-2.5
-	virtual/pkgconfig"
-
-DOCS=( NOTICE )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with fftw FFTW)
-		$(cmake-utils_use_with sqlite SQLITE3)
-		-DWITH_RC_FILES=OFF
-		-DLIB=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use doc; then
-		cd "${BUILD_DIR}"
-		cmake-utils_src_make html
-		dohtml -r share/doc/html/*
-	fi
-}


^ permalink raw reply related	[flat|nested] 23+ messages in thread

end of thread, other threads:[~2016-07-14 17:32 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-14 17:31 [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/ Christoph Junghans
  -- strict thread matches above, loose matches on Subject: below --
2015-09-24  5:20 Christoph Junghans
2015-09-22  8:19 Justin Lecher
2014-11-13 15:37 Christoph Junghans
2014-09-01  0:21 Christoph Junghans
2014-02-27 23:01 Sebastien Fabbro
2012-12-31  3:17 Christoph Junghans
2012-07-25  1:24 Christoph Junghans
2012-07-18  2:53 Christoph Junghans
2012-03-24 22:46 Christoph Junghans
2011-11-05  2:33 Christoph Junghans
2011-11-03 23:51 Christoph Junghans
2011-08-14 15:04 Christoph Junghans
2011-06-24 17:09 Justin Lecher
2011-06-03 21:59 Christoph Junghans
2011-06-02 13:03 Christoph Junghans
2011-03-08 21:40 Christoph Junghans
2011-03-03 21:43 Christoph Junghans
2011-03-03 21:43 Christoph Junghans
2011-02-19 17:03 Christoph Junghans
2011-02-13 17:27 Christoph Junghans
2011-02-12 16:16 Christoph Junghans
2011-02-12 13:54 Christoph Junghans

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox