Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

13 files changed, 127 insertions, 158 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 06d7b61a3b3c..19ec0667b2cb 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/ipp/Manifest b/sci-libs/ipp/Manifest
new file mode 100644
index 000000000000..505cb48a22d3
--- /dev/null
+++ b/sci-libs/ipp/Manifest
@@ -0,0 +1,5 @@
+DIST parallel_studio_xe_2015_update3.tgz 4156836825 BLAKE2B afa2e9d776b721605508cd2cb659f112fa1bab728a94d548d1c75eeb3db764ac82d591dcf2fe505cf2ef107a51fca8eafa6f7e8d7ce12243c5c45e44c674ae8a SHA512 eccc2bfe85ccd039a2ec9e334d370e49d43baa0522d095c087a5982aa08bddb4c97bfc3125bd09f5cd57d3ed252c598012e1f2670b8373a1b3bb455825d18f96
+DIST parallel_studio_xe_2015_update6.tgz 4190044333 BLAKE2B b038cda914b4c736259b84d2958a16a718fc75fe1663b4a835f4011fadb553a28f5c231d6f0a2744fc3eec257b390b021b0af709d69a5d10845cf9d63d1aa320 SHA512 a9896289db8e820f02c330702ff1e954af11af5f9bbc0e5623a001b3a8c33a2bcb8660ac8b0e569994a3682bfd263bf119dbe6a43fb343139adbeaaaa13f8a81
+EBUILD ipp-8.2.2.187.ebuild 715 BLAKE2B 0b65f922d644e6277160880b2301a71e7fb0e2d5129e87b88783c5baa248f5504ce9ead0ea16495c2d03d5efa95b90c16e087190029182431a28471c247f9b4b SHA512 25521f78842c613c20c10e43d8f8c66b790bd974f6009bc34cb4f834f2eb80c650e989372ed59ddac7a4ea4696516d398f371430513e7f6d82baf04efb52051f
+EBUILD ipp-8.2.3.233.ebuild 715 BLAKE2B 2c322a8075e3b615777190dae16d3165e2614b29b90fca80d3f7a35f8cb71dc24652146df2604a4d2323daa0e27ebe1466ed15f2c5b3affd047e33e251bcbe8e SHA512 d5aff5dc0971ba6421ae25ef2fc0ced4f43482b44c3ecf30baaf9ff4af8d0090ed712e2de369d6c6481159310f88faa6b1b29b0852af9db3e98b4c621b3ceb56
+MISC metadata.xml 500 BLAKE2B 0e8630c46aac418e4cb37ff792c4f722254504ba15bb1880efc85e7e82bacaea2b435295177997a7341dd586bd3bd3dc2fb5e6d2bc9f678622e9de612d97baaf SHA512 c6a74517c3ee5a5f7495353d057c2f6ffbdb22c9a26a12893473f23c78238b771802f0f963aa1bc2250115925e23b15a3ca12ac1d0df895ebb5f2659d1057237
diff --git a/sci-libs/ipp/ipp-8.2.2.187.ebuild b/sci-libs/ipp/ipp-8.2.2.187.ebuild
new file mode 100644
index 000000000000..c9ce9ca2f3ae
--- /dev/null
+++ b/sci-libs/ipp/ipp-8.2.2.187.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=7538
+INTEL_DPV=2015_update3
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp
+
+DESCRIPTION="Intel Integrated Performance Primitives for multimedia and data processing"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-ipp/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-libs/intel-common-15"
+DEPEND=""
+
+CHECKREQS_DISK_BUILD=6400M
+
+INTEL_BIN_RPMS=( ipp-{ac,di,gen,jp,mt,mt-devel,mx,rr,sc,st,st-devel,vc} )
+INTEL_DAT_RPMS=( ipp-common ipp-{ac,di,gen,jp,mx,rr,sc,st-devel,vc}-common )
+
+INTEL_SKIP_LICENSE=true
diff --git a/sci-libs/ipp/ipp-8.2.3.233.ebuild b/sci-libs/ipp/ipp-8.2.3.233.ebuild
new file mode 100644
index 000000000000..14d562a8dc99
--- /dev/null
+++ b/sci-libs/ipp/ipp-8.2.3.233.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=8470
+INTEL_DPV=2015_update6
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp
+
+DESCRIPTION="Intel Integrated Performance Primitives for multimedia and data processing"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-ipp/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-libs/intel-common-15"
+DEPEND=""
+
+CHECKREQS_DISK_BUILD=6400M
+
+INTEL_BIN_RPMS=( ipp-{ac,di,gen,jp,mt,mt-devel,mx,rr,sc,st,st-devel,vc} )
+INTEL_DAT_RPMS=( ipp-common ipp-{ac,di,gen,jp,mx,rr,sc,st-devel,vc}-common )
+
+INTEL_SKIP_LICENSE=true
diff --git a/sci-libs/ipp/metadata.xml b/sci-libs/ipp/metadata.xml
new file mode 100644
index 000000000000..b61694fd8092
--- /dev/null
+++ b/sci-libs/ipp/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  Intel(R) Integrated Performance Primitives (Intel(R) IPP) is a
+  library of multi-core-ready, optimized software functions for
+  multimedia data processing, and communications applications.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-libs/lmfit/Manifest b/sci-libs/lmfit/Manifest
deleted file mode 100644
index 08aa24a94f1f..000000000000
--- a/sci-libs/lmfit/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX lmfit-7.0-cmake.patch 2226 BLAKE2B 317d232718c8172508d67de527161b074676bf62ff4da45d21a9444626fb2e84150c0b3fb099a6a9c5247ea2ec9b53c89b4b0f6d64f8b3d6352629e440e89ad4 SHA512 a9e95299baac18818a131ac67c82d49777e7cae6629d9f6bedc2e7f175f2d6a416888d973064df13d79315a5445d95c0e9a2e3d5fc1ac476fdb2b688dbe601e3
-DIST lmfit-5.1.tgz 345077 BLAKE2B df27621745601ffacd2110b28f3e3ea2b06d4c8c3c8fad5dda13bb4d6c2bd9f2a793ff88fab4f6d8c78075278bb26f3f424bd0074095e67ab1780a9d57b72b4b SHA512 1df6ed51d7f2137529793948f6c57ef3658932c9198776925a9f6e1d586352651c93aa053a064db7a201dbb848a7108f284223feff45171d142087539d834b29
-DIST lmfit-6.4.tgz 388809 BLAKE2B 48aa619642ac3fd009ec6a8f8b44ee4c800fc3f33e2603b557218cdf37c789159dc3947a648d560b9e2dd7fef08a6644fd25ac61505859dc3b1d151eeea58c27 SHA512 2bd0f24dd4638345b8b1ce6803ddcf45ca3ef888eb285e99f9f158c2e30b0f96016d9d84a112cdbf28f2ba98470e54fe773416179a65264426043c9a5186757d
-DIST lmfit-7.0.tgz 37950 BLAKE2B a509110f70e7e863d1172b8d91f7439763f0434702f265751e9955494f4982b4c17f0baaa080af86e5cae7f535555e27b98b45ba6a529061d107e53bdb9fd698 SHA512 78f479786c6e5c417781c6d629f5a517335fac70df049fafdefd511485da4e542c988d69c998f96eaab4306160de4bb09a631ca6ffff74bba70c51428d734fc3
-EBUILD lmfit-5.1.ebuild 516 BLAKE2B 51a6715eeca7a7c3b6172530af4d6c908bdbcb3b3a5339e60c1af9bf60277b4275f49cfbf68eb3072f7f3f7864f9890ab486093253c72f0988673ea764b2513f SHA512 3ff7c3bb21bf2c95ce466f3168c2362a5fd3a0e8085621e0bae0d6b28191bc5d7368f4e09afc87ffe0720ac4740cdfeb27ee4bdc5cd83006f6837c2ac46775f9
-EBUILD lmfit-6.4.ebuild 516 BLAKE2B 51a6715eeca7a7c3b6172530af4d6c908bdbcb3b3a5339e60c1af9bf60277b4275f49cfbf68eb3072f7f3f7864f9890ab486093253c72f0988673ea764b2513f SHA512 3ff7c3bb21bf2c95ce466f3168c2362a5fd3a0e8085621e0bae0d6b28191bc5d7368f4e09afc87ffe0720ac4740cdfeb27ee4bdc5cd83006f6837c2ac46775f9
-EBUILD lmfit-7.0.ebuild 536 BLAKE2B 29221f8196319bc8ff31d0ca6989ec50136e074b2bfcf5df90c012d21d416222ae9c83de1fa8f5d92129ee548960f7da1d0a580936df04d62036cc4ae8ad3d90 SHA512 7887abc5f96ed37a81d61c392829a9bfd7027dd7092387b2b20e812187c63d3c0379dc578b7d27129fc9701066f4b9ae04dbce11d166d2267227a4f423ed5e28
-MISC metadata.xml 328 BLAKE2B fe29c76e5725821e31de0e2b14e0b975d5b8838e9907bf9ddacdb40cddc0529550fe83468226bf045fcf7ad95b2e56d31dc564dcf7e6d9a0401317313e2f0f27 SHA512 e6cf20d6c9130a16ce37c44890f928cb5dca1bb67425d8cdcc1ab7db22f7c8e2ac513b11c33b0f0495e25dd389ac926f2099d0253288eb1ed290f30e655a1c4f
diff --git a/sci-libs/lmfit/files/lmfit-7.0-cmake.patch b/sci-libs/lmfit/files/lmfit-7.0-cmake.patch
deleted file mode 100644
index 9ca4efb248e9..000000000000
--- a/sci-libs/lmfit/files/lmfit-7.0-cmake.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 4e66272e1f5ebb220af517ca4d8804936f7f465c Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@votca.org>
-Date: Thu, 31 May 2018 18:11:26 -0600
-Subject: [PATCH] cmake: minor distribution tweaks
-
-- Use GNUInstallDirs to allow to configure install dirs
-- Allow to disable injecting c flags
-
-Signed-off-by: Christoph Junghans <junghans@votca.org>
----
- CMakeLists.txt     | 7 +++++--
- lib/CMakeLists.txt | 4 ++--
- man/CMakeLists.txt | 2 +-
- 3 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f2d0bdf..75753d3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,9 +13,12 @@ set(lmfit_VERSION ${lmfit_SOVERSION}.0) # lib version
- # --- Declare project-wide user flags, and set default values ---
- option(FITTEST "Build with FitTest" OFF)
- 
--set(destination ${CMAKE_INSTALL_PREFIX})
-+include(GNUInstallDirs)
- 
--set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses  -Wno-unknown-pragmas -Werror")
-+option(INJECT_C_FLAGS "Inject a bunch of useful c flags" ON)
-+if (INJECT_C_FLAGS)
-+    set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses  -Wno-unknown-pragmas -Werror")
-+endif()
- 
- add_subdirectory(lib)
- add_subdirectory(demo)
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 51b79bb..754f60f 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -17,9 +17,9 @@ target_link_libraries(${library_name} m)
- 
- install(
-     TARGETS ${library_name} LIBRARY
--    DESTINATION ${destination}/lib
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     COMPONENT Libraries)
- install(
-     FILES ${inc_files}
--    DESTINATION ${destination}/include
-+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-     COMPONENT Headers)
-diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
-index a718d3d..4a15597 100644
---- a/man/CMakeLists.txt
-+++ b/man/CMakeLists.txt
-@@ -15,7 +15,7 @@ function(one_page pname section)
-     )
-     install(
-         FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.${section}
--        DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man${section}"
-+        DESTINATION "${CMAKE_INSTALL_MANDIR}/man${section}"
-     )
- endfunction()
- 
--- 
-2.16.4
-
diff --git a/sci-libs/lmfit/lmfit-5.1.ebuild b/sci-libs/lmfit/lmfit-5.1.ebuild
deleted file mode 100644
index 5cc8fa8bda4d..000000000000
--- a/sci-libs/lmfit/lmfit-5.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="library for Levenberg-Marquardt least-squares minimization and curve fitting"
-HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/lmfit"
-SRC_URI="http://apps.jcns.fz-juelich.de/src/lmfit/old/${P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/sci-libs/lmfit/lmfit-6.4.ebuild b/sci-libs/lmfit/lmfit-6.4.ebuild
deleted file mode 100644
index 5cc8fa8bda4d..000000000000
--- a/sci-libs/lmfit/lmfit-6.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="library for Levenberg-Marquardt least-squares minimization and curve fitting"
-HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/lmfit"
-SRC_URI="http://apps.jcns.fz-juelich.de/src/lmfit/old/${P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/sci-libs/lmfit/lmfit-7.0.ebuild b/sci-libs/lmfit/lmfit-7.0.ebuild
deleted file mode 100644
index e895f1f06889..000000000000
--- a/sci-libs/lmfit/lmfit-7.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="library for Levenberg-Marquardt least-squares minimization and curve fitting"
-HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/lmfit"
-SRC_URI="http://apps.jcns.fz-juelich.de/src/lmfit/${P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DINJECT_C_FLAGS=OFF
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/lmfit/metadata.xml b/sci-libs/lmfit/metadata.xml
deleted file mode 100644
index 2550df8221b6..000000000000
--- a/sci-libs/lmfit/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">lmfit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-libs/lrslib/Manifest b/sci-libs/lrslib/Manifest
index c772578f6353..4736eb2b0f26 100644
--- a/sci-libs/lrslib/Manifest
+++ b/sci-libs/lrslib/Manifest
@@ -1,6 +1,7 @@
 DIST lrslib-042c.tar.gz 168765 BLAKE2B d9ac0d59e4ca356f4cf76fa4f3756b6badd79a8c8546b7bd3a2dc65d211af30d354b9829395e68d79bb5acf24ba2087ca4d8a390a7c7d98e6cad86d0f9a27eac SHA512 a5fdd65b2c4e4cadd5fb9679e0e94ddc6b3564cdb9bdfcb7304351fec943527d2dccf117148d8d418ad8bd4577c9f69dabd6ca07107c1c1555c8c6d17f38fa60
 DIST lrslib-051.tar.gz 179396 BLAKE2B 22697dc4e99bf9ae528328c1a03e87f5101b1e0c74cbee9c7dafb5e1c897ad07587e9664abd9710094a6fe78cba0cff48c0489f687bedb616886101286153cc6 SHA512 65e4752ae75f06bccb74b0e12e0b03943654cba048d54dbcf93a36bea7f73b32826babe066d5fe20d3c6609548dc957063558633affe64d795c240c1fe748927
 DIST lrslib-062.tar.gz 292745 BLAKE2B 1a2c0e264d590c38d83ee35616b1ec36d8a093b5c7f08179019261d8b321d5b95d8889ca6555ae69853f919d6d66358a865a8a2002516dfd560bec6658f3913d SHA512 1d644a7798580457ff266730f42f6fac317ec8cdf2509ad6028e7a838e5c4c948bd0f9499b840c227bad4269f7144ff72b87fe3a19bdb9ad0925ebe4a7bc4f9f
+EBUILD lrslib-042c-r1.ebuild 1161 BLAKE2B 308c13e1c44e3ea783c9cf68d70d10a987dee2b3d968c0cc3a1f1ac4b8a36e1e24386a1b04bda328a2b2af553b110661a7c02ea2887b89090738dbed33b10570 SHA512 f90699a8429b03b524ab66b0cb7496d4fff367cc46c6be87d9db2430f445f198082df1f67d7f045926c69b9f7b85dd05d2078e81cb03fbc81d1ebf480d337da0
 EBUILD lrslib-042c-r2.ebuild 1312 BLAKE2B 67ab2c35e3be56629e05fc62d3602058bc799a94c8741fe47c3f0346a93282cb7bf155f67e819b0992db9030950e06d344b054cc9e24fba3e4c1121a7ee656d2 SHA512 3d9dc22227f77784303922d1fb693ddd7ccd8b588743b2270243c584f1dbac97b633cab7bc4fcd5c2176fd4c6d29841f6a6eec589e8fbdf6f4420fb284bc9b79
 EBUILD lrslib-051.ebuild 915 BLAKE2B c67319e8aec861ca0a0ab3220390025164625c4f4d10bf876edd4bcf49cb3469dbf534d5c2659975f4c299f7bb4215fb82a62d3463fbc9c78b52b23e0bb3b5b0 SHA512 f557d6681656fa4bc6243a88575f3ae14eb5b6264e8c409b898cc23423eb80107cc311a5ad01cb4338f87dc059a96536b23bf0b0e6cb4981014383310aea00e2
 EBUILD lrslib-062.ebuild 1114 BLAKE2B 455c4e6e732fdfaa491da292db2d8bdf55c6b692da6bd738d617d8bb51e225dfa3b88263894482f4b5b38a0bb0daf3bc726fd5ec5e88ca269e210dd198a5eee9 SHA512 6e29d90108ae11e1cc5143406ecb7636277395fa3ebfbaa02eb8cd11e5f2f5a0f43877a75e52bbfddc5ea6104f4524b87daa8f092bfa02a20f13733d38d2492e
diff --git a/sci-libs/lrslib/lrslib-042c-r1.ebuild b/sci-libs/lrslib/lrslib-042c-r1.ebuild
new file mode 100644
index 000000000000..b1fba3a5f344
--- /dev/null
+++ b/sci-libs/lrslib/lrslib-042c-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit toolchain-funcs
+
+DESCRIPTION="self-contained ANSI C implementation of the reverse search algorithm"
+HOMEPAGE="http://cgm.cs.mcgill.ca/~avis/C/lrs.html"
+SRC_URI="http://cgm.cs.mcgill.ca/~avis/C/lrslib/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="gmp"
+
+DEPEND="gmp? ( dev-libs/gmp )"
+RDEPEND="${DEPEND}"
+
+src_prepare(){
+	sed -i "s/gcc/$(tc-getCC)/g" makefile || die
+	sed -i "s/-O3/${CFLAGS} ${LDFLAGS}/g" makefile || die
+}
+
+src_compile () {
+	if use amd64 ; then
+		emake all64 || die "make failed"
+	else
+		emake || die "make failed"
+	fi
+	if use gmp ; then
+		emake gmp || die "make failed"
+	fi
+}
+
+src_install() {
+	dobin lrs redund redund1 || die
+	# Collides with sys-block/buffer
+	newbin buffer lrsbuffer || die
+	if use x86; then
+		dobin nash setupnash setupnash2 2nash || die
+		# Prevent clash with cddlib:
+		newbin fourier lrsfourier || die
+	fi
+	if use gmp; then
+		dobin glrs gredund gfourier || die
+		# Clash with www-plugins/gnash
+		newbin gnash lrsgnash || die
+	fi
+	dodoc readme || die
+	dohtml lrslib.html || die
+}