gentoo resync 08.09.2018

7 files changed, 18 insertions, 311 deletions

diff --git a/sci-libs/getdata/Manifest b/sci-libs/getdata/Manifest
index ea1219077727..73d3e2355733 100644
--- a/sci-libs/getdata/Manifest
+++ b/sci-libs/getdata/Manifest
@@ -1,10 +1,4 @@
-AUX getdata-0.8.5-out-of-source.patch 660 BLAKE2B 36874c076ec9ac89aad28cd59ed23b6da73f9b742ddc98eb8dd3d2a138779db115c9600ae6569a8d5db2bf1e2fef12ac1b90cb5cd18cb1a04a4c1d9d4fcf450a SHA512 03205c0472df80f487476ee24e8a5478e8a67ef2e87fe47e59f709653b9a74356ba566657e662f606584431f03e918ae35111b1c202cbd6a5eee83a820e9c347
-AUX getdata-0.8.5-serial-test.patch 1386 BLAKE2B 3ba25eb60fbcc01dbcd393ce2ba9e6da39a440473b3355608e6e30ffa952c9e67f7aca8db09ecc1d6d48b7ed18ffadeff107d457bebf6761f734c0293e75b784 SHA512 2610bd2b7aa76117e16361833c77c61bef68ed0080cbb39520c089b00430e5aced32694dea24e9cd52a89fafc609f82cb54c17b7e7ee7c38860dd163d1659eb0
 AUX getdata-0.9.0-remove-python-test.patch 257 BLAKE2B bc60176d361d2cb891742c0ee8b443d0cb5c1350478bec1047e56d6a38b50021096ad8bab6ed4b1205744785f002227b22a80a4ab888c4bd52d517de8503e12b SHA512 7a8b5e8e1f2164fca9caba81c7b24f705c6caac036f8f2a3c6dd436961311e4dc34aa6a669eb0bd9e50fb50c09a8b22d32fe04961085c983a29da00e438cbc7c
-AUX getdata-0.9.0-serial-test.patch 1399 BLAKE2B c0fda8d60ba4c5d074346c2be33e774290aa2c5346cd9f72bb137bad11c97c986fdb3029e10244bb6ee70aec8dc41f26e29bb3dd4d5730499a3c2bef5264c591 SHA512 8892dc1f1ba7ba268d66085e34c82dc8cd07fac28aecfad54153a6f0e27fcac82f2d801e376e4635170c45c82aba72816db40160af825881821c4c90b6a80e04
-DIST getdata-0.8.5.tar.bz2 1015954 BLAKE2B 8a7740a95cb08bd188fc5d6a102a9cf6c8a2a5573a9b0152c5e9f8766c65e1f008390568c06672fb55c031e0877b5d1eaf9925fc4a04daa9321aac19cc7a61fe SHA512 3a87ea2fbaa5491ac1d6faecdf10f0a80eef62fb8beefc6103f7f18e74efd404884f100f1d123b1fec672d1a09ea2c87e75626b7c62ea56b568a11cc44feaad0
 DIST getdata-0.9.0.tar.xz 920652 BLAKE2B d5f0659474dfab9f4e589a28a7788b5a51de3c0064b58de37bdb11dad27b56daa05d8e705da743c5da271bd8c4e1343ac6ac41adfdfabfcaef0006e46c45d2bf SHA512 28d720141e34cc56a5166594d0a6ac293144d123706988ed170e40dd9d7aaf13b920305e8bd8343ecd7cbe43eee5d83720e3e5f5d2da0cdccdc1444725cc6844
-EBUILD getdata-0.8.5.ebuild 2427 BLAKE2B 74e3ac2312d89ea4ffc57f79a653db10082c3281e2888521f9eda59576ffca5f3ca31adb4f24ef0e155cc112468dd3c7b8a79e8ea0f1ce8179f8e3c477222f36 SHA512 257452ae0aed4f691f4482681579d1f1ac3639e7951a42e724509804acebda53d2d21a153ba350b68eaa67a61296c74b8a9a3eb12983e24ed453d0ace1d8ec1f
-EBUILD getdata-0.9.0-r1.ebuild 1443 BLAKE2B f65de7df71899a6726df5ee3ba913a4503688f85f2925e1a739c8492323eb1e6dea602b6f88435a61d970ee85f1dc48bb434c3f0532da76657dc1fa052d7970e SHA512 96cbabaa512443277327fe68fa1c0ca0b0bc645b07c063398af0f07ba887f998d15c5261581dbca03ee51ffb68c1338941e97f3e9915e1ac0f93a016a8877653
-EBUILD getdata-0.9.0.ebuild 2412 BLAKE2B b0f9bc8bcb262230ac37d67733ae3be38674102e414febf643fc8904120a95c6508cc58abfccb9a0751d56e653ae2195eac54db0a6827986737df9519fa7b5af SHA512 5da44d448efa5eac32364728eac9bbe003cea02940fc78a74cd0737f92c1fa2e25319769fb8379a84ecd979658c0a9caa3ec3b49a417713690a1a47a401a8937
+EBUILD getdata-0.9.0-r1.ebuild 1506 BLAKE2B 938e0d6d91fa5ca0458fbf545d5485adc6f20addea8b33bab1d120fa3b63c36814d870c73aa5b0e8d1df6d479517472a81049880bca74c2b66da2229e7857cc7 SHA512 02b932f496218b8c70e0d4b83d667b2af5c1f2ce4c8258d988565c2bc27bce6526ec64005d01f573c74179649b4ee71c536e5cb4fb26a6f039ed45a82acb0e00
 MISC metadata.xml 660 BLAKE2B 74c050abc2e0978cc5c7d16625a6858f9a0a22d9c4ce4fbf0c303cb3361ef460d5d50d09845e5c8b9be82a73b22e9d159a554fec12f5dd7058602c99b7b5073d SHA512 d821e374438aad1beb22199383ebbc8a48247867b08370f08c370e02d7abaf7273a62e750a9ed3befc5e9674489a2a8e56453a6dad09a363a514986a79eb7460
diff --git a/sci-libs/getdata/files/getdata-0.8.5-out-of-source.patch b/sci-libs/getdata/files/getdata-0.8.5-out-of-source.patch
deleted file mode 100644
index 45a6c7e14c31..000000000000
--- a/sci-libs/getdata/files/getdata-0.8.5-out-of-source.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- bindings/python/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
-index c2ab221..f5ade68 100644
---- a/bindings/python/Makefile.am
-+++ b/bindings/python/Makefile.am
-@@ -35,7 +35,7 @@ LIBS=
- 
- BUILT_SOURCES = pyconstants.c
- AM_CFLAGS = ${WALL} -fno-strict-aliasing
--AM_CPPFLAGS = $(CPPFLAGS) $(PYTHON_CPPFLAGS) $(NUMPY_CPPFLAGS)
-+AM_CPPFLAGS = $(CPPFLAGS) $(PYTHON_CPPFLAGS) $(NUMPY_CPPFLAGS) -I$(top_srcdir)/src
- pygetdata_la_LDFLAGS = -module -avoid-version \
- 											 -export-symbols-regex initpygetdata
- pygetdata_la_LIBADD = $(PYTHON_LIBS) ../../src/libgetdata.la
diff --git a/sci-libs/getdata/files/getdata-0.8.5-serial-test.patch b/sci-libs/getdata/files/getdata-0.8.5-serial-test.patch
deleted file mode 100644
index 976757ea8646..000000000000
--- a/sci-libs/getdata/files/getdata-0.8.5-serial-test.patch
+++ /dev/null
@@ -1,42 +0,0 @@
- bindings/Makefile.am             | 6 +-----
- bindings/python/test/Makefile.am | 3 +--
- 2 files changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/bindings/Makefile.am b/bindings/Makefile.am
-index df53b0f..ec33316 100644
---- a/bindings/Makefile.am
-+++ b/bindings/Makefile.am
-@@ -38,10 +38,6 @@ if MAKE_MATLABBINDINGS
- MATLAB_SUBDIR=matlab
- endif
- 
--if MAKE_PYBINDINGS
--PY_SUBDIR=python
--endif
--
- if MAKE_PERLBINDINGS
- PERL_SUBDIR=perl
- endif
-@@ -52,7 +48,7 @@ make_parameters_SOURCES = make_parameters.c
- nodist_make_parameters_SOURCES = ../src/getdata.h ../src/gd_config.h
- 
- SUBDIRS = . ${F77_SUBDIR} ${CXX_SUBDIR} ${IDL_SUBDIR} ${MATLAB_SUBDIR} \
--					${PY_SUBDIR} ${PERL_SUBDIR}
-+					${PERL_SUBDIR}
- 
- make_parameters$(EXEEXT): $(make_parameters_SOURCES) \
- 				    $(nodist_make_parameters_SOURCES)
-diff --git a/bindings/python/test/Makefile.am b/bindings/python/test/Makefile.am
-index d159cad..b793b02 100644
---- a/bindings/python/test/Makefile.am
-+++ b/bindings/python/test/Makefile.am
-@@ -18,8 +18,7 @@
- # along with GetData; if not, write to the Free Software Foundation, Inc.,
- # 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- #
--AUTOMAKE_OPTIONS = foreign
--
-+AUTOMAKE_OPTIONS = foreign serial-tests
- if TEST_PYTHON
- TESTS_ENVIRONMENT=${DL_LIBRARY_PATH}=${${DL_LIBRARY_PATH}}:../../../src/.libs PYTHONPATH=../.libs/ ${PYTHON}
- pyTESTS=callback.py big_test.py
diff --git a/sci-libs/getdata/files/getdata-0.9.0-serial-test.patch b/sci-libs/getdata/files/getdata-0.9.0-serial-test.patch
deleted file mode 100644
index ea17e548da2f..000000000000
--- a/sci-libs/getdata/files/getdata-0.9.0-serial-test.patch
+++ /dev/null
@@ -1,41 +0,0 @@
- bindings/Makefile.am             | 6 +-----
- bindings/python/test/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/bindings/Makefile.am b/bindings/Makefile.am
-index ad9f0d2..9e333a5 100644
---- a/bindings/Makefile.am
-+++ b/bindings/Makefile.am
-@@ -38,10 +38,6 @@ if MAKE_MATLABBINDINGS
- MATLAB_SUBDIR=matlab
- endif
- 
--if MAKE_PYBINDINGS
--PY_SUBDIR=python
--endif
--
- if MAKE_PERLBINDINGS
- PERL_SUBDIR=perl
- endif
-@@ -55,7 +51,7 @@ noinst_PROGRAMS=make_parameters
- make_parameters_SOURCES = make_parameters.c
- nodist_make_parameters_SOURCES = ../src/getdata.h ../src/gd_config.h
- 
--SUBDIRS = . ${F77_SUBDIR} ${CXX_SUBDIR} ${IDL_SUBDIR} ${PY_SUBDIR} \
-+SUBDIRS = . ${F77_SUBDIR} ${CXX_SUBDIR} ${IDL_SUBDIR} \
- 					${PERL_SUBDIR} ${MATLAB_SUBDIR} ${PHP_SUBDIR}
- 
- make_parameters$(EXEEXT): $(make_parameters_SOURCES) \
-diff --git a/bindings/python/test/Makefile.am b/bindings/python/test/Makefile.am
-index 32d786f..f4be3de 100644
---- a/bindings/python/test/Makefile.am
-+++ b/bindings/python/test/Makefile.am
-@@ -18,7 +18,7 @@
- # along with GetData; if not, write to the Free Software Foundation, Inc.,
- # 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- #
--AUTOMAKE_OPTIONS = foreign serial-tests
-+AUTOMAKE_OPTIONS = foreign
- 
- if TEST_PYTHON
- TESTS_ENVIRONMENT=${DL_LIBRARY_PATH}=../../../src/.libs:${${DL_LIBRARY_PATH}} PYTHONPATH=..:${PYTHONPATH} ${PYTHON}
diff --git a/sci-libs/getdata/getdata-0.8.5.ebuild b/sci-libs/getdata/getdata-0.8.5.ebuild
deleted file mode 100644
index e22e53814e25..000000000000
--- a/sci-libs/getdata/getdata-0.8.5.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-AUTOTOOLS_AUTORECONF=true
-
-FORTRAN_STANDARD="95"
-FORTRAN_NEEDED=fortran
-
-inherit autotools-utils fortran-2 python-single-r1
-
-DESCRIPTION="Reference implementation of the Dirfile, format for time-ordered binary data"
-HOMEPAGE="http://getdata.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 debug fortran lzma python perl static-libs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	perl? ( dev-lang/perl )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-serial-test.patch
-	"${FILESDIR}"/${P}-out-of-source.patch
-	)
-
-src_configure() {
-	local myeconfargs=()
-	use perl && myeconfargs+=( --with-perl-dir=vendor )
-	myeconfargs+=(
-		--disable-idl
-		--without-libslim
-		--with-libz
-		--docdir="${EPREFIX}/usr/share/doc/${P}"
-		$(use_enable debug)
-		$(use_enable fortran)
-		$(use_enable fortran fortran95)
-		$(use_enable python)
-		$(use_enable perl)
-		$(use_with bzip2 libbz2)
-		$(use_with lzma liblzma)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use python; then
-		python_copy_sources
-		building() {
-			cd "${BUILD_DIR}"/bindings/python || die
-			sed "s:-lpython...:$(python_get_LIBS):g" -i Makefile || die
-			emake \
-				PYTHON_VERSION="${EPYTHON#python}" \
-				NUMPY_CPPFLAGS="-I${EPREFIX}$(python_get_sitedir)/numpy/core/include" \
-				PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \
-				pyexecdir="${EPREFIX}$(python_get_sitedir)" \
-				pythondir="${EPREFIX}$(python_get_sitedir)"
-		}
-		python_foreach_impl building
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use python; then
-		installation() {
-			cd "${BUILD_DIR}"/bindings/python || die
-			emake \
-				DESTDIR="${D}" \
-				PYTHON_VERSION="${EPYTHON#python}" \
-				NUMPY_CPPFLAGS="-I${EPREFIX}$(python_get_sitedir)/numpy/core/include" \
-				PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \
-				pyexecdir="${EPREFIX}$(python_get_sitedir)" \
-				pythondir="${EPREFIX}$(python_get_sitedir)" \
-				install
-				find \
-					"${ED}/$(python_get_sitedir)" \
-					-type f \( -name "*.a" -o -name "*.la" \) -delete || die
-		}
-		python_foreach_impl installation
-	fi
-}
diff --git a/sci-libs/getdata/getdata-0.9.0-r1.ebuild b/sci-libs/getdata/getdata-0.9.0-r1.ebuild
index 9bbc02d66ae9..1e6aa25c7ab1 100644
--- a/sci-libs/getdata/getdata-0.9.0-r1.ebuild
+++ b/sci-libs/getdata/getdata-0.9.0-r1.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
-
 FORTRAN_STANDARD="95"
 FORTRAN_NEEDED=fortran
-
-inherit autotools eutils fortran-2 python-single-r1
+PYTHON_COMPAT=( python2_7 )
+inherit autotools fortran-2 python-single-r1
 
 DESCRIPTION="Reference implementation of the Dirfile, format for time-ordered binary data"
 HOMEPAGE="http://getdata.sourceforge.net/"
@@ -28,9 +26,11 @@ DEPEND="
 	python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )"
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-remove-python-test.patch"
-)
+PATCHES=( "${FILESDIR}/${P}-remove-python-test.patch" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
 
 src_prepare() {
 	default
@@ -42,23 +42,23 @@ src_configure() {
 		--disable-idl \
 		--disable-matlab \
 		--disable-php \
-		$(use_enable cxx cplusplus) \
-		$(use_enable debug) \
-		$(use_enable fortran) \
-		$(use_enable fortran fortran95) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable static-libs static) \
 		--with-libz \
 		--without-libslim \
 		--without-libzzip \
 		$(use_with bzip2 libbz2) \
+		$(use_enable cxx cplusplus) \
+		$(use_enable debug) \
 		$(use_with flac libFLAC) \
+		$(use_enable fortran) \
+		$(use_enable fortran fortran95) \
 		$(use_with lzma liblzma) \
-		$(usex perl --with-perl-dir=vendor)
+		$(use_enable perl) \
+		$(usex perl --with-perl-dir=vendor) \
+		$(use_enable python) \
+		$(use_enable static-libs static)
 }
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/getdata/getdata-0.9.0.ebuild b/sci-libs/getdata/getdata-0.9.0.ebuild
deleted file mode 100644
index 458e6a8186ac..000000000000
--- a/sci-libs/getdata/getdata-0.9.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-AUTOTOOLS_AUTORECONF=true
-
-FORTRAN_STANDARD="95"
-FORTRAN_NEEDED=fortran
-
-inherit autotools-utils fortran-2 python-single-r1
-
-DESCRIPTION="Reference implementation of the Dirfile, format for time-ordered binary data"
-HOMEPAGE="http://getdata.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 debug fortran lzma python perl static-libs"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	python? ( ${PYTHON_DEPS} )
-	perl? ( dev-lang/perl )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-serial-test.patch
-	)
-
-src_configure() {
-	local myeconfargs=()
-	use perl && myeconfargs+=( --with-perl-dir=vendor )
-	myeconfargs+=(
-		--disable-idl
-		--without-libslim
-		--with-libz
-		--docdir="${EPREFIX}/usr/share/doc/${P}"
-		$(use_enable debug)
-		$(use_enable fortran)
-		$(use_enable fortran fortran95)
-		$(use_enable python)
-		$(use_enable perl)
-		$(use_with bzip2 libbz2)
-		$(use_with lzma liblzma)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use python; then
-		python_copy_sources
-		building() {
-			cd "${BUILD_DIR}"/bindings/python || die
-			sed "s:-lpython...:$(python_get_LIBS):g" -i Makefile || die
-			emake \
-				PYTHON_VERSION="${EPYTHON#python}" \
-				NUMPY_CPPFLAGS="-I${EPREFIX}$(python_get_sitedir)/numpy/core/include" \
-				PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \
-				pyexecdir="${EPREFIX}$(python_get_sitedir)" \
-				pythondir="${EPREFIX}$(python_get_sitedir)"
-		}
-		python_foreach_impl building
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use python; then
-		installation() {
-			cd "${BUILD_DIR}"/bindings/python || die
-			emake \
-				DESTDIR="${D}" \
-				PYTHON_VERSION="${EPYTHON#python}" \
-				NUMPY_CPPFLAGS="-I${EPREFIX}$(python_get_sitedir)/numpy/core/include" \
-				PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \
-				pyexecdir="${EPREFIX}$(python_get_sitedir)" \
-				pythondir="${EPREFIX}$(python_get_sitedir)" \
-				install
-				find \
-					"${ED}/$(python_get_sitedir)" \
-					-type f \( -name "*.a" -o -name "*.la" \) -delete || die
-		}
-		python_foreach_impl installation
-	fi
-}