Merge remote-tracking branch 'github/master'

* github/master:
  sci-libs/dealii: Ebuild maintenance, remove wrong avx2 use flag
  sci-mathematics/acl2: Version bump, drop old; USE flags change.

11 files changed, 81 insertions, 113 deletions

diff --git a/sci-libs/dealii/ChangeLog b/sci-libs/dealii/ChangeLog
index 1b5b46aa4..b3491fe13 100644
--- a/sci-libs/dealii/ChangeLog
+++ b/sci-libs/dealii/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*dealii-8.2.1-r1 (28 Mar 2015)
+
+  28 Mar 2015; Matthias Maier <tamiko@gentoo.org> +dealii-8.2.1-r1.ebuild,
+  -dealii-8.2.1.ebuild, dealii-8.1.0-r2.ebuild, dealii-8.2.0.ebuild,
+  dealii-9999.ebuild:
+  sci-libs/dealii: Ebuild maintenance, remove wrong avx2 use flag
+
   29 Jan 2015; Matthias Maier <tamiko@gentoo.org> dealii-8.1.0-r2.ebuild,
   dealii-8.2.1.ebuild, dealii-9999.ebuild, metadata.xml:
   Convert to CPU_FLAGS_X86
diff --git a/sci-libs/dealii/dealii-8.1.0-r2.ebuild b/sci-libs/dealii/dealii-8.1.0-r2.ebuild
index 7e174ffa8..e1bce5e4a 100644
--- a/sci-libs/dealii/dealii-8.1.0-r2.ebuild
+++ b/sci-libs/dealii/dealii-8.1.0-r2.ebuild
@@ -44,7 +44,7 @@ RDEPEND="dev-libs/boost
 	metis? ( >=sci-libs/parmetis-4 )
 	mpi? ( virtual/mpi )
 	mumps? ( sci-libs/mumps[mpi] )
-	netcdf? ( || ( <sci-libs/netcdf-4.2[cxx] sci-libs/netcdf-cxx ) )
+	netcdf? ( sci-libs/netcdf-cxx:0 )
 	p4est? ( sci-libs/p4est[mpi] )
 	parameter_gui? ( dev-qt/qtgui )
 	petsc? ( sci-mathematics/petsc[mpi=] )
diff --git a/sci-libs/dealii/dealii-8.2.0.ebuild b/sci-libs/dealii/dealii-8.2.0.ebuild
index e7cf68128..c0e321cf2 120000
--- a/sci-libs/dealii/dealii-8.2.0.ebuild
+++ b/sci-libs/dealii/dealii-8.2.0.ebuild
@@ -1 +1 @@
-dealii-8.2.1.ebuild
\ No newline at end of file
+dealii-8.2.1-r1.ebuild
\ No newline at end of file
diff --git a/sci-libs/dealii/dealii-8.2.1.ebuild b/sci-libs/dealii/dealii-8.2.1-r1.ebuild
index 07c31a30f..145cb29e6 100644
--- a/sci-libs/dealii/dealii-8.2.1.ebuild
+++ b/sci-libs/dealii/dealii-8.2.1-r1.ebuild
@@ -31,10 +31,9 @@ fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="
-	arpack cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse2 c++11
-	+debug doc +examples hdf5 +lapack mesh_converter metis mpi mumps
-	muparser opencascade netcdf p4est parameter_gui petsc +sparse
-	static-libs +tbb trilinos
+	arpack cpu_flags_x86_avx cpu_flags_x86_sse2 c++11 +debug doc +examples
+	hdf5 +lapack mesh_converter metis mpi mumps muparser opencascade netcdf
+	p4est parameter_gui petsc +sparse static-libs +tbb trilinos
 "
 
 # TODO: add slepc use flag once slepc is packaged for gentoo-science
@@ -53,7 +52,7 @@ RDEPEND="dev-libs/boost
 	mpi? ( virtual/mpi )
 	mumps? ( sci-libs/mumps[mpi] )
 	muparser? ( dev-cpp/muParser )
-	netcdf? ( || ( <sci-libs/netcdf-4.2[cxx] sci-libs/netcdf-cxx ) )
+	netcdf? ( sci-libs/netcdf-cxx:0 )
 	opencascade? ( sci-libs/opencascade )
 	p4est? ( sci-libs/p4est[mpi] )
 	parameter_gui? ( dev-qt/qtgui )
@@ -86,7 +85,6 @@ src_configure() {
 		$(cmake-utils_use arpack DEAL_II_WITH_ARPACK)
 		$(cmake-utils_use c++11 DEAL_II_WITH_CXX11)
 		$(cmake-utils_use cpu_flags_x86_avx DEAL_II_HAVE_AVX)
-		$(cmake-utils_use cpu_flags_x86_avx2 DEAL_II_HAVE_AVX512)
 		$(cmake-utils_use cpu_flags_x86_sse2 DEAL_II_HAVE_SSE2)
 		$(cmake-utils_use doc DEAL_II_COMPONENT_DOCUMENTATION)
 		$(cmake-utils_use examples DEAL_II_COMPONENT_EXAMPLES)
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 2774e75cb..dc836023b 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -31,10 +31,9 @@ fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="
-	arpack cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse2 c++11
-	+debug doc +examples hdf5 +lapack mesh_converter metis mpi muparser
-	opencascade netcdf p4est parameter_gui petsc +sparse static-libs +tbb
-	trilinos
+	arpack cpu_flags_x86_avx cpu_flags_x86_sse2 c++11 +debug doc +examples
+	hdf5 +lapack mesh_converter metis mpi muparser opencascade
+	netcdf p4est parameter_gui petsc +sparse static-libs +tbb trilinos
 "
 
 # TODO: add slepc use flag once slepc is packaged for gentoo-science
@@ -51,7 +50,7 @@ RDEPEND="dev-libs/boost
 	metis? ( >=sci-libs/parmetis-4 )
 	mpi? ( virtual/mpi )
 	muparser? ( dev-cpp/muParser )
-	netcdf? ( || ( <sci-libs/netcdf-4.2[cxx] sci-libs/netcdf-cxx ) )
+	netcdf? ( sci-libs/netcdf-cxx:0 )
 	opencascade? ( sci-libs/opencascade )
 	p4est? ( sci-libs/p4est[mpi] )
 	parameter_gui? ( dev-qt/qtgui )
@@ -82,7 +81,6 @@ src_configure() {
 		$(cmake-utils_use arpack DEAL_II_WITH_ARPACK)
 		$(cmake-utils_use c++11 DEAL_II_WITH_CXX11)
 		$(cmake-utils_use cpu_flags_x86_avx DEAL_II_HAVE_AVX)
-		$(cmake-utils_use cpu_flags_x86_avx2 DEAL_II_HAVE_AVX512)
 		$(cmake-utils_use cpu_flags_x86_sse2 DEAL_II_HAVE_SSE2)
 		$(cmake-utils_use doc DEAL_II_COMPONENT_DOCUMENTATION)
 		$(cmake-utils_use examples DEAL_II_COMPONENT_EXAMPLES)
diff --git a/sci-mathematics/acl2/ChangeLog b/sci-mathematics/acl2/ChangeLog
index 995db6561..baff65ab7 100644
--- a/sci-mathematics/acl2/ChangeLog
+++ b/sci-mathematics/acl2/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-mathematics/acl2
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*acl2-7.0 (25 Mar 2015)
+
+  25 Mar 2015; zcj <ustcscgy@163.com> +acl2-7.0.ebuild, -acl2-6.3.ebuild,
+  -files/set-booksdir.patch, metadata.xml:
+  sci-mathematics/acl2: sci-mathematics/acl2 version bump, drop old
+
   12 Nov 2014; Justin Lecher <jlec@gentoo.org> -acl2-4.2.ebuild,
   -acl2-4.3.ebuild:
   Drop old
@@ -28,4 +34,3 @@
 
   12 Apr 2011; Dongxu Li <dongxuli2011@gmail.com> +acl2-4.2.ebuild +ChangeLog +metadata.xml :
   Initial import.  #49316
-
diff --git a/sci-mathematics/acl2/Manifest b/sci-mathematics/acl2/Manifest
index 4cdd06d66..abf3d42ae 100644
--- a/sci-mathematics/acl2/Manifest
+++ b/sci-mathematics/acl2/Manifest
@@ -1,3 +1 @@
-DIST acl2-6.3.tar.gz 7068895 SHA256 ee7ca85232c36068516e8852a5b31fcd8f38cb2596ce8d4d7934009e28400bb9 SHA512 e79c7da62b7edf7d02080a750f767c2d71a8565b2ff54c4421ab48a6df0c191bc29e54b7496b63ea025980bbcf790a5fc6a7211ce5c639537dda4127296fc529 WHIRLPOOL 1b2d669c6ff4369ed5a32ac1e9a8802218814f12e04312dbdea90b3d704edefcaf4f795fdc5b98a67fd47ca9b2bcee3d35ea16bc71e1c7656e7fc70002d9b03d
-DIST books-6.3.tar.gz 13598991 SHA256 29f9c5b1de6131695b01153f337bb107869e9ae0c1b506e46a3de9373bbd1bfa SHA512 5bde2d2118bd67c3efcff79e22d43513cf6545fc0c7143bdfb70aec6a018f06eb995df29ed1d67d81ce24f61dc8f7fa900874e1f64f25ed05346bfa508ebc21f WHIRLPOOL 28e371556dd24362daaa7906a70dfe9c5f9a88d2b2d5b78b1b8c91c0cf2e6674ac09b78fa433286cba34bf4cd324d902053e3894b50bccd19fed703659b0dbf5
-DIST workshops-6.3.tar.gz 29675655 SHA256 203a65d8d8b42d41a202c34255cf2603fcb5d6b568938550603bdd48e5248164 SHA512 3b6016780ae4310287c859907350905f9e531b33f4b4e29c23462e09caa6ec8720f4923eb6b61f4d9ac2789c8e9109b5943f2bd9ad9c3da70b560bdcf5d27a26 WHIRLPOOL d0868690981c464fc1900173c073180c5c47c424a1ef16a7081dbd42d10f4b7f66767d5b8f5c0336e13eeb14bfcb00633f2f572a63f99b750bbbf069374482a2
+DIST acl2-7.0.tar.gz 58301172 SHA256 dbbe63ddbe342072fa0504e05f9e02fb01bb654b6befcc1e34ba7ceab2b1e0eb SHA512 25746df91de3b418d0be8f5b6aa906b5456eb95e46745362f4c8697cd5dc57ad44fa25151ebffa6ad3efc28efd9ecdb830dedc136c79082d3fbc71e9393fa2cc WHIRLPOOL 1b7232d0c7c9c68bd3ee8bfc9d2a6547e533dfac5681313e513f7f72bc4aff6a727f36b1704020c21f2d44a8bf36baac91ac411633ff67cf7a3f46071e671fa8
diff --git a/sci-mathematics/acl2/acl2-6.3.ebuild b/sci-mathematics/acl2/acl2-6.3.ebuild
deleted file mode 100644
index 5302b3c55..000000000
--- a/sci-mathematics/acl2/acl2-6.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="ACL2 industrial strength theorem prover"
-HOMEPAGE="http://www.cs.utexas.edu/users/moore/acl2/"
-SRC_URI="
-	http://www.cs.utexas.edu/users/moore/${PN}/v${PV/\./-}/distrib/${PN}.tar.gz -> ${P}.tar.gz
-	books? ( https://acl2-books.googlecode.com/files/books-${PV}.tar.gz
-	workshops? ( http://acl2-books.googlecode.com/files/workshops-${PV}.tar.gz ) )"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="+books workshops html"
-
-REQUIRED_USE="workshops? ( books )"
-
-DEPEND="
-	dev-lisp/sbcl
-	books? ( dev-lang/perl )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-sources"
-
-src_unpack() {
-	default
-	if use books; then
-		mv "${WORKDIR}/books" "${S}"/ || die
-		if use workshops; then
-			mv "${WORKDIR}/workshops" "${S}/books/" || die
-		fi
-	fi
-}
-
-src_compile() {
-	emake LISP="sbcl --noinform --noprint"
-
-	if use books; then
-		echo
-		einfo "Building certificates ..."
-		einfo "(this may take hours to finish)"
-		emake regression
-	fi
-}
-
-src_install() {
-	sed -e "s:${S}:/usr/share/acl2:g" -i saved_acl2 || die
-	if use books; then
-		sed -e "/5/a export ACL2_SYSTEM_BOOKS=/usr/share/acl2/books/" \
-			-i saved_acl2 || die
-	fi
-	dobin saved_acl2
-
-	insinto /usr/share/acl2
-	doins TAGS saved_acl2.core
-	if use books; then
-		doins -r books
-	fi
-
-	if use html; then
-		dohtml -r doc/HTML
-	fi
-	doinfo doc/EMACS/*
-}
diff --git a/sci-mathematics/acl2/acl2-7.0.ebuild b/sci-mathematics/acl2/acl2-7.0.ebuild
new file mode 100644
index 000000000..c1bfb9036
--- /dev/null
+++ b/sci-mathematics/acl2/acl2-7.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Industrial strength theorem prover"
+HOMEPAGE="http://www.cs.utexas.edu/users/moore/acl2/"
+SRC_URI="https://github.com/acl2/acl2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="books"
+
+DEPEND="
+	dev-lisp/sbcl:=
+	books? ( dev-lang/perl )"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake LISP="sbcl --noinform --noprint \
+		--no-sysinit --no-userinit --disable-debugger"
+
+	if use books; then
+		echo
+		einfo "Building certificates ..."
+		einfo "(this may take hours to finish)"
+		emake regression
+	fi
+}
+
+src_install() {
+	SAVED_NAME=saved_acl2h
+	sed -e "s:${S}:/usr/share/acl2:g" -i ${SAVED_NAME} || die
+	if use books; then
+		sed -e "/5/a export ACL2_SYSTEM_BOOKS=/usr/share/acl2/books/" \
+			-i ${SAVED_NAME} || die
+	fi
+	dobin ${SAVED_NAME}
+	dosym ${SAVED_NAME} /usr/bin/saved_acl2
+
+	insinto /usr/share/acl2
+	doins TAGS ${SAVED_NAME}.core
+	if use books; then
+		doins -r books
+	fi
+}
diff --git a/sci-mathematics/acl2/files/set-booksdir.patch b/sci-mathematics/acl2/files/set-booksdir.patch
deleted file mode 100644
index 4f4d4334a..000000000
--- a/sci-mathematics/acl2/files/set-booksdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/books/Makefile-generic	2011-04-12 14:42:17.790165650 -0400
-+++ b/books/Makefile-generic	2011-04-12 14:55:54.436829607 -0400
-@@ -55,7 +55,7 @@
- # Determine the location of this Makefile-generic.  NOTE: We have
- # tried $(realpath $(dir ...)) and similarly for abspath, but they
- # have returned the empty string, presumably an error.
--BOOKS_DIR := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
-+BOOKS_DIR := /usr/share/acl2/books/
- 
- # and use that to determine the default location of ACL2.  To override,
- # set the ACL2 variable on the command line or in the environment.
diff --git a/sci-mathematics/acl2/metadata.xml b/sci-mathematics/acl2/metadata.xml
index d0675a2ec..47ab9cabf 100644
--- a/sci-mathematics/acl2/metadata.xml
+++ b/sci-mathematics/acl2/metadata.xml
@@ -5,25 +5,17 @@
   <maintainer>
     <email>dongxuli2011@gmail.com</email>
     <name>Dongxu Li</name>
-    <description>ACL2 industrial strength theorem prover</description>
+    <description>Industrial strength theorem prover</description>
   </maintainer>
   <longdescription>
-ACL2 is both a programming language in which you can model computer systems and 
-a tool to help you prove properties of those models. ACL2 is part of the 
-Boyer-Moore family of provers, for which its authors have received the 2005 ACM 
+ACL2 is both a programming language in which you can model computer systems and
+a tool to help you prove properties of those models. ACL2 is part of the
+Boyer-Moore family of provers, for which its authors have received the 2005 ACM
 Software System Award.
-</longdescription>
+  </longdescription>
   <use>
     <flag name="books">
 	build community books, the canonical collection of open-source libraries
-</flag>
-  </use>
-  <use>
-    <flag name="html"> Install HTML documentation</flag>
-  </use>
-  <use>
-    <flag name="workshops"> 
-	build community books from ACL2 community workshops
-</flag>
+    </flag>
   </use>
 </pkgmetadata>