gentoo resync 08.09.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-09-08 10:50:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-09-08 10:50:14 +0100
commit: 3f71901f8c228f4de570abed1831ce3ee425343e (patch)
tree: a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /sci-libs
parent: 12bb627384ddfd47382b9f1b6464481a58d01ebb (diff)
39 files changed, 435 insertions, 1606 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 128881001ecd..b65a9c65d955 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest
index 3c62edbdc6a7..706fe3d835c7 100644
--- a/sci-libs/dcmtk/Manifest
+++ b/sci-libs/dcmtk/Manifest
@@ -1,16 +1,5 @@
-AUX 01_fix_perl_script_path.patch 8946 BLAKE2B 76f69ab764a150539732cfa71014bf8b4d50ae5f43352c244ee3eb8bf3048a6cd213198f12e89a560206dfb465d9a02416d8490b099bf2792865415d4b5a74ad SHA512 002b6fe72068a185ecf87ecf04990e8b085593aeee1faa399aacc64de2810f45ecfb181cac9651a37a07719b41cf0029176404ce33264e196350ff701b51f18a
-AUX 02_dcmtk_3.6.0-1.patch 3245 BLAKE2B 0aa7fae29baeacfddf676324ed13f8386be94129e45e3e8e5e4355491e2418177600b102b9b47e2969277b095f0d4d7c0d7c07ad931f788290c4ff8a69acb695 SHA512 369ee28f0d30f7aaa6f204aa45a4314218eb6ed070dc1e3a557802d62956ec3bdf8dcc1490c0b7b879d1a2e9145aa8bf0de691ef32e2bc7dd9270f63cc31f68a
-AUX 04_nostrip.patch 7339 BLAKE2B 1ff0efe77ba2d277e5d3eceec6de5ed3bd9bc0df415909584d95c74b2d40507b8a1a10eed0956182c944190c8f70fec2ecf68528b4f2f6916ae4c4064a311eb1 SHA512 7f8fb30a4ad4b2b0ab6ace37afb618efc3faed6af3dbed6793ff8c61dfd0a99aa26b880e6c0cc7addfffa008044ba8e81e622f94bebf6152cb0bd273da023e29
 AUX dcmtk-3.6.3-dcmqrdb-cfg.patch 3031 BLAKE2B 9fd21949e42c7f0c479db7d9b81c133837bec4ba68554e463d253c47b451ded6e1d74aa8d545ca10220570be48021f8640eb47f63706ad517ee0ae6c6b2fa2cf SHA512 2487f88a650e299cc6a2011ba12f74bd2c305c4d8aad57034b04f99f4c0095505f6e000cada9fcafe466590719c0678735cafec0254d473c48e171c3adc91d9a
 AUX dcmtk-3.6.3-nostrip.patch 7049 BLAKE2B 57d7b4d2cc3bdd683cb6c51c6d9c7e37023ddaf255655cf3f6c1473484d4e41d4a75b3bcb452a3caa06b8c751cfca47a14b0cd10372c1ebde936f7dec3046ed0 SHA512 00f28de0995c2d38b32b59298ac1c97878248647d403df86244d16a16cfd4c7ba47e7fe400592e5ac0f935a3704733a768fa3b94c9625903e86ab5f714d093bd
-AUX dcmtk-asneeded.patch 4403 BLAKE2B 14323df7dccad5de0f4746a025c25ed9fb92964c0acecacd25a9aed9d00e655e9681800cc4eb6fef562fbc2b941542d119b3f0531ec2dd0670c4c768be2a96ec SHA512 629b6cc819c0440b9173ca09343309399abaa1cd23b92f7a2a78b732508140c9b6f9885f38c18328dc9b3dc5e86534940595380fac9223c2fb45c901c9f1222c
-AUX dcmtk-fix_doc_install.patch 877 BLAKE2B 70b85d1e1747b309413c5ba2c201eaccf52dadf93e84a18bfd0dd8a202b1fa5f1a10755c6cca7b2dd8feb5df10bd6c3565de6bae4ec83d997ec17213f8fe2903 SHA512 243d4fe9c3259f852de3e662e5b3914a9ea8e22ebdd7992b61561f9e26d04fc2b78a1045eca63791d13ad34dcc26c3e9a76b750a1b7b1cc1040151cb454903b2
-AUX dcmtk-gcc472-error.patch 13994 BLAKE2B d9f376ea78c181c24caddb7fddcdf2a83fbee587e98152fd47048f84c8871611004fb01903e66fdfd054b92bae79c13f616e734be54436e8abda918d09e7abd8 SHA512 d408a83cd7b1de08041ff2c3df7ee3a766ffa31a7085c8a1e853de6fd3d4d871557a5b2a2a417c52953a4bcc4ed2d5f813cd3a5170fb27482caec60ff1361eac
-AUX dcmtk_version_number.patch 5439 BLAKE2B 91f3a39227bb7c6a70005dca060709a5e976f3c442057e19e7ec6537c7b9b5b95677b36c2e93a80622b4532a78ac02c9c15b8b112920112a5a46d43d2163d786 SHA512 22f93c2bd3b1d4ac301653484bf5dca384a65fbc31ee61038c156d285ab587715ed61101761d5edaf4e64c31cd56239fb09c8d81a3aa241772e5c2c0556da872
-AUX png_tiff.patch 620 BLAKE2B a4bf8a55581723131f27a513f7e16550be70012b85f709bc54e4a4404a72f2211571f41be00e64042a520f7a51740a3d09a76e7889ff7fbc925102ac7a618892 SHA512 b6c30e40ffcabf77f3dd04dbf5ba76ac0e86972e06eec81a1833c472099e7b207c4343208dc756f650f5b5ff77df6b950b0acb24c43029f30e2d67a3f882fab2
-AUX regression_stacksequenceisodd.patch 4989 BLAKE2B 4a2ab9cb535d6d643b6b92134e5ebb53f25d600e6e744ee6ab51ee66b4fd1d37570c321c4b957678d28f5c0c94dfc112faafb07de01beccb45ad6152fd30f916 SHA512 bb126c947646ca3274863b8517478e738fcbe16f3e1e0bb75b8601ad2b5e6492400f96a89aaf25f683b06f6f3f9dad76391d5adc62177496cbffc0309aa7dc72
-DIST dcmtk-3.6.0.tar.gz 4673121 BLAKE2B 5694669bf4e612fbc39c5785a1498097972d47ecd5c66e437603dd2259258783b36ac86ea2dd57cc74b3af1701c933965e53c433dd09e1acd94dbb768b81b365 SHA512 2a9d866bafcaea72d889d24b51ff2341ee39c717aacf9ae5825c8588cd5cb01c3e341b6173abce751f6cb32c45be8888e81ccb08967cae2cca7fdcb2b61be53c
 DIST dcmtk-3.6.3.tar.gz 6269785 BLAKE2B 8f0797840fa5ab4ffb60e46f65b16739d3ed0cb7591b20cbfba81a59de97344a663f73bed8fc7f349a99accc46fd2fde3cff021861bde6f07957a433a4db67a3 SHA512 5b907422d2d80e417ae8239e159d1300da4ed8db7e92cee619cc1d37116165e8824f8a9103605e07a95b1bffe94bbd2d5e05125f068281d241e8e78755d0b5e8
-EBUILD dcmtk-3.6.0.ebuild 2337 BLAKE2B ba98732e46fe8a25081bb6e2bc633b492e1fdb9c8180735a5516cd077faf298be5b022e8265d2b1f30ec4ad1c8a12eb1d0df7aa248c8991024cfbf22773ff1d0 SHA512 2af5f13e108f90614fb59da36887b49ca3adb5bfc4676997b9adbf75c770406af41588747c821cac2a731ebde1bf3540a9d6ae781495d6cc21304040d921302e
 EBUILD dcmtk-3.6.3.ebuild 2001 BLAKE2B 86e238bd4e5c4c407b586d00ba35647b76a90d115627950449a34da2b6ba22b2731317763c52fd5297a2f9cb7bfbd875aa2578620e938d9bed4a821f0458d666 SHA512 a2ffe250b409318886005a092c349dc510d754c46629fa23cfbdef1ab423876e43141c721784a6d19e3ddbbfdd829398731c88a4684c2a549fddd36dcf4d5ff1
 MISC metadata.xml 317 BLAKE2B cad6b71cf9d8e4f626ee594c2eaad2e75f8ae288ea53206ae8ba37f0be04168f2ce7adeef7e45876d1358250e7ec6f2d9a07cc1c0ea4cf929323f1292ae4853a SHA512 0c6bb7cc6f8d56a7809354d0630ee49f33b63f7b60ad0a0ccbbfd7f28391a4c6b0c9f56caeb7cefcc74bf169ed6d46adda4fd204ef633311376b3cc3f7193d68
diff --git a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
deleted file mode 100644
index 1a94d20b5063..000000000000
--- a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit cmake-utils eutils
-
-DESCRIPTION="The DICOM Toolkit"
-HOMEPAGE="https://dicom.offis.de/dcmtk.php.en"
-SRC_URI="ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk360/${P}.tar.gz"
-
-LICENSE="OFFIS"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="doc png ssl tcpd tiff +threads xml zlib"
-
-RDEPEND="
-	virtual/jpeg:0
-	png? ( media-libs/libpng:* )
-	ssl? ( dev-libs/openssl:0 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	tiff? ( media-libs/tiff:0 )
-	xml? ( dev-libs/libxml2:2 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	media-gfx/graphviz"
-
-PATCHES=(
-	"${FILESDIR}"/01_fix_perl_script_path.patch
-	"${FILESDIR}"/02_dcmtk_3.6.0-1.patch
-	"${FILESDIR}"/04_nostrip.patch
-	"${FILESDIR}"/dcmtk_version_number.patch
-	"${FILESDIR}"/png_tiff.patch
-	"${FILESDIR}"/regression_stacksequenceisodd.patch
-	"${FILESDIR}"/${PN}-asneeded.patch
-	"${FILESDIR}"/${PN}-gcc472-error.patch
-	"${FILESDIR}"/${PN}-fix_doc_install.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s:share/doc/dcmtk:&-${PV}:" \
-		-e "s:DIR \"/:DIR \"/usr/:" \
-		-e "s:usr/etc:etc:" \
-		-e "s:/lib\":/$(get_libdir)\":" \
-		-e "s:COPYRIGHT::" \
-		-i CMakeLists.txt || die
-	sed -e 's:${CMAKE_INSTALL_PREFIX}/::' \
-		-i dcmwlm/data/CMakeLists.txt doxygen/CMakeLists.txt || die
-	# Temporary workaround: docs are not built with CMake
-	sed -i -e '/include/d' doxygen/Makefile.in || die
-
-	# fix -D deprecation warnings
-	sed -i -e "s|_BSD_SOURCE|_DEFAULT_SOURCE|g" \
-		"${S}"/config/configure.in \
-		"${S}"/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DCMAKE_INSTALL_PREFIX=/
-		$(cmake-utils_use tiff DCMTK_WITH_TIFF)
-		$(cmake-utils_use png DCMTK_WITH_PNG)
-		$(cmake-utils_use xml DCMTK_WITH_XML)
-		$(cmake-utils_use zlib DCMTK_WITH_ZLIB)
-		$(cmake-utils_use ssl DCMTK_WITH_OPENSSL)
-		$(cmake-utils_use doc DCMTK_WITH_DOXYGEN)
-		$(cmake-utils_use threads DCMTK_WITH_THREADS)
-	)
-
-	cmake-utils_src_configure
-
-	if use doc; then
-		cd "${S}"/doxygen || die
-		econf
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		emake -C "${S}"/doxygen
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	doman doxygen/manpages/man1/*
-
-	if use doc; then
-		dohtml -r "${S}"/doxygen/htmldocs/*
-	fi
-}
diff --git a/sci-libs/dcmtk/files/01_fix_perl_script_path.patch b/sci-libs/dcmtk/files/01_fix_perl_script_path.patch
deleted file mode 100644
index 9f002d85640f..000000000000
--- a/sci-libs/dcmtk/files/01_fix_perl_script_path.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-Author: Jürgen Salk <jsa@debian.org>
-Description: The original maintainer Jürgen Salk applied
- a set of patches to the original code.  The part which fixes
- the path to the perl executable is collected in this patch set.
-
---- dcmtk-3.5.5_20101130/dcmwlm/perl/changepw.pl	2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/changepw.pl	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/checkvr.ph	2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/checkvr.ph	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/isocode.ph	2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/isocode.ph	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/layout.ph	2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/layout.ph	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/lock.ph	2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/lock.ph	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/log.ph	2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/log.ph	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/main.pl	2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/main.pl	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/password.ph	2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/password.ph	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/patidel.pl	2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/patidel.pl	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/patiedit.pl	2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/patiedit.pl	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/patient.pl	2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/patient.pl	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/prefs.ph	2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/prefs.ph	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/procdel.pl	2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/procdel.pl	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/procedit.pl	2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/procedit.pl	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/procedur.pl	2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/procedur.pl	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/procstep.pl	2010-10-14 15:02:01.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/procstep.pl	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/prstdel.pl	2010-10-14 15:02:02.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/prstdel.pl	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/prstedit.pl	2010-10-14 15:02:02.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/prstedit.pl	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/statdel.pl	2010-10-14 15:02:02.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/statdel.pl	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/statedit.pl	2010-10-14 15:02:02.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/statedit.pl	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/station.pl	2010-10-14 15:02:02.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/station.pl	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/urldecod.ph	2010-10-14 15:02:02.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/urldecod.ph	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Copyright & Disclaimer.
- #	This set of routines may be freely distributed, modified and
---- dcmtk-3.5.5_20101130/dcmwlm/perl/workdel.pl	2010-10-14 15:02:02.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/workdel.pl	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/workedit.pl	2010-10-14 15:02:02.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/workedit.pl	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/worklist.pl	2010-10-14 15:02:02.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/worklist.pl	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
---- dcmtk-3.5.5_20101130/dcmwlm/perl/write.ph	2010-10-14 15:02:02.000000000 +0200
-+++ dcmtk-3.5.5_20101130.new/dcmwlm/perl/write.ph	2010-12-09 11:50:35.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- #  Copyright (C) 1996-2010, OFFIS e.V.
- #  All rights reserved.  See COPYRIGHT file for details.
-@@ -59,7 +59,7 @@
-   if (open(outfile, ">@_[0]"))
-   {
-     print outfile <<EOF;
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # automatically generated by write.pl - do not modify!
- #
diff --git a/sci-libs/dcmtk/files/02_dcmtk_3.6.0-1.patch b/sci-libs/dcmtk/files/02_dcmtk_3.6.0-1.patch
deleted file mode 100644
index 11aaaec37646..000000000000
--- a/sci-libs/dcmtk/files/02_dcmtk_3.6.0-1.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Author: Jürgen Salk <jsa@debian.org>
-Description: The original maintainer Jürgen Salk applied
- a set of patches to the original code.  This file contains
- changes to C++ code
-
-Index: dcmtk-3.6.0/dcmqrdb/etc/dcmqrscp.cfg
-===================================================================
---- dcmtk-3.6.0.orig/dcmqrdb/etc/dcmqrscp.cfg	2010-09-09 19:20:25.000000000 +0200
-+++ dcmtk-3.6.0/dcmqrdb/etc/dcmqrscp.cfg	2011-01-28 09:49:02.000000000 +0100
-@@ -10,6 +10,9 @@
- NetworkTCPPort  = 104
- MaxPDUSize      = 16384
- MaxAssociations = 16
-+UserName        = "dcmtk"
-+GroupName       = "dcmtk"
-+
- #
- # UserName      = <not used>
- # GroupName     = <not used>
-@@ -28,12 +31,13 @@
- # NOTE: in the current implementation you cannot substitute an IP address
- # for a hostname.
- #
--acme1           = (ACME1, acmehost1, 5678)
--acme2           = (ACME2, acmehost2, 5678)
--acmeCTcompany   = acme1, acme2
--united1         = (UNITED1, unitedhost1, 104)
--united2         = (UNITED2, unitedhost2, 104)
--unitedMRcompany = united1, united2
-+# Example:
-+#acme1           = (ACME1, acmehost1, 5678)
-+#acme2           = (ACME2, acmehost2, 5678)
-+#acmeCTcompany   = acme1, acme2
-+#united1         = (UNITED1, unitedhost1, 104)
-+#united2         = (UNITED2, unitedhost2, 104)
-+#unitedMRcompany = united1, united2
- #
- HostTable END
- 
-@@ -51,8 +55,9 @@
- #       VendorName = SymbolicName
- # The symbolic name should be defined in the HostTable.
- #
--"Acme CT Company"   = acmeCTcompany
--"United MR Company" = unitedMRcompany
-+# Example:
-+#"Acme CT Company"   = acmeCTcompany
-+#"United MR Company" = unitedMRcompany
- #
- VendorTable END
- 
-@@ -70,8 +75,13 @@
- #               Entry in HostTable                      |
- #               ANY
- #
--COMMON       /home/dicom/db/COMMON       R  (200, 1024mb) ANY
--ACME_STORE   /home/dicom/db/ACME_STORE   RW (9, 1024mb)   acmeCTcompany
--UNITED_STORE /home/dicom/db/UNITED_STORE RW (9, 1024mb)   unitedMRcompany
-+# Example:
-+#
-+#ACME_STORE   /var/lib/dcmtk/db/ACME_STORE   RW (9, 1024mb)   acmeCTcompany
-+#UNITED_STORE /var/lib/dcmtk/db/UNITED_STORE RW (9, 1024mb)   unitedMRcompany
-+#
-+# Uncomment and adjust the following lines for a common r/rw storage area:
-+#READWRITE     /var/lib/dcmtk/db/READWRITE    RW (10, 1024mb)  ANY
-+#READ          /var/lib/dcmtk/db/READ         R  (200, 1024mb) ANY
- #
- AETable END
-Index: dcmtk-3.6.0/dcmqrdb/docs/dcmqrcnf.txt
-===================================================================
---- dcmtk-3.6.0.orig/dcmqrdb/docs/dcmqrcnf.txt	2010-09-09 19:20:12.000000000 +0200
-+++ dcmtk-3.6.0/dcmqrdb/docs/dcmqrcnf.txt	2011-01-28 09:46:02.000000000 +0100
-@@ -44,8 +44,8 @@
- NetworkTCPPort  = 104
- MaxPDUSize      = 8192
- MaxAssociations = 20
--UserName        = (do not change user)
--GroupName       = (do not change group)
-+UserName        = "dcmtk"
-+GroupName       = "dcmtk"
- 
- NOTE: You must have root privileges to bind port 104 for DICOM association 
- requests on Unix/Linux/Posix platforms as this is a privileged port number 
-Index: dcmtk-3.6.0/dcmwlm/wlistdb/OFFIS/lockfile
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ dcmtk-3.6.0/dcmwlm/wlistdb/OFFIS/lockfile	2011-01-28 09:46:02.000000000 +0100
-@@ -0,0 +1 @@
-+
diff --git a/sci-libs/dcmtk/files/04_nostrip.patch b/sci-libs/dcmtk/files/04_nostrip.patch
deleted file mode 100644
index c4a109ca5df8..000000000000
--- a/sci-libs/dcmtk/files/04_nostrip.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-Remove all hardcoded calls to `strip` command
-
-Index: dcmtk-3.6.0/config/templates/Makefile.src
-===================================================================
---- dcmtk-3.6.0.orig/config/templates/Makefile.src	2009-01-30 10:27:58.000000000 +0100
-+++ dcmtk-3.6.0/config/templates/Makefile.src	2011-01-28 09:53:28.000000000 +0100
-@@ -31,7 +31,7 @@
- install-bin: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmdata/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.0.orig/dcmdata/apps/Makefile.in	2009-11-04 10:58:05.000000000 +0100
-+++ dcmtk-3.6.0/dcmdata/apps/Makefile.in	2011-01-28 09:53:45.000000000 +0100
-@@ -76,7 +76,7 @@
- install-bin: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmimage/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.0.orig/dcmimage/apps/Makefile.in	2009-10-13 16:08:33.000000000 +0200
-+++ dcmtk-3.6.0/dcmimage/apps/Makefile.in	2011-01-28 09:53:59.000000000 +0100
-@@ -42,7 +42,7 @@
- install: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmimgle/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.0.orig/dcmimgle/apps/Makefile.in	2009-10-28 10:53:39.000000000 +0100
-+++ dcmtk-3.6.0/dcmimgle/apps/Makefile.in	2011-01-28 09:54:11.000000000 +0100
-@@ -39,7 +39,7 @@
- install: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmjpeg/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.0.orig/dcmjpeg/apps/Makefile.in	2009-10-07 14:44:33.000000000 +0200
-+++ dcmtk-3.6.0/dcmjpeg/apps/Makefile.in	2011-01-28 09:54:28.000000000 +0100
-@@ -72,7 +72,7 @@
- install: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- clean:
-Index: dcmtk-3.6.0/dcmnet/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.0.orig/dcmnet/apps/Makefile.in	2009-11-04 11:24:29.000000000 +0100
-+++ dcmtk-3.6.0/dcmnet/apps/Makefile.in	2011-01-28 09:54:50.000000000 +0100
-@@ -52,7 +52,7 @@
- install: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmpstat/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.0.orig/dcmpstat/apps/Makefile.in	2009-10-13 16:57:49.000000000 +0200
-+++ dcmtk-3.6.0/dcmpstat/apps/Makefile.in	2011-01-28 09:55:10.000000000 +0100
-@@ -113,7 +113,7 @@
- install: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmqrdb/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.0.orig/dcmqrdb/apps/Makefile.in	2009-11-04 11:24:30.000000000 +0100
-+++ dcmtk-3.6.0/dcmqrdb/apps/Makefile.in	2011-01-28 09:55:24.000000000 +0100
-@@ -57,7 +57,7 @@
- install: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmsign/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.0.orig/dcmsign/apps/Makefile.in	2009-09-04 17:42:31.000000000 +0200
-+++ dcmtk-3.6.0/dcmsign/apps/Makefile.in	2011-01-28 09:55:35.000000000 +0100
-@@ -33,7 +33,7 @@
- install: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmsr/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.0.orig/dcmsr/apps/Makefile.in	2009-10-13 16:57:49.000000000 +0200
-+++ dcmtk-3.6.0/dcmsr/apps/Makefile.in	2011-01-28 09:55:48.000000000 +0100
-@@ -44,7 +44,7 @@
- install-bin: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmwlm/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.0.orig/dcmwlm/apps/Makefile.in	2009-11-04 11:24:30.000000000 +0100
-+++ dcmtk-3.6.0/dcmwlm/apps/Makefile.in	2011-01-28 09:55:58.000000000 +0100
-@@ -49,7 +49,7 @@
- install: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmwlm/wwwapps/Makefile.in
-===================================================================
---- dcmtk-3.6.0.orig/dcmwlm/wwwapps/Makefile.in	2009-11-04 11:24:30.000000000 +0100
-+++ dcmtk-3.6.0/dcmwlm/wwwapps/Makefile.in	2011-01-28 09:56:33.000000000 +0100
-@@ -55,7 +55,7 @@
- install: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmjpls/apps/Makefile.in
-===================================================================
---- dcmtk-3.6.0.orig/dcmjpls/apps/Makefile.in	2011-01-28 09:56:54.000000000 +0100
-+++ dcmtk-3.6.0/dcmjpls/apps/Makefile.in	2011-01-28 09:57:00.000000000 +0100
-@@ -71,7 +71,7 @@
- install: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && strip $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
diff --git a/sci-libs/dcmtk/files/dcmtk-asneeded.patch b/sci-libs/dcmtk/files/dcmtk-asneeded.patch
deleted file mode 100644
index a27e46eda2af..000000000000
--- a/sci-libs/dcmtk/files/dcmtk-asneeded.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- dcmimgle/libsrc/CMakeLists.txt.orig	2010-10-14 12:19:24.416833916 +0200
-+++ dcmimgle/libsrc/CMakeLists.txt	2010-10-14 12:18:51.682258692 +0200
-@@ -1,5 +1,5 @@
- # create library from source files
- ADD_LIBRARY(dcmimgle dcmimage dibaslut diciefn dicielut didislut didispfn didocu digsdfn digsdlut diimage diinpx diluptab dimo1img dimo2img dimoimg dimoimg3 dimoimg4 dimoimg5 dimomod dimoopx dimopx diovdat diovlay diovlimg diovpln diutils)
--
-+TARGET_LINK_LIBRARIES(dcmimgle dcmdata)
- # declare installation files
- INSTALL_TARGETS(${INSTALL_LIBDIR} dcmimgle)
---- dcmpstat/libsrc/CMakeLists.txt.orig	2010-10-14 12:26:05.324680803 +0200
-+++ dcmpstat/libsrc/CMakeLists.txt	2010-10-14 12:26:35.309298272 +0200
-@@ -1,5 +1,5 @@
- # create library from source files
- ADD_LIBRARY(dcmpstat dcmpstat dviface dvpsab dvpsabl dvpsal dvpsall dvpscf dvpscu dvpscul dvpsda dvpsdal dvpsfs dvpsga dvpsgal dvpsgl dvpsgll dvpsgr dvpsgrl dvpshlp dvpsib dvpsibl dvpsmsg dvpsov dvpsovl dvpspl dvpspl2 dvpspll dvpspr dvpsprt dvpsri dvpsril dvpsrs dvpsrsl dvpssp dvpsspl dvpssv dvpssvl dvpstat dvpstx dvpstxl dvpsvl dvpsvll dvpsvw dvpsvwl dvsighdl)
--
-+TARGET_LINK_LIBRARIES(dcmpstat dcmdsig dcmtls dcmsr)
- # declare installation files
- INSTALL_TARGETS(${INSTALL_LIBDIR} dcmpstat)
---- dcmsign/libsrc/CMakeLists.txt.orig	2010-10-14 12:37:02.149984538 +0200
-+++ dcmsign/libsrc/CMakeLists.txt	2010-10-14 12:38:53.602332737 +0200
-@@ -1,5 +1,5 @@
- # create library from source files
- ADD_LIBRARY(dcmdsig dcsignat siautopr sibrsapr sicert sicertvf sicreapr sidsa simaccon simd5 sinullpr siprivat siripemd sirsa sisha1 sisprof sitypes)
--
-+TARGET_LINK_LIBRARIES(dcmdsig ${OPENSSL_LIBS})
- # declare installation files
- INSTALL_TARGETS(${INSTALL_LIBDIR} dcmdsig)
---- dcmimage/libsrc/CMakeLists.txt.orig	2010-10-14 12:45:06.926394516 +0200
-+++ dcmimage/libsrc/CMakeLists.txt	2010-10-14 12:46:05.197437359 +0200
-@@ -1,5 +1,5 @@
- # create library from source files
- ADD_LIBRARY(dcmimage diargimg dicmyimg dicoimg dicoopx dicopx dihsvimg dilogger dipalimg dipipng dipitiff diqtctab diqtfs diqthash diqthitl diqtpbox diquant diregist dirgbimg diybrimg diyf2img diyp2img)
--
-+TARGET_LINK_LIBRARIES(dcmimage ${LIBTIFF_LIBS} ${LIBPNG_LIBS})
- # declare installation files
- INSTALL_TARGETS(${INSTALL_LIBDIR} dcmimage)
---- dcmdata/libsrc/CMakeLists.txt.orig	2010-10-14 12:44:00.991741511 +0200
-+++ dcmdata/libsrc/CMakeLists.txt	2010-10-14 12:44:55.918954304 +0200
-@@ -1,5 +1,5 @@
- # create library from source files
- ADD_LIBRARY(dcmdata cmdlnarg dcbytstr dcchrstr dccodec dcdatset dcddirif dcdicdir dcdicent dcdict dcdictzz dcdirrec dcelem dcerror dcfilefo dchashdi dcistrma dcistrmb dcistrmf dcistrmz dcitem dclist dcmetinf dcobject dcostrma dcostrmb dcostrmf dcostrmz dcpcache dcpixel dcpixseq dcpxitem dcrleccd dcrlecce dcrlecp dcrledrg dcrleerg dcrlerp dcsequen dcstack dcswap dctag dctagkey dctypes dcuid dcwcache dcvm dcvr dcvrae dcvras dcvrat dcvrcs dcvrda dcvrds dcvrdt dcvrfd dcvrfl dcvris dcvrlo dcvrlt dcvrobow dcvrof dcvrpn dcvrpobw dcvrsh dcvrsl dcvrss dcvrst dcvrtm dcvrui dcvrul dcvrulup dcvrus dcvrut dcxfer dcpath vrscan vrscanl)
--
-+TARGET_LINK_LIBRARIES(dcmdata ${ZLIB_LIBS})
- # declare installation files
- INSTALL_TARGETS(${INSTALL_LIBDIR} dcmdata)
---- dcmsr/libsrc/CMakeLists.txt.orig	2010-10-14 14:45:48.736866802 +0200
-+++ dcmsr/libsrc/CMakeLists.txt	2010-10-14 14:46:40.910215801 +0200
-@@ -1,5 +1,5 @@
- # create library from source files
- ADD_LIBRARY(dcmsr dsrcitem dsrcodtn dsrcodvl dsrcomtn dsrcomvl dsrcontn dsrcsidl dsrdattn dsrdoc dsrdoctn dsrdoctr dsrdtitn dsrimgfr dsrimgtn dsrimgvl dsrnumtn dsrnumvl dsrpnmtn dsrreftn dsrscogr dsrsc3gr dsrscotn dsrsc3tn dsrscovl dsrsc3vl dsrsoprf dsrstrvl dsrtcodt dsrtcosp dsrtcotn dsrtcoto dsrtcovl dsrtextn dsrtimtn dsrtncsr dsrtree dsrtypes dsruidtn dsrwavch dsrwavtn dsrwavvl dsrxmlc dsrxmld dsriodcc dsrbascc dsrenhcc dsrcomcc dsrkeycc dsrmamcc dsrchecc dsrcolcc dsrprocc dsrxrdcc dsrspecc dsrmaccc)
--
-+TARGET_LINK_LIBRARIES(dcmsr ${LIBXML_LIBS})
- # declare installation files
- INSTALL_TARGETS(${INSTALL_LIBDIR} dcmsr)
---- dcmtls/libsrc/CMakeLists.txt.orig	2012-11-11 19:19:00.832767189 -0800
-+++ dcmtls/libsrc/CMakeLists.txt	2012-11-11 19:29:43.887972426 -0800
-@@ -1,5 +1,6 @@
- # create library from source files
- ADD_LIBRARY(dcmtls tlslayer tlstrans tlsscu)
- 
-+TARGET_LINK_LIBRARIES(dcmtls ${OPENSSL_LIBS})
- # declare installation files
- INSTALL_TARGETS(${INSTALL_LIBDIR} dcmtls)
diff --git a/sci-libs/dcmtk/files/dcmtk-fix_doc_install.patch b/sci-libs/dcmtk/files/dcmtk-fix_doc_install.patch
deleted file mode 100644
index 50f4a362dccc..000000000000
--- a/sci-libs/dcmtk/files/dcmtk-fix_doc_install.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/doxygen/CMakeLists.txt b/doxygen/CMakeLists.txt
-index 6a0323f..4f18087 100644
---- a/doxygen/CMakeLists.txt
-+++ b/doxygen/CMakeLists.txt
-@@ -32,9 +32,9 @@ IF(DCMTK_WITH_DOXYGEN)
-   ENDIF(NOT WIN32)
- 
-   # install html docs and manpages
--  INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/htmldocs/ DESTINATION ${CMAKE_INSTALL_PREFIX}${INSTALL_HTMDIR} PATTERN "CVS" EXCLUDE)
-+  INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/htmldocs/ DESTINATION ${INSTALL_HTMDIR} PATTERN "CVS" EXCLUDE)
-   IF(NOT WIN32)
--    INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/manpages/ DESTINATION ${CMAKE_INSTALL_PREFIX}${INSTALL_MANDIR} PATTERN "CVS" EXCLUDE)
-+    INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/manpages/ DESTINATION ${INSTALL_MANDIR} PATTERN "CVS" EXCLUDE)
-   ENDIF(NOT WIN32)
- 
-   # cleanup created files on "make clean" - directories are not removed with CMake 2.4 :-/
diff --git a/sci-libs/dcmtk/files/dcmtk-gcc472-error.patch b/sci-libs/dcmtk/files/dcmtk-gcc472-error.patch
deleted file mode 100644
index 9d344d7206e8..000000000000
--- a/sci-libs/dcmtk/files/dcmtk-gcc472-error.patch
+++ /dev/null
@@ -1,318 +0,0 @@
---- ofstd/include/dcmtk/ofstd/ofoset.h.orig	2013-06-22 09:11:13.000000000 -0700
-+++ ofstd/include/dcmtk/ofstd/ofoset.h	2013-06-22 09:12:07.000000000 -0700
-@@ -146,7 +146,7 @@
-       {
-         // if size equals num, we need more space
-         if( this->size == this->num )
--          Resize( this->size * 2 );
-+          this->Resize( this->size * 2 );
- 
-         // copy item
-         T *newItem = new T( item );
-@@ -189,7 +189,7 @@
-         {
-           // if size equals num, we need more space
-           if( this->size == this->num )
--            Resize( this->size * 2 );
-+            this->Resize( this->size * 2 );
- 
-           // copy item
-           T *newItem = new T( item );
---- dcmimage/include/dcmtk/dcmimage/diargpxt.h.orig	2013-06-22 09:32:37.000000000 -0700
-+++ dcmimage/include/dcmtk/dcmimage/diargpxt.h	2013-06-22 09:34:20.000000000 -0700
-@@ -91,7 +91,7 @@
-                  const unsigned long planeSize,
-                  const int bits)
-     {                                             // not very much optimized, but no one really uses ARGB !!
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             register T2 value;
-             const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
---- dcmimage/include/dcmtk/dcmimage/dicmypxt.h.orig	2013-06-22 09:44:02.000000000 -0700
-+++ dcmimage/include/dcmtk/dcmimage/dicmypxt.h	2013-06-22 09:51:29.000000000 -0700
-@@ -87,7 +87,7 @@
-                  const unsigned long planeSize,
-                  const int bits)
-     {
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             // use the number of input pixels derived from the length of the 'PixelData'
-             // attribute), but not more than the size of the intermediate buffer
---- dcmimgle/include/dcmtk/dcmimgle/discalet.h.orig	2013-06-22 09:52:08.000000000 -0700
-+++ dcmimgle/include/dcmtk/dcmimgle/discalet.h	2013-06-22 09:54:35.000000000 -0700
-@@ -206,12 +206,12 @@
-                 (Left >= OFstatic_cast(signed long, Columns)) || (Top >= OFstatic_cast(signed long, Rows)))
-             {                                                                         // no image to be displayed
-                 DCMIMGLE_DEBUG("clipping area is fully outside the image boundaries");
--                fillPixel(dest, value);                                               // ... fill bitmap
-+                this->fillPixel(dest, value);                                               // ... fill bitmap
-             }
-             else if ((this->Src_X == this->Dest_X) && (this->Src_Y == this->Dest_Y))  // no scaling
-             {
-                 if ((Left == 0) && (Top == 0) && (Columns == this->Src_X) && (Rows == this->Src_Y))
--                    copyPixel(src, dest);                                             // copying
-+                    this->copyPixel(src, dest);                                             // copying
-                 else if ((Left >= 0) && (OFstatic_cast(Uint16, Left + this->Src_X) <= Columns) &&
-                          (Top >= 0) && (OFstatic_cast(Uint16, Top + this->Src_Y) <= Rows))
-                     clipPixel(src, dest);                                             // clipping
-@@ -567,7 +567,7 @@
-         if ((xtemp == NULL) || (xvalue == NULL))
-         {
-             DCMIMGLE_ERROR("can't allocate temporary buffers for interpolation scaling");
--            clearPixel(dest);
-+            this->clearPixel(dest);
-         } else {
-             for (int j = 0; j < this->Planes; ++j)
-             {
-@@ -905,7 +905,7 @@
-         if (pTemp == NULL)
-         {
-             DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling");
--            clearPixel(dest);
-+            this->clearPixel(dest);
-         } else {
- 
-             /*
-@@ -1029,7 +1029,7 @@
-         if (pTemp == NULL)
-         {
-             DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling");
--            clearPixel(dest);
-+            this->clearPixel(dest);
-         } else {
- 
-             /*
---- dcmimage/include/dcmtk/dcmimage/dicocpt.h.orig	2013-06-22 10:01:51.000000000 -0700
-+++ dcmimage/include/dcmtk/dcmimage/dicocpt.h	2013-06-22 10:03:10.000000000 -0700
-@@ -86,7 +86,7 @@
-     inline void copy(const T *pixel[3],
-                      const unsigned long offset)
-     {
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             for (int j = 0; j < 3; j++)
-                 OFBitmanipTemplate<T>::copyMem(pixel[j] + offset, this->Data[j], this->getCount());
---- dcmimage/include/dcmtk/dcmimage/dicosct.h.orig	2013-06-22 10:03:27.000000000 -0700
-+++ dcmimage/include/dcmtk/dcmimage/dicosct.h	2013-06-22 10:04:56.000000000 -0700
-@@ -107,8 +107,8 @@
-     inline void scale(const T *pixel[3],
-                       const int interpolate)
-     {
--        if (Init(pixel))
--            scaleData(pixel, this->Data, interpolate);
-+        if (this->Init(pixel))
-+            this->scaleData(pixel, this->Data, interpolate);
-     }
- };
- 
---- dcmimage/include/dcmtk/dcmimage/dicoflt.h.orig	2013-06-22 10:05:04.000000000 -0700
-+++ dcmimage/include/dcmtk/dcmimage/dicoflt.h	2013-06-22 10:08:17.000000000 -0700
-@@ -98,14 +98,14 @@
-                      const int horz,
-                      const int vert)
-     {
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             if (horz && vert)
--                flipHorzVert(pixel, this->Data);
-+                this->flipHorzVert(pixel, this->Data);
-             else if (horz)
--                flipHorz(pixel, this->Data);
-+                this->flipHorz(pixel, this->Data);
-             else if (vert)
--                flipVert(pixel, this->Data);
-+                this->flipVert(pixel, this->Data);
-         }
-     }
- };
---- dcmimage/include/dcmtk/dcmimage/dicorot.h.orig	2013-06-22 10:08:25.000000000 -0700
-+++ dcmimage/include/dcmtk/dcmimage/dicorot.h	2013-06-22 10:09:57.000000000 -0700
-@@ -98,14 +98,14 @@
-     inline void rotate(const T *pixel[3],
-                        const int degree)
-     {
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             if (degree == 90)
--                rotateRight(pixel, this->Data);
-+                this->rotateRight(pixel, this->Data);
-             else if (degree == 180)
--                rotateTopDown(pixel, this->Data);
-+                this->rotateTopDown(pixel, this->Data);
-             else  if (degree == 270)
--                rotateLeft(pixel, this->Data);
-+                this->rotateLeft(pixel, this->Data);
-         }
-     }
- };
---- dcmimage/include/dcmtk/dcmimage/dihsvpxt.h.orig	2013-06-22 10:10:11.000000000 -0700
-+++ dcmimage/include/dcmtk/dcmimage/dihsvpxt.h	2013-06-22 10:10:54.000000000 -0700
-@@ -87,7 +87,7 @@
-                  const unsigned long planeSize,
-                  const int bits)
-     {
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             register T2 *r = this->Data[0];
-             register T2 *g = this->Data[1];
---- dcmimage/include/dcmtk/dcmimage/dipalpxt.h.orig	2013-06-22 10:18:26.000000000 -0700
-+++ dcmimage/include/dcmtk/dcmimage/dipalpxt.h	2013-06-22 10:19:13.000000000 -0700
-@@ -92,7 +92,7 @@
-     void convert(const T1 *pixel,
-                  DiLookupTable *palette[3])
-     {                                                                // can be optimized if necessary !
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             register const T1 *p = pixel;
-             register T2 value = 0;
---- dcmimage/include/dcmtk/dcmimage/diybrpxt.h.orig	2013-06-22 10:34:13.000000000 -0700
-+++ dcmimage/include/dcmtk/dcmimage/diybrpxt.h	2013-06-22 10:34:48.000000000 -0700
-@@ -91,7 +91,7 @@
-                  const int bits,
-                  const OFBool rgb)
-     {
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
-             // use the number of input pixels derived from the length of the 'PixelData'
---- dcmimage/include/dcmtk/dcmimage/dirgbpxt.h.orig	2013-06-22 10:35:08.000000000 -0700
-+++ dcmimage/include/dcmtk/dcmimage/dirgbpxt.h	2013-06-22 10:35:39.000000000 -0700
-@@ -87,7 +87,7 @@
-                  const unsigned long planeSize,
-                  const int bits)
-     {
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             // use the number of input pixels derived from the length of the 'PixelData'
-             // attribute), but not more than the size of the intermediate buffer
---- dcmimage/include/dcmtk/dcmimage/diyp2pxt.h.orig	2013-06-22 10:35:45.000000000 -0700
-+++ dcmimage/include/dcmtk/dcmimage/diyp2pxt.h	2013-06-22 10:36:34.000000000 -0700
-@@ -91,7 +91,7 @@
-     void convert(const T1 *pixel,
-                  const int bits)
-     {
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             register T2 *r = this->Data[0];
-             register T2 *g = this->Data[1];
---- dcmimage/include/dcmtk/dcmimage/diyf2pxt.h.orig	2013-06-22 10:36:47.000000000 -0700
-+++ dcmimage/include/dcmtk/dcmimage/diyf2pxt.h	2013-06-22 10:37:19.000000000 -0700
-@@ -95,7 +95,7 @@
-                  const int bits,
-                  const OFBool rgb)
-     {
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
-             register unsigned long i;
---- dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h.orig	2013-06-22 10:44:20.000000000 -0700
-+++ dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h	2013-06-22 10:47:08.000000000 -0700
-@@ -76,10 +76,10 @@
-             else if ((this->Modality != NULL) && this->Modality->hasRescaling())
-             {
-                 rescale(pixel, this->Modality->getRescaleSlope(), this->Modality->getRescaleIntercept());
--                determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
-+                this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
-             } else {
-                 rescale(pixel);                     // "copy" or reference pixel data
--                determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
-+                this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
-             }
-         }
-     }
---- dcmimgle/include/dcmtk/dcmimgle/dimosct.h.orig	2013-06-22 10:47:22.000000000 -0700
-+++ dcmimgle/include/dcmtk/dcmimgle/dimosct.h	2013-06-22 10:48:02.000000000 -0700
-@@ -124,7 +124,7 @@
-             {
-                 const T value = OFstatic_cast(T, OFstatic_cast(double, DicomImageClass::maxval(bits)) *
-                     OFstatic_cast(double, pvalue) / OFstatic_cast(double, DicomImageClass::maxval(WIDTH_OF_PVALUES)));
--                scaleData(&pixel, &this->Data, interpolate, value);
-+                this->scaleData(&pixel, &this->Data, interpolate, value);
-              }
-         }
-     }
---- dcmimgle/include/dcmtk/dcmimgle/dimoflt.h.orig	2013-06-22 10:48:07.000000000 -0700
-+++ dcmimgle/include/dcmtk/dcmimgle/dimoflt.h	2013-06-22 10:48:37.000000000 -0700
-@@ -106,11 +106,11 @@
-             if (this->Data != NULL)
-             {
-                 if (horz && vert)
--                    flipHorzVert(&pixel, &this->Data);
-+                    this->flipHorzVert(&pixel, &this->Data);
-                 else if (horz)
--                    flipHorz(&pixel, &this->Data);
-+                    this->flipHorz(&pixel, &this->Data);
-                 else if (vert)
--                    flipVert(&pixel, &this->Data);
-+                    this->flipVert(&pixel, &this->Data);
-             }
-         }
-     }
---- dcmimgle/include/dcmtk/dcmimgle/dimorot.h,orig	2013-06-22 10:50:38.000000000 -0700
-+++ dcmimgle/include/dcmtk/dcmimgle/dimorot.h	2013-06-22 10:53:57.000000000 -0700
-@@ -105,11 +105,11 @@
-             if (this->Data != NULL)
-             {
-                 if (degree == 90)
--                    rotateRight(&pixel, &(this->Data));
-+                    this->rotateRight(&pixel, &(this->Data));
-                 else if (degree == 180)
--                    rotateTopDown(&pixel, &(this->Data));
-+                    this->rotateTopDown(&pixel, &(this->Data));
-                 else if (degree == 270)
--                    rotateLeft(&pixel, &(this->Data));
-+                    this->rotateLeft(&pixel, &(this->Data));
-             }
-         }
-     }
---- dcmimgle/include/dcmtk/dcmimgle/diflipt.h.orig	2013-06-22 11:03:34.000000000 -0700
-+++ dcmimgle/include/dcmtk/dcmimgle/diflipt.h	2013-06-22 11:04:43.000000000 -0700
-@@ -123,13 +123,13 @@
-         if ((src != NULL) && (dest != NULL))
-         {
-             if (horz && vert)
--                flipHorzVert(src, dest);
-+                this->flipHorzVert(src, dest);
-             else if (horz)
--                flipHorz(src, dest);
-+                this->flipHorz(src, dest);
-             else if (vert)
--                flipVert(src, dest);
-+                this->flipVert(src, dest);
-             else
--                copyPixel(src, dest);
-+                this->copyPixel(src, dest);
-         }
-     }
- 
---- dcmimgle/include/dcmtk/dcmimgle/dirotat.h.orig	2013-06-22 11:06:17.000000000 -0700
-+++ dcmimgle/include/dcmtk/dcmimgle/dirotat.h	2013-06-22 11:07:00.000000000 -0700
-@@ -126,13 +126,13 @@
-                            const int degree)
-     {
-         if (degree == 90)
--            rotateRight(src, dest);
-+            this->rotateRight(src, dest);
-         else if (degree == 180)
--            rotateTopDown(src, dest);
-+            this->rotateTopDown(src, dest);
-         else if (degree == 270)
--            rotateLeft(src, dest);
-+            this->rotateLeft(src, dest);
-         else
--            copyPixel(src, dest);
-+            this->copyPixel(src, dest);
-     }
- 
- 
diff --git a/sci-libs/dcmtk/files/dcmtk_version_number.patch b/sci-libs/dcmtk/files/dcmtk_version_number.patch
deleted file mode 100644
index 130a3bfb8efe..000000000000
--- a/sci-libs/dcmtk/files/dcmtk_version_number.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From: Joerg Riesmeier <dicom@offis.de>
-Date: Tue, 1 Feb 2011 17:01:14 +0000 (+0000)
-Subject: Made sure that OFFIS_DCMTK_VERSION_NUMBER is really a number and not a
-X-Git-Url: http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff_plain;h=12c35ca
-
-Made sure that OFFIS_DCMTK_VERSION_NUMBER is really a number and not a
-string.
----
-
-Index: dcmtk-3.6.0/CMake/osconfig.h.in
-===================================================================
---- dcmtk-3.6.0.orig/CMake/osconfig.h.in	2010-11-24 14:53:32.000000000 +0100
-+++ dcmtk-3.6.0/CMake/osconfig.h.in	2011-06-17 14:34:56.000000000 +0200
-@@ -677,7 +677,7 @@
- #define PACKAGE_VERSION_SUFFIX "@DCMTK_PACKAGE_VERSION_SUFFIX@"
- 
- /* Define to the version number of this package. */
--#define PACKAGE_VERSION_NUMBER "@DCMTK_PACKAGE_VERSION_NUMBER@"
-+#define PACKAGE_VERSION_NUMBER @DCMTK_PACKAGE_VERSION_NUMBER@
- 
- /* Define path separator */
- #define PATH_SEPARATOR '@PATH_SEPARATOR@'
-Index: dcmtk-3.6.0/CMakeLists.txt
-===================================================================
---- dcmtk-3.6.0.orig/CMakeLists.txt	2011-01-06 11:48:43.000000000 +0100
-+++ dcmtk-3.6.0/CMakeLists.txt	2011-06-17 14:34:56.000000000 +0200
-@@ -21,7 +21,7 @@
- SET(DCMTK_PACKAGE_DATE "2011-01-06")
- #SET(DCMTK_PACKAGE_TARNAME "dcmtk-3.6.0")
- SET(DCMTK_PACKAGE_VERSION "3.6.0")
--SET(DCMTK_PACKAGE_VERSION_NUMBER "360")
-+SET(DCMTK_PACKAGE_VERSION_NUMBER 360)
- SET(DCMTK_PACKAGE_VERSION_SUFFIX "")
- #SET(DCMTK_PACKAGE_STRING "dcmtk 3.6.0")
- #SET(DCMTK_PACKAGE_BUGREPORT "dicom-bugs@offis.de")
-Index: dcmtk-3.6.0/config/configure
-===================================================================
---- dcmtk-3.6.0.orig/config/configure	2011-01-06 11:48:47.000000000 +0100
-+++ dcmtk-3.6.0/config/configure	2011-06-17 14:34:56.000000000 +0200
-@@ -1774,13 +1774,13 @@
- 
- 
- 
--PACKAGE_VERSION_NUMBER="360"
-+PACKAGE_VERSION_NUMBER=360
- PACKAGE_VERSION_SUFFIX=""
- PACKAGE_DATE="2011-01-06"
- 
- 
- cat >>confdefs.h <<_ACEOF
--#define PACKAGE_VERSION_NUMBER "${PACKAGE_VERSION_NUMBER}"
-+#define PACKAGE_VERSION_NUMBER ${PACKAGE_VERSION_NUMBER}
- _ACEOF
- 
- 
-Index: dcmtk-3.6.0/config/configure.in
-===================================================================
---- dcmtk-3.6.0.orig/config/configure.in	2011-01-06 11:48:47.000000000 +0100
-+++ dcmtk-3.6.0/config/configure.in	2011-06-17 14:34:56.000000000 +0200
-@@ -8,11 +8,11 @@
- dnl Additional Package Information
- dnl -------------------------------------------------------
- 
--PACKAGE_VERSION_NUMBER="360"
-+PACKAGE_VERSION_NUMBER=360
- PACKAGE_VERSION_SUFFIX=""
- PACKAGE_DATE="2011-01-06"
- 
--AC_DEFINE_UNQUOTED(PACKAGE_VERSION_NUMBER,"${PACKAGE_VERSION_NUMBER}",[Define to the version number of this package.])
-+AC_DEFINE_UNQUOTED(PACKAGE_VERSION_NUMBER,${PACKAGE_VERSION_NUMBER},[Define to the version number of this package.])
- AC_DEFINE_UNQUOTED(PACKAGE_VERSION_SUFFIX,"${PACKAGE_VERSION_SUFFIX}",[Define to the version suffix of this package.])
- AC_DEFINE_UNQUOTED(PACKAGE_DATE,"${PACKAGE_DATE}",[Define to the release date of this package.])
- 
-Index: dcmtk-3.6.0/dcmdata/include/dcmtk/dcmdata/dcuid.h
-===================================================================
---- dcmtk-3.6.0.orig/dcmdata/include/dcmtk/dcmdata/dcuid.h	2010-11-05 11:26:10.000000000 +0100
-+++ dcmtk-3.6.0/dcmdata/include/dcmtk/dcmdata/dcuid.h	2011-06-17 14:34:56.000000000 +0200
-@@ -1,6 +1,6 @@
- /*
-  *
-- *  Copyright (C) 1994-2010, OFFIS e.V.
-+ *  Copyright (C) 1994-2011, OFFIS e.V.
-  *  All rights reserved.  See COPYRIGHT file for details.
-  *
-  *  This software and supporting documentation were developed by
-@@ -20,8 +20,8 @@
-  *  routines for finding and creating UIDs.
-  *
-  *  Last Update:      $Author: joergr $
-- *  Update Date:      $Date: 2010-11-05 10:26:10 $
-- *  CVS/RCS Revision: $Revision: 1.89 $
-+ *  Update Date:      $Date: 2011-02-01 17:01:33 $
-+ *  CVS/RCS Revision: $Revision: 1.90 $
-  *  Status:           $State: Exp $
-  *
-  *  CVS/RCS Log at end of file
-@@ -165,16 +165,21 @@
- #error Required compiler definition PACKAGE_VERSION_NUMBER undefined
- #endif
- 
-+// helper macros for version number conversion
-+
-+#define PACKAGE_VERSION_NUMBER_TO_STRING_( x ) #x
-+#define PACKAGE_VERSION_NUMBER_TO_STRING( x ) PACKAGE_VERSION_NUMBER_TO_STRING_( x )
-+
- /* NOTE: Implementation version name VR=SH may not be longer than 16 chars
-  *       The second name is used to identify files written without dcmdata
-  *       (i.e. using the --bit-preserving switch in various tools)
-  */
- 
- /// implementation version name for this version of the toolkit
--#define OFFIS_DTK_IMPLEMENTATION_VERSION_NAME   "OFFIS_DCMTK_" PACKAGE_VERSION_NUMBER
-+#define OFFIS_DTK_IMPLEMENTATION_VERSION_NAME   "OFFIS_DCMTK_" PACKAGE_VERSION_NUMBER_TO_STRING(PACKAGE_VERSION_NUMBER)
- 
- /// implementation version name for this version of the toolkit, used for files received in "bit preserving" mode
--#define OFFIS_DTK_IMPLEMENTATION_VERSION_NAME2  "OFFIS_DCMBP_" PACKAGE_VERSION_NUMBER
-+#define OFFIS_DTK_IMPLEMENTATION_VERSION_NAME2  "OFFIS_DCMBP_" PACKAGE_VERSION_NUMBER_TO_STRING(PACKAGE_VERSION_NUMBER)
- 
- /// release date of current toolkit release
- #ifdef DCMTK_BUILD_DATE
-@@ -704,6 +709,10 @@
- /*
- ** CVS/RCS Log:
- ** $Log: dcuid.h,v $
-+** Revision 1.90  2011-02-01 17:01:33  joergr
-+** Made sure that OFFIS_DCMTK_VERSION_NUMBER is really a number and not a
-+** string.
-+**
- ** Revision 1.89  2010-11-05 10:26:10  joergr
- ** Added new SOP Class UIDs from Supplement 131 and 134 (Implant Templates).
- **
diff --git a/sci-libs/dcmtk/files/png_tiff.patch b/sci-libs/dcmtk/files/png_tiff.patch
deleted file mode 100644
index 0c498838816a..000000000000
--- a/sci-libs/dcmtk/files/png_tiff.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dcmtk-3.5.5_20100504/dcmjpls/apps/Makefile.in	2010-12-09 11:27:05.000000000 +0100
-+++ dcmtk-3.5.5_20100504.old/dcmjpls/apps/Makefile.in	2010-12-09 11:27:44.000000000 +0100
-@@ -50,7 +50,7 @@
- LIBDIRS = -L$(top_srcdir)/libsrc $(dcmjplslibdir) $(libcharlslibdir) $(dcmimagelibdir) \
- 	$(dcmimglelibdir) $(dcmdatalibdir) $(ofloglibdir) $(ofstdlibdir)
- LOCALLIBS = $(dcmjplslib) $(dcmimagelib) $(dcmimglelib) $(dcmdatalib) $(ofloglib) $(ofstdlib) \
--	$(libcharlslib) $(ZLIBLIBS)
-+	$(libcharlslib) $(ZLIBLIBS) $(TIFFLIBS) $(PNGLIBS)
- PNMLIBS = $(TIFFLIBS) $(PNGLIBS) $(ZLIBLIBS)
- 
- objs = dcmdjpls.o dcmcjpls.o dcml2pnm.o
diff --git a/sci-libs/dcmtk/files/regression_stacksequenceisodd.patch b/sci-libs/dcmtk/files/regression_stacksequenceisodd.patch
deleted file mode 100644
index f95cb2ef3b38..000000000000
--- a/sci-libs/dcmtk/files/regression_stacksequenceisodd.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From: Joerg Riesmeier <dicom@offis.de>
-Date: Tue, 1 Mar 2011 10:04:16 +0000 (+0000)
-Subject: Fixed some private tags copied from Philips MR Achieva conformance statement.
-X-Git-Url: http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff_plain;h=0d3d794e71a3b9035c154a266834f93383083819;hp=0025bc0f762e96afec42dfff505386b3d591f6f7
-
-Fixed some private tags copied from Philips MR Achieva conformance statement.
-Also added a couple of new private tags from the same conformance statement.
----
-
-Index: dcmtk-3.6.0/dcmdata/data/private.dic
-===================================================================
---- dcmtk-3.6.0.orig/dcmdata/data/private.dic	2010-11-22 11:39:26.000000000 +0100
-+++ dcmtk-3.6.0/dcmdata/data/private.dic	2011-06-17 14:40:20.000000000 +0200
-@@ -35,6 +35,7 @@
- #   - Philips Digital Diagnost 1.3 conformance statement
- #   - Philips Integris H, catheterization laboratory, RIS-interface
- #   - Philips Intera Achieva Conformance Statement
-+#   - Philips MR Achieva Conformance Statement
- #   - Siemens Somatom syngo VA40B conformance statement
- #   - Siemens AXIOM Artis VB30 conformance statement
- #   - SonoWand Invite 2.1.1 conformance statement
-@@ -1159,7 +1160,7 @@
- (2001,"Philips Imaging DD 001",35)	SS	StackSliceNumber	1
- (2001,"Philips Imaging DD 001",36)	CS	StackType	1
- (2001,"Philips Imaging DD 001",3f)	CS	ZoomMode	1
--(2001,"Philips Imaging DD 001",5f)	SQ	StackSequence	1-n
-+(2001,"Philips Imaging DD 001",5f)	SQ	StackSequence	1
- (2001,"Philips Imaging DD 001",60)	SL	NumberOfStacks	1
- (2001,"Philips Imaging DD 001",61)	CS	SeriesTransmitted	1
- (2001,"Philips Imaging DD 001",62)	CS	SeriesCommitted	1
-@@ -1204,7 +1205,7 @@
- (2001,"PHILIPS IMAGING DD 001",35)	SS	StackSliceNumber	1
- (2001,"PHILIPS IMAGING DD 001",36)	CS	StackType	1
- (2001,"PHILIPS IMAGING DD 001",3f)	CS	ZoomMode	1
--(2001,"PHILIPS IMAGING DD 001",5f)	SQ	StackSequence	1-n
-+(2001,"PHILIPS IMAGING DD 001",5f)	SQ	StackSequence	1
- (2001,"PHILIPS IMAGING DD 001",60)	SL	NumberOfStacks	1
- (2001,"PHILIPS IMAGING DD 001",61)	CS	SeriesTransmitted	1
- (2001,"PHILIPS IMAGING DD 001",62)	CS	SeriesCommitted	1
-@@ -1221,12 +1222,6 @@
- (2005,"Philips MR Imaging DD 001",1f)	SH	MPRProtocol	1
- (2005,"Philips MR Imaging DD 001",20)	SL	NumberOfChemicalShifts	1
- (2005,"Philips MR Imaging DD 001",2d)	SS	NumberOfStackSlices	1
--(2005,"Philips MR Imaging DD 001",32)	FL	StackRadialAngle	1
--(2005,"Philips MR Imaging DD 001",33)	CS	StackRadialAxis	1
--(2005,"Philips MR Imaging DD 001",35)	SS	StackSliceNumber	1
--(2005,"Philips MR Imaging DD 001",36)	CS	StackType	1
--(2005,"Philips MR Imaging DD 001",a1)	CS	SyncraScanType	1
--(2005,"Philips MR Imaging DD 001",5f)	SQ	StackSequence	1
- (2005,"Philips MR Imaging DD 001",83)	SQ	Unknown	1
- 
- (2005,"Philips MR Imaging DD 005",02)	SQ	Unknown	1
-@@ -1240,12 +1235,6 @@
- (2005,"PHILIPS MR IMAGING DD 001",1f)	SH	MPRProtocol	1
- (2005,"PHILIPS MR IMAGING DD 001",20)	SL	NumberOfChemicalShifts	1
- (2005,"PHILIPS MR IMAGING DD 001",2d)	SS	NumberOfStackSlices	1
--(2005,"PHILIPS MR IMAGING DD 001",32)	FL	StackRadialAngle	1
--(2005,"PHILIPS MR IMAGING DD 001",33)	CS	StackRadialAxis	1
--(2005,"PHILIPS MR IMAGING DD 001",35)	SS	StackSliceNumber	1
--(2005,"PHILIPS MR IMAGING DD 001",36)	CS	StackType	1
--(2005,"PHILIPS MR IMAGING DD 001",a1)	CS	SyncraScanType	1
--(2005,"PHILIPS MR IMAGING DD 001",5f)	SQ	StackSequence	1
- (2005,"PHILIPS MR IMAGING DD 001",83)	SQ	Unknown	1
- 
- (0019,"PHILIPS MR R5.5/PART",1000)	DS	FieldOfView	1
-Index: dcmtk-3.6.0/dcmdata/libsrc/dcdictzz.cc
-===================================================================
---- dcmtk-3.6.0.orig/dcmdata/libsrc/dcdictzz.cc	2010-11-22 11:48:17.000000000 +0100
-+++ dcmtk-3.6.0/dcmdata/libsrc/dcdictzz.cc	2011-06-17 14:41:07.000000000 +0200
-@@ -20753,11 +20817,11 @@
-       DcmDictRange_Unspecified, DcmDictRange_Unspecified,
-       "PHILIPS IMAGING DD 001" }
-   , { 0x2001, 0x005f, 0x2001, 0x005f,
--      EVR_SQ, "StackSequence", 1, -1, "DICOM",
-+      EVR_SQ, "StackSequence", 1, 1, "DICOM",
-       DcmDictRange_Unspecified, DcmDictRange_Unspecified,
-       "Philips Imaging DD 001" }
-   , { 0x2001, 0x005f, 0x2001, 0x005f,
--      EVR_SQ, "StackSequence", 1, -1, "DICOM",
-+      EVR_SQ, "StackSequence", 1, 1, "DICOM",
-       DcmDictRange_Unspecified, DcmDictRange_Unspecified,
-       "PHILIPS IMAGING DD 001" }
-   , { 0x2001, 0x0060, 0x2001, 0x0060,
-@@ -20884,14 +20996,6 @@
-       EVR_CS, "StackType", 1, 1, "DICOM",
-       DcmDictRange_Unspecified, DcmDictRange_Unspecified,
-       "PHILIPS MR IMAGING DD 001" }
--  , { 0x2005, 0x005f, 0x2005, 0x005f,
--      EVR_SQ, "StackSequence", 1, 1, "DICOM",
--      DcmDictRange_Unspecified, DcmDictRange_Unspecified,
--      "Philips MR Imaging DD 001" }
--  , { 0x2005, 0x005f, 0x2005, 0x005f,
--      EVR_SQ, "StackSequence", 1, 1, "DICOM",
--      DcmDictRange_Unspecified, DcmDictRange_Unspecified,
--      "PHILIPS MR IMAGING DD 001" }
-   , { 0x2005, 0x0083, 0x2005, 0x0083,
-       EVR_SQ, "Unknown", 1, 1, "DICOM",
-       DcmDictRange_Unspecified, DcmDictRange_Unspecified,
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 0c4bae34922a..ffe08dd42d84 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -6,7 +6,9 @@ AUX fftw-2.1.5-parallel-tests.patch 3720 BLAKE2B 6b18c68e121035c517cf8eae245d32a
 AUX fftw-2.1.5-texinfo5.1.patch 596 BLAKE2B f45dcfef53cfb374c2022e88632934b48f2a19e5e75734a5c7d7901b8464403ceb675efcf6e43b00f10779776a8e9789956bb77e937b754c0a070e15821f4877 SHA512 71dd3c13784f9bd1b518827a6784e2619145377cbc88764c69830519096f61863140b90c8138d6a65e3994487cb12cd06baba826d48735c2cbddc1d2320a4214
 DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0466fa0a59fccfa2cec930e8870a5febfccfacfe44e876e40534c34e05dc62b8e7bf188b43fe3a65c6a7bdba SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15
 DIST fftw-3.3.6-pl2.tar.gz 4185261 BLAKE2B e2f877c13ab441ddf1ae731cf3ebdc5d1565f8216f497694ea1fccc43b6a53fc02d39e17f97c56d15d03410b2005e6c693cb4b639399aac0f6ebdc63fed32d2e SHA512 e130309856752a1555b6d151c4d0ce9eb4b2c208fff7e3e89282ca8ef6104718f865cbb5e9c4af4367b3615b69b0d50fd001a26d74fd5324ff2faabe14fe3472
+DIST fftw-3.3.8.tar.gz 4110137 BLAKE2B 555ac1401a5a41b7661afd0288c2353398f2c9b73695742459079ebf050dfa4c371484ea65324fd4b7d374f70d88a5942ff8abaad167b0d44d485bf1dc9e208c SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38
 EBUILD fftw-2.1.5-r9.ebuild 3148 BLAKE2B c6b8afd87370e5f46aa702cebf74f7daaed6234ec175e013046a9bf13c8168a3a8b223c8bd72cba2aabbee19f9a246bdf1954865945a90a94afdb4de21e09936 SHA512 bced55608e2635cb945ff22ccdcfd1aab37313edbf64728f53fc6653cde54c7863f2dee32f8a198205c46906363a1503ad604f2a3d47f79fdd97634a67caed59
 EBUILD fftw-3.3.6_p2.ebuild 4433 BLAKE2B ba57766a5fc3f4dbf6eb5545b55e2c8eeed8a5e63cc35746fb78d9b583f2ba7831062ccc471cc426f12c1635cd5b259967e1a855a9465d2b566847d7ce896322 SHA512 61dd69bd2e7d1b0aee3907775a231837b3012d6e31ed1cd02436e74d53c4d8db5e7dceea9cc4debde00d9a3390f58418047801202a616691cda6e4274e67f94b
+EBUILD fftw-3.3.8.ebuild 4464 BLAKE2B dde9683528689277dd8265737eebd85dccd37bac2270d55f563903f0459bed7b3c244187782bd00d6da887f067f820a990b365258e19c9decaf5ecc306f0bb02 SHA512 2aa1a0c1f18148f68b6b0e1791b56b456649d53ee1ba6910f1b22ad320f77b5f8e9209f6c65b59e8281f18fe531789c81aa7c3718c237869945ae8db6c8e6466
 EBUILD fftw-9999.ebuild 4654 BLAKE2B b4118a314849101394a263073a661735c3e2ed85ff0b1b55ac3f62e23d295bd92259cca9f21f4e65839d3f264febdadd4198789fa5728c5c71a7c305ecac0bcd SHA512 b19cb97bbc3cd97e3d8c0500bf667e960ae252c6b3ef083736ba903f8bfacb284dd0369b15f3013754978cc9fe71f8dc5f21441e1854bea9967fbfb5a898f94f
 MISC metadata.xml 1088 BLAKE2B 308c6b8e2b7388d41c5ee6c3336b7b61037277b4563cb212cccaf25c894d350434eaa0f282172f943cf26496345b4c7e58afa55f50b9cf07fc04aea7a5d25244 SHA512 df52860deccf7e7139affaad8cfb837b7f3770a22c621f668db24d916cee5b27acc1486884797e8d0881d8887874627b919816f8245101982e963a8db43f3c98
diff --git a/sci-libs/fftw/fftw-3.3.8.ebuild b/sci-libs/fftw/fftw-3.3.8.ebuild
new file mode 100644
index 000000000000..47b31f4171e3
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3.8.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
+
+DESCRIPTION="Fast C library for the Discrete Fourier Transform"
+HOMEPAGE="http://www.fftw.org/"
+
+MY_P=${PN}-${PV/_p/-pl}
+
+if [[ ${PV} = *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
+else
+	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+fi
+
+LICENSE="GPL-2+"
+SLOT="3.0/3"
+IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
+
+RDEPEND="
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	quad? ( sys-devel/gcc[fortran] )
+	test? ( dev-lang/perl )"
+
+S=${WORKDIR}/${MY_P}
+HTML_DOCS=( doc/html/. )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-check-openmp
+		FORTRAN_NEED_OPENMP=1
+	fi
+
+	fortran-2_pkg_setup
+
+	MULTIBUILD_VARIANTS=( single double longdouble )
+	if use quad; then
+		if ! tc-is-gcc; then
+			ewarn "quad precision only available for gcc >= 4.6"
+			die "need quad precision capable gcc"
+		fi
+		MULTIBUILD_VARIANTS+=( quad )
+	fi
+}
+
+src_prepare() {
+	default
+
+	# fix info file for category directory
+	if [[ ${PV} = *9999 ]]; then
+		sed -i -e
+			's/Texinfo documentation system/Libraries/' \
+			doc/fftw3."info" || die "failed to fix info file"
+
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	# jlec reported USE=quad on abi_x86_32 has too few registers
+	# stub Makefiles
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
+		mkdir -p "${BUILD_DIR}/tests" || die
+		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
+		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
+		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
+		return 0
+	fi
+
+	local myconf=(
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
+		$(use_enable fortran)
+		$(use_enable zbus mips-zbus-timer)
+		$(use_enable threads)
+		$(use_enable openmp)
+	)
+	case "${MULTIBUILD_ID}" in
+		single-*)
+			# altivec, sse, single-paired only work for single
+			myconf+=(
+				--enable-single
+				$(use_enable altivec)
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
+				$(use_enable cpu_flags_x86_sse sse)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable neon)
+				$(use_enable mpi)
+			)
+			;;
+
+		double-*)
+			myconf+=(
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable mpi)
+			)
+			;;
+
+		longdouble-*)
+			myconf+=(
+				--enable-long-double
+				$(use_enable mpi)
+			)
+			;;
+
+		quad-*)
+			# quad does not support mpi
+			myconf+=(
+				--enable-quad-precision
+			)
+			;;
+
+		*)
+			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
+			;;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC -lmpi)"
+}
+
+src_configure() {
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+	emake -C tests smallcheck
+}
+
+src_test() {
+	# We want this to be a reasonably quick test, but that is still hard...
+	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
+	# Do not increase the number of threads, it will not help your performance
+	# local testbase="perl check.pl --nthreads=1 --estimate"
+	#     ${testbase} -${p}d || die "Failure: $n"
+
+	multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant multilib-minimal_src_install
+	dodoc CONVENTIONS
+
+	if use doc; then
+		dodoc doc/*.pdf
+		docinto faq
+		dodoc -r doc/FAQ/fftw-faq.html/.
+	else
+		rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
+	fi
+
+	local x
+	for x in "${ED%/}"/usr/lib*/pkgconfig/*.pc; do
+		local u
+		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
+			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
+		done
+	done
+
+	# fftw uses pkg-config to record its private dependencies
+	find "${D}" -name '*.la' -delete || die
+}
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
-}
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index 2161c982e065..66f547c29cdf 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -10,9 +10,9 @@ DIST hdf-4.2.11.tar.bz2 3173535 BLAKE2B a35a366858cc67d6ef68959cf407c21a929d5dca
 DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899 SHA512 d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
 DIST hdf-4.2.8.tar.bz2 3027253 BLAKE2B b1291fce4b2f47a4b2f1d725cfc5314c4e451d2dd4ede242ef64a11490884ff991b800b06b7aabf574659117c6abde5cd26236d23d8f38e003c7df9271248d90 SHA512 d033007eff74d957572db8433f66e9df6fec44f67b28ddbad6e9a2d832b5504a29e9ecc5565d861b8308bab8d0dbfce19ae1e2ade0dd758d370a333819364c8e
 DIST hdf-4.2.9.tar.bz2 3126686 BLAKE2B 491fdad375bef944ed9f7040faba0e811b11019e1f51c5c3f874f29be07b945eb68af31cfce56db5e1f03f3bbd9e85320bed6e5f7f2b725676ead50dac022986 SHA512 99630177167f115f4a7f4424cf3fc77962c4eb46698f884d0e89acfe7d585aa659fd7cdf36a29246ae518675b07182223d4337a7d0aac6344ce21ccbed9aa390
-EBUILD hdf-4.2.11.ebuild 1598 BLAKE2B 6cc328bba07d7f5fd96dfc11576d8f89d17b8e4889d74210ef2ed5bfa5faf72f3200d74e8cfd8856c0658f9376139fde9261b03ffbdc51549fcc3d7113e4171d SHA512 e873ec4aec9c1890b1a658aae3e07c6acbd304b6f4e1e90aee2930222518eccc9539dd9a4c0182f4fb352ec5e693cae2f6897a0606c56ab8055f52422e73c488
-EBUILD hdf-4.2.13-r1.ebuild 1783 BLAKE2B a21301f8ef349b0b1a77d849151ad04a937f05d8163f7d656a3771afa0bfce9a689aa1b4f6396f4f4bc6a8cc2f2fca0df1fd32f3c0bef04467d0c6441b492d9f SHA512 c799f8c84981158f3934bfa0caa293bbf10dc7d08647068602168def959f3924750e8b1585dca6495d771cbf781b3801d546b11760979dbb33f8eb1e2ddd9c67
-EBUILD hdf-4.2.13.ebuild 1670 BLAKE2B b0af1304dc0a3ea13dbac2094322e96cc0cf87dcaf2ac0e1700fa4dfb514d8e62869fd47b92c323d07736217498fd8ee74604563eef52f975d4f8858365e6d58 SHA512 1d86aa88ac7fd4f9b8037d3dc5a0c0c1f3b07bf85af3508bc6bd0d29608fe0f37a52cc99001c634ac4632f3cfe1750286ac95adfdaa6d827167ed3884d573aa7
-EBUILD hdf-4.2.8.ebuild 1333 BLAKE2B dd4a11a50035b4279c5460f8db46988a9b3786b9bd9bd24ff7aa806dcddf2a9baacc95a37f7a80a02b4e5fd0f84876d166c52aa98f6ecfb739f5a89432910b17 SHA512 87e14301b2f8ffed92013aafc9dce2ebd1ab127c7bbf1bfa2ed73de9e44a57130fe18d3db1dc2b23de03d73029aee114a521278da5d9e07853f6a2375224c74f
-EBUILD hdf-4.2.9.ebuild 1327 BLAKE2B 8d7d692ce5370dc405cbd3a81afa564b5ff59fdcdd21a6d9af44b468c72df2fd4672579ee0fd9e27521db714ecc958b28e47accee3b3c7366c56ce4bfddb12b0 SHA512 17b9ffe9ce05679f64f8bf87ad0ef69d45e6a07fee2745c9378e73d6538e00cd82e08395b272b98cf4933baa6e9ab8bf1d240b052dc991a4f5f8b2d74b3f5462
+EBUILD hdf-4.2.11.ebuild 1605 BLAKE2B 3fbc0b8249a58acd581bd772dbc87c84b18cf523394148dc6492c4fb80a1b7a9667f681650da569afb5db34488361ae27b29db1e3c9fde5570a2a4e08c2b8546 SHA512 45933e613ec198793450fdabcc8c70523eeead4b37e416b607803165c57e8f493d40c863e19e30d754fc765a0a14ccc92b472a4a5606d73912a87309339d5233
+EBUILD hdf-4.2.13-r1.ebuild 1790 BLAKE2B 839f4242d020887d46a486b1f74fb192ec3139f08218b3831d80d2b0ba38ac4dd46297b10df70bf9953a18570f689afb07061cc8c678d026378495b3ee36003e SHA512 218b0e94ec940abcf3603a391de2a694195db122c1331f1ad101262bc968bfb820854e3988fe35b6528d0a6afbfa4f520d4511c0da8159d7fc03e6dd6434bc0f
+EBUILD hdf-4.2.13.ebuild 1677 BLAKE2B 5f82e08c5181de3e8b9bfc50774a7f122a47208b8709e557521cdaefbae51e10fe9c5bcc0ee0a58d3d12b6cae8c6c3f8cd74b3e268b4c5c28e6c8f519a205246 SHA512 17fe44cab142ac357c219c012773d0d411a29292a745c414ff1fd1490c5514a231ccbaae6117eddd8b3e9e2c98a70f0b786c7337841259b07095f83813a92787
+EBUILD hdf-4.2.8.ebuild 1340 BLAKE2B 44771193f4f552d5b2eee9b738ff73bb778b0582e81822d804ef4d8c9686026b8c99f26cd794a7db5b110bb3c79e2993e80647f0f6656502d08d17a7e748a695 SHA512 dcd81c3766e8d4f1c86df61f71758c3076f654945baf467c3514d7793594d561935e65241ee75915aaf3b88c9c2d2bd2226920bb4a9cff1e19fad6d09a782475
+EBUILD hdf-4.2.9.ebuild 1334 BLAKE2B f5cfc1d8e968023374efdd236be5d2b410a07e788f3150b14ba6e69f5ae5a4a4d6a5edada69455629a867bf2c33cc8d38e2d62eb1e023dda33c1edf8dc8013b8 SHA512 cd5ca63b5a190cf7ae29a02782a30f953dbfd82ebb6844e06b8d5cf57e6c5b6d065413f93e49740aa65644b72ba1d63662e4c2e3c6f176757b9b6cfad1de6477
 MISC metadata.xml 859 BLAKE2B c5c33f1a444d0af6287dac495443be05de5a2b8d9c55d4bf9aeb80ebc28f1391612510771848277fa1467097ab480b9b1dc306af587d2621e4a1d16c6bdc91a5 SHA512 2a38d2fbd5672f4465cba6da9f74c6ef95068be26514acc3d2949049f8461265e2ce7c6751d1853218ac4a4b62746e355faa9f2e0d7d8d6dc2faf17d8e40fceb
diff --git a/sci-libs/hdf/hdf-4.2.11.ebuild b/sci-libs/hdf/hdf-4.2.11.ebuild
index 1d23a4cfe970..3582363389a5 100644
--- a/sci-libs/hdf/hdf-4.2.11.ebuild
+++ b/sci-libs/hdf/hdf-4.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 REQUIRED_USE="test? ( szip )"
 
diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index 63e729e70104..d92320b868a6 100644
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="amd64 ia64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ia64 ppc -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 REQUIRED_USE="test? ( szip )"
 
diff --git a/sci-libs/hdf/hdf-4.2.13.ebuild b/sci-libs/hdf/hdf-4.2.13.ebuild
index 103ea3b4428a..d7244d6583fa 100644
--- a/sci-libs/hdf/hdf-4.2.13.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 REQUIRED_USE="test? ( szip )"
 
diff --git a/sci-libs/hdf/hdf-4.2.8.ebuild b/sci-libs/hdf/hdf-4.2.8.ebuild
index 3561a95953c1..32d8a3f2f0a5 100644
--- a/sci-libs/hdf/hdf-4.2.8.ebuild
+++ b/sci-libs/hdf/hdf-4.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -15,7 +15,7 @@ SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="amd64 ia64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ia64 ppc -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="fortran szip static-libs"
 
 RDEPEND="
diff --git a/sci-libs/hdf/hdf-4.2.9.ebuild b/sci-libs/hdf/hdf-4.2.9.ebuild
index 3d7f73a04cda..04467f229444 100644
--- a/sci-libs/hdf/hdf-4.2.9.ebuild
+++ b/sci-libs/hdf/hdf-4.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -15,7 +15,7 @@ SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="fortran szip static-libs"
 
 RDEPEND="
diff --git a/sci-libs/libh2o/Manifest b/sci-libs/libh2o/Manifest
index d443f161a540..9e165fac64c1 100644
--- a/sci-libs/libh2o/Manifest
+++ b/sci-libs/libh2o/Manifest
@@ -1,5 +1,4 @@
 DIST libh2o-0.2.1.tar.bz2 290418 BLAKE2B a1de444e13d8ceb65af73eb7fc8f0b35ff59377fa72417b1cf2ee4d919a44d31f356ed14dc0bf9c04ca6f3e5cce71bed7552e98a30f5b134f7a5d322845bf105 SHA512 e2fb14171aa401e85edcef6be36bfd2af31a7da2db03bc77c41fd58962a8e2616bbbd43adb268c262b848d044c9d33016c504ce770f5cfe0d585d05dacc63e2a
 EBUILD libh2o-0.2.1-r1.ebuild 597 BLAKE2B 2374db74af4e9cd5c40c9bf8dc438db95b62bd469ecdef2f575aac298c5e730338ed267952ccde02537565d2b11ca330859c4373dab77c36f4008f8d9c99b82a SHA512 2b648c1a16d8059c02fdcf1c3c57d26cb926ea66831473e0497bbe9b4419c53e5fc42eaf4d194d4731bc3c5441210a329fd316aa6bd524b8f1f1945d784bbb30
-EBUILD libh2o-0.2.1.ebuild 532 BLAKE2B 1f784f0688ffc788d931c771d42842e457bbeae5d7b7db2197136efbc28c4a50e8f47da552092eb3effb73ba7e84d5e864d689dbf2e33f4513156fcbe67e9f9e SHA512 e77231e598f59483f88c7a547e60c6ede36700045fce70641b4f0ce3a16b81e95446848a6e1e143d6659a8167f4b1fbadfe88ddd7a8eade26907d2df8fe2f640
 EBUILD libh2o-9999.ebuild 638 BLAKE2B 8cc669e90631baa193f0af2600d1fa409f84ac4ac5f0c955e6782b421dcccbe9dc1d99e5eec40112b67ff25d801a6c51f1e5f206cbe4991ea2a71a95d66e6050 SHA512 1dd674261ab0423d1d66f61e48731ae3209e11d30d56d836ad29b589d17e82ad9803d831035b46dc6ff316a22bc101ff4628be85c42aa7f9a56d856805250fac
 MISC metadata.xml 501 BLAKE2B 6eb77e4e388dd5c0cabe3d85563c8bd58b8053ed68f33b4b36d78836ff3507a9168ec568aa7aa179acfe9bda97ac755db13c5fa615b89356c5d293191cf2c736 SHA512 87be30fa6955758d194d0f50b1102d337157cfad6ba35ef346afa7e960c9885f2bbdefd5432fb783aa99339702986d7e287db8a3cec1398e8d5fbb57e78806f9
diff --git a/sci-libs/libh2o/libh2o-0.2.1.ebuild b/sci-libs/libh2o/libh2o-0.2.1.ebuild
deleted file mode 100644
index 1cc49ecad8b6..000000000000
--- a/sci-libs/libh2o/libh2o-0.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="Library of routines for IF97 water & steam properties"
-HOMEPAGE="https://github.com/mgorny/libh2o/"
-SRC_URI="https://github.com/mgorny/libh2o/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug static-libs"
-
-DEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-
-	autotools-utils_src_configure
-}
diff --git a/sci-libs/libh2oxx/Manifest b/sci-libs/libh2oxx/Manifest
index 27ffaa60b64c..598d904bd54e 100644
--- a/sci-libs/libh2oxx/Manifest
+++ b/sci-libs/libh2oxx/Manifest
@@ -1,5 +1,4 @@
 DIST libh2oxx-0.2.tar.bz2 266320 BLAKE2B b63363dfa5ec1a63a3fa35b0dcf8bf79b84d33a8fdd1452c4ae2b7e2c3ed14d5e24bc732ff5cf240557ab7e92558f2aa41f005b1bfe2f7efa294dde21bd1c0b9 SHA512 37b5eb713eed9a41f001add0ed3415fb4e1d6a19917de7fe36017f9a8b102394ac86b47fa845b18d7c4c63ad94e270f28e0883c9e9503c1952fdefbfdb6cc3a3
 EBUILD libh2oxx-0.2-r1.ebuild 599 BLAKE2B 32339fb44bd05cba08923727741d8599dfa6c6cbd3f78f9ece8256ddfe48c8669f77d15e60cfd3a6ae0c6c32ca3ed078f2bfda8cfc7b9bc999deeb7eb2d7e507 SHA512 cf78484e2ba2ad412d06282a5a2b6e383eb4d6d93cb81690bc53c7b0188caa6e6d10046915edb08853d91857d6cbde0ed477e6e9167a8905a10039d16d00554e
-EBUILD libh2oxx-0.2.ebuild 531 BLAKE2B 67884c0fbab74c0a7350c67d42521d1f7834215c7aba01511b7693ca9c05704fa4cd342f48102cb7d25928feeb077958a1f5af84b14852ebfb630b94975042b4 SHA512 693d14b374a5f2eda401248b67eb02e76c9ec67618cdaaee169c8e6d0e2bc5e3702de8f0fd92dd2302973e60212208f0ef39282736a2fafe0394de4215c23df2
 EBUILD libh2oxx-9999.ebuild 640 BLAKE2B 437011e0add2d627aeb00ce2463eed6142c895f573363cc3261b602a90f3c8432f164eb0cbcc4f285ab7cf64bb91247596b332aa26e7edc053eeb5a7ddacf10a SHA512 5d95dc5282690e55e5fa99304771e6bf67d26801d71fc8cf0a2c30e8f9a04412a1c282265113a0f337a49f35a786cb41bd6f5564fbf530b02738e68a5fd50761
 MISC metadata.xml 505 BLAKE2B 5e8794a8c28c717046b54793fe07bf87208716702a00aa40ce702e63607f7ea778ac6ae74dfa69831e2795e0d0fd24ef1cd8793280d4997946953df130584f4b SHA512 bc7138f060c6c2dfe3ec7d0fd2150e895bded77ccdb143f866f20aa7d2c683fb94a88163928a70cf9cb7974695b0358303b4bc4ca4709bae0dfab7578c0b880a
diff --git a/sci-libs/libh2oxx/libh2oxx-0.2.ebuild b/sci-libs/libh2oxx/libh2oxx-0.2.ebuild
deleted file mode 100644
index 9d629d2d6a24..000000000000
--- a/sci-libs/libh2oxx/libh2oxx-0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="C++ bindings for libh2o"
-HOMEPAGE="https://github.com/mgorny/libh2oxx/"
-SRC_URI="https://github.com/mgorny/libh2oxx/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug static-libs"
-
-RDEPEND=">=sci-libs/libh2o-0.2"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-
-	autotools-utils_src_configure
-}
diff --git a/sci-libs/oce/Manifest b/sci-libs/oce/Manifest
new file mode 100644
index 000000000000..dad3d0fc1894
--- /dev/null
+++ b/sci-libs/oce/Manifest
@@ -0,0 +1,3 @@
+DIST OCE-0.18.3.tar.gz 24633768 BLAKE2B c1923fb6310ea30318251fedac371655a575bf4dfcc4c38e7c748d316416e08c33a3f27bd5db7f5b437265cf2f518651d69a6920f9f487dc7e0065a6406c653f SHA512 6fdeb6ca4ce25361379872ccc465799d4a43407974c4f626b32df695e582b9e553cce17af6a6a7ff46ebed9b813d910ad23eb308a5356dabb9b9bbd4f42a8636
+EBUILD oce-0.18.3.ebuild 1758 BLAKE2B e029967daad246ec223d3898fcd474dac53ed7fe4b4ac6eca7061c212680696f2498101e00ff86da9fb4bd0e36d2be490ab5276cbe0717a4076222a202952d55 SHA512 4b7f16575d1f52eecb947e7b014350f56927cf6dbadc98943fd104715f7d9bd0138c491d3237d8fd5b341c1650687bc081cc456818429af7452c9282ed60dbe4
+MISC metadata.xml 900 BLAKE2B aec66b3c98aaaadf1727f4522a79ad01e8d195ac62799a5112a2d61ca9d916635ff110f99840f97ebad81a1324780d15218757c1b982536ae9e14945699e6b5b SHA512 86a44a573579df2416b949b62fe931172681f36bf7af9f90f7224e3fc433cb7091c3ef757581337aa87d80962a4800fa03e005e5360233f570f7d926553735ba
diff --git a/sci-libs/oce/metadata.xml b/sci-libs/oce/metadata.xml
new file mode 100644
index 000000000000..fe5bc3187c0e
--- /dev/null
+++ b/sci-libs/oce/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zoltan@sinustrom.info</email>
+		<name>Zoltan Puskas</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		oce is a C++ 3D modeling library. It can be used to develop CAD/CAM 
+		softwares. oce stands for opencascade community edition. This project
+		aims at gathering patches/ changes/ improvements from the OCC community.
+	</longdescription>
+<use>
+	<flag name="freeimage">Enable support for image i/o via media-libs/freeimage</flag>
+	<flag name="gl2ps">Use gl2ps PostScript printing library</flag>
+	<flag name="tbb">Enable parallel meshing</flag>
+	<flag name="vtk">Enable Virtualisation Toolkit</flag></use>
+</pkgmetadata>
diff --git a/sci-libs/oce/oce-0.18.3.ebuild b/sci-libs/oce/oce-0.18.3.ebuild
new file mode 100644
index 000000000000..90829fcdfbbf
--- /dev/null
+++ b/sci-libs/oce/oce-0.18.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils check-reqs multilib java-pkg-opt-2
+
+DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
+HOMEPAGE="https://github.com/tpaviot/oce"
+SRC_URI="https://github.com/tpaviot/oce/archive/OCE-$PV.tar.gz"
+
+LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
+SLOT="${PV}"
+KEYWORDS="~amd64"
+IUSE="examples freeimage gl2ps +openmp tbb vtk"
+REQUIRED_USE="?? ( openmp tbb )"
+
+MY_P="oce-OCE-${PV}"
+S="${WORKDIR}/${MY_P}"
+DEPEND="
+	dev-lang/tcl:0=
+	dev-lang/tk:0=
+	dev-tcltk/itcl
+	dev-tcltk/itk
+	dev-tcltk/tix
+	media-libs/ftgl
+	media-libs/freetype
+	virtual/glu
+	virtual/opengl
+	x11-libs/libXmu
+	freeimage? ( media-libs/freeimage )
+	gl2ps? ( x11-libs/gl2ps )
+	tbb? ( dev-cpp/tbb )
+	vtk? ( =sci-libs/vtk-8.1*[boost,imaging,qt5,python,rendering,views,xdmf2] )"
+RDEPEND="${DEPEND}"
+
+CHECKREQS_MEMORY="256M"
+CHECKREQS_DISK_BUILD="3584M"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# From BUILD.Unix.md
+	local mycmakeargs=(
+		-DOCE_INSTALL_PREFIX="/usr"
+		-DOCE_ENABLE_DEB_FLAG=off
+		-DOCE_COPY_HEADERS_BUILD=yes
+		-DOCE_DRAW=yes
+		-DOCE_WITH_FREEIMAGE=$(usex freeimage)
+		-DOCE_WITH_GL2PS=$(usex gl2ps)
+		-DOCE_WITH_VTK=$(usex vtk)
+	)
+	# Mutual exclusion of tbb and openmp flags is guaranteed by REQUIRED_USE.
+	use tbb && mycmakeargs+=(
+		-DOCE_MULTITHREAD_LIBRARY="TBB"
+	)
+	use openmp && mycmakeargs+=(
+		-DOCE_MULTITHREAD_LIBRARY="OPENMP"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# If user asked for samples let's copy them to the docs folder
+	if use examples ; then
+		dodoc -r samples
+	fi
+}
diff --git a/sci-libs/xdmf2/Manifest b/sci-libs/xdmf2/Manifest
index 4affc013eec2..4f3898144366 100644
--- a/sci-libs/xdmf2/Manifest
+++ b/sci-libs/xdmf2/Manifest
@@ -1,6 +1,8 @@
 AUX xdmf2-1.0_p141226-cannot-find-hdf5-bug-591302.patch 1675 BLAKE2B f1a2674d987c414223c6dd53774fe436077dfcee9960f4f628087c7152a21f0855daca7aa10fb18bc91b6362e7da14dffd6ce0718486850aafc3c647c3a7668d SHA512 c2a8a2e5f39b86cd083211f5e14188e8f63822d24b1b0d8a8beb485f0a0766894b4dcd717f6cc57c6352e46b4c69574b5c05ec318b7d6819d03fa68fbcd2e5ea
+AUX xdmf2-1.0_p141226-cmake-3.12.patch 422 BLAKE2B 904de870ce6e7cb9aaa4454dbecd47447048eee08e7826869e09e7f294570e0dd235f011ccc775a1c4369bb4e6e890d8279c2102ce1c85f8488815c185be891e SHA512 e9fbf5caeffcccd12d9112cc4afc2485cea89105743d69483c08e931e84cb5d48facf67017b49c20a9c0f3087dbac974fa6eb2b0b76714ad207c1bbb20fd9518
 AUX xdmf2-1.0_p141226-module.patch 452 BLAKE2B 1611edbdf962ba25b72dab702044b7c7299abe5d92757c333827f08eb643fd17661739a4c0f7c0e759c516d9eeba794733145bdb03ef6779d1a9ef6e315fc5db SHA512 9a9e05001f1d8ea8250a7bb9231a43e8cceeface61fb125330b6255a1ba452650a80cb6592a69fdecc04212752c0d1fa195151b13c88262c40a36ca566a33dcd
 DIST xdmf2-1.0_p141226.tar.xz 267096 BLAKE2B 230ed73cc0521f04ff519c0050559ccf3837b915a196336de4b439cf05cae02220270a81290a6aac70e04095695b853e7de35613fba39cef6a90e93e6c99a3f9 SHA512 031b947ccd942c39cb40504e939f03bc9e3190ae1a7baf8325809decf70a040e860b43d5bc9debfcf2f3838f5f0d7a9c77c92561c89fc0d632306e140b136db9
 EBUILD xdmf2-1.0_p141226-r1.ebuild 1540 BLAKE2B fb84d09a0aa7082f90deb5ec8fffa003a409da6ed0318b33837473d1c61bbb9bce6793eeb92152efe4e5495e0baf255432170866764318218250b92b40052f92 SHA512 4758b233409d8979fe16e6c700528692c61784573613f74d154e99902e09b80bf37463558e96627b4e422bdcc98516aaf10066533465d9a0315c8f917c115115
 EBUILD xdmf2-1.0_p141226-r2.ebuild 1842 BLAKE2B 68a934b26e310b71f731dce6976e6cfed38748772c5901266d78cdfd329499cdab6da4f13643db97320de22c14eb52fe0fc3246caba714c1e2d8ab2b7c95a329 SHA512 2449dc11ade78c5675d468fc76843a4a61a9485bad1bcc07dcbcf56ed0c070d48f2ad0d6c5a5372ffffaf7c5ae626e062c95059f0766901d21e62f0d6aa379ab
+EBUILD xdmf2-1.0_p141226-r3.ebuild 1804 BLAKE2B d28284c7baea14314147481b2ddce3a27c80b0b71355e71f9a6930bac821113010c3d3e41d72e7926a7fa34ee116b971c58af5036509e9a3162580232965d445 SHA512 00a34db9765b2d20faeaf27f6b4c3ca086c5e4eb101c024f4f857aa021ffb4c5fd92ce2f9da4f3b996a60c0b09c4bc9c924f891fb8d5dd96bbb2fe5f02120557
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/xdmf2/files/xdmf2-1.0_p141226-cmake-3.12.patch b/sci-libs/xdmf2/files/xdmf2-1.0_p141226-cmake-3.12.patch
new file mode 100644
index 000000000000..14e74bb6108e
--- /dev/null
+++ b/sci-libs/xdmf2/files/xdmf2-1.0_p141226-cmake-3.12.patch
@@ -0,0 +1,14 @@
+--- a/CMakeLists.txt	2018-08-30 17:49:07.777815386 +0300
++++ b/CMakeLists.txt	2018-08-30 17:49:49.276706955 +0300
+@@ -6,6 +6,11 @@
+ 	cmake_policy(SET CMP0015 NEW)
+ endif (POLICY CMP0015)
+ 
++# Needed for CMake 2.12+
++if(POLICY CMP0077)
++	cmake_policy(SET CMP0077 NEW)
++endif()
++
+ if(MSVC10)
+ 	SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
+ 	SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
diff --git a/sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild b/sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild
new file mode 100644
index 000000000000..205807de8ada
--- /dev/null
+++ b/sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils flag-o-matic python-single-r1
+
+DESCRIPTION="eXtensible Data Model and Format"
+HOMEPAGE="http://xdmf.org/index.php/Main_Page"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="VTK"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/boost:=
+	sci-libs/hdf5:=
+	dev-libs/libxml2:2
+	python? ( ${PYTHON_DEPS} )
+	"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	python? ( dev-lang/swig:0 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-module.patch
+	"${FILESDIR}"/${P}-cannot-find-hdf5-bug-591302.patch
+	"${FILESDIR}"/${P}-cmake-3.12.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup && python_export
+}
+
+src_prepare() {
+	if use python; then
+		local _site=$(python_get_sitedir)
+		sed \
+			-e "/DESTINATION/s:python:${_site##${EPREFIX}/usr/$(get_libdir)/}:g" \
+			-i CMakeLists.txt || die
+	fi
+
+	sed \
+		-e "/DESTINATION/s:lib:$(get_libdir):g" \
+		-e "/INSTALL/s:lib:$(get_libdir):g" \
+		-i CMakeLists.txt core/CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# bug 619604
+	append-cxxflags -std=c++14
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=1
+		-DXDMF_BUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_TESTING=$(usex test)
+		-DXDMF_WRAP_PYTHON=$(usex python)
+#		-DXDMF_WRAP_JAVA=$(usex java)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dosym XdmfConfig.cmake /usr/share/cmake/Modules/${PN}Config.cmake
+
+	# need to byte-compile 'XdmfCore.py' and 'Xdmf.py'
+	# as the CMake build system does not compile them itself
+	use python && python_optimize "${D%/}$(python_get_sitedir)"
+}
diff --git a/sci-libs/xdrfile/Manifest b/sci-libs/xdrfile/Manifest
index 4020d3a8ac13..36aaa1c2149f 100644
--- a/sci-libs/xdrfile/Manifest
+++ b/sci-libs/xdrfile/Manifest
@@ -1,3 +1,5 @@
 DIST xdrfile-1.1.1.tar.gz 378942 BLAKE2B 21b1524a7c31e957b28b93dab4b83b88c183528e534864b06ff76e3f31422129c22ac4bc24a054749dd1b5b80d93a82d873cae82571f0b89c16d55ef0de267c7 SHA512 bff06b08e547b956825f9b16a55fe93d07ff0c529426b892fd4b39be538774aa06facffc68994215e22e36edfa5642674653022da0762ca7cd1b7bc654112868
+DIST xdrfile-1.1.4.tar.gz 815342 BLAKE2B 9f2703cdd67dd6cb3156ab96e496dd4fa37d3a60d660da0a6129562ed295bb52ed5d5acb54aab1bd8b682e31f6155e96541dd47fee7226ae058d62f6efe3937a SHA512 70352efcce989172893e34855edd17990c80f3b5f956b2d8b03a5e75593280e981a56b00616adb950a7da5713729029aecb5dd2cd4c52a658a77eca43aa290df
 EBUILD xdrfile-1.1.1.ebuild 597 BLAKE2B 95ee6146aa52f9f1d0b3a0d73bc834ffae55c6f1f779408c105e52d8ec864f6e26de74422fd52a4717491c608519f2043ee733662743b1fee543997a98127475 SHA512 ab0156c4e760395f0320e640e5f452edab209da13abcb496717bfabaa03c86d001e30bdc4e1365eb18ed58dc287199b724635c304a72d5b6763df826dc37dae6
+EBUILD xdrfile-1.1.4.ebuild 562 BLAKE2B a1e86a9bc547f651d80598e7fa6a058f03b48e4cf86701fc72a0391c2de0a0510d0f24b74d15723098cad7e6cf666a178b57f163c6538f84643c5a5762496a72 SHA512 a8b0ba154efe06925c20c0a0b35e82b3c15dd0105e64bf191a5d48bb5e2564c2b3cfb19dbe3e3bdcc9ff9b80f8113dc97dc05d2978ee78f5c0bef3e9531caa78
 MISC metadata.xml 373 BLAKE2B f02aa6fee8d485b12b280def0754651f3831474773215f4b20002544e84575dab97ba478adbd6031a9545482576783e854f69e69deb7df27fcdb14e1128587b1 SHA512 e8817074c54b6f66a21bbb69f4c5cc51e28282dd23e10f322b6e676a1859d47fbef3baea4b55d4f343517ae4de9bda3a009ed76b49ebdf898d875f29b13083ac
diff --git a/sci-libs/xdrfile/xdrfile-1.1.4.ebuild b/sci-libs/xdrfile/xdrfile-1.1.4.ebuild
new file mode 100644
index 000000000000..9789dad9d61d
--- /dev/null
+++ b/sci-libs/xdrfile/xdrfile-1.1.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED="fortran"
+
+inherit fortran-2 multilib
+
+DESCRIPTION="Library to read gromacs trajectory and topology files"
+HOMEPAGE="http://www.gromacs.org/Developer_Zone/Programming_Guide/XTC_Library"
+SRC_URI="ftp://ftp.gromacs.org/pub/contrib/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="fortran static-libs"
+
+src_configure() {
+	local myeconfargs=( $(use_enable fortran) )
+
+	default
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-09-08 10:50:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-09-08 10:50:14 +0100
commit	3f71901f8c228f4de570abed1831ce3ee425343e (patch)
tree	a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /sci-libs
parent	12bb627384ddfd47382b9f1b6464481a58d01ebb (diff)