[gentoo-commits] proj/sci:master commit in: sci-misc/salome-pycalculator/, sci-misc/salome-smesh/, sci-misc/salome-visu/, ...

[Justin Lecher]

commit:     d61e0d4512a778bdd97ba19cf26fd9b398d553f2
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 16:46:51 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 17:44:23 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d61e0d45

Drop obsolete

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 profiles/package.mask                              |  15 --
 sci-misc/salome-component/ChangeLog                |  64 -----
 .../files/salome-component-5.1.3-mpi.patch         |  11 -
 sci-misc/salome-component/metadata.xml             |   5 -
 .../salome-component/salome-component-5.1.3.ebuild | 111 --------
 .../salome-component/salome-component-5.1.4.ebuild | 112 --------
 sci-misc/salome-geom/ChangeLog                     |  48 ----
 .../files/salome-geom-5.1.3-qt4-path.patch         |  11 -
 sci-misc/salome-geom/metadata.xml                  |   5 -
 sci-misc/salome-geom/salome-geom-5.1.3.ebuild      | 110 --------
 sci-misc/salome-geom/salome-geom-5.1.4.ebuild      | 112 --------
 sci-misc/salome-gui/ChangeLog                      |  68 -----
 .../files/salome-gui-5.1.3-qt4-path.patch          |  11 -
 .../files/salome-gui-5.1.4-qt4-path.patch          |  11 -
 sci-misc/salome-gui/metadata.xml                   |   5 -
 sci-misc/salome-gui/salome-gui-5.1.3.ebuild        | 115 --------
 sci-misc/salome-gui/salome-gui-5.1.4.ebuild        | 117 --------
 sci-misc/salome-kernel/ChangeLog                   |  92 -------
 .../files/salome-kernel-5.1.3-lib_location.patch   |  13 -
 .../files/salome-kernel-5.1.3-openmpi.patch        |  21 --
 .../files/salome-kernel-5.1.3-python-2.6.patch     |  13 -
 .../files/salome-kernel-5.1.4-lib_location.patch   |  13 -
 .../files/salome-kernel-5.1.4-openmpi.patch        |  21 --
 .../files/salome-kernel-5.1.4-python-2.6.patch     |  13 -
 sci-misc/salome-kernel/files/salome-kernel.png     | Bin 1934 -> 0 bytes
 sci-misc/salome-kernel/metadata.xml                |   8 -
 sci-misc/salome-kernel/salome-kernel-5.1.3.ebuild  | 121 ---------
 sci-misc/salome-kernel/salome-kernel-5.1.4.ebuild  | 121 ---------
 sci-misc/salome-med/ChangeLog                      |  77 ------
 .../files/salome-med-5.1.3-check_metis.patch       |  48 ----
 .../files/salome-med-5.1.3-check_scotch.patch      |  74 -----
 .../salome-med/files/salome-med-5.1.3-gcc.patch    |  43 ---
 .../files/salome-med-5.1.3-med_int.patch           | 297 ---------------------
 .../salome-med/files/salome-med-5.1.3-mpi.patch    |  13 -
 .../files/salome-med-5.1.3-qt4-path.patch          |  11 -
 .../salome-med/files/salome-med-5.1.3-scotch.patch |  11 -
 .../files/salome-med-5.1.4-check_metis.patch       |  48 ----
 .../files/salome-med-5.1.4-check_scotch.patch      |  74 -----
 .../salome-med/files/salome-med-5.1.4-gcc.patch    |  11 -
 .../files/salome-med-5.1.4-med_int.patch           | 297 ---------------------
 .../salome-med/files/salome-med-5.1.4-scotch.patch |  11 -
 sci-misc/salome-med/metadata.xml                   |   9 -
 sci-misc/salome-med/salome-med-5.1.3.ebuild        | 129 ---------
 sci-misc/salome-med/salome-med-5.1.4.ebuild        | 129 ---------
 sci-misc/salome-meta/ChangeLog                     |  23 --
 sci-misc/salome-meta/metadata.xml                  |   5 -
 sci-misc/salome-meta/salome-meta-5.1.3.ebuild      |  31 ---
 sci-misc/salome-meta/salome-meta-5.1.4.ebuild      |  31 ---
 sci-misc/salome-pycalculator/ChangeLog             |  41 ---
 sci-misc/salome-pycalculator/metadata.xml          |   5 -
 .../salome-pycalculator-5.1.3.ebuild               |  83 ------
 .../salome-pycalculator-5.1.4.ebuild               |  83 ------
 sci-misc/salome-smesh/ChangeLog                    |  60 -----
 sci-misc/salome-smesh/metadata.xml                 |   5 -
 sci-misc/salome-smesh/salome-smesh-5.1.3.ebuild    | 108 --------
 sci-misc/salome-smesh/salome-smesh-5.1.4.ebuild    | 110 --------
 sci-misc/salome-visu/ChangeLog                     |  49 ----
 sci-misc/salome-visu/metadata.xml                  |   5 -
 sci-misc/salome-visu/salome-visu-5.1.3.ebuild      | 103 -------
 sci-misc/salome-visu/salome-visu-5.1.4.ebuild      | 105 --------
 sci-misc/salome-yacs/ChangeLog                     |  37 ---
 .../files/salome-yacs-5.1.3-ac_python_devel.patch  |  13 -
 .../files/salome-yacs-5.1.3-lib_location.patch     |  14 -
 .../files/salome-yacs-5.1.3-libdir.patch           |  22 --
 .../files/salome-yacs-5.1.4-ac_python_devel.patch  |  12 -
 sci-misc/salome-yacs/metadata.xml                  |   5 -
 sci-misc/salome-yacs/salome-yacs-5.1.3.ebuild      | 102 -------
 sci-misc/salome-yacs/salome-yacs-5.1.4.ebuild      | 102 -------
 68 files changed, 3803 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index d97a441..b67f4fc 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,21 +30,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Christoph Junghans <ottxor@g.o> (14 Nov 2014)
-# sci-misc/salome-* masked for removal in 30 days
-# not bumped since 2010, reintroduced back in science overlay
-# if properly maintained
-sci-misc/salome-component
-sci-misc/salome-geom
-sci-misc/salome-gui
-sci-misc/salome-kernel
-sci-misc/salome-med
-sci-misc/salome-meta
-sci-misc/salome-pycalculator
-sci-misc/salome-smesh
-sci-misc/salome-visu
-sci-misc/salome-yacs
-
 # Andreas K. Huettel <dilfridge@g.o> (1 Nov 2014)
 # Lab::Instrument and Lab::Tools provided as separate packages
 # are way outdated. These are now supplied as parts of the package

diff --git a/sci-misc/salome-component/ChangeLog b/sci-misc/salome-component/ChangeLog
deleted file mode 100644
index e4e4189..0000000
--- a/sci-misc/salome-component/ChangeLog
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Id$
-
-  03 Mar 2013; Justin Lecher <jlec@g.o> salome-component-5.1.3.ebuild,
-  salome-component-5.1.4.ebuild, metadata.xml:
-  Update to new qt deps names
-
-  10 Feb 2012; Alexey Shvetsov <alexxy@g.o>
-  salome-component-5.1.3.ebuild, salome-component-5.1.4.ebuild:
-  [sci-misc/salome*] Fix python depend
-
-  07 Mar 2011; Justin Lecher <jlec@g.o> salome-component-5.1.3.ebuild,
-  salome-component-5.1.4.ebuild:
-  QA STUFF
-
-  07 Mar 2011; Justin Lecher <jlec@g.o> salome-component-5.1.3.ebuild,
-  salome-component-5.1.4.ebuild:
-  QA STUFF
-
-  07 Mar 2011; Justin Lecher <jlec@g.o> salome-component-5.1.3.ebuild,
-  salome-component-5.1.4.ebuild:
-  Correct Slots for gtk 3 introduction to tree
-
-*salome-component-5.1.4 (27 Oct 2010)
-
-  27 Oct 2010; Thomas Kahle <tomka@g.o>
-  +salome-component-5.1.4.ebuild:
-  Bump to 5.1.4, ebuild by Michael Riss in bug 330303
-
-  29 Jun 2010; Justin Lecher <jlec@g.o>
-  salome-component-5.1.3.ebuild:
-  Python ABI fixes
-
-  04 Apr 2010; Etienne Lorriaux <etienne.lorriaux@×××××.com>
-  salome-component-5.1.3.ebuild:
-  changed fetch URL + cleaning
-
-*salome-component-5.1.3 (14 Mar 2010)
-
-  14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@×××××.com>
-  -salome-component-3.2.6.ebuild,
-  -files/salome-component-3.2.6-gcc-4.3.patch,
-  -files/salome-component-3.2.6.patch, +salome-component-5.1.3.ebuild,
-  +files/salome-component-5.1.3-mpi.patch, metadata.xml:
-  Version bump 5.1.3 + removed broken 3.2.6
-
-  04 Sep 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-component-3.2.6.ebuild:
-  removed omniorb* and med dependencies, as they are already in salome-kernel
-  and salome-med
-
-  27 Aug 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-component-3.2.6.ebuild, -Changelog, +metadata.xml:
-  Removed fetch restriction, removed hardcode
-
-  29 May 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  +salome-component-3.2.6-gcc-4.3.patch
-  Added support to gcc-4.3. Patch provided by Bert Karwatzki <spasswolf@×××.de>
-
-  20 May 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  Initial import.
-  +salome-component-3.2.6.ebuild, +salome-component-3.2.6.patch
-  A major thank to Francois Dorin <f.dorin@××××.fr>, Jon Hood <squinky86@×××××.com>, Dewald Pietersen <dewald.pieterse@×××××.com>, <etienne.lorriaux@×××××.com> and Richard Westwell <garlicbread@××××××××.com> for their respective contributions and feedback. Without you guys, the Salome ebuilds would not exist today. Thanks!
-  See bug #155974 for more info

diff --git a/sci-misc/salome-component/files/salome-component-5.1.3-mpi.patch b/sci-misc/salome-component/files/salome-component-5.1.3-mpi.patch
deleted file mode 100644
index e9e920c..0000000
--- a/sci-misc/salome-component/files/salome-component-5.1.3-mpi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src5.1.3.orig/COMPONENT_SRC_5.1.3/src/AddComponent/Makefile.in	2010-03-07 22:08:31.371569651 +0100
-+++ src5.1.3/COMPONENT_SRC_5.1.3/src/AddComponent/Makefile.in	2010-03-07 22:09:05.060321118 +0100
-@@ -571,7 +571,7 @@
- 	done
- AddComponent_CheckOfUndefined$(EXEEXT): $(AddComponent_CheckOfUndefined_OBJECTS) $(AddComponent_CheckOfUndefined_DEPENDENCIES) 
- 	@rm -f AddComponent_CheckOfUndefined$(EXEEXT)
--	$(AddComponent_CheckOfUndefined_LINK) $(AddComponent_CheckOfUndefined_OBJECTS) $(AddComponent_CheckOfUndefined_LDADD) $(LIBS)
-+	$(AddComponent_CheckOfUndefined_LINK) $(AddComponent_CheckOfUndefined_OBJECTS) $(AddComponent_CheckOfUndefined_LDADD) $(LIBS) $(MPI_LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)

diff --git a/sci-misc/salome-component/metadata.xml b/sci-misc/salome-component/metadata.xml
deleted file mode 100644
index 897aa2e..0000000
--- a/sci-misc/salome-component/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci</herd>
-</pkgmetadata>

diff --git a/sci-misc/salome-component/salome-component-5.1.3.ebuild b/sci-misc/salome-component/salome-component-5.1.3.ebuild
deleted file mode 100644
index 719a10c..0000000
--- a/sci-misc/salome-component/salome-component-5.1.3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils flag-o-matic python
-
-DESCRIPTION="The Open Source Integration Platform for Numerical Simulation - COMPONENT Component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc mpi"
-
-RDEPEND="
-	>=sci-misc/salome-kernel-${PV}
-	>=sci-misc/salome-gui-${PV}
-	>=sci-misc/salome-med-${PV}
-	>=dev-qt/qtcore-4.4.3
-	>=dev-qt/qtgui-4.4.3
-	>=dev-qt/qtopengl-4.4.3
-	>=x11-libs/qwt-5.2
-	>=dev-python/PyQt4-4.4.3
-	>=sci-libs/opencascade-6.3
-	debug?   ( dev-util/cppunit )
-	mpi?
-		(
-		|| (
-			sys-cluster/openmpi[cxx]
-			sys-cluster/mpich2[cxx]
-			)
-		)"
-DEPEND="${RDEPEND}
-	>=app-doc/doxygen-1.5.6
-	media-gfx/graphviz
-	>=dev-python/docutils-0.4
-	>=dev-python/sip-4.7.7
-	dev-lang/swig
-	dev-libs/libxml2:2"
-
-MODULE_NAME="COMPONENT"
-S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-COMPONENT_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-
-pkg_setup() {
-	[[ $(python_get_version) > 2.4 ]] && \
-		ewarn "Python 2.4 is highly recommended for Salome..."
-	python_set_active_version 2
-}
-
-src_prepare() {
-	rm -r -f autom4te.cache
-	./build_configure
-}
-
-src_configure() {
-	local myconf=""
-
-#   --without-mpi does not disable mpi support, just omit it to disable
-	if use mpi; then
-		append-ldflags -lmpi -lmpi_cxx
-		if has_version ">=sys-cluster/openmpi-1.2.9"; then
-			myconf="${myconf} --with-mpi --with-openmpi"
-		elif has_version ">=sys-cluster/mpich2-1.0.8"; then
-			myconf="${myconf} --with-mpi --with-mpich"
-			append-flags -DMPICH_IGNORE_CXX_SEEK
-		fi
-	fi
-
-	econf --prefix=${INSTALL_DIR} \
-	      --datadir=${INSTALL_DIR}/share/salome \
-	      --docdir=${INSTALL_DIR}/doc/salome \
-	      --infodir=${INSTALL_DIR}/share/info \
-		  --libdir=${INSTALL_DIR}/$(get_libdir)/salome \
-	      --with-python-site=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      ${myconf} \
-	      $(use_enable debug ) \
-	      $(use_enable !debug production ) \
-	|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install \
-	|| die "emake install failed"
-
-	use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
-
-	echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
-	echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
-	echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
-	echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome" >> ./90${P}
-	doenvd 90${P}
-	rm adm_local/Makefile
-	insinto "${INSTALL_DIR}"
-	doins -r adm_local
-
-	use doc && dodoc INSTALL
-}
-
-pkg_postinst() {
-	elog "Run \`env-update && source /etc/profile\`"
-	elog "now to set up the correct paths."
-	elog ""
-}

diff --git a/sci-misc/salome-component/salome-component-5.1.4.ebuild b/sci-misc/salome-component/salome-component-5.1.4.ebuild
deleted file mode 100644
index 1d7806a..0000000
--- a/sci-misc/salome-component/salome-component-5.1.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils flag-o-matic python
-
-DESCRIPTION="The Open Source Integration Platform for Numerical Simulation - COMPONENT Component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc mpi"
-
-RDEPEND="
-	>=sci-misc/salome-kernel-${PV}
-	>=sci-misc/salome-gui-${PV}
-	>=sci-misc/salome-med-${PV}
-	>=dev-qt/qtcore-4.4.3
-	>=dev-qt/qtgui-4.4.3
-	>=dev-qt/qtopengl-4.4.3
-	>=x11-libs/qwt-5.2
-	>=dev-python/PyQt4-4.4.3
-	>=sci-libs/opencascade-6.3
-	debug?   ( dev-util/cppunit )
-	mpi?
-		(
-		|| (
-			sys-cluster/openmpi[cxx]
-			sys-cluster/mpich2[cxx]
-			)
-		)"
-DEPEND="${RDEPEND}
-	>=app-doc/doxygen-1.5.6
-	media-gfx/graphviz
-	>=dev-python/docutils-0.4
-	>=dev-python/sip-4.7.7
-	dev-lang/swig
-	dev-libs/libxml2:2"
-
-MODULE_NAME="COMPONENT"
-S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-COMPONENT_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-
-pkg_setup() {
-	[[ $(python_get_version) > 2.4 ]] && \
-		ewarn "Python 2.4 is highly recommended for Salome..."
-	python_set_active_version 2
-	append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-	rm -r -f autom4te.cache
-	./build_configure
-}
-
-src_configure() {
-	local myconf=""
-
-#   --without-mpi does not disable mpi support, just omit it to disable
-	if use mpi; then
-		append-ldflags -lmpi -lmpi_cxx
-		if has_version ">=sys-cluster/openmpi-1.2.9"; then
-			myconf="${myconf} --with-mpi --with-openmpi"
-		elif has_version ">=sys-cluster/mpich2-1.0.8"; then
-			myconf="${myconf} --with-mpi --with-mpich"
-			append-flags -DMPICH_IGNORE_CXX_SEEK
-		fi
-	fi
-
-	econf --prefix=${INSTALL_DIR} \
-	      --datadir=${INSTALL_DIR}/share/salome \
-	      --docdir=${INSTALL_DIR}/doc/salome \
-	      --infodir=${INSTALL_DIR}/share/info \
-		  --libdir=${INSTALL_DIR}/$(get_libdir)/salome \
-	      --with-python-site=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      ${myconf} \
-	      $(use_enable debug ) \
-	      $(use_enable !debug production ) \
-	|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install \
-	|| die "emake install failed"
-
-	use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
-
-	echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
-	echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
-	echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
-	echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome" >> ./90${P}
-	doenvd 90${P}
-	rm adm_local/Makefile
-	insinto "${INSTALL_DIR}"
-	doins -r adm_local
-
-	use doc && dodoc INSTALL
-}
-
-pkg_postinst() {
-	elog "Run \`env-update && source /etc/profile\`"
-	elog "now to set up the correct paths."
-	elog ""
-}

diff --git a/sci-misc/salome-geom/ChangeLog b/sci-misc/salome-geom/ChangeLog
deleted file mode 100644
index 58a2461..0000000
--- a/sci-misc/salome-geom/ChangeLog
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Id$
-
-  03 Mar 2013; Justin Lecher <jlec@g.o> salome-geom-5.1.3.ebuild,
-  salome-geom-5.1.4.ebuild, metadata.xml:
-  Update to new qt deps names
-
-  10 Feb 2012; Alexey Shvetsov <alexxy@g.o> salome-geom-5.1.3.ebuild,
-  salome-geom-5.1.4.ebuild:
-  [sci-misc/salome*] Fix python depend
-
-*salome-geom-5.1.4 (27 Oct 2010)
-
-  27 Oct 2010; Thomas Kahle <tomka@g.o> +salome-geom-5.1.4.ebuild:
-  Bump to 5.1.4, ebuild by Michael Riss in bug 330303
-
-  29 Jun 2010; Justin Lecher <jlec@g.o> salome-geom-5.1.3.ebuild:
-  Python ABI fixes
-
-  04 Apr 2010; Etienne Lorriaux <etienne.lorriaux@×××××.com>
-  salome-geom-5.1.3.ebuild:
-  changed fetch URL + cleaning
-
-*salome-geom-5.1.3 (14 Mar 2010)
-
-  14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@×××××.com>
-  -salome-geom-3.2.6.ebuild, -files/salome-geom-3.2.6-vtk-5.2.patch,
-  -files/salome-geom-3.2.6.patch, +salome-geom-5.1.3.ebuild,
-  +files/salome-geom-5.1.3-qt4-path.patch:
-  Version bump 5.1.3 + removed broken 3.2.6
-
-  20 Oct May 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  +salome-geom-3.2.6-vtk-5.2.patch
-  Added support to vtk 5.2. Patch provided by Bert Karwatzki <spasswolf@×××.de>
-
-  04 Sep 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-geom-3.2.6.ebuild:
-  removed omniorb* dependencies, as they are already in salome-kernel
-
-  27 Aug 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-geom-3.2.6.ebuild, -Changelog, +metadata.xml:
-  Removed fetch restriction, removed hardcode
-
-  21 May 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  Initial import.
-  +salome-geom-3.2.6.ebuild, +salome-geom-3.2.6.patch
-  A major thank to Francois Dorin <f.dorin@××××.fr>, Jon Hood <squinky86@gmail.$
-  See bug #155974 for more info

diff --git a/sci-misc/salome-geom/files/salome-geom-5.1.3-qt4-path.patch b/sci-misc/salome-geom/files/salome-geom-5.1.3-qt4-path.patch
deleted file mode 100644
index 0f41686..0000000
--- a/sci-misc/salome-geom/files/salome-geom-5.1.3-qt4-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src5.1.3.orig/GEOM_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4	2010-03-06 21:00:58.281572535 +0100
-+++ src5.1.3/GEOM_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4	2010-03-06 21:03:34.110325466 +0100
-@@ -333,7 +333,7 @@
- 
-   LIBS_old=$LIBS
-   if test "x$QTDIR" = "x/usr" ; then
--    QT_LIB_DIR=""
-+    QT_LIB_DIR="-L/usr/lib${LIB_LOCATION_SUFFIX}/qt4"
-   elif test -d ${QTDIR}/lib; then
-     QT_LIB_DIR="-L$QTDIR/lib"
-   elif test -d ${QTDIR}/lib64; then

diff --git a/sci-misc/salome-geom/metadata.xml b/sci-misc/salome-geom/metadata.xml
deleted file mode 100644
index 897aa2e..0000000
--- a/sci-misc/salome-geom/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci</herd>
-</pkgmetadata>

diff --git a/sci-misc/salome-geom/salome-geom-5.1.3.ebuild b/sci-misc/salome-geom/salome-geom-5.1.3.ebuild
deleted file mode 100644
index 7605d3c..0000000
--- a/sci-misc/salome-geom/salome-geom-5.1.3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils python
-
-DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. GEOM component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc mpi opengl"
-
-RDEPEND="opengl?  ( virtual/opengl )
-		 mpi?     ( || ( sys-cluster/openmpi[cxx]
-		 				 sys-cluster/mpich2[cxx] ) )
-	 	 debug?   ( dev-util/cppunit )
-		 >=sci-misc/salome-kernel-${PV}
-		 >=sci-misc/salome-gui-${PV}
-		 >=dev-python/omniorbpy-3.4
-		 >=net-misc/omniORB-4.1.4
-		 >=dev-qt/qtcore-4.5.2
-		 >=dev-qt/qtgui-4.5.2
-		 >=dev-qt/qtopengl-4.5.2
-		 >=sci-libs/opencascade-6.3
-		 >=dev-libs/boost-1.40.0
-		 >=sci-libs/vtk-5.0[python]
-		 >=sci-libs/hdf5-1.6.4"
-
-DEPEND="${RDEPEND}
-		>=app-doc/doxygen-1.5.6
-		media-gfx/graphviz
-		>=dev-python/docutils-0.4
-		dev-lang/swig"
-
-MODULE_NAME="GEOM"
-S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-GEOM_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-
-pkg_setup() {
-	[[ $(python_get_version) > 2.4 ]] && \
-		ewarn "Python 2.4 is highly recommended for Salome..."
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-qt4-path.patch
-
-	rm -r -f autom4te.cache
-	./clean_configure
-	./build_configure
-}
-
-src_configure() {
-	local vtk_suffix=""
-
-	has_version ">=sci-libs/vtk-5.0" && vtk_suffix="-5.0"
-	has_version ">=sci-libs/vtk-5.2" && vtk_suffix="-5.2"
-	has_version ">=sci-libs/vtk-5.4" && vtk_suffix="-5.4"
-
-	econf --prefix=${INSTALL_DIR} \
-	      --datadir=${INSTALL_DIR}/share/salome \
-	      --docdir=${INSTALL_DIR}/doc/salome \
-	      --infodir=${INSTALL_DIR}/share/info \
-	      --libdir=${INSTALL_DIR}/$(get_libdir)/salome \
-	      --with-python-site=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-		  --with-vtk=${VTKHOME} \
-		  --with-vtk-version=${vtk_suffix} \
-		  --with-qt='/usr' \
-	      $(use_enable debug ) \
-	      $(use_enable debug debug ) \
-	      $(use_enable !debug production ) \
-	      $(use_with opengl opengl /usr) \
-	|| die "econf failed"
-}
-
-src_compile() {
-	MAKEOPTS+=" -j1" emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
-
-	echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
-	echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
-	echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
-	echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome" >> ./90${P}
-	doenvd 90${P}
-	rm adm_local/Makefile adm_local/unix/Makefile adm_local/cmake_files/Makefile
-	insinto "${INSTALL_DIR}"
-	doins -r adm_local
-
-	use doc && dodoc INSTALL
-}
-
-pkg_postinst() {
-	elog "Run \`env-update && source /etc/profile\`"
-	elog "now to set up the correct paths."
-	elog ""
-}

diff --git a/sci-misc/salome-geom/salome-geom-5.1.4.ebuild b/sci-misc/salome-geom/salome-geom-5.1.4.ebuild
deleted file mode 100644
index c75dd13..0000000
--- a/sci-misc/salome-geom/salome-geom-5.1.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils flag-o-matic python
-
-DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. GEOM component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc mpi opengl"
-
-RDEPEND="opengl?  ( virtual/opengl )
-		 mpi?     ( || ( sys-cluster/openmpi[cxx]
-		 				 sys-cluster/mpich2[cxx] ) )
-	 	 debug?   ( dev-util/cppunit )
-		 >=sci-misc/salome-kernel-${PV}
-		 >=sci-misc/salome-gui-${PV}
-		 >=dev-python/omniorbpy-3.4
-		 >=net-misc/omniORB-4.1.4
-		 >=dev-qt/qtcore-4.5.2
-		 >=dev-qt/qtgui-4.5.2
-		 >=dev-qt/qtopengl-4.5.2
-		 >=sci-libs/opencascade-6.3
-		 >=dev-libs/boost-1.40.0
-		 >=sci-libs/vtk-5.0[python]
-		 >=sci-libs/hdf5-1.6.4"
-
-DEPEND="${RDEPEND}
-		>=app-doc/doxygen-1.5.6
-		media-gfx/graphviz
-		>=dev-python/docutils-0.4
-		dev-lang/swig"
-
-MODULE_NAME="GEOM"
-S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-GEOM_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-
-pkg_setup() {
-	[[ $(python_get_version) > 2.4 ]] && \
-		ewarn "Python 2.4 is highly recommended for Salome..."
-	python_set_active_version 2
-	append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-	#epatch "${FILESDIR}"/${P}-qt4-path.patch
-
-	rm -r -f autom4te.cache
-	./clean_configure
-	./build_configure
-}
-
-src_configure() {
-	local vtk_suffix=""
-
-	has_version ">=sci-libs/vtk-5.0" && vtk_suffix="-5.0"
-	has_version ">=sci-libs/vtk-5.2" && vtk_suffix="-5.2"
-	has_version ">=sci-libs/vtk-5.4" && vtk_suffix="-5.4"
-	has_version ">=sci-libs/vtk-5.6" && vtk_suffix="-5.6"
-
-	econf --prefix=${INSTALL_DIR} \
-	      --datadir=${INSTALL_DIR}/share/salome \
-	      --docdir=${INSTALL_DIR}/doc/salome \
-	      --infodir=${INSTALL_DIR}/share/info \
-	      --libdir=${INSTALL_DIR}/$(get_libdir)/salome \
-	      --with-python-site=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-		  --with-vtk=${VTKHOME} \
-		  --with-vtk-version=${vtk_suffix} \
-		  --with-qt='/usr' \
-	      $(use_enable debug ) \
-	      $(use_enable debug debug ) \
-	      $(use_enable !debug production ) \
-	      $(use_with opengl opengl /usr) \
-	|| die "econf failed"
-}
-
-src_compile() {
-	MAKEOPTS+=" -j1" emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
-
-	echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
-	echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
-	echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
-	echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome" >> ./90${P}
-	doenvd 90${P}
-	rm adm_local/Makefile adm_local/unix/Makefile adm_local/cmake_files/Makefile
-	insinto "${INSTALL_DIR}"
-	doins -r adm_local
-
-	use doc && dodoc INSTALL
-}
-
-pkg_postinst() {
-	elog "Run \`env-update && source /etc/profile\`"
-	elog "now to set up the correct paths."
-	elog ""
-}

diff --git a/sci-misc/salome-gui/ChangeLog b/sci-misc/salome-gui/ChangeLog
deleted file mode 100644
index 36482de..0000000
--- a/sci-misc/salome-gui/ChangeLog
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Id$
-
-  03 Mar 2013; Justin Lecher <jlec@g.o> salome-gui-5.1.3.ebuild,
-  salome-gui-5.1.4.ebuild, metadata.xml:
-  Update to new qt deps names
-
-  10 Feb 2012; Alexey Shvetsov <alexxy@g.o> salome-gui-5.1.3.ebuild,
-  salome-gui-5.1.4.ebuild:
-  [sci-misc/salome*] Fix python depend
-
-  07 Mar 2011; Justin Lecher <jlec@g.o> salome-gui-5.1.3.ebuild,
-  salome-gui-5.1.4.ebuild:
-  Correct Slots for gtk 3 introduction to tree
-
-*salome-gui-5.1.4 (27 Oct 2010)
-
-  27 Oct 2010; Thomas Kahle <tomka@g.o> +salome-gui-5.1.4.ebuild,
-  +files/salome-gui-5.1.4-qt4-path.patch:
-  Bump to 5.1.4, ebuild by Michael Riss in bug 330303
-
-  29 Jun 2010; Justin Lecher <jlec@g.o> salome-gui-5.1.3.ebuild:
-  Python ABI fixes
-
-  04 Apr 2010; Etienne Lorriaux <etienne.lorriaux@×××××.com>
-  salome-gui-5.1.3.ebuild:
-  changed fetch URL + cleaning
-  added sci-libs/vtk[mpi] dependency to solve:
-  http://bugs.gentoo.org/show_bug.cgi?id=155974#c528
-
-*salome-gui-5.1.3 (14 Mar 2010)
-
-  14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@×××××.com>
-  -salome-gui-3.2.6.ebuild, -files/salome-gui-3.2.6-gcc-4.3.patch,
-  -files/salome-gui-3.2.6-vtk-5.2.patch,
-  -files/salome-gui-3.2.6_configure_in_base.patch,
-  -files/salome-gui-3.2.6_pyobject.patch,
-  -files/salome-gui-3.2.6_qwt-4.patch,
-  -files/salome-gui-3.2.6_sip-4.1.7.patch, -files/salome-gui-3.2.6.patch,
-  -files/salome-gui-vtk-5.0.patch, +salome-gui-5.1.3.ebuild,
-  +files/salome-gui-5.1.3-qt4-path.patch:
-  Version bump 5.1.3 + removed broken 3.2.6
-
-  20 Oct 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  +salome-gui-3.2.6-vtk-5.2.patch
-  Added support to vtk 5.2 and QT-3.3.8b. Patch provided by Bert Karwatzki <spasswolf@×××.de>
-
-  04 Sep 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-gui-3.2.6.ebuild, +files/salome-gui-3.2.6_pyobject.patch:
-  Most USE-flags doesn't seem to be optional, changed default settings; added
-  pyobject.patch
-
-  27 Aug 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-gui-3.2.6.ebuild, -Changelog, +metadata.xml:
-  Removed fetch restriction, removed hardcode
-
-  29 May 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  +salome-gui-3.2.6-gcc-4.3.patch
-  Added support to gcc-4.3. Patch provided by Bert Karwatzki <spasswolf@×××.de>
-
-  20 May 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  Corrected a minor issue (icon)
-
-  20 May 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  Initial import.
-  +salome-gui-3.2.6.ebuild, +salome-gui-3.2.6.patch, +salome-gui-3.2.6_sip-4.1.7.patch, +salome-gui-3.2.6_configure_in_base.patch, +salome-gui-3.2.6_qwt-4.patch, +salome-gui-vtk-5.0.patch
-  A major thank to Francois Dorin <f.dorin@××××.fr>, Jon Hood <squinky86@×××××.com>, Dewald Pietersen <dewald.pieterse@×××××.com>, <etienne.lorriaux@×××××.com> and Richard Westwell <garlicbread@××××××××.com> for their respective contributions and feedback. Without you guys, the Salome ebuilds would not exist today. Thanks!
-  See bug #155974 for more info

diff --git a/sci-misc/salome-gui/files/salome-gui-5.1.3-qt4-path.patch b/sci-misc/salome-gui/files/salome-gui-5.1.3-qt4-path.patch
deleted file mode 100644
index da9c6d0..0000000
--- a/sci-misc/salome-gui/files/salome-gui-5.1.3-qt4-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src5.1.3.orig/GUI_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4	2010-03-06 21:00:58.281572535 +0100
-+++ src5.1.3/GUI_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4	2010-03-06 21:03:34.110325466 +0100
-@@ -333,7 +333,7 @@
- 
-   LIBS_old=$LIBS
-   if test "x$QTDIR" = "x/usr" ; then
--    QT_LIB_DIR=""
-+    QT_LIB_DIR="-L/usr/lib${LIB_LOCATION_SUFFIX}/qt4"
-   elif test -d ${QTDIR}/lib; then
-     QT_LIB_DIR="-L$QTDIR/lib"
-   elif test -d ${QTDIR}/lib64; then

diff --git a/sci-misc/salome-gui/files/salome-gui-5.1.4-qt4-path.patch b/sci-misc/salome-gui/files/salome-gui-5.1.4-qt4-path.patch
deleted file mode 100644
index e29bd76..0000000
--- a/sci-misc/salome-gui/files/salome-gui-5.1.4-qt4-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src5.1.4.orig/GUI_SRC_5.1.4/adm_local/unix/config_files/check_qt.m4	2010-03-06 21:00:58.281572535 +0100
-+++ src5.1.4/GUI_SRC_5.1.4/adm_local/unix/config_files/check_qt.m4	2010-03-06 21:03:34.110325466 +0100
-@@ -333,7 +333,7 @@
- 
-   LIBS_old=$LIBS
-   if test "x$QTDIR" = "x/usr" ; then
--    QT_LIB_DIR=""
-+    QT_LIB_DIR="-L/usr/lib${LIB_LOCATION_SUFFIX}/qt4"
-   elif test -d ${QTDIR}/lib; then
-     QT_LIB_DIR="-L$QTDIR/lib"
-   elif test -d ${QTDIR}/lib64; then

diff --git a/sci-misc/salome-gui/metadata.xml b/sci-misc/salome-gui/metadata.xml
deleted file mode 100644
index 897aa2e..0000000
--- a/sci-misc/salome-gui/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci</herd>
-</pkgmetadata>

diff --git a/sci-misc/salome-gui/salome-gui-5.1.3.ebuild b/sci-misc/salome-gui/salome-gui-5.1.3.ebuild
deleted file mode 100644
index d3772b9..0000000
--- a/sci-misc/salome-gui/salome-gui-5.1.3.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils flag-o-matic python
-
-DESCRIPTION="The Open Source Integration Platform for Numerical Simulation - GUI component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc opengl"
-
-RDEPEND="
-	>=sci-misc/salome-kernel-${PV}
-	>=net-misc/omniORB-4.1.4
-	>=dev-python/omniorbpy-3.4
-	>=sci-libs/hdf5-1.6.4
-	>=dev-libs/boost-1.40.0
-	>=dev-qt/qtcore-4.5.2
-	>=dev-qt/qtgui-4.5.2
-	>=dev-qt/qtopengl-4.5.2
-	>=x11-libs/qwt-5.2
-	>=dev-python/PyQt4-4.5.4
-	>=sci-libs/vtk-5.0[python,mpi]
-	>=sci-libs/opencascade-6.3
-	app-text/dgs
-	opengl?  ( virtual/opengl )
-	debug?   ( dev-util/cppunit )"
-DEPEND="${RDEPEND}
-	>=app-doc/doxygen-1.5.6
-	media-gfx/graphviz
-	>=dev-python/sip-4.8.2
-	dev-lang/swig
-	dev-libs/libxml2:2"
-
-MODULE_NAME="GUI"
-S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-GUI_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-
-pkg_setup() {
-	[[ $(python_get_version) > 2.4 ]] && \
-		ewarn "Python 2.4 is highly recommended for Salome..."
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-qt4-path.patch
-
-	rm -r -f autom4te.cache
-	./clean_configure
-	./build_configure
-}
-
-src_configure() {
-	local vtk_suffix=""
-
-	has_version ">=sci-libs/vtk-5.0" && vtk_suffix="-5.0"
-	has_version ">=sci-libs/vtk-5.2" && vtk_suffix="-5.2"
-	has_version ">=sci-libs/vtk-5.4" && vtk_suffix="-5.4"
-
-	econf --prefix=${INSTALL_DIR} \
-	      --datadir=${INSTALL_DIR}/share/salome \
-	      --docdir=${INSTALL_DIR}/doc/salome \
-	      --infodir=${INSTALL_DIR}/share/info \
-	      --libdir=${INSTALL_DIR}/$(get_libdir)/salome \
-	      --with-python-site=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-		  --with-qt=/usr \
-		  --with-qwt=/usr \
-		  --with-qwt_inc=/usr/include/qwt5 \
-		  --with-vtk=${VTKHOME} \
-		  --with-vtk-version=${vtk_suffix} \
-		  ${myconf} \
-	      $(use_enable debug ) \
-	      $(use_enable !debug production ) \
-	      $(use_with debug cppunit /usr ) \
-	      $(use_with opengl opengl /usr) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	MAKEOPTS+=" -j1" emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
-
-	echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
-	echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
-	echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
-	echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome" >> ./90${P}
-	doenvd 90${P}
-	rm adm_local/Makefile adm_local/unix/Makefile adm_local/cmake_files/Makefile \
-		adm_local/unix/config_files/Makefile
-
-	insinto "${INSTALL_DIR}"
-	doins -r adm_local
-	use doc && dodoc AUTHORS INSTALL NEWS README
-}
-
-pkg_postinst() {
-	elog "Run \`env-update && source /etc/profile\`"
-	elog "now to set up the correct paths."
-	elog ""
-}

diff --git a/sci-misc/salome-gui/salome-gui-5.1.4.ebuild b/sci-misc/salome-gui/salome-gui-5.1.4.ebuild
deleted file mode 100644
index 47b6d0c..0000000
--- a/sci-misc/salome-gui/salome-gui-5.1.4.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils flag-o-matic python
-
-DESCRIPTION="The Open Source Integration Platform for Numerical Simulation - GUI component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc opengl"
-
-RDEPEND="
-	>=sci-misc/salome-kernel-${PV}
-	>=net-misc/omniORB-4.1.4
-	>=dev-python/omniorbpy-3.4
-	>=sci-libs/hdf5-1.6.4
-	>=dev-libs/boost-1.40.0
-	>=dev-qt/qtcore-4.5.2
-	>=dev-qt/qtgui-4.5.2
-	>=dev-qt/qtopengl-4.5.2
-	>=x11-libs/qwt-5.2
-	>=dev-python/PyQt4-4.5.4
-	>=sci-libs/vtk-5.0[python,mpi]
-	>=sci-libs/opencascade-6.3
-	app-text/dgs
-	opengl?  ( virtual/opengl )
-	debug?   ( dev-util/cppunit )"
-DEPEND="${RDEPEND}
-	>=app-doc/doxygen-1.5.6
-	media-gfx/graphviz
-	>=dev-python/sip-4.8.2
-	dev-lang/swig
-	dev-libs/libxml2:2"
-
-MODULE_NAME="GUI"
-S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-GUI_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-
-pkg_setup() {
-	[[ $(python_get_version) > 2.4 ]] && \
-		ewarn "Python 2.4 is highly recommended for Salome..."
-	python_set_active_version 2
-	append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-qt4-path.patch
-
-	rm -r -f autom4te.cache
-	./clean_configure
-	./build_configure
-}
-
-src_configure() {
-	local vtk_suffix=""
-
-	has_version ">=sci-libs/vtk-5.0" && vtk_suffix="-5.0"
-	has_version ">=sci-libs/vtk-5.2" && vtk_suffix="-5.2"
-	has_version ">=sci-libs/vtk-5.4" && vtk_suffix="-5.4"
-	has_version ">=sci-libs/vtk-5.6" && vtk_suffix="-5.6"
-
-	econf --prefix=${INSTALL_DIR} \
-	      --datadir=${INSTALL_DIR}/share/salome \
-	      --docdir=${INSTALL_DIR}/doc/salome \
-	      --infodir=${INSTALL_DIR}/share/info \
-	      --libdir=${INSTALL_DIR}/$(get_libdir)/salome \
-	      --with-python-site=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-		  --with-qt=/usr \
-		  --with-qwt=/usr \
-		  --with-qwt_inc=/usr/include/qwt5 \
-		  --with-vtk=${VTKHOME} \
-		  --with-vtk-version=${vtk_suffix} \
-		  ${myconf} \
-	      $(use_enable debug ) \
-	      $(use_enable !debug production ) \
-	      $(use_with debug cppunit /usr ) \
-	      $(use_with opengl opengl /usr) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	MAKEOPTS+=" -j1" emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
-
-	echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
-	echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
-	echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
-	echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome" >> ./90${P}
-	doenvd 90${P}
-	rm adm_local/Makefile adm_local/unix/Makefile adm_local/cmake_files/Makefile \
-		adm_local/unix/config_files/Makefile
-
-	insinto "${INSTALL_DIR}"
-	doins -r adm_local
-	use doc && dodoc AUTHORS INSTALL NEWS README
-}
-
-pkg_postinst() {
-	elog "Run \`env-update && source /etc/profile\`"
-	elog "now to set up the correct paths."
-	elog ""
-}

diff --git a/sci-misc/salome-kernel/ChangeLog b/sci-misc/salome-kernel/ChangeLog
deleted file mode 100644
index d03f79a..0000000
--- a/sci-misc/salome-kernel/ChangeLog
+++ /dev/null
@@ -1,92 +0,0 @@
-# ChangeLog for sci-misc/salome-kernel
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Id$
-
-  10 Feb 2012; Alexey Shvetsov <alexxy@g.o> salome-kernel-5.1.3.ebuild,
-  salome-kernel-5.1.4.ebuild:
-  [sci-misc/salome*] Fix python depend
-
-  07 Mar 2011; Justin Lecher <jlec@g.o> salome-kernel-5.1.3.ebuild,
-  salome-kernel-5.1.4.ebuild:
-  Correct Slots for gtk 3 introduction to tree
-
-*salome-kernel-5.1.4 (27 Oct 2010)
-
-  27 Oct 2010; Thomas Kahle <tomka@g.o> +salome-kernel-5.1.4.ebuild,
-  +files/salome-kernel-5.1.4-openmpi.patch,
-  +files/salome-kernel-5.1.4-python-2.6.patch:
-  Bump to 5.1.4, ebuild by Michael Riss in bug 330303
-
-  29 Jun 2010; Justin Lecher <jlec@g.o> salome-kernel-5.1.3.ebuild:
-  Python ABI fixes
-
-  04 Apr 2010; Etienne Lorriaux <etienne.lorriaux@×××××.com>
-  salome-kernel-5.1.3.ebuild:
-  changed fetch URL + cleaning
-
-*salome-kernel-5.1.3 (14 Mar 2010)
-
-  14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@×××××.com>
-  -salome-kernel-3.2.6.ebuild,
-  -files/salome-kernel-3.2.6-Batch_Couple.patch,
-  -files/salome-kernel-3.2.6-gcc-4.3.patch,
-  -files/salome-kernel-3.2.6-mpich2.patch,
-  -files/salome-kernel-3.2.6-omniorb_4.1.patch,
-  -files/salome-kernel-3.2.6-pyobject.patch,
-  -files/salome-kernel-3.2.6_openpbs.patch, +salome-kernel-5.1.3.ebuild,
-  +files/salome-kernel-5.1.3-lib_location.patch,
-  +files/salome-kernel-5.1.3-openmpi.patch,
-  +files/salome-kernel-5.1.3-python-2.6.patch,
-  -files/salome-kernel-gcc4.patch, metadata.xml:
-  Version bump 5.1.3 + removed broken 3.2.6
-
-  02 Nov 2009; Justin Lecher (jlec) <jlec@×××××××××.net>
-  -files/digest-salome-kernel-3.2.6:
-  remove old digest
-
-  05 Feb 2009; Thomas Anderson <gentoofan23@g.o>
-  sci-misc/salome-kernel/salome-kernel-3.2.6.ebuild:
-  [QA]: We need EAPI=1 for SLOT dependencies
-
-  27 Oct 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-kernel-3.2.6.ebuild, metadata.xml:
-  Reordered dependencies
-
-  22 Sep 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-kernel-3.2.6.ebuild:
-  fixed dependency
-
-  19 Sep 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-kernel-3.2.6.ebuild:
-  Fixed typo in dependency
-
-  05 Sep 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-kernel-3.2.6.ebuild:
-  Fixed version dependency
-
-  04 Sep 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-kernel-3.2.6.ebuild:
-  Fixed version dependency
-
-  04 Sep 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-kernel-3.2.6.ebuild, +files/salome-kernel-3.2.6-omniorb_4.1.patch,
-  files/salome-kernel-3.2.6-pyobject.patch,
-  -files/salome-kernel-3.2.6_omniorg.patch:
-  Reworked USE-flags, changed default behaviour, added omniorb_4.1.patch
-
-  26 Aug 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-kernel-3.2.6.ebuild, -Changelog, +metadata.xml:
-  Removed fetch restriction, added python-2.5 support, removed hardcode
-
-  6 July 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  Updated to a new gcc-4.3 patch provided by Bert K.
-
-  29 May 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  +salome-kernel-3.2.6-gcc-4.3.patch
-  Added support to gcc-4.3. Patch provided by Bert Karwatzki <spasswolf@×××.de>
-
-  20 May 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  Initial import.
-  +salome-kernel-3.2.6.ebuild, +salome-kernel-3.2.6_omniorg.patch, +salome-kernel-gcc4.patch, +salome-kernel-3.2.6-Batch_Couple.patch, +salome-kernel-3.2.6_openpbs.patch, +salome-kernel.png, +salome-kernel-3.2.6-mpich2.patch, +salome-kernel-3.2.6-pyobject.patch
-  A major thank to Francois Dorin <f.dorin@××××.fr>, Jon Hood <squinky86@×××××.com>, Dewald Pietersen <dewald.pieterse@×××××.com>, <etienne.lorriaux@×××××.com> and Richard Westwell <garlicbread@××××××××.com> for their respective contributions and feedback. Without you guys, the Salome ebuilds would not exist today. Thanks!
-  See bug #155974 for more info

diff --git a/sci-misc/salome-kernel/files/salome-kernel-5.1.3-lib_location.patch b/sci-misc/salome-kernel/files/salome-kernel-5.1.3-lib_location.patch
deleted file mode 100644
index afb5e45..0000000
--- a/sci-misc/salome-kernel/files/salome-kernel-5.1.3-lib_location.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src5.1.3.old/KERNEL_SRC_5.1.3/salome_adm/unix/config_files/ac_linker_options.m4	2009-07-10 19:08:57.000000000 +0200
-+++ src5.1.3/KERNEL_SRC_5.1.3/salome_adm/unix/config_files/ac_linker_options.m4	2009-07-26 19:47:05.000000000 +0200
-@@ -26,6 +26,10 @@
- 
-   AC_CHECKING(for LIB_LOCATION_SUFFIX)
-   LIB_LOCATION_SUFFIX=""
-+  case "$build_cpu" in
-+  x86_64*)  LIB_LOCATION_SUFFIX="64" ;;
-+  *)        LIB_LOCATION_SUFFIX="" ;;
-+  esac
-   AC_SUBST(LIB_LOCATION_SUFFIX)
-   AC_MSG_RESULT(LIB_LOCATION_SUFFIX is $LIB_LOCATION_SUFFIX)
- 

diff --git a/sci-misc/salome-kernel/files/salome-kernel-5.1.3-openmpi.patch b/sci-misc/salome-kernel/files/salome-kernel-5.1.3-openmpi.patch
deleted file mode 100644
index 660d1ae..0000000
--- a/sci-misc/salome-kernel/files/salome-kernel-5.1.3-openmpi.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src5.1.3.orig/KERNEL_SRC_5.1.3/salome_adm/unix/config_files/check_mpi.m4	2008-12-10 10:14:34.000000000 +0100
-+++ src5.1.3/KERNEL_SRC_5.1.3/salome_adm/unix/config_files/check_mpi.m4	2009-09-29 10:14:56.821299268 +0200
-@@ -76,7 +76,7 @@
- 
-   if test "$WITHMPI" = "yes";then
-     mpi_ok=yes
--    MPI_LIBS="$MPI_LIBS -lmpi -lmpio -lmpiCC"
-+    MPI_LIBS="$MPI_LIBS -lmpi -lmpi_cxx"
-   else
-     mpi_ok=no
-   fi
---- src5.1.3.orig/KERNEL_SRC_5.1.3/src/Communication/SALOME_Comm_i.hxx	2008-12-10 10:14:33.000000000 +0100
-+++ src5.1.3/KERNEL_SRC_5.1.3/src/Communication/SALOME_Comm_i.hxx	2009-09-29 11:10:13.227293648 +0200
-@@ -25,6 +25,7 @@
- #include <SALOME_Communication.hxx>
- 
- #ifdef HAVE_MPI2
-+#define OMPI_IGNORE_CXX_SEEK 1
- #include "mpi.h"
- #endif
- #include <string>

diff --git a/sci-misc/salome-kernel/files/salome-kernel-5.1.3-python-2.6.patch b/sci-misc/salome-kernel/files/salome-kernel-5.1.3-python-2.6.patch
deleted file mode 100644
index bac07b1..0000000
--- a/sci-misc/salome-kernel/files/salome-kernel-5.1.3-python-2.6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Only in src5.1.3/KERNEL_SRC_5.1.3/src/KERNEL_PY: .import_hook.py.swp
-diff -ur src5.1.3.orig/KERNEL_SRC_5.1.3/src/KERNEL_PY/import_hook.py src5.1.3/KERNEL_SRC_5.1.3/src/KERNEL_PY/import_hook.py
---- src5.1.3.orig/KERNEL_SRC_5.1.3/src/KERNEL_PY/import_hook.py	2010-03-07 17:35:38.450323100 +0100
-+++ src5.1.3/KERNEL_SRC_5.1.3/src/KERNEL_PY/import_hook.py	2010-03-07 17:37:18.940255407 +0100
-@@ -150,7 +150,7 @@
-             l.append((subname,submod))
-     return l
- 
--def import_hook(name, globals=None, locals=None, fromlist=None, *args):
-+def import_hook(name, globals=None, locals=None, fromlist=None, level=-1, *args):
-     """ Import replacement for sharing modules among multiple interpreters
-         Mostly update sys.modules before doing real import
-     """

diff --git a/sci-misc/salome-kernel/files/salome-kernel-5.1.4-lib_location.patch b/sci-misc/salome-kernel/files/salome-kernel-5.1.4-lib_location.patch
deleted file mode 100644
index afb5e45..0000000
--- a/sci-misc/salome-kernel/files/salome-kernel-5.1.4-lib_location.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src5.1.3.old/KERNEL_SRC_5.1.3/salome_adm/unix/config_files/ac_linker_options.m4	2009-07-10 19:08:57.000000000 +0200
-+++ src5.1.3/KERNEL_SRC_5.1.3/salome_adm/unix/config_files/ac_linker_options.m4	2009-07-26 19:47:05.000000000 +0200
-@@ -26,6 +26,10 @@
- 
-   AC_CHECKING(for LIB_LOCATION_SUFFIX)
-   LIB_LOCATION_SUFFIX=""
-+  case "$build_cpu" in
-+  x86_64*)  LIB_LOCATION_SUFFIX="64" ;;
-+  *)        LIB_LOCATION_SUFFIX="" ;;
-+  esac
-   AC_SUBST(LIB_LOCATION_SUFFIX)
-   AC_MSG_RESULT(LIB_LOCATION_SUFFIX is $LIB_LOCATION_SUFFIX)
- 

diff --git a/sci-misc/salome-kernel/files/salome-kernel-5.1.4-openmpi.patch b/sci-misc/salome-kernel/files/salome-kernel-5.1.4-openmpi.patch
deleted file mode 100644
index daa51bb..0000000
--- a/sci-misc/salome-kernel/files/salome-kernel-5.1.4-openmpi.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src5.1.4.orig/KERNEL_SRC_5.1.4/salome_adm/unix/config_files/check_mpi.m4	2008-12-10 10:14:34.000000000 +0100
-+++ src5.1.4/KERNEL_SRC_5.1.4/salome_adm/unix/config_files/check_mpi.m4	2009-09-29 10:14:56.821299268 +0200
-@@ -76,7 +76,7 @@
- 
-   if test "$WITHMPI" = "yes";then
-     mpi_ok=yes
--    MPI_LIBS="$MPI_LIBS -lmpi -lmpio -lmpiCC"
-+    MPI_LIBS="$MPI_LIBS -lmpi -lmpi_cxx"
-   else
-     mpi_ok=no
-   fi
---- src5.1.4.orig/KERNEL_SRC_5.1.4/src/Communication/SALOME_Comm_i.hxx	2008-12-10 10:14:33.000000000 +0100
-+++ src5.1.4/KERNEL_SRC_5.1.4/src/Communication/SALOME_Comm_i.hxx	2009-09-29 11:10:13.227293648 +0200
-@@ -25,6 +25,7 @@
- #include <SALOME_Communication.hxx>
- 
- #ifdef HAVE_MPI2
-+#define OMPI_IGNORE_CXX_SEEK 1
- #include "mpi.h"
- #endif
- #include <string>

diff --git a/sci-misc/salome-kernel/files/salome-kernel-5.1.4-python-2.6.patch b/sci-misc/salome-kernel/files/salome-kernel-5.1.4-python-2.6.patch
deleted file mode 100644
index 2395d95..0000000
--- a/sci-misc/salome-kernel/files/salome-kernel-5.1.4-python-2.6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Only in src5.1.4/KERNEL_SRC_5.1.4/src/KERNEL_PY: .import_hook.py.swp
-diff -ur src5.1.4.orig/KERNEL_SRC_5.1.4/src/KERNEL_PY/import_hook.py src5.1.4/KERNEL_SRC_5.1.4/src/KERNEL_PY/import_hook.py
---- src5.1.4.orig/KERNEL_SRC_5.1.4/src/KERNEL_PY/import_hook.py	2010-03-07 17:35:38.450323100 +0100
-+++ src5.1.4/KERNEL_SRC_5.1.4/src/KERNEL_PY/import_hook.py	2010-03-07 17:37:18.940255407 +0100
-@@ -150,7 +150,7 @@
-             l.append((subname,submod))
-     return l
- 
--def import_hook(name, globals=None, locals=None, fromlist=None, *args):
-+def import_hook(name, globals=None, locals=None, fromlist=None, level=-1, *args):
-     """ Import replacement for sharing modules among multiple interpreters
-         Mostly update sys.modules before doing real import
-     """

diff --git a/sci-misc/salome-kernel/files/salome-kernel.png b/sci-misc/salome-kernel/files/salome-kernel.png
deleted file mode 100644
index 485c127..0000000
Binary files a/sci-misc/salome-kernel/files/salome-kernel.png and /dev/null differ

diff --git a/sci-misc/salome-kernel/metadata.xml b/sci-misc/salome-kernel/metadata.xml
deleted file mode 100644
index 217d71c..0000000
--- a/sci-misc/salome-kernel/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>sci</herd>
-	<use>
-		<flag name='numpy'>Enable support for <pkg>dev-python/numpy</pkg></flag>
-	</use>
-</pkgmetadata>

diff --git a/sci-misc/salome-kernel/salome-kernel-5.1.3.ebuild b/sci-misc/salome-kernel/salome-kernel-5.1.3.ebuild
deleted file mode 100644
index 337fbd2..0000000
--- a/sci-misc/salome-kernel/salome-kernel-5.1.3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils python
-
-DESCRIPTION="The Open Source Integration Platform for Numerical Simulation - KERNEL Component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc mpi numpy"
-
-RDEPEND="
-	>=dev-python/omniorbpy-3.4
-	>=net-misc/omniORB-4.1.4
-	>=dev-libs/boost-1.40.0
-	 sci-libs/hdf5
-	debug?   ( dev-util/cppunit )
-	mpi?
-		( || (
-			sys-cluster/openmpi[cxx]
-			sys-cluster/mpich2[cxx]
-			) )
-	numpy?   ( dev-python/numpy )"
-DEPEND="${RDEPEND}
-	>=app-doc/doxygen-1.5.6
-	media-gfx/graphviz
-	dev-python/docutils
-	dev-lang/swig
-	dev-libs/libxml2:2
-	>=dev-python/docutils-0.4"
-
-MODULE_NAME="KERNEL"
-S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-KERNEL_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-
-pkg_setup() {
-	[[ $(python_get_version) > 2.4 ]] && \
-		ewarn "Python 2.4 is highly recommended for Salome..."
-
-	#Warn about mpi use flag for hdf5
-	has_version "sci-libs/hdf5[mpi]" &&
-		ewarn "mpi use flag enabled for sci-libs/hdf5, this may cause the build to fail for salome-kernel"
-	python_set_active_version 2
-}
-
-src_prepare() {
-	use amd64 && epatch "${FILESDIR}"/${P}-lib_location.patch
-	[[ $(python_get_version) == 2.6 ]] && \
-		epatch "${FILESDIR}"/${P}-python-2.6.patch
-
-	has_version "sys-cluster/openmpi" && \
-		epatch "${FILESDIR}"/${P}-openmpi.patch
-
-	./clean_configure
-	./build_configure
-}
-
-src_configure() {
-	local myconf=""
-
-#   --without-mpi does not disable mpi support, just omit it to disable
-	if use mpi; then
-		if has_version ">=sys-cluster/openmpi-1.2.9"; then
-			myconf="${myconf} --with-mpi --with-openmpi"
-		elif has_version ">=sys-cluster/mpich2-1.0.8"; then
-			myconf="${myconf} --with-mpi --with-mpich"
-		fi
-	fi
-
-	econf --prefix=${INSTALL_DIR} \
-	      --docdir=${INSTALL_DIR}/share/doc/salome \
-	      --infodir=${INSTALL_DIR}/share/info \
-	      --datadir=${INSTALL_DIR}/share/salome \
-	      --with-python-site=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      --enable-corba-gen \
-	      ${myconf} \
-	      $(use_enable mpi parallel_extension ) \
-	      $(use_enable debug ) \
-	      $(use_enable !debug production ) \
-	      $(use_with debug cppunit /usr ) \
-	|| die "econf failed"
-}
-
-src_install() {
-	MAKEOPTS="-j1" emake DESTDIR="${D}" install || die "emake install failed"
-
-	use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
-
-	echo "KERNEL_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
-	echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
-	echo "PATH=${INSTALL_DIR}/bin/salome"   >> ./90${P}
-	echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome" >> ./90${P}
-	doenvd 90${P}
-	use doc && dodoc AUTHORS ChangeLog INSTALL NEWS README README.FIRST.txt
-
-	# Install icon and .desktop for menu entry
-	doicon "${FILESDIR}"/${PN}.png
-	make_desktop_entry runSalome Salome ${PN} "Science;Engineering"
-}
-
-pkg_postinst() {
-	elog "Run \`env-update && source /etc/profile\`"
-	elog "now to set up the correct paths."
-	elog ""
-
-	ewarn "note a small change to /etc/hosts may be required"
-	ewarn "salome doesn't seem to recognise localhost within the hosts file"
-	ewarn "a line such as"
-	ewarn "127.0.0.1	name.domain	name"
-	ewarn "may be required within /etc/hosts"
-	ewarn ""
-}

diff --git a/sci-misc/salome-kernel/salome-kernel-5.1.4.ebuild b/sci-misc/salome-kernel/salome-kernel-5.1.4.ebuild
deleted file mode 100644
index 337fbd2..0000000
--- a/sci-misc/salome-kernel/salome-kernel-5.1.4.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils python
-
-DESCRIPTION="The Open Source Integration Platform for Numerical Simulation - KERNEL Component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc mpi numpy"
-
-RDEPEND="
-	>=dev-python/omniorbpy-3.4
-	>=net-misc/omniORB-4.1.4
-	>=dev-libs/boost-1.40.0
-	 sci-libs/hdf5
-	debug?   ( dev-util/cppunit )
-	mpi?
-		( || (
-			sys-cluster/openmpi[cxx]
-			sys-cluster/mpich2[cxx]
-			) )
-	numpy?   ( dev-python/numpy )"
-DEPEND="${RDEPEND}
-	>=app-doc/doxygen-1.5.6
-	media-gfx/graphviz
-	dev-python/docutils
-	dev-lang/swig
-	dev-libs/libxml2:2
-	>=dev-python/docutils-0.4"
-
-MODULE_NAME="KERNEL"
-S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-KERNEL_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-
-pkg_setup() {
-	[[ $(python_get_version) > 2.4 ]] && \
-		ewarn "Python 2.4 is highly recommended for Salome..."
-
-	#Warn about mpi use flag for hdf5
-	has_version "sci-libs/hdf5[mpi]" &&
-		ewarn "mpi use flag enabled for sci-libs/hdf5, this may cause the build to fail for salome-kernel"
-	python_set_active_version 2
-}
-
-src_prepare() {
-	use amd64 && epatch "${FILESDIR}"/${P}-lib_location.patch
-	[[ $(python_get_version) == 2.6 ]] && \
-		epatch "${FILESDIR}"/${P}-python-2.6.patch
-
-	has_version "sys-cluster/openmpi" && \
-		epatch "${FILESDIR}"/${P}-openmpi.patch
-
-	./clean_configure
-	./build_configure
-}
-
-src_configure() {
-	local myconf=""
-
-#   --without-mpi does not disable mpi support, just omit it to disable
-	if use mpi; then
-		if has_version ">=sys-cluster/openmpi-1.2.9"; then
-			myconf="${myconf} --with-mpi --with-openmpi"
-		elif has_version ">=sys-cluster/mpich2-1.0.8"; then
-			myconf="${myconf} --with-mpi --with-mpich"
-		fi
-	fi
-
-	econf --prefix=${INSTALL_DIR} \
-	      --docdir=${INSTALL_DIR}/share/doc/salome \
-	      --infodir=${INSTALL_DIR}/share/info \
-	      --datadir=${INSTALL_DIR}/share/salome \
-	      --with-python-site=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      --enable-corba-gen \
-	      ${myconf} \
-	      $(use_enable mpi parallel_extension ) \
-	      $(use_enable debug ) \
-	      $(use_enable !debug production ) \
-	      $(use_with debug cppunit /usr ) \
-	|| die "econf failed"
-}
-
-src_install() {
-	MAKEOPTS="-j1" emake DESTDIR="${D}" install || die "emake install failed"
-
-	use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
-
-	echo "KERNEL_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
-	echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
-	echo "PATH=${INSTALL_DIR}/bin/salome"   >> ./90${P}
-	echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome" >> ./90${P}
-	doenvd 90${P}
-	use doc && dodoc AUTHORS ChangeLog INSTALL NEWS README README.FIRST.txt
-
-	# Install icon and .desktop for menu entry
-	doicon "${FILESDIR}"/${PN}.png
-	make_desktop_entry runSalome Salome ${PN} "Science;Engineering"
-}
-
-pkg_postinst() {
-	elog "Run \`env-update && source /etc/profile\`"
-	elog "now to set up the correct paths."
-	elog ""
-
-	ewarn "note a small change to /etc/hosts may be required"
-	ewarn "salome doesn't seem to recognise localhost within the hosts file"
-	ewarn "a line such as"
-	ewarn "127.0.0.1	name.domain	name"
-	ewarn "may be required within /etc/hosts"
-	ewarn ""
-}

diff --git a/sci-misc/salome-med/ChangeLog b/sci-misc/salome-med/ChangeLog
deleted file mode 100644
index ac7206d..0000000
--- a/sci-misc/salome-med/ChangeLog
+++ /dev/null
@@ -1,77 +0,0 @@
-# ChangeLog for sci-misc/salome-med
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Id$
-
-  03 Mar 2013; Justin Lecher <jlec@g.o> salome-med-5.1.3.ebuild,
-  salome-med-5.1.4.ebuild, metadata.xml:
-  Update to new qt deps names
-
-  10 Feb 2012; Alexey Shvetsov <alexxy@g.o> salome-med-5.1.3.ebuild,
-  salome-med-5.1.4.ebuild:
-  [sci-misc/salome*] Fix python depend
-
-  07 Mar 2011; Justin Lecher <jlec@g.o> salome-med-5.1.3.ebuild,
-  salome-med-5.1.4.ebuild:
-  Correct Slots for gtk 3 introduction to tree
-
-*salome-med-5.1.4 (27 Oct 2010)
-
-  27 Oct 2010; Thomas Kahle <tomka@g.o> +salome-med-5.1.4.ebuild,
-  +files/salome-med-5.1.4-check_metis.patch,
-  +files/salome-med-5.1.4-check_scotch.patch,
-  +files/salome-med-5.1.4-gcc.patch, +files/salome-med-5.1.4-scotch.patch:
-  Bump to 5.1.4, ebuild by Michael Riss in bug 330303
-
-  29 Jun 2010; Justin Lecher <jlec@g.o> salome-med-5.1.3.ebuild:
-  Python ABI fixes
-
-  04 Apr 2010; Etienne Lorriaux <etienne.lorriaux@×××××.com>
-  salome-med-5.1.3.ebuild, +files/salome-med-5.1.3-med_int.patch:
-  changed fetch URL + cleaning
-  new patch to (partially) solve typedef long med_int issues on amd64:
-  http://bugs.gentoo.org/show_bug.cgi?id=155974#c525
-
-*salome-med-5.1.3 (14 Mar 2010)
-
-  14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@×××××.com>
-  -salome-med-3.2.6.ebuild, -files/salome-med-3.2.6-gcc-4.3.patch,
-  -files/salome-med-3.2.6-hdf5-1.6.7.patch,
-  -files/salome-med-3.2.6_boost-1.35.patch,
-  -files/salome-med-3.2.6_environ.patch, -files/salome-med-3.2.6_gcc4.patch,
-  -files/salome-med-3.2.6.patch, +salome-med-5.1.3.ebuild,
-  +files/salome-med-5.1.3-check_metis.patch,
-  +files/salome-med-5.1.3-check_scotch.patch,
-  +files/salome-med-5.1.3-gcc.patch, +files/salome-med-5.1.3-mpi.patch,
-  +files/salome-med-5.1.3-qt4-path.patch,
-  +files/salome-med-5.1.3-scotch.patch, metadata.xml:
-  Version bump 5.1.3 + removed broken 3.2.6
-
-  03 Nov 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-med-3.2.6.ebuild, metadata.xml:
-  Reordered dependencies
-
-  25 October 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  +salome-med-3.2.6-hdf5-1.6.7.patch
-  Patch provided by Bert Karwatzki <spasswolf@×××.de>
-
-  05 Sep 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-med-3.2.6.ebuild, +files/salome-med-3.2.6_boost-1.35.patch:
-  Added patch for >=dev-libs/boost-1.35.0
-
-  04 Sep 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-med-3.2.6.ebuild:
-  removed omniorb* dependencies, as they are already in salome-kernel
-
-  27 Aug 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-med-3.2.6.ebuild, -Changelog, +metadata.xml:
-  Removed fetch restriction, removed hardcode
-
-  29 May 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  +salome-med-3.2.6-gcc-4.3.patch
-  Added support to gcc-4.3. Patch provided by Bert Karwatzki <spasswolf@×××.de>
-
-  20 May 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  Initial import.
-  +salome-med-3.2.6.ebuild, +salome-med-3.2.6_environ.patch, +salome-med-3.2.6_gcc4.patch, +salome-med-3.2.6.patch
-  A major thank to Francois Dorin <f.dorin@××××.fr>, Jon Hood <squinky86@×××××.com>, Dewald Pietersen <dewald.pieterse@×××××.com>, <etienne.lorriaux@×××××.com> and Richard Westwell <garlicbread@××××××××.com> for their respective contributions and feedback. Without you guys, the Salome ebuilds would not exist today. Thanks!
-  See bug #155974 for more info

diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-check_metis.patch b/sci-misc/salome-med/files/salome-med-5.1.3-check_metis.patch
deleted file mode 100644
index c133b7f..0000000
--- a/sci-misc/salome-med/files/salome-med-5.1.3-check_metis.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_metis.m4.orig	2009-09-27 22:35:51.014701709 +0200
-+++ src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_metis.m4	2009-09-27 22:41:46.471297649 +0200
-@@ -28,6 +28,10 @@
- 
- METIS_CPPFLAGS=""
- METIS_LIBSUFFIX=""
-+case "$build_cpu" in
-+x86_64*)  METIS_LIBSUFFIX="64" ;;
-+*)        METIS_LIBSUFFIX="" ;;
-+esac
- METIS_LIBS=""
- ENABLE_METIS="no"
- 
-@@ -43,8 +47,8 @@
- LIBS_old=$LIBS
- 
- if test "x${METISDIR}" != "x" ; then
--  METIS_CPPFLAGS="-DENABLE_METIS -I${METISDIR}/Lib"
--  METIS_LIBS="-L${METISDIR} -lmetis"
-+  METIS_CPPFLAGS="-DENABLE_METIS -I${METISDIR}/include/metis"
-+  METIS_LIBS="-L${METISDIR}/lib${METIS_LIBSUFFIX} -lmetis"
- fi
- 
- metis_ok=no
-@@ -57,7 +61,7 @@
- 
- metis_include_dir_ok=yes
- if test "x${METISDIR}" != "x" ; then
--  AC_CHECK_FILE(${METISDIR}/Lib/metis.h,
-+  AC_CHECK_FILE(${METISDIR}/include/metis/metis.h,
-                 metis_include_dir_ok=yes,
-                 metis_include_dir_ok=no)
- fi
-@@ -81,12 +85,12 @@
-   AC_CHECKING(for METIS binaries)
-   metis_lib_dir_ok=yes
-   if test "x${METISDIR}" != "x" ; then
--    AC_CHECK_FILE(${METISDIR}/libmetis.a,
-+    AC_CHECK_FILE(${METISDIR}/lib${METIS_LIBSUFFIX}/libmetis.a,
-                   metis_lib_dir_ok=yes,
-                   metis_lib_dir_ok=no)
-     if test "x${metis_lib_dir_ok}" = "xno" ; then
-       METIS_LIBSUFFIX=""
--      AC_CHECK_FILE(${METISDIR}/libmetis.a,
-+      AC_CHECK_FILE(${METISDIR}/lib${METIS_LIBSUFFIX}/libmetis.a,
-                     metis_lib_dir_ok=yes,
-                     metis_lib_dir_ok=no)
-     fi

diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-check_scotch.patch b/sci-misc/salome-med/files/salome-med-5.1.3-check_scotch.patch
deleted file mode 100644
index 64c8bb2..0000000
--- a/sci-misc/salome-med/files/salome-med-5.1.3-check_scotch.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_scotch.m4.orig	2009-09-27 23:07:31.245061430 +0200
-+++ src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_scotch.m4	2009-09-27 23:11:02.080868671 +0200
-@@ -28,6 +28,10 @@
- 
- SCOTCH_CPPFLAGS=""
- SCOTCH_LIBSUFFIX=""
-+case "$build_cpu" in
-+x86_64*)  SCOTCH_LIBSUFFIX="64" ;;
-+*)        SCOTCH_LIBSUFFIX="" ;;
-+esac
- SCOTCH_LIBS=""
- ENABLE_SCOTCH="no"
- 
-@@ -43,8 +47,8 @@
- LIBS_old=$LIBS
- 
- if test "x${SCOTCHDIR}" != "x" ; then
--  SCOTCH_CPPFLAGS="-DENABLE_SCOTCH -I${SCOTCHDIR}"
--  SCOTCH_LIBS="-L${SCOTCHDIR}/bin -lscotch -lscotcherr"
-+  SCOTCH_CPPFLAGS="-DENABLE_SCOTCH -I${SCOTCHDIR}/include/scotch"
-+  SCOTCH_LIBS="-L${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX} -lscotch -lscotcherr"
- fi
- 
- scotch_ok=no
-@@ -57,14 +61,14 @@
- 
- scotch_include_dir_ok=yes
- if test "x${SCOTCHDIR}" != "x" ; then
--  AC_CHECK_FILE(${SCOTCHDIR}/bin/scotch.h,
-+  AC_CHECK_FILE(${SCOTCHDIR}/include/scotch/scotch.h,
-                 scotch_include_dir_ok=yes,
-                 scotch_include_dir_ok=no)
- fi
- 
- if test "x${scotch_include_dir_ok}" = "xyes" ; then
-   AC_TRY_COMPILE([#include <stdio.h>
--		  #include <bin/scotch.h>],
-+		  #include <scotch.h>],
-                  [SCOTCH_Graph* graph;
- 		  SCOTCH_graphInit(graph)],
-                  scotch_headers_ok=yes,
-@@ -83,12 +87,12 @@
-   AC_CHECKING(for SCOTCH binaries)
-   scotch_lib_dir_ok=yes
-   if test "x${SCOTCHDIR}" != "x" ; then
--    AC_CHECK_FILE(${SCOTCHDIR}/bin/libscotch.a,
-+    AC_CHECK_FILE(${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX}/libscotch.a,
-                   scotch_lib_dir_ok=yes,
-                   scotch_lib_dir_ok=no)
-     if test "x${scotch_lib_dir_ok}" = "xno" ; then
-       SCOTCH_LIBSUFFIX=""
--      AC_CHECK_FILE(${SCOTCHDIR}/bin/libscotch.a,
-+      AC_CHECK_FILE(${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX}/libscotch.a,
-                     scotch_lib_dir_ok=yes,
-                     scotch_lib_dir_ok=no)
-     fi
-@@ -96,7 +100,7 @@
-   if test "x${scotch_lib_dir_ok}" = "xyes" ; then
-     LIBS="${LIBS_old} ${SCOTCH_LIBS}"
-     AC_TRY_LINK([#include <stdio.h>
--		#include <bin/scotch.h>],
-+		#include <scotch.h>],
-                   [SCOTCH_Graph* graph;
- 		  SCOTCH_graphInit(graph)],
-                 scotch_binaries_ok=yes,
-@@ -105,7 +109,7 @@
-       SCOTCH_LIBSUFFIX=""
-       LIBS="${LIBS_old} ${SCOTCH_LIBS} "
-       AC_TRY_LINK([#include <stdio.h>
--		   #include <bin/scotch.h>],
-+		   #include <scotch.h>],
-                   [SCOTCH_Graph* graph;
- 		  SCOTCH_graphInit(graph)],
-                   scotch_binaries_ok=yes,

diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-gcc.patch b/sci-misc/salome-med/files/salome-med-5.1.3-gcc.patch
deleted file mode 100644
index 15e3492..0000000
--- a/sci-misc/salome-med/files/salome-med-5.1.3-gcc.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- ./src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx	2010-03-07 23:18:07.064072621 +0100
-+++ ./src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/ParaMEDMEMTest.cxx	2010-03-07 23:19:44.920271906 +0100
-@@ -23,6 +23,7 @@
- #include <cmath>
- #include <list>
- #include <stdexcept>
-+#include <cstdlib>
- 
- //================================================================================
- /*!
---- ./src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx	2010-03-07 23:18:07.102331566 +0100
-+++ ./src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx	2010-03-07 23:24:44.300321009 +0100
-@@ -21,7 +21,7 @@
- #include <map>
- #include <iostream>
- #include <mpi.h>
--#include <time.h>
-+#include <ctime>
- 
- #include "MPIAccessDECTest.hxx"
- #include <cppunit/TestAssert.h>
---- ./src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx	2010-03-07 23:18:07.084009650 +0100
-+++ ./src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx	2010-03-07 23:25:22.930322599 +0100
-@@ -22,7 +22,7 @@
- #include <map>
- #include <iostream>
- #include <mpi.h>
--#include <time.h>
-+#include <ctime>
- 
- #include "MPIAccessDECTest.hxx"
- #include <cppunit/TestAssert.h>
---- ./src5.1.3.orig/MED_SRC_5.1.3/src/INTERPOLATION/create_mesh_interpolation.c	2010-03-13 13:14:50.721209673 +0100
-+++ ./src5.1.3/MED_SRC_5.1.3/src/INTERPOLATION/create_mesh_interpolation.c	2010-03-13 13:15:35.420479255 +0100
-@@ -21,7 +21,7 @@
- //
- #include <med.h>
- #include <string.h>
--
-+#include <stdlib.h>
- 
- /*****************************************************************************************************/
- 

diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-med_int.patch b/sci-misc/salome-med/files/salome-med-5.1.3-med_int.patch
deleted file mode 100644
index 6db1510..0000000
--- a/sci-misc/salome-med/files/salome-med-5.1.3-med_int.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx
---- src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx	2010-03-15 17:07:56.860301255 +0100
-+++ src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx	2010-03-15 17:33:59.740251721 +0100
-@@ -189,7 +189,7 @@
-         
-       int ncorr = med_2_3::MEDjointInfo(fid,meshname, ijoint+1, name, 
-                 joint_description,
--                &distant, name_distant);
-+                (med_int*)&distant, name_distant);
-   
-       for (int ic=0; ic<ncorr; ic++)
-         {
-@@ -209,7 +209,7 @@
-       {
-       
-         med_2_3::MEDjointLire(fid, meshname, name,
--            node_corresp,ncouples,
-+            (med_int*)node_corresp,ncouples,
-             cor_typent_local,  cor_typgeo_local,
-             cor_typent_dist, cor_typgeo_dist
-             );
-@@ -247,7 +247,7 @@
-         if (!m_collection->isDimensionOK(type,m_collection->getMeshDimension())) continue;
-         int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_CELL,type);
-         if (ntype==0) continue;
--        med_2_3::MEDglobalNumLire(fid,meshname, array+offset, ntype,
-+        med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array+offset, ntype,
-                 med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type);
-         offset+=ntype;
-       }
-@@ -259,7 +259,7 @@
-   int nnode= (m_collection->getMesh())[idomain]->getNumberOfNodes();
-   {
-   int* array=new int[nnode];
--  med_2_3::MEDglobalNumLire(fid,meshname, array, nnode,
-+  med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array, nnode,
-           med_2_3::MED_NOEUD, med_2_3::MED_POINT1); 
-   nodeglobal[idomain]=array;
-   } 
-@@ -280,7 +280,7 @@
-     
-     int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_FACE,type);
-     if (ntype==0) continue;
--    med_2_3::MEDglobalNumLire(fid,meshname, array+offset, ntype,
-+    med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array+offset, ntype,
-             med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type);
-     offset+=ntype;
-         }
-@@ -348,7 +348,7 @@
-              jointSort(node_corresp, nbnodes, false);
-           
-         error=
--    med_2_3::MEDjointEcr(fid, mesh_name, joint_name, node_corresp, nbnodes,
-+    med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)node_corresp, nbnodes,
-              med_2_3::MED_NOEUD, med_2_3::MED_POINT1,med_2_3::MED_NOEUD, med_2_3::MED_POINT1);
-         if (error==-1) cout << "erreur creation de joint "<<endl;
-         
-@@ -388,7 +388,7 @@
- 					if (!m_collection->isDimensionOK(type,m_collection->getMeshDimension())) continue;
- 					int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_CELL,type);
- 					if (ntype==0) continue;
--					med_2_3::MEDglobalNumEcr(fid,meshchar, array+offset, ntype,
-+					med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array+offset, ntype,
- 																	 med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type);
- 					offset+=ntype;
-           
-@@ -426,7 +426,7 @@
- 					
- 					int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(constituent_entity,type);
- 					if (ntype==0) continue;
--					med_2_3::MEDglobalNumEcr(fid,meshchar, array+offset, ntype,
-+					med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array+offset, ntype,
- 																	 med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type);
- 					
- 					offset+=ntype;
-@@ -443,7 +443,7 @@
-       
- 			m_collection->getTopology()->getNodeList(idomain,array);
- 			
--			med_2_3::MEDglobalNumEcr(fid,meshchar, array, nnode,
-+			med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array, nnode,
- 															 med_2_3::MED_NOEUD, med_2_3::MED_POINT1);
- 			
- 			delete[] array;
-@@ -507,7 +507,7 @@
- 							corresp.push_back(value[icol]);
- 						}
- 				int size_joint = corresp.size()/2;
--				med_2_3::MEDjointEcr(fid, mesh_name, joint_name, &corresp[0], 
-+				med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)&corresp[0], 
- 														 size_joint, med_2_3::MED_MAILLE,
- 														 (med_2_3::med_geometrie_element)local_type    ,med_2_3::MED_MAILLE, 
- 														 (med_2_3::med_geometrie_element)distant_type    );
-@@ -541,7 +541,7 @@
- 					med_2_3::med_geometrie_element distant_geo_elem=(med_2_3::med_geometrie_element)iter->first.second;
- 					int size_joint=size/2;
- 					//med_2_3::med_err error =
--					med_2_3::MEDjointEcr(fid, mesh_name, joint_name, corresp, size_joint, med_2_3::MED_MAILLE,
-+					med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)corresp, size_joint, med_2_3::MED_MAILLE,
- 															 local_geo_elem,med_2_3::MED_MAILLE, distant_geo_elem);
- 					delete[] corresp;
- 				}
-diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx src5.1.3/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx
---- src5.1.3.orig/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx	2010-03-15 17:07:56.624073897 +0100
-+++ src5.1.3/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx	2010-03-15 17:42:31.140322486 +0100
-@@ -34,6 +34,7 @@
- 
- #include <vector>
- #include <set>
-+#include <med.h>
- 
- //*****************************************************************************
- // Some useful macros
-@@ -46,7 +47,7 @@
-  * Pair of index.
-  * See definition of GaussIndexList.
-  */
--typedef std::pair < std::set<int>*, std::set<int> > IndexPair;
-+typedef std::pair < std::set<med_int>*, std::set<med_int> > IndexPair;
- 
- /**
-  * List of gauss index for optimized domain split.
-diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx
---- src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx	2010-03-15 17:07:55.512824126 +0100
-+++ src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx	2010-03-15 17:23:57.950316309 +0100
-@@ -169,11 +169,11 @@
-       {
-         int ngro=MEDnGroupe(fid,(char *)meshName,i+1);
-         med_int natt=MEDnAttribut(fid,(char *)meshName,i+1);
--        med_int *attide=new int[natt];
--        med_int *attval=new int[natt];
-+        med_int *attide=new med_int[natt];
-+        med_int *attval=new med_int[natt];
-         char *attdes=new char[MED_TAILLE_DESC*natt+1];
-         char *gro=new char[MED_TAILLE_LNOM*ngro+1];
--        MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro);
-+        MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro);
-         std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam));
-         ret[i]=cur;
-         delete [] attdes;
-@@ -196,11 +196,11 @@
-       {
-         int ngro=MEDnGroupe(fid,(char *)meshName,i+1);
-         med_int natt=MEDnAttribut(fid,(char *)meshName,i+1);
--        med_int *attide=new int[natt];
--        med_int *attval=new int[natt];
-+        med_int *attide=new med_int[natt];
-+        med_int *attval=new med_int[natt];
-         char *attdes=new char[MED_TAILLE_DESC*natt+1];
-         char *gro=new char[MED_TAILLE_LNOM*ngro+1];
--        MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro);
-+        MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro);
- 	for(int j=0;j<ngro;j++)
- 	  {
- 	    std::string cur=buildStringFromFortran(gro+j*MED_TAILLE_LNOM,MED_TAILLE_LNOM);
-@@ -446,11 +446,11 @@
-       {
-         int ngro=MEDnGroupe(fid,(char *)meshName,i+1);
-         med_int natt=MEDnAttribut(fid,(char *)meshName,i+1);
--        med_int *attide=new int[natt];
--        med_int *attval=new int[natt];
-+        med_int *attide=new med_int[natt];
-+        med_int *attval=new med_int[natt];
-         char *attdes=new char[MED_TAILLE_DESC*natt+1];
-         char *gro=new char[MED_TAILLE_LNOM*ngro+1];
--        MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro);
-+        MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro);
-         std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam));
- 	if(std::find(fams.begin(),fams.end(),cur)!=fams.end())
- 	  ret.push_back(numfam);
-@@ -474,11 +474,11 @@
-       {
-         int ngro=MEDnGroupe(fid,(char *)meshName,i+1);
-         med_int natt=MEDnAttribut(fid,(char *)meshName,i+1);
--        med_int *attide=new int[natt];
--        med_int *attval=new int[natt];
-+        med_int *attide=new med_int[natt];
-+        med_int *attval=new med_int[natt];
-         char *attdes=new char[MED_TAILLE_DESC*natt+1];
-         char *gro=new char[MED_TAILLE_LNOM*ngro+1];
--        MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro);
-+        MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro);
-         std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam));
- 	for(int j=0;j<ngro;j++)
- 	  {
-@@ -566,12 +566,12 @@
-             MEDLoader::MEDConnOfOneElemType elem(typmai2[i],connTab,0,fam,curNbOfElem,-1);
-             int *tmp=new int[curNbOfElem];
-             char *noms=new char[MED_TAILLE_PNOM*curNbOfElem+1];
--            MEDelementsLire(fid,nommaa,Mdim,connTab,MED_FULL_INTERLACE,noms,&inoele,tmp,&inuele,fam,curNbOfElem,whichEntity,curMedType,MED_NOD);
-+            MEDelementsLire(fid,nommaa,Mdim,(med_int*)connTab,MED_FULL_INTERLACE,noms,&inoele,(med_int*)tmp,&inuele,(med_int*)fam,curNbOfElem,whichEntity,curMedType,MED_NOD);
-             delete [] tmp;
-             delete [] noms;
-             //trying to read global numbering
-             int *globArr=new int[curNbOfElem];
--            if(MEDglobalNumLire(fid,nommaa,globArr,curNbOfElem,whichEntity,curMedType)==0)
-+            if(MEDglobalNumLire(fid,nommaa,(med_int*)globArr,curNbOfElem,whichEntity,curMedType)==0)
-               elem.setGlobal(globArr);
-             else
-               delete [] globArr;
-@@ -590,9 +590,9 @@
-         int *index=new int[curNbOfPolyElem+1];
-         int *locConn=new int[arraySize];
-         int *fam=new int[curNbOfPolyElem];
--        MEDLoader::MEDConnOfOneElemType elem(INTERP_KERNEL::NORM_POLYGON,locConn,index,fam,curNbOfPolyElem,arraySize);
--        MEDpolygoneConnLire(fid,nommaa,index,curNbOfPolyElem+1,locConn,whichPolyEntity,MED_NOD);
--        MEDfamLire(fid,nommaa,fam,curNbOfPolyElem,MED_MAILLE,MED_POLYGONE);
-+        MEDLoader::MEDConnOfOneElemType elem(INTERP_KERNEL::NORM_POLYGON,locConn,index,fam,curNbOfPolyElem,(int)arraySize);
-+        MEDpolygoneConnLire(fid,nommaa,(med_int*)index,curNbOfPolyElem+1,(med_int*)locConn,whichPolyEntity,MED_NOD);
-+        MEDfamLire(fid,nommaa,(med_int*)fam,curNbOfPolyElem,MED_MAILLE,MED_POLYGONE);
-         conn.push_back(elem);
-       }
-     curNbOfPolyElem=MEDnEntMaa(fid,nommaa,MED_CONN,MED_MAILLE,MED_POLYEDRE,MED_NOD);
-@@ -604,8 +604,8 @@
-         int *indexFace=new int[indexFaceLgth];
-         int *locConn=new int[connFaceLgth];
-         int *fam=new int[curNbOfPolyElem];
--        MEDpolyedreConnLire(fid,nommaa,index,curNbOfPolyElem+1,indexFace,indexFaceLgth,locConn,MED_NOD);
--        MEDfamLire(fid,nommaa,fam,curNbOfPolyElem,MED_MAILLE,MED_POLYEDRE);
-+        MEDpolyedreConnLire(fid,nommaa,(med_int*)index,curNbOfPolyElem+1,(med_int*)indexFace,indexFaceLgth,(med_int*)locConn,MED_NOD);
-+        MEDfamLire(fid,nommaa,(med_int*)fam,curNbOfPolyElem,MED_MAILLE,MED_POLYEDRE);
-         int arraySize=connFaceLgth;
-         for(int i=0;i<curNbOfPolyElem;i++)
-           arraySize+=index[i+1]-index[i]-1;
-@@ -1051,11 +1051,11 @@
-           std::vector<int> medConnIndex2;
-           int nbOfElt=buildMEDSubConnectivityOfOneType(conn,connIndex,curType,medConn,medConnIndex,medConnIndex2);
-           if(curMedType!=MED_POLYGONE && curMedType!=MED_POLYEDRE)
--            MEDconnEcr(fid,maa,mesh->getMeshDimension(),&medConn[0],MED_FULL_INTERLACE,nbOfElt,MED_MAILLE,curMedType,MED_NOD);
-+            MEDconnEcr(fid,maa,mesh->getMeshDimension(),(med_int*)&medConn[0],MED_FULL_INTERLACE,nbOfElt,MED_MAILLE,curMedType,MED_NOD);
-           else
-             {
-               if(curMedType==MED_POLYGONE)
--                MEDpolygoneConnEcr(fid,maa,&medConnIndex[0],medConnIndex.size(),&medConn[0],MED_MAILLE,MED_NOD);
-+                MEDpolygoneConnEcr(fid,maa,(med_int*)&medConnIndex[0],medConnIndex.size(),(med_int*)&medConn[0],MED_MAILLE,MED_NOD);
-             }
-         }
-     }
---- src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx	2010-03-21 20:24:36.370545867 +0100
-+++ src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx	2010-03-21 20:30:11.329293723 +0100
-@@ -300,8 +300,8 @@
-   char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM];
-   char desc2[MED_TAILLE_DESC], maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM];
-   int dom1, dom2;
--  med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1);
--  med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2);
-+  med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1,(med_int*)&dom1, maa_dist1);
-+  med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2,(med_int*)&dom2, maa_dist2);
- 	CPPUNIT_ASSERT(strcmp(jn1,"joint_2")==0);
- 	CPPUNIT_ASSERT(strcmp(jn2,"joint_1")==0);
-   CPPUNIT_ASSERT_EQUAL(dom1,1);
-@@ -467,8 +467,8 @@
-   char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM];
-   char desc2[MED_TAILLE_DESC], maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM];
-   int dom1, dom2;
--  med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1);
--  med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2);
-+  med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1);
-+  med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2);
-   CPPUNIT_ASSERT_EQUAL(dom1,1);
-   CPPUNIT_ASSERT_EQUAL(dom2,0);
-   
-@@ -548,7 +548,7 @@
-   //testing cells global numbering
-   num = new med_2_3::med_int[2];
-   MEDglobalNumLire(fid1, meshname1, num, 2, typ_ent_loc, typ_geo_loc);
--  med_2_3::med_int* globcellref = new int[2];
-+  med_2_3::med_int* globcellref = new med_int[2];
-   globcellref[0]=1;
-   globcellref[1]=3;
-   
-@@ -773,10 +773,10 @@
-   char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM];
-   char desc2[MED_TAILLE_DESC];
-   char maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM];
--  //int dom1, dom2;
--  med_2_3::med_int dom1, dom2;
--  med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1);
--  med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2);
-+  int dom1, dom2;
-+//  med_2_3::med_int dom1, dom2;
-+  med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1);
-+  med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2);
-   CPPUNIT_ASSERT_EQUAL(dom1,1);
-   CPPUNIT_ASSERT_EQUAL(dom2,0);
- 
-@@ -1143,8 +1143,8 @@
-   char maa_dist1[MED_TAILLE_NOM+1], jn1[MED_TAILLE_NOM+1];
-   char desc2[MED_TAILLE_DESC+1], maa_dist2[MED_TAILLE_NOM+1], jn2[MED_TAILLE_NOM+1];
-   int dom1, dom2;
--  med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1);
--  med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2);
-+  med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1);
-+  med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2);
-   CPPUNIT_ASSERT_EQUAL(dom1,1);
-   CPPUNIT_ASSERT_EQUAL(dom2,0);
-   

diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-mpi.patch b/sci-misc/salome-med/files/salome-med-5.1.3-mpi.patch
deleted file mode 100644
index a4dc199..0000000
--- a/sci-misc/salome-med/files/salome-med-5.1.3-mpi.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/MxN_Mapping.hxx	2010-03-07 19:42:49.442822826 +0100
-+++ ./src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/MxN_Mapping.hxx	2010-03-07 19:43:38.710252330 +0100
-@@ -39,8 +39,8 @@
-     void addElementFromSource(int distant_proc, int distant_elem);
-     void prepareSendRecv();
-     void sendRecv(MEDCouplingFieldDouble& field);
--    void sendRecv(double* field, MEDCouplingFieldDouble& field) const ;
--    void reverseSendRecv(double* field, MEDCouplingFieldDouble& field) const ;
-+    void sendRecv(double* sendfield, MEDCouplingFieldDouble& field) const ;
-+    void reverseSendRecv(double* recvfield, MEDCouplingFieldDouble& field) const ;
-  
-     //
-     const std::vector<std::pair<int,int> >& getSendingIds() const { return _sending_ids; }

diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-qt4-path.patch b/sci-misc/salome-med/files/salome-med-5.1.3-qt4-path.patch
deleted file mode 100644
index 0737e67..0000000
--- a/sci-misc/salome-med/files/salome-med-5.1.3-qt4-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src5.1.3.orig/MED_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4	2010-03-06 21:00:58.281572535 +0100
-+++ src5.1.3/MED_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4	2010-03-06 21:03:34.110325466 +0100
-@@ -333,7 +333,7 @@
- 
-   LIBS_old=$LIBS
-   if test "x$QTDIR" = "x/usr" ; then
--    QT_LIB_DIR=""
-+    QT_LIB_DIR="-L/usr/lib${LIB_LOCATION_SUFFIX}/qt4"
-   elif test -d ${QTDIR}/lib; then
-     QT_LIB_DIR="-L$QTDIR/lib"
-   elif test -d ${QTDIR}/lib64; then

diff --git a/sci-misc/salome-med/files/salome-med-5.1.3-scotch.patch b/sci-misc/salome-med/files/salome-med-5.1.3-scotch.patch
deleted file mode 100644
index 0cfcaf7..0000000
--- a/sci-misc/salome-med/files/salome-med-5.1.3-scotch.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx	2008-12-10 10:14:43.000000000 +0100
-+++ src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx	2009-09-27 23:26:59.010112791 +0200
-@@ -19,7 +19,7 @@
- #include <cstdio>
- extern "C" {
- #define restrict
--#include "bin/scotch.h"
-+#include "scotch.h"
- }
- #include "MEDSPLITTER_Graph.hxx"
- #include "MEDSPLITTER_SCOTCHGraph.hxx"

diff --git a/sci-misc/salome-med/files/salome-med-5.1.4-check_metis.patch b/sci-misc/salome-med/files/salome-med-5.1.4-check_metis.patch
deleted file mode 100644
index a572ad6..0000000
--- a/sci-misc/salome-med/files/salome-med-5.1.4-check_metis.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- src5.1.4/MED_SRC_5.1.4/adm_local/unix/config_files/check_metis.m4.orig	2009-09-27 22:35:51.014701709 +0200
-+++ src5.1.4/MED_SRC_5.1.4/adm_local/unix/config_files/check_metis.m4	2009-09-27 22:41:46.471297649 +0200
-@@ -28,6 +28,10 @@
- 
- METIS_CPPFLAGS=""
- METIS_LIBSUFFIX=""
-+case "$build_cpu" in
-+x86_64*)  METIS_LIBSUFFIX="64" ;;
-+*)        METIS_LIBSUFFIX="" ;;
-+esac
- METIS_LIBS=""
- ENABLE_METIS="no"
- 
-@@ -43,8 +47,8 @@
- LIBS_old=$LIBS
- 
- if test "x${METISDIR}" != "x" ; then
--  METIS_CPPFLAGS="-DENABLE_METIS -I${METISDIR}/Lib"
--  METIS_LIBS="-L${METISDIR} -lmetis"
-+  METIS_CPPFLAGS="-DENABLE_METIS -I${METISDIR}/include/metis"
-+  METIS_LIBS="-L${METISDIR}/lib${METIS_LIBSUFFIX} -lmetis"
- fi
- 
- metis_ok=no
-@@ -57,7 +61,7 @@
- 
- metis_include_dir_ok=yes
- if test "x${METISDIR}" != "x" ; then
--  AC_CHECK_FILE(${METISDIR}/Lib/metis.h,
-+  AC_CHECK_FILE(${METISDIR}/include/metis/metis.h,
-                 metis_include_dir_ok=yes,
-                 metis_include_dir_ok=no)
- fi
-@@ -81,12 +85,12 @@
-   AC_CHECKING(for METIS binaries)
-   metis_lib_dir_ok=yes
-   if test "x${METISDIR}" != "x" ; then
--    AC_CHECK_FILE(${METISDIR}/libmetis.a,
-+    AC_CHECK_FILE(${METISDIR}/lib${METIS_LIBSUFFIX}/libmetis.a,
-                   metis_lib_dir_ok=yes,
-                   metis_lib_dir_ok=no)
-     if test "x${metis_lib_dir_ok}" = "xno" ; then
-       METIS_LIBSUFFIX=""
--      AC_CHECK_FILE(${METISDIR}/libmetis.a,
-+      AC_CHECK_FILE(${METISDIR}/lib${METIS_LIBSUFFIX}/libmetis.a,
-                     metis_lib_dir_ok=yes,
-                     metis_lib_dir_ok=no)
-     fi

diff --git a/sci-misc/salome-med/files/salome-med-5.1.4-check_scotch.patch b/sci-misc/salome-med/files/salome-med-5.1.4-check_scotch.patch
deleted file mode 100644
index bcf0509..0000000
--- a/sci-misc/salome-med/files/salome-med-5.1.4-check_scotch.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- src5.1.4/MED_SRC_5.1.4/adm_local/unix/config_files/check_scotch.m4.orig	2009-09-27 23:07:31.245061430 +0200
-+++ src5.1.4/MED_SRC_5.1.4/adm_local/unix/config_files/check_scotch.m4	2009-09-27 23:11:02.080868671 +0200
-@@ -28,6 +28,10 @@
- 
- SCOTCH_CPPFLAGS=""
- SCOTCH_LIBSUFFIX=""
-+case "$build_cpu" in
-+x86_64*)  SCOTCH_LIBSUFFIX="64" ;;
-+*)        SCOTCH_LIBSUFFIX="" ;;
-+esac
- SCOTCH_LIBS=""
- ENABLE_SCOTCH="no"
- 
-@@ -43,8 +47,8 @@
- LIBS_old=$LIBS
- 
- if test "x${SCOTCHDIR}" != "x" ; then
--  SCOTCH_CPPFLAGS="-DENABLE_SCOTCH -I${SCOTCHDIR}"
--  SCOTCH_LIBS="-L${SCOTCHDIR}/bin -lscotch -lscotcherr"
-+  SCOTCH_CPPFLAGS="-DENABLE_SCOTCH -I${SCOTCHDIR}/include/scotch"
-+  SCOTCH_LIBS="-L${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX} -lscotch -lscotcherr"
- fi
- 
- scotch_ok=no
-@@ -57,14 +61,14 @@
- 
- scotch_include_dir_ok=yes
- if test "x${SCOTCHDIR}" != "x" ; then
--  AC_CHECK_FILE(${SCOTCHDIR}/bin/scotch.h,
-+  AC_CHECK_FILE(${SCOTCHDIR}/include/scotch/scotch.h,
-                 scotch_include_dir_ok=yes,
-                 scotch_include_dir_ok=no)
- fi
- 
- if test "x${scotch_include_dir_ok}" = "xyes" ; then
-   AC_TRY_COMPILE([#include <stdio.h>
--		  #include <bin/scotch.h>],
-+		  #include <scotch.h>],
-                  [SCOTCH_Graph* graph;
- 		  SCOTCH_graphInit(graph)],
-                  scotch_headers_ok=yes,
-@@ -83,12 +87,12 @@
-   AC_CHECKING(for SCOTCH binaries)
-   scotch_lib_dir_ok=yes
-   if test "x${SCOTCHDIR}" != "x" ; then
--    AC_CHECK_FILE(${SCOTCHDIR}/bin/libscotch.a,
-+    AC_CHECK_FILE(${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX}/libscotch.a,
-                   scotch_lib_dir_ok=yes,
-                   scotch_lib_dir_ok=no)
-     if test "x${scotch_lib_dir_ok}" = "xno" ; then
-       SCOTCH_LIBSUFFIX=""
--      AC_CHECK_FILE(${SCOTCHDIR}/bin/libscotch.a,
-+      AC_CHECK_FILE(${SCOTCHDIR}/lib${SCOTCH_LIBSUFFIX}/libscotch.a,
-                     scotch_lib_dir_ok=yes,
-                     scotch_lib_dir_ok=no)
-     fi
-@@ -96,7 +100,7 @@
-   if test "x${scotch_lib_dir_ok}" = "xyes" ; then
-     LIBS="${LIBS_old} ${SCOTCH_LIBS}"
-     AC_TRY_LINK([#include <stdio.h>
--		#include <bin/scotch.h>],
-+		#include <scotch.h>],
-                   [SCOTCH_Graph* graph;
- 		  SCOTCH_graphInit(graph)],
-                 scotch_binaries_ok=yes,
-@@ -105,7 +109,7 @@
-       SCOTCH_LIBSUFFIX=""
-       LIBS="${LIBS_old} ${SCOTCH_LIBS} "
-       AC_TRY_LINK([#include <stdio.h>
--		   #include <bin/scotch.h>],
-+		   #include <scotch.h>],
-                   [SCOTCH_Graph* graph;
- 		  SCOTCH_graphInit(graph)],
-                   scotch_binaries_ok=yes,

diff --git a/sci-misc/salome-med/files/salome-med-5.1.4-gcc.patch b/sci-misc/salome-med/files/salome-med-5.1.4-gcc.patch
deleted file mode 100644
index 102cb91..0000000
--- a/sci-misc/salome-med/files/salome-med-5.1.4-gcc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src5.1.4.orig/MED_SRC_5.1.4/src/INTERPOLATION/create_mesh_interpolation.c	2010-03-13 13:14:50.721209673 +0100
-+++ ./src5.1.4/MED_SRC_5.1.4/src/INTERPOLATION/create_mesh_interpolation.c	2010-03-13 13:15:35.420479255 +0100
-@@ -21,7 +21,7 @@
- //
- #include <med.h>
- #include <string.h>
--
-+#include <stdlib.h>
- 
- /*****************************************************************************************************/
- 

diff --git a/sci-misc/salome-med/files/salome-med-5.1.4-med_int.patch b/sci-misc/salome-med/files/salome-med-5.1.4-med_int.patch
deleted file mode 100644
index 6db1510..0000000
--- a/sci-misc/salome-med/files/salome-med-5.1.4-med_int.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx
---- src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx	2010-03-15 17:07:56.860301255 +0100
-+++ src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/MEDSPLITTER_MESHCollectionDriver.cxx	2010-03-15 17:33:59.740251721 +0100
-@@ -189,7 +189,7 @@
-         
-       int ncorr = med_2_3::MEDjointInfo(fid,meshname, ijoint+1, name, 
-                 joint_description,
--                &distant, name_distant);
-+                (med_int*)&distant, name_distant);
-   
-       for (int ic=0; ic<ncorr; ic++)
-         {
-@@ -209,7 +209,7 @@
-       {
-       
-         med_2_3::MEDjointLire(fid, meshname, name,
--            node_corresp,ncouples,
-+            (med_int*)node_corresp,ncouples,
-             cor_typent_local,  cor_typgeo_local,
-             cor_typent_dist, cor_typgeo_dist
-             );
-@@ -247,7 +247,7 @@
-         if (!m_collection->isDimensionOK(type,m_collection->getMeshDimension())) continue;
-         int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_CELL,type);
-         if (ntype==0) continue;
--        med_2_3::MEDglobalNumLire(fid,meshname, array+offset, ntype,
-+        med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array+offset, ntype,
-                 med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type);
-         offset+=ntype;
-       }
-@@ -259,7 +259,7 @@
-   int nnode= (m_collection->getMesh())[idomain]->getNumberOfNodes();
-   {
-   int* array=new int[nnode];
--  med_2_3::MEDglobalNumLire(fid,meshname, array, nnode,
-+  med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array, nnode,
-           med_2_3::MED_NOEUD, med_2_3::MED_POINT1); 
-   nodeglobal[idomain]=array;
-   } 
-@@ -280,7 +280,7 @@
-     
-     int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_FACE,type);
-     if (ntype==0) continue;
--    med_2_3::MEDglobalNumLire(fid,meshname, array+offset, ntype,
-+    med_2_3::MEDglobalNumLire(fid,meshname, (med_int*)array+offset, ntype,
-             med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type);
-     offset+=ntype;
-         }
-@@ -348,7 +348,7 @@
-              jointSort(node_corresp, nbnodes, false);
-           
-         error=
--    med_2_3::MEDjointEcr(fid, mesh_name, joint_name, node_corresp, nbnodes,
-+    med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)node_corresp, nbnodes,
-              med_2_3::MED_NOEUD, med_2_3::MED_POINT1,med_2_3::MED_NOEUD, med_2_3::MED_POINT1);
-         if (error==-1) cout << "erreur creation de joint "<<endl;
-         
-@@ -388,7 +388,7 @@
- 					if (!m_collection->isDimensionOK(type,m_collection->getMeshDimension())) continue;
- 					int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(MED_EN::MED_CELL,type);
- 					if (ntype==0) continue;
--					med_2_3::MEDglobalNumEcr(fid,meshchar, array+offset, ntype,
-+					med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array+offset, ntype,
- 																	 med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type);
- 					offset+=ntype;
-           
-@@ -426,7 +426,7 @@
- 					
- 					int ntype = (m_collection->getMesh())[idomain]->getNumberOfElementsWithPoly(constituent_entity,type);
- 					if (ntype==0) continue;
--					med_2_3::MEDglobalNumEcr(fid,meshchar, array+offset, ntype,
-+					med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array+offset, ntype,
- 																	 med_2_3::MED_MAILLE, (med_2_3::med_geometrie_element)type);
- 					
- 					offset+=ntype;
-@@ -443,7 +443,7 @@
-       
- 			m_collection->getTopology()->getNodeList(idomain,array);
- 			
--			med_2_3::MEDglobalNumEcr(fid,meshchar, array, nnode,
-+			med_2_3::MEDglobalNumEcr(fid,meshchar, (med_int*)array, nnode,
- 															 med_2_3::MED_NOEUD, med_2_3::MED_POINT1);
- 			
- 			delete[] array;
-@@ -507,7 +507,7 @@
- 							corresp.push_back(value[icol]);
- 						}
- 				int size_joint = corresp.size()/2;
--				med_2_3::MEDjointEcr(fid, mesh_name, joint_name, &corresp[0], 
-+				med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)&corresp[0], 
- 														 size_joint, med_2_3::MED_MAILLE,
- 														 (med_2_3::med_geometrie_element)local_type    ,med_2_3::MED_MAILLE, 
- 														 (med_2_3::med_geometrie_element)distant_type    );
-@@ -541,7 +541,7 @@
- 					med_2_3::med_geometrie_element distant_geo_elem=(med_2_3::med_geometrie_element)iter->first.second;
- 					int size_joint=size/2;
- 					//med_2_3::med_err error =
--					med_2_3::MEDjointEcr(fid, mesh_name, joint_name, corresp, size_joint, med_2_3::MED_MAILLE,
-+					med_2_3::MEDjointEcr(fid, mesh_name, joint_name, (med_int*)corresp, size_joint, med_2_3::MED_MAILLE,
- 															 local_geo_elem,med_2_3::MED_MAILLE, distant_geo_elem);
- 					delete[] corresp;
- 				}
-diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx src5.1.3/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx
---- src5.1.3.orig/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx	2010-03-15 17:07:56.624073897 +0100
-+++ src5.1.3/MED_SRC_5.1.3/src/MULTIPR/MULTIPR_Globals.hxx	2010-03-15 17:42:31.140322486 +0100
-@@ -34,6 +34,7 @@
- 
- #include <vector>
- #include <set>
-+#include <med.h>
- 
- //*****************************************************************************
- // Some useful macros
-@@ -46,7 +47,7 @@
-  * Pair of index.
-  * See definition of GaussIndexList.
-  */
--typedef std::pair < std::set<int>*, std::set<int> > IndexPair;
-+typedef std::pair < std::set<med_int>*, std::set<med_int> > IndexPair;
- 
- /**
-  * List of gauss index for optimized domain split.
-diff -ur src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx
---- src5.1.3.orig/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx	2010-03-15 17:07:55.512824126 +0100
-+++ src5.1.3/MED_SRC_5.1.3/src/ParaMEDMEM/MEDLoader/MEDLoader.cxx	2010-03-15 17:23:57.950316309 +0100
-@@ -169,11 +169,11 @@
-       {
-         int ngro=MEDnGroupe(fid,(char *)meshName,i+1);
-         med_int natt=MEDnAttribut(fid,(char *)meshName,i+1);
--        med_int *attide=new int[natt];
--        med_int *attval=new int[natt];
-+        med_int *attide=new med_int[natt];
-+        med_int *attval=new med_int[natt];
-         char *attdes=new char[MED_TAILLE_DESC*natt+1];
-         char *gro=new char[MED_TAILLE_LNOM*ngro+1];
--        MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro);
-+        MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro);
-         std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam));
-         ret[i]=cur;
-         delete [] attdes;
-@@ -196,11 +196,11 @@
-       {
-         int ngro=MEDnGroupe(fid,(char *)meshName,i+1);
-         med_int natt=MEDnAttribut(fid,(char *)meshName,i+1);
--        med_int *attide=new int[natt];
--        med_int *attval=new int[natt];
-+        med_int *attide=new med_int[natt];
-+        med_int *attval=new med_int[natt];
-         char *attdes=new char[MED_TAILLE_DESC*natt+1];
-         char *gro=new char[MED_TAILLE_LNOM*ngro+1];
--        MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro);
-+        MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro);
- 	for(int j=0;j<ngro;j++)
- 	  {
- 	    std::string cur=buildStringFromFortran(gro+j*MED_TAILLE_LNOM,MED_TAILLE_LNOM);
-@@ -446,11 +446,11 @@
-       {
-         int ngro=MEDnGroupe(fid,(char *)meshName,i+1);
-         med_int natt=MEDnAttribut(fid,(char *)meshName,i+1);
--        med_int *attide=new int[natt];
--        med_int *attval=new int[natt];
-+        med_int *attide=new med_int[natt];
-+        med_int *attval=new med_int[natt];
-         char *attdes=new char[MED_TAILLE_DESC*natt+1];
-         char *gro=new char[MED_TAILLE_LNOM*ngro+1];
--        MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro);
-+        MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro);
-         std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam));
- 	if(std::find(fams.begin(),fams.end(),cur)!=fams.end())
- 	  ret.push_back(numfam);
-@@ -474,11 +474,11 @@
-       {
-         int ngro=MEDnGroupe(fid,(char *)meshName,i+1);
-         med_int natt=MEDnAttribut(fid,(char *)meshName,i+1);
--        med_int *attide=new int[natt];
--        med_int *attval=new int[natt];
-+        med_int *attide=new med_int[natt];
-+        med_int *attval=new med_int[natt];
-         char *attdes=new char[MED_TAILLE_DESC*natt+1];
-         char *gro=new char[MED_TAILLE_LNOM*ngro+1];
--        MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,&ngro);
-+        MEDfamInfo(fid,(char *)meshName,i+1,nomfam,&numfam,attide,attval,attdes,&natt,gro,(med_int*)&ngro);
-         std::string cur=buildStringFromFortran(nomfam,sizeof(nomfam));
- 	for(int j=0;j<ngro;j++)
- 	  {
-@@ -566,12 +566,12 @@
-             MEDLoader::MEDConnOfOneElemType elem(typmai2[i],connTab,0,fam,curNbOfElem,-1);
-             int *tmp=new int[curNbOfElem];
-             char *noms=new char[MED_TAILLE_PNOM*curNbOfElem+1];
--            MEDelementsLire(fid,nommaa,Mdim,connTab,MED_FULL_INTERLACE,noms,&inoele,tmp,&inuele,fam,curNbOfElem,whichEntity,curMedType,MED_NOD);
-+            MEDelementsLire(fid,nommaa,Mdim,(med_int*)connTab,MED_FULL_INTERLACE,noms,&inoele,(med_int*)tmp,&inuele,(med_int*)fam,curNbOfElem,whichEntity,curMedType,MED_NOD);
-             delete [] tmp;
-             delete [] noms;
-             //trying to read global numbering
-             int *globArr=new int[curNbOfElem];
--            if(MEDglobalNumLire(fid,nommaa,globArr,curNbOfElem,whichEntity,curMedType)==0)
-+            if(MEDglobalNumLire(fid,nommaa,(med_int*)globArr,curNbOfElem,whichEntity,curMedType)==0)
-               elem.setGlobal(globArr);
-             else
-               delete [] globArr;
-@@ -590,9 +590,9 @@
-         int *index=new int[curNbOfPolyElem+1];
-         int *locConn=new int[arraySize];
-         int *fam=new int[curNbOfPolyElem];
--        MEDLoader::MEDConnOfOneElemType elem(INTERP_KERNEL::NORM_POLYGON,locConn,index,fam,curNbOfPolyElem,arraySize);
--        MEDpolygoneConnLire(fid,nommaa,index,curNbOfPolyElem+1,locConn,whichPolyEntity,MED_NOD);
--        MEDfamLire(fid,nommaa,fam,curNbOfPolyElem,MED_MAILLE,MED_POLYGONE);
-+        MEDLoader::MEDConnOfOneElemType elem(INTERP_KERNEL::NORM_POLYGON,locConn,index,fam,curNbOfPolyElem,(int)arraySize);
-+        MEDpolygoneConnLire(fid,nommaa,(med_int*)index,curNbOfPolyElem+1,(med_int*)locConn,whichPolyEntity,MED_NOD);
-+        MEDfamLire(fid,nommaa,(med_int*)fam,curNbOfPolyElem,MED_MAILLE,MED_POLYGONE);
-         conn.push_back(elem);
-       }
-     curNbOfPolyElem=MEDnEntMaa(fid,nommaa,MED_CONN,MED_MAILLE,MED_POLYEDRE,MED_NOD);
-@@ -604,8 +604,8 @@
-         int *indexFace=new int[indexFaceLgth];
-         int *locConn=new int[connFaceLgth];
-         int *fam=new int[curNbOfPolyElem];
--        MEDpolyedreConnLire(fid,nommaa,index,curNbOfPolyElem+1,indexFace,indexFaceLgth,locConn,MED_NOD);
--        MEDfamLire(fid,nommaa,fam,curNbOfPolyElem,MED_MAILLE,MED_POLYEDRE);
-+        MEDpolyedreConnLire(fid,nommaa,(med_int*)index,curNbOfPolyElem+1,(med_int*)indexFace,indexFaceLgth,(med_int*)locConn,MED_NOD);
-+        MEDfamLire(fid,nommaa,(med_int*)fam,curNbOfPolyElem,MED_MAILLE,MED_POLYEDRE);
-         int arraySize=connFaceLgth;
-         for(int i=0;i<curNbOfPolyElem;i++)
-           arraySize+=index[i+1]-index[i]-1;
-@@ -1051,11 +1051,11 @@
-           std::vector<int> medConnIndex2;
-           int nbOfElt=buildMEDSubConnectivityOfOneType(conn,connIndex,curType,medConn,medConnIndex,medConnIndex2);
-           if(curMedType!=MED_POLYGONE && curMedType!=MED_POLYEDRE)
--            MEDconnEcr(fid,maa,mesh->getMeshDimension(),&medConn[0],MED_FULL_INTERLACE,nbOfElt,MED_MAILLE,curMedType,MED_NOD);
-+            MEDconnEcr(fid,maa,mesh->getMeshDimension(),(med_int*)&medConn[0],MED_FULL_INTERLACE,nbOfElt,MED_MAILLE,curMedType,MED_NOD);
-           else
-             {
-               if(curMedType==MED_POLYGONE)
--                MEDpolygoneConnEcr(fid,maa,&medConnIndex[0],medConnIndex.size(),&medConn[0],MED_MAILLE,MED_NOD);
-+                MEDpolygoneConnEcr(fid,maa,(med_int*)&medConnIndex[0],medConnIndex.size(),(med_int*)&medConn[0],MED_MAILLE,MED_NOD);
-             }
-         }
-     }
---- src5.1.3.orig/MED_SRC_5.1.3/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx	2010-03-21 20:24:36.370545867 +0100
-+++ src5.1.3/MED_SRC_5.1.3/src/MEDSPLITTER/Test/MEDSPLITTERTest_MESHCollection.cxx	2010-03-21 20:30:11.329293723 +0100
-@@ -300,8 +300,8 @@
-   char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM];
-   char desc2[MED_TAILLE_DESC], maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM];
-   int dom1, dom2;
--  med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1);
--  med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2);
-+  med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1,(med_int*)&dom1, maa_dist1);
-+  med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2,(med_int*)&dom2, maa_dist2);
- 	CPPUNIT_ASSERT(strcmp(jn1,"joint_2")==0);
- 	CPPUNIT_ASSERT(strcmp(jn2,"joint_1")==0);
-   CPPUNIT_ASSERT_EQUAL(dom1,1);
-@@ -467,8 +467,8 @@
-   char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM];
-   char desc2[MED_TAILLE_DESC], maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM];
-   int dom1, dom2;
--  med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1);
--  med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2);
-+  med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1);
-+  med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2);
-   CPPUNIT_ASSERT_EQUAL(dom1,1);
-   CPPUNIT_ASSERT_EQUAL(dom2,0);
-   
-@@ -548,7 +548,7 @@
-   //testing cells global numbering
-   num = new med_2_3::med_int[2];
-   MEDglobalNumLire(fid1, meshname1, num, 2, typ_ent_loc, typ_geo_loc);
--  med_2_3::med_int* globcellref = new int[2];
-+  med_2_3::med_int* globcellref = new med_int[2];
-   globcellref[0]=1;
-   globcellref[1]=3;
-   
-@@ -773,10 +773,10 @@
-   char maa_dist1[MED_TAILLE_NOM], jn1[MED_TAILLE_NOM];
-   char desc2[MED_TAILLE_DESC];
-   char maa_dist2[MED_TAILLE_NOM], jn2[MED_TAILLE_NOM];
--  //int dom1, dom2;
--  med_2_3::med_int dom1, dom2;
--  med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1);
--  med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2);
-+  int dom1, dom2;
-+//  med_2_3::med_int dom1, dom2;
-+  med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1);
-+  med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2);
-   CPPUNIT_ASSERT_EQUAL(dom1,1);
-   CPPUNIT_ASSERT_EQUAL(dom2,0);
- 
-@@ -1143,8 +1143,8 @@
-   char maa_dist1[MED_TAILLE_NOM+1], jn1[MED_TAILLE_NOM+1];
-   char desc2[MED_TAILLE_DESC+1], maa_dist2[MED_TAILLE_NOM+1], jn2[MED_TAILLE_NOM+1];
-   int dom1, dom2;
--  med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, &dom1, maa_dist1);
--  med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, &dom2, maa_dist2);
-+  med_2_3::MEDjointInfo(fid1, meshname1, 1, jn1, desc1, (med_int*)&dom1, maa_dist1);
-+  med_2_3::MEDjointInfo(fid2, meshname2, 1, jn2, desc2, (med_int*)&dom2, maa_dist2);
-   CPPUNIT_ASSERT_EQUAL(dom1,1);
-   CPPUNIT_ASSERT_EQUAL(dom2,0);
-   

diff --git a/sci-misc/salome-med/files/salome-med-5.1.4-scotch.patch b/sci-misc/salome-med/files/salome-med-5.1.4-scotch.patch
deleted file mode 100644
index 4045559..0000000
--- a/sci-misc/salome-med/files/salome-med-5.1.4-scotch.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src5.1.4.orig/MED_SRC_5.1.4/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx	2008-12-10 10:14:43.000000000 +0100
-+++ src5.1.4/MED_SRC_5.1.4/src/MEDSPLITTER/MEDSPLITTER_SCOTCHGraph.cxx	2009-09-27 23:26:59.010112791 +0200
-@@ -19,7 +19,7 @@
- #include <cstdio>
- extern "C" {
- #define restrict
--#include "bin/scotch.h"
-+#include "scotch.h"
- }
- #include "MEDSPLITTER_Graph.hxx"
- #include "MEDSPLITTER_SCOTCHGraph.hxx"

diff --git a/sci-misc/salome-med/metadata.xml b/sci-misc/salome-med/metadata.xml
deleted file mode 100644
index 25c2ffe..0000000
--- a/sci-misc/salome-med/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci</herd>
-  <use>
-    <flag name="metis">Add support for metis</flag>
-    <flag name="scotch">Add support for scotch</flag>
-  </use>
-</pkgmetadata>

diff --git a/sci-misc/salome-med/salome-med-5.1.3.ebuild b/sci-misc/salome-med/salome-med-5.1.3.ebuild
deleted file mode 100644
index 23fb90f..0000000
--- a/sci-misc/salome-med/salome-med-5.1.3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils flag-o-matic python
-
-DESCRIPTION="The Open Source Integration Platform for Numerical Simulation - MED Component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc metis mpi opengl scotch"
-
-RDEPEND="
-	>=sci-misc/salome-kernel-${PV}
-	>=sci-misc/salome-gui-${PV}
-	>=dev-qt/qtcore-4.5.2
-	>=dev-qt/qtgui-4.5.2
-	>=dev-qt/qtopengl-4.5.2
-	>=dev-libs/boost-1.40.0
-	>=sci-libs/opencascade-6.3
-	>=sci-libs/med-2.3.5
-	>=sci-libs/vtk-5.0[python]
-	debug?  ( dev-util/cppunit )
-	metis?	 ( >=sci-libs/metis-4.0 )
-	mpi? ( || (
-			sys-cluster/openmpi[cxx]
-			sys-cluster/mpich2[cxx]
-		) )
-	opengl? ( virtual/opengl )
-	scotch? ( >=sci-libs/scotch-4.0 )"
-
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	dev-libs/libxml2:2"
-
-MODULE_NAME="MED"
-S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-MED_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-
-pkg_setup() {
-	[[ $(python_get_version) > 2.4 ]] && \
-		ewarn "Python 2.4 is highly recommended for Salome..."
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-qt4-path.patch
-	epatch "${FILESDIR}"/${P}-gcc.patch
-	use mpi && epatch "${FILESDIR}"/${P}-mpi.patch
-	use metis && epatch "${FILESDIR}"/${P}-check_metis.patch
-	if use scotch; then
-		epatch "${FILESDIR}"/${P}-check_scotch.patch
-		epatch "${FILESDIR}"/${P}-scotch.patch
-	fi
-	use amd64 && epatch "${FILESDIR}"/${P}-med_int.patch
-
-	rm -r -f autom4te.cache
-	./clean_configure
-	./build_configure
-}
-
-src_configure() {
-	local myconf=""
-	local vtk_suffix=""
-
-	has_version ">=sci-libs/vtk-5.0" && vtk_suffix="-5.0"
-	has_version ">=sci-libs/vtk-5.2" && vtk_suffix="-5.2"
-	has_version ">=sci-libs/vtk-5.4" && vtk_suffix="-5.4"
-
-#   --without-mpi does not disable mpi support, just omit it to disable
-	if use mpi; then
-		if has_version ">=sys-cluster/openmpi-1.2.9"; then
-			myconf="${myconf} --with-mpi --with-openmpi"
-		elif has_version ">=sys-cluster/mpich2-1.0.8"; then
-			myconf="${myconf} --with-mpi --with-mpich"
-		fi
-	fi
-
-	use amd64 && append-flags -DHAVE_F77INT64
-
-	econf --prefix=${INSTALL_DIR} \
-	      --datadir=${INSTALL_DIR}/share/salome \
-	      --docdir=${INSTALL_DIR}/doc/salome \
-	      --infodir=${INSTALL_DIR}/share/info \
-	      --libdir=${INSTALL_DIR}/$(get_libdir)/salome \
-	      --with-python-site=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-		  --with-qt=/usr \
-		  --with-vtk=${VTKHOME} \
-		  --with-vtk-version=${vtk_suffix} \
-	      ${myconf} \
-	      $(use_enable debug ) \
-	      $(use_enable !debug production ) \
-	      $(use_with debug cppunit_inc /usr/include/cppunit) \
-	      $(use_with opengl opengl /usr) \
-	      $(use_with metis metis /usr) \
-	      $(use_with scotch scotch /usr) \
-	|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
-
-	echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
-	echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
-	echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
-	echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome" >> ./90${P}
-	doenvd 90${P}
-	rm adm_local/Makefile
-	insinto "${INSTALL_DIR}"
-	doins -r adm_local
-
-	use doc && dodoc INSTALL README
-}
-
-pkg_postinst() {
-	elog "Run \`env-update && source /etc/profile\`"
-	elog "now to set up the correct paths."
-	elog ""
-}

diff --git a/sci-misc/salome-med/salome-med-5.1.4.ebuild b/sci-misc/salome-med/salome-med-5.1.4.ebuild
deleted file mode 100644
index 5937eb0..0000000
--- a/sci-misc/salome-med/salome-med-5.1.4.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils flag-o-matic python
-
-DESCRIPTION="The Open Source Integration Platform for Numerical Simulation - MED Component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc metis mpi opengl scotch"
-
-RDEPEND="
-	>=sci-misc/salome-kernel-${PV}
-	>=sci-misc/salome-gui-${PV}
-	>=dev-qt/qtcore-4.5.2
-	>=dev-qt/qtgui-4.5.2
-	>=dev-qt/qtopengl-4.5.2
-	>=dev-libs/boost-1.40.0
-	>=sci-libs/opencascade-6.3
-	>=sci-libs/med-2.3.5
-	>=sci-libs/vtk-5.0[python]
-	debug?  ( dev-util/cppunit )
-	metis?	 ( >=sci-libs/metis-4.0 )
-	mpi? ( || (
-			sys-cluster/openmpi[cxx]
-			sys-cluster/mpich2[cxx]
-		) )
-	opengl? ( virtual/opengl )
-	scotch? ( >=sci-libs/scotch-4.0 )"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	dev-libs/libxml2:2"
-
-MODULE_NAME="MED"
-S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-MED_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-
-pkg_setup() {
-	[[ $(python_get_version) > 2.4 ]] && \
-		ewarn "Python 2.4 is highly recommended for Salome..."
-	python_set_active_version 2
-	append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc.patch
-	use mpi && epatch "${FILESDIR}"/${P}-mpi.patch
-	use metis && epatch "${FILESDIR}"/${P}-check_metis.patch
-	if use scotch; then
-		epatch "${FILESDIR}"/${P}-check_scotch.patch
-		epatch "${FILESDIR}"/${P}-scotch.patch
-	fi
-	use amd64 && epatch "${FILESDIR}"/${P}-med_int.patch
-
-	rm -r -f autom4te.cache
-	./clean_configure
-	./build_configure
-}
-
-src_configure() {
-	local myconf=""
-	local vtk_suffix=""
-
-	has_version ">=sci-libs/vtk-5.0" && vtk_suffix="-5.0"
-	has_version ">=sci-libs/vtk-5.2" && vtk_suffix="-5.2"
-	has_version ">=sci-libs/vtk-5.4" && vtk_suffix="-5.4"
-	has_version ">=sci-libs/vtk-5.6" && vtk_suffix="-5.6"
-
-#   --without-mpi does not disable mpi support, just omit it to disable
-	if use mpi; then
-		if has_version ">=sys-cluster/openmpi-1.2.9"; then
-			myconf="${myconf} --with-mpi --with-openmpi"
-		elif has_version ">=sys-cluster/mpich2-1.0.8"; then
-			myconf="${myconf} --with-mpi --with-mpich"
-		fi
-	fi
-
-	use amd64 && append-flags -DHAVE_F77INT64
-
-	econf --prefix=${INSTALL_DIR} \
-	      --datadir=${INSTALL_DIR}/share/salome \
-	      --docdir=${INSTALL_DIR}/doc/salome \
-	      --infodir=${INSTALL_DIR}/share/info \
-	      --libdir=${INSTALL_DIR}/$(get_libdir)/salome \
-	      --with-python-site=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-		  --with-qt=/usr \
-		  --with-vtk=${VTKHOME} \
-		  --with-vtk-version=${vtk_suffix} \
-	      ${myconf} \
-	      $(use_enable debug ) \
-	      $(use_enable !debug production ) \
-	      $(use_with debug cppunit_inc /usr/include/cppunit) \
-	      $(use_with opengl opengl /usr) \
-	      $(use_with metis metis /usr) \
-	      $(use_with scotch scotch /usr) \
-	|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
-
-	echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
-	echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
-	echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
-	echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome" >> ./90${P}
-	doenvd 90${P}
-	rm adm_local/Makefile
-	insinto "${INSTALL_DIR}"
-	doins -r adm_local
-
-	use doc && dodoc INSTALL README
-}
-
-pkg_postinst() {
-	elog "Run \`env-update && source /etc/profile\`"
-	elog "now to set up the correct paths."
-	elog ""
-}

diff --git a/sci-misc/salome-meta/ChangeLog b/sci-misc/salome-meta/ChangeLog
deleted file mode 100644
index 39778a0..0000000
--- a/sci-misc/salome-meta/ChangeLog
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Id$
-21 May 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  Initial import.
-  +salome-meta-3.2.6.ebuild
-  A major thank to Francois Dorin <f.dorin@××××.fr>, Jon Hood <squinky86@×××××.com>, Dewald Pietersen <dewald.pieterse@×××××.com>, <etienne.lorriaux@×××××.com> and Richard Westwell <garlicbread@××××××××.com> for their respective contributions and feedback. Without you guys, the Salome ebuilds would not exist today. Thanks!
-  See bug #155974 for more info
-
-*salome-meta-5.1.4 (27 Oct 2010)
-
-  27 Oct 2010; Thomas Kahle <tomka@g.o> +salome-meta-5.1.4.ebuild:
-  Bump to 5.1.4, ebuild by Michael Riss in bug 330303
-
-*salome-meta-5.1.3 (14 Mar 2010)
-
-  14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@×××××.com>
-  -salome-meta-3.2.6.ebuild, +salome-meta-5.1.3.ebuild:
-  Version bump 5.1.3 + removed broken 3.2.6
-
-  27 Aug 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-meta-3.2.6.ebuild, -Changelog, +metadata.xml:
-  Fixed repoman errors, removed hardcode
-

diff --git a/sci-misc/salome-meta/metadata.xml b/sci-misc/salome-meta/metadata.xml
deleted file mode 100644
index b229aec..0000000
--- a/sci-misc/salome-meta/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci</herd>
-</pkgmetadata>

diff --git a/sci-misc/salome-meta/salome-meta-5.1.3.ebuild b/sci-misc/salome-meta/salome-meta-5.1.3.ebuild
deleted file mode 100644
index b7a34ba..0000000
--- a/sci-misc/salome-meta/salome-meta-5.1.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation"
-HOMEPAGE="http://www.salome-platform.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug mpi"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="=sci-misc/salome-kernel-5.1.3*[debug?,mpi?]
-		 =sci-misc/salome-gui-5.1.3*[debug?]
-		 =sci-misc/salome-med-5.1.3*[debug?,mpi?]
-		 =sci-misc/salome-geom-5.1.3*[debug?]
-		 =sci-misc/salome-smesh-5.1.3*[debug?]
-		 =sci-misc/salome-visu-5.1.3*[debug?]
-		 =sci-misc/salome-component-5.1.3*[debug?,mpi?]
-		 =sci-misc/salome-yacs-5.1.3*[debug?]
-		 =sci-misc/salome-pycalculator-5.1.3*[debug?]"
-
-DEPEND="${RDEPEND}"
-
-pkg_postinst() {
-	einfo "Salome ebuild needs further development. Please inform any problems or improvements in http://bugs.gentoo.org/show_bug.cgi?id=155974"
-}

diff --git a/sci-misc/salome-meta/salome-meta-5.1.4.ebuild b/sci-misc/salome-meta/salome-meta-5.1.4.ebuild
deleted file mode 100644
index 39f6dcf..0000000
--- a/sci-misc/salome-meta/salome-meta-5.1.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation"
-HOMEPAGE="http://www.salome-platform.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug mpi"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="=sci-misc/salome-kernel-5.1.4*[debug?,mpi?]
-		 =sci-misc/salome-gui-5.1.4*[debug?]
-		 =sci-misc/salome-med-5.1.4*[debug?,mpi?]
-		 =sci-misc/salome-geom-5.1.4*[debug?]
-		 =sci-misc/salome-smesh-5.1.4*[debug?]
-		 =sci-misc/salome-visu-5.1.4*[debug?]
-		 =sci-misc/salome-component-5.1.4*[debug?,mpi?]
-		 =sci-misc/salome-yacs-5.1.4*[debug?]
-		 =sci-misc/salome-pycalculator-5.1.4*[debug?]"
-
-DEPEND="${RDEPEND}"
-
-pkg_postinst() {
-	einfo "Salome ebuild needs further development. Please inform any problems or improvements in http://bugs.gentoo.org/show_bug.cgi?id=155974"
-}

diff --git a/sci-misc/salome-pycalculator/ChangeLog b/sci-misc/salome-pycalculator/ChangeLog
deleted file mode 100644
index 4297e79..0000000
--- a/sci-misc/salome-pycalculator/ChangeLog
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Id$
-  10 Feb 2012; Alexey Shvetsov <alexxy@g.o>
-  salome-pycalculator-5.1.3.ebuild, salome-pycalculator-5.1.4.ebuild:
-  [sci-misc/salome*] Fix python depend
-
-21 May 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  Initial import.
-  +salome-pycalculator-3.2.6.ebuild, +salome-pycalculator-3.2.6.patch
-  A major thank to Francois Dorin <f.dorin@××××.fr>, Jon Hood <squinky86@×××××.com>, Dewald Pietersen <dewald.pieterse@×××××.com>, <etienne.lorriaux@×××××.com> and Richard Westwell <garlicbread@××××××××.com> for their respective contributions and feedback. Without you guys, the Salome ebuilds would not exist today. Thanks!
-  See bug #155974 for more info
-
-*salome-pycalculator-5.1.4 (27 Oct 2010)
-
-  27 Oct 2010; Thomas Kahle <tomka@g.o>
-  +salome-pycalculator-5.1.4.ebuild:
-  Bump to 5.1.4, ebuild by Michael Riss in bug 330303
-
-  29 Jun 2010; Justin Lecher <jlec@g.o>
-  salome-pycalculator-5.1.3.ebuild:
-  Python ABI fixes
-
-  04 Apr 2010; Etienne Lorriaux <etienne.lorriaux@×××××.com>
-  salome-pycalculator-5.1.3.ebuild:
-  changed fetch URL + cleaning
-
-*salome-pycalculator-5.1.3 (14 Mar 2010)
-
-  14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@×××××.com>
-  -salome-pycalculator-3.2.6.ebuild, -files/salome-pycalculator-3.2.6.patch,
-  +salome-pycalculator-5.1.3.ebuild:
-  Version bump 5.1.3 + removed broken 3.2.6
-
-  04 Sep 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-pycalculator-3.2.6.ebuild:
-  removed omniorb* dependencies, as they are already in salome-kernel
-
-  27 Aug 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-pycalculator-3.2.6.ebuild, -Changelog, +metadata.xml:
-  Removed fetch restriction, removed hardcode
-

diff --git a/sci-misc/salome-pycalculator/metadata.xml b/sci-misc/salome-pycalculator/metadata.xml
deleted file mode 100644
index b229aec..0000000
--- a/sci-misc/salome-pycalculator/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci</herd>
-</pkgmetadata>

diff --git a/sci-misc/salome-pycalculator/salome-pycalculator-5.1.3.ebuild b/sci-misc/salome-pycalculator/salome-pycalculator-5.1.3.ebuild
deleted file mode 100644
index 29dbe5e..0000000
--- a/sci-misc/salome-pycalculator/salome-pycalculator-5.1.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils python
-
-DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. PYCALCULATOR Component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc"
-
-RDEPEND="debug?   ( dev-util/cppunit )
-		 >=sci-misc/salome-kernel-${PV}
-		 >=sci-misc/salome-med-${PV}
-		 >=sci-misc/salome-component-${PV}
-		 >=dev-python/omniorbpy-3.4
-		 >=net-misc/omniORB-4.1.4
-		 >=sci-libs/med-2.3.5"
-
-DEPEND="${RDEPEND}
-		>=app-doc/doxygen-1.5.6
-		media-gfx/graphviz
-		>=dev-python/docutils-0.4"
-
-MODULE_NAME="PYCALCULATOR"
-S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-PYCALCULATOR_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-
-pkg_setup() {
-	[[ $(python_get_version) > 2.4 ]] && \
-		ewarn "Python 2.4 is highly recommended for Salome..."
-	python_set_active_version 2
-}
-
-src_prepare() {
-	rm -r -f autom4te.cache
-	./build_configure
-}
-
-src_configure() {
-	econf --prefix=${INSTALL_DIR} \
-	      --datadir=${INSTALL_DIR}/share/salome \
-	      --docdir=${INSTALL_DIR}/doc/salome \
-	      --infodir=${INSTALL_DIR}/share/info \
-	      --libdir=${INSTALL_DIR}/$(get_libdir)/salome \
-	      --with-python-site=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      $(use_enable debug ) \
-	      $(use_enable !debug production ) \
-	|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
-
-	echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
-	echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}a
-	echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
-	echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome" >> ./90${P}
-	doenvd 90${P}
-	rm adm_local/Makefile adm_local/unix/config_files/Makefile \
-		adm_local/unix/Makefile
-	insinto "${INSTALL_DIR}"
-	doins -r adm_local
-
-	use doc && dodoc INSTALL
-}
-
-pkg_postinst() {
-	elog "Run \`env-update && source /etc/profile\`"
-	elog "now to set up the correct paths."
-	elog ""
-}

diff --git a/sci-misc/salome-pycalculator/salome-pycalculator-5.1.4.ebuild b/sci-misc/salome-pycalculator/salome-pycalculator-5.1.4.ebuild
deleted file mode 100644
index 29dbe5e..0000000
--- a/sci-misc/salome-pycalculator/salome-pycalculator-5.1.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils python
-
-DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. PYCALCULATOR Component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc"
-
-RDEPEND="debug?   ( dev-util/cppunit )
-		 >=sci-misc/salome-kernel-${PV}
-		 >=sci-misc/salome-med-${PV}
-		 >=sci-misc/salome-component-${PV}
-		 >=dev-python/omniorbpy-3.4
-		 >=net-misc/omniORB-4.1.4
-		 >=sci-libs/med-2.3.5"
-
-DEPEND="${RDEPEND}
-		>=app-doc/doxygen-1.5.6
-		media-gfx/graphviz
-		>=dev-python/docutils-0.4"
-
-MODULE_NAME="PYCALCULATOR"
-S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-PYCALCULATOR_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-
-pkg_setup() {
-	[[ $(python_get_version) > 2.4 ]] && \
-		ewarn "Python 2.4 is highly recommended for Salome..."
-	python_set_active_version 2
-}
-
-src_prepare() {
-	rm -r -f autom4te.cache
-	./build_configure
-}
-
-src_configure() {
-	econf --prefix=${INSTALL_DIR} \
-	      --datadir=${INSTALL_DIR}/share/salome \
-	      --docdir=${INSTALL_DIR}/doc/salome \
-	      --infodir=${INSTALL_DIR}/share/info \
-	      --libdir=${INSTALL_DIR}/$(get_libdir)/salome \
-	      --with-python-site=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      $(use_enable debug ) \
-	      $(use_enable !debug production ) \
-	|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
-
-	echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
-	echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}a
-	echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
-	echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome" >> ./90${P}
-	doenvd 90${P}
-	rm adm_local/Makefile adm_local/unix/config_files/Makefile \
-		adm_local/unix/Makefile
-	insinto "${INSTALL_DIR}"
-	doins -r adm_local
-
-	use doc && dodoc INSTALL
-}
-
-pkg_postinst() {
-	elog "Run \`env-update && source /etc/profile\`"
-	elog "now to set up the correct paths."
-	elog ""
-}

diff --git a/sci-misc/salome-smesh/ChangeLog b/sci-misc/salome-smesh/ChangeLog
deleted file mode 100644
index eeb172a..0000000
--- a/sci-misc/salome-smesh/ChangeLog
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Id$
-
-  03 Mar 2013; Justin Lecher <jlec@g.o> salome-smesh-5.1.3.ebuild,
-  salome-smesh-5.1.4.ebuild, metadata.xml:
-  Update to new qt deps names
-
-  10 Feb 2012; Alexey Shvetsov <alexxy@g.o> salome-smesh-5.1.3.ebuild,
-  salome-smesh-5.1.4.ebuild:
-  [sci-misc/salome*] Fix python depend
-
-*salome-smesh-5.1.4 (27 Oct 2010)
-
-  27 Oct 2010; Thomas Kahle <tomka@g.o> +salome-smesh-5.1.4.ebuild:
-  Bump to 5.1.4, ebuild by Michael Riss in bug 330303
-
-  29 Jun 2010; Justin Lecher <jlec@g.o> salome-smesh-5.1.3.ebuild:
-  Python ABI fixes
-
-  04 Apr 2010; Etienne Lorriaux <etienne.lorriaux@×××××.com>
-  salome-smesh-5.1.3.ebuild:
-  changed fetch URL + cleaning
-  solved typedef long med_int issues
-
-*salome-smesh-5.1.3 (14 Mar 2010)
-
-  14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@×××××.com>
-  -salome-smesh-3.2.6.ebuild,
-  -files/salome-smesh-3.2.6-amd64-relocation-error.patch,
-  -files/salome-smesh-3.2.6-gcc-4.3.patch,
-  -files/salome-smesh-3.2.6-vtk-5.2.patch,
-  -files/salome-smesh-3.2.6_makefiles.patch,
-  -files/salome-smesh-3.2.6.patch, +salome-smesh-5.1.3.ebuild:
-  Version bump 5.1.3 + removed broken 3.2.6
-
-  20 Oct 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  +salome-smesh-3.2.6-vtk-5.2.patch
-  Added support to vtk 5.2. Patch provided by Bert Karwatzki <spasswolf@×××.de>
- 
-  04 Sep 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-smesh-3.2.6.ebuild:
-  removed omniorb* dependencies, as they are already in salome-kernel
-
-  27 Aug 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-smesh-3.2.6.ebuild:
-  Now really removed fetch restriction
-
-  27 Aug 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-smesh-3.2.6.ebuild, -Changelog, +metadata.xml:
-  Removed fetch restriction, removed hardcode
-
-  29 May 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  +salome-smesh-3.2.6-gcc-4.3.patch
-  Added support to gcc-4.3. Patch provided by Bert Karwatzki <spasswolf@×××.de>
-
-  21 May 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  Initial import.
-  +salome-smesh-3.2.6.ebuild, +salome-smesh-3.2.6.patch, +salome-smesh-3.2.6_makefiles.patch
-  A major thank to Francois Dorin <f.dorin@××××.fr>, Jon Hood <squinky86@×××××.com>, Dewald Pietersen <dewald.pieterse@×××××.com>, <etienne.lorriaux@×××××.com> and Richard Westwell <garlicbread@××××××××.com> for their respective contributions and feedback. Without you guys, the Salome ebuilds would not exist today. Thanks!
-  See bug #155974 for more info

diff --git a/sci-misc/salome-smesh/metadata.xml b/sci-misc/salome-smesh/metadata.xml
deleted file mode 100644
index 897aa2e..0000000
--- a/sci-misc/salome-smesh/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci</herd>
-</pkgmetadata>

diff --git a/sci-misc/salome-smesh/salome-smesh-5.1.3.ebuild b/sci-misc/salome-smesh/salome-smesh-5.1.3.ebuild
deleted file mode 100644
index 55cec40..0000000
--- a/sci-misc/salome-smesh/salome-smesh-5.1.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils flag-o-matic python
-
-DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. SMESH Component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc mpi opengl"
-
-RDEPEND="opengl?  ( virtual/opengl )
-		 mpi?     ( || ( sys-cluster/openmpi[cxx]
-		 				 sys-cluster/mpich2[cxx] ) )
-		 debug?   ( dev-util/cppunit )
-		 >=sci-misc/salome-kernel-${PV}
-		 >=sci-misc/salome-med-${PV}
-		 >=sci-misc/salome-geom-${PV}
-		 >=dev-python/omniorbpy-3.4
-		 >=net-misc/omniORB-4.1.4
-		 >=dev-qt/qtcore-4.5.2
-		 >=dev-qt/qtgui-4.5.2
-		 >=dev-qt/qtopengl-4.5.2
-		 >=x11-libs/qwt-5.2
-		 >=dev-libs/boost-1.40.0
-		 >=sci-libs/opencascade-6.3
-		 >=sci-libs/hdf5-1.6.4
-		 >=sci-libs/med-2.3.5
-		 >=sci-libs/vtk-5.0[python]"
-
-DEPEND="${RDEPEND}
-		dev-lang/swig
-		>=app-doc/doxygen-1.5.6
-		media-gfx/graphviz
-		>=dev-python/docutils-0.4"
-
-MODULE_NAME="SMESH"
-S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-SMESH_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-
-pkg_setup() {
-	[[ $(python_get_version) > 2.4 ]] && \
-		ewarn "Python 2.4 is highly recommended for Salome..."
-	python_set_active_version 2
-}
-
-src_prepare() {
-	rm -r -f autom4te.cache
-	./build_configure
-}
-
-src_configure() {
-	local vtk_suffix=""
-
-	has_version ">=sci-libs/vtk-5.0" && vtk_suffix="-5.0"
-	has_version ">=sci-libs/vtk-5.2" && vtk_suffix="-5.2"
-	has_version ">=sci-libs/vtk-5.4" && vtk_suffix="-5.4"
-
-	use amd64 && append-flags -DHAVE_F77INT64
-
-	# Configuration
-	econf --prefix=${INSTALL_DIR} \
-	      --datadir=${INSTALL_DIR}/share/salome \
-	      --docdir=${INSTALL_DIR}/doc/salome \
-	      --infodir=${INSTALL_DIR}/share/info \
-		  --libdir=${INSTALL_DIR}/$(get_libdir)/salome \
-	      --with-python-site=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-		  --with-vtk=${VTKHOME} \
-		  --with-vtk-version=${vtk_suffix} \
-		  --with-qt='/usr' \
-		  --with-qwt_inc='/usr/include/qwt5' \
-	      $(use_enable debug ) \
-	      $(use_enable !debug production ) \
-	      $(use_with opengl opengl /usr) \
-	|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
-
-	echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
-	echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
-	echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
-	echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome" >> ./90${P}
-	doenvd 90${P}
-	rm adm_local/Makefile
-	insinto "${INSTALL_DIR}"
-	doins -r adm_local
-
-	use doc && dodoc INSTALL
-}
-
-pkg_postinst() {
-	elog "Run \`env-update && source /etc/profile\`"
-	elog "now to set up the correct paths."
-	elog ""
-}

diff --git a/sci-misc/salome-smesh/salome-smesh-5.1.4.ebuild b/sci-misc/salome-smesh/salome-smesh-5.1.4.ebuild
deleted file mode 100644
index b9b8374..0000000
--- a/sci-misc/salome-smesh/salome-smesh-5.1.4.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils flag-o-matic python
-
-DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. SMESH Component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc mpi opengl"
-
-RDEPEND="opengl?  ( virtual/opengl )
-		 mpi?     ( || ( sys-cluster/openmpi[cxx]
-		 				 sys-cluster/mpich2[cxx] ) )
-		 debug?   ( dev-util/cppunit )
-		 >=sci-misc/salome-kernel-${PV}
-		 >=sci-misc/salome-med-${PV}
-		 >=sci-misc/salome-geom-${PV}
-		 >=dev-python/omniorbpy-3.4
-		 >=net-misc/omniORB-4.1.4
-		 >=dev-qt/qtcore-4.5.2
-		 >=dev-qt/qtgui-4.5.2
-		 >=dev-qt/qtopengl-4.5.2
-		 >=x11-libs/qwt-5.2
-		 >=dev-libs/boost-1.40.0
-		 >=sci-libs/opencascade-6.3
-		 >=sci-libs/hdf5-1.6.4
-		 >=sci-libs/med-2.3.5
-		 >=sci-libs/vtk-5.0[python]"
-
-DEPEND="${RDEPEND}
-		dev-lang/swig
-		>=app-doc/doxygen-1.5.6
-		media-gfx/graphviz
-		>=dev-python/docutils-0.4"
-
-MODULE_NAME="SMESH"
-S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-SMESH_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-
-pkg_setup() {
-	[[ $(python_get_version) > 2.4 ]] && \
-		ewarn "Python 2.4 is highly recommended for Salome..."
-	python_set_active_version 2
-	append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-	rm -r -f autom4te.cache
-	./build_configure
-}
-
-src_configure() {
-	local vtk_suffix=""
-
-	has_version ">=sci-libs/vtk-5.0" && vtk_suffix="-5.0"
-	has_version ">=sci-libs/vtk-5.2" && vtk_suffix="-5.2"
-	has_version ">=sci-libs/vtk-5.4" && vtk_suffix="-5.4"
-	has_version ">=sci-libs/vtk-5.6" && vtk_suffix="-5.6"
-
-	use amd64 && append-flags -DHAVE_F77INT64
-
-	# Configuration
-	econf --prefix=${INSTALL_DIR} \
-	      --datadir=${INSTALL_DIR}/share/salome \
-	      --docdir=${INSTALL_DIR}/doc/salome \
-	      --infodir=${INSTALL_DIR}/share/info \
-		  --libdir=${INSTALL_DIR}/$(get_libdir)/salome \
-	      --with-python-site=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-		  --with-vtk=${VTKHOME} \
-		  --with-vtk-version=${vtk_suffix} \
-		  --with-qt='/usr' \
-		  --with-qwt_inc='/usr/include/qwt5' \
-	      $(use_enable debug ) \
-	      $(use_enable !debug production ) \
-	      $(use_with opengl opengl /usr) \
-	|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
-
-	echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
-	echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
-	echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
-	echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome" >> ./90${P}
-	doenvd 90${P}
-	rm adm_local/Makefile
-	insinto "${INSTALL_DIR}"
-	doins -r adm_local
-
-	use doc && dodoc INSTALL
-}
-
-pkg_postinst() {
-	elog "Run \`env-update && source /etc/profile\`"
-	elog "now to set up the correct paths."
-	elog ""
-}

diff --git a/sci-misc/salome-visu/ChangeLog b/sci-misc/salome-visu/ChangeLog
deleted file mode 100644
index 8b5c309..0000000
--- a/sci-misc/salome-visu/ChangeLog
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Id$
-
-  03 Mar 2013; Justin Lecher <jlec@g.o> salome-visu-5.1.3.ebuild,
-  salome-visu-5.1.4.ebuild, metadata.xml:
-  Update to new qt deps names
-
-  10 Feb 2012; Alexey Shvetsov <alexxy@g.o> salome-visu-5.1.3.ebuild,
-  salome-visu-5.1.4.ebuild:
-  [sci-misc/salome*] Fix python depend
-
-*salome-visu-5.1.4 (27 Oct 2010)
-
-  27 Oct 2010; Thomas Kahle <tomka@g.o> +salome-visu-5.1.4.ebuild:
-  Bump to 5.1.4, ebuild by Michael Riss in bug 330303
-
-  29 Jun 2010; Justin Lecher <jlec@g.o> salome-visu-5.1.3.ebuild:
-  Python ABI fixes
-
-  04 Apr 2010; Etienne Lorriaux <etienne.lorriaux@×××××.com>
-  salome-visu-5.1.3.ebuild:
-  changed fetch URL + cleaning
-  solved typedef long med_int issues
-
-*salome-visu-5.1.3 (14 Mar 2010)
-
-  14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@×××××.com>
-  -salome-visu-3.2.6.ebuild, -files/salome-visu-3.2.6-gcc-4.3.patch,
-  -files/salome-visu-3.2.6_makefiles.patch, -files/salome-visu-3.2.6.patch,
-  +salome-visu-5.1.3.ebuild:
-  Version bump 5.1.3 + removed broken 3.2.6
-
-  04 Sep 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-visu-3.2.6.ebuild:
-  removed omniorb* dependencies, as they are already in salome-kernel
-
-  27 Aug 2008; Oliver Borm (boroli) <oli.borm@×××.de>
-  salome-visu-3.2.6.ebuild, -Changelog, +metadata.xml:
-  Removed fetch restriction, removed hardcode
-
-  29 May 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  +salome-visu-3.2.6-gcc-4.3.patch
-  Added support to gcc-4.3. Patch provided by Bert Karwatzki <spasswolf@×××.de>
-
-  21 May 2008; Daniel Tourde <daniel.tourde@××××××.se>
-  Initial import.
-  +salome-visu-3.2.6.ebuild, +salome-visu-3.2.6.patch, +salome-visu-3.2.6_makefiles.patch
-  A major thank to Francois Dorin <f.dorin@××××.fr>, Jon Hood <squinky86@×××××.com>, Dewald Pietersen <dewald.pieterse@×××××.com>, <etienne.lorriaux@×××××.com> and Richard Westwell <garlicbread@××××××××.com> for their respective contributions and feedback. Without you guys, the Salome ebuilds would not exist today. Thanks!
-  See bug #155974 for more info

diff --git a/sci-misc/salome-visu/metadata.xml b/sci-misc/salome-visu/metadata.xml
deleted file mode 100644
index 897aa2e..0000000
--- a/sci-misc/salome-visu/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci</herd>
-</pkgmetadata>

diff --git a/sci-misc/salome-visu/salome-visu-5.1.3.ebuild b/sci-misc/salome-visu/salome-visu-5.1.3.ebuild
deleted file mode 100644
index 04419dc..0000000
--- a/sci-misc/salome-visu/salome-visu-5.1.3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils flag-o-matic python
-
-DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. VISU Component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc opengl"
-
-RDEPEND="opengl?  ( virtual/opengl )
-		 >=dev-python/omniorbpy-3.4
-		 >=net-misc/omniORB-4.1.4
-		 >=sci-misc/salome-kernel-${PV}
-		 >=sci-misc/salome-gui-${PV}
-		 >=sci-misc/salome-component-${PV}
-		 >=dev-qt/qtcore-4.5.2
-		 >=dev-qt/qtgui-4.5.2
-		 >=dev-qt/qtopengl-4.5.2
-		 >=dev-libs/boost-1.40.0
-		 >=sci-libs/opencascade-6.3
-		 >=sci-libs/hdf5-1.6.4
-		 >=sci-libs/med-2.3.5
-		 >=sci-libs/vtk-5.0[python]"
-
-DEPEND="${RDEPEND}
-		dev-lang/swig
-		>=app-doc/doxygen-1.5.6
-		media-gfx/graphviz
-		>=dev-python/docutils-0.4"
-
-MODULE_NAME="VISU"
-S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-VISU_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-
-pkg_setup() {
-	[[ $(python_get_version) > 2.4 ]] && \
-		ewarn "Python 2.4 is highly recommended for Salome..."
-	python_set_active_version 2
-}
-
-src_prepare() {
-	rm -r -f autom4te.cache
-	./build_configure
-}
-
-src_configure() {
-	local vtk_suffix=""
-
-	has_version ">=sci-libs/vtk-5.0" && vtk_suffix="-5.0"
-	has_version ">=sci-libs/vtk-5.2" && vtk_suffix="-5.2"
-	has_version ">=sci-libs/vtk-5.4" && vtk_suffix="-5.4"
-
-	use amd64 && append-flags -DHAVE_F77INT64
-
-	econf --prefix=${INSTALL_DIR} \
-	      --datadir=${INSTALL_DIR}/share/salome \
-	      --docdir=${INSTALL_DIR}/doc/salome \
-	      --infodir=${INSTALL_DIR}/share/info \
-	      --libdir=${INSTALL_DIR}/$(get_libdir)/salome \
-	      --with-python-site=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-		  --with-vtk=${VTKHOME} \
-		  --with-vtk-version=${vtk_suffix} \
-		  --with-qt="/usr" \
-		  --with-qwt_inc="/usr/include/qwt5" \
-	      $(use_enable debug ) \
-	      $(use_enable !debug production ) \
-	      $(use_with opengl opengl /usr) \
-	|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
-
-	echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
-	echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
-	echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
-	echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome" >> ./90${P}
-	doenvd 90${P}
-	rm adm_local/Makefile
-	insinto "${INSTALL_DIR}"
-	doins -r adm_local
-
-	use doc && dodoc INSTALL
-}
-
-pkg_postinst() {
-	elog "Run \`env-update && source /etc/profile\`"
-	elog "now to set up the correct paths."
-	elog ""
-}

diff --git a/sci-misc/salome-visu/salome-visu-5.1.4.ebuild b/sci-misc/salome-visu/salome-visu-5.1.4.ebuild
deleted file mode 100644
index 84cdcf8..0000000
--- a/sci-misc/salome-visu/salome-visu-5.1.4.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils flag-o-matic python
-
-DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. VISU Component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc opengl"
-
-RDEPEND="opengl?  ( virtual/opengl )
-		 >=dev-python/omniorbpy-3.4
-		 >=net-misc/omniORB-4.1.4
-		 >=sci-misc/salome-kernel-${PV}
-		 >=sci-misc/salome-gui-${PV}
-		 >=sci-misc/salome-component-${PV}
-		 >=dev-qt/qtcore-4.5.2
-		 >=dev-qt/qtgui-4.5.2
-		 >=dev-qt/qtopengl-4.5.2
-		 >=dev-libs/boost-1.40.0
-		 >=sci-libs/opencascade-6.3
-		 >=sci-libs/hdf5-1.6.4
-		 >=sci-libs/med-2.3.5
-		 >=sci-libs/vtk-5.0[python]"
-
-DEPEND="${RDEPEND}
-		dev-lang/swig
-		>=app-doc/doxygen-1.5.6
-		media-gfx/graphviz
-		>=dev-python/docutils-0.4"
-
-MODULE_NAME="VISU"
-S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-VISU_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-
-pkg_setup() {
-	[[ $(python_get_version) > 2.4 ]] && \
-		ewarn "Python 2.4 is highly recommended for Salome..."
-	python_set_active_version 2
-	append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-	rm -r -f autom4te.cache
-	./build_configure
-}
-
-src_configure() {
-	local vtk_suffix=""
-
-	has_version ">=sci-libs/vtk-5.0" && vtk_suffix="-5.0"
-	has_version ">=sci-libs/vtk-5.2" && vtk_suffix="-5.2"
-	has_version ">=sci-libs/vtk-5.4" && vtk_suffix="-5.4"
-	has_version ">=sci-libs/vtk-5.6" && vtk_suffix="-5.6"
-
-	use amd64 && append-flags -DHAVE_F77INT64
-
-	econf --prefix=${INSTALL_DIR} \
-	      --datadir=${INSTALL_DIR}/share/salome \
-	      --docdir=${INSTALL_DIR}/doc/salome \
-	      --infodir=${INSTALL_DIR}/share/info \
-	      --libdir=${INSTALL_DIR}/$(get_libdir)/salome \
-	      --with-python-site=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-	      --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome \
-		  --with-vtk=${VTKHOME} \
-		  --with-vtk-version=${vtk_suffix} \
-		  --with-qt="/usr" \
-		  --with-qwt_inc="/usr/include/qwt5" \
-	      $(use_enable debug ) \
-	      $(use_enable !debug production ) \
-	      $(use_with opengl opengl /usr) \
-	|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
-
-	echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
-	echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
-	echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
-	echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome" >> ./90${P}
-	doenvd 90${P}
-	rm adm_local/Makefile
-	insinto "${INSTALL_DIR}"
-	doins -r adm_local
-
-	use doc && dodoc INSTALL
-}
-
-pkg_postinst() {
-	elog "Run \`env-update && source /etc/profile\`"
-	elog "now to set up the correct paths."
-	elog ""
-}

diff --git a/sci-misc/salome-yacs/ChangeLog b/sci-misc/salome-yacs/ChangeLog
deleted file mode 100644
index 919ee33..0000000
--- a/sci-misc/salome-yacs/ChangeLog
+++ /dev/null
@@ -1,37 +0,0 @@
-# ChangeLog for sci-misc/salome-yacs
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Id$
-
-  03 Mar 2013; Justin Lecher <jlec@g.o> salome-yacs-5.1.3.ebuild,
-  salome-yacs-5.1.4.ebuild, metadata.xml:
-  Update to new qt deps names
-
-  10 Feb 2012; Alexey Shvetsov <alexxy@g.o> salome-yacs-5.1.3.ebuild,
-  salome-yacs-5.1.4.ebuild:
-  [sci-misc/salome*] Fix python depend
-
-  07 Mar 2011; Justin Lecher <jlec@g.o> salome-yacs-5.1.3.ebuild,
-  salome-yacs-5.1.4.ebuild:
-  Correct Slots for gtk 3 introduction to tree
-
-*salome-yacs-5.1.4 (27 Oct 2010)
-
-  27 Oct 2010; Thomas Kahle <tomka@g.o> +salome-yacs-5.1.4.ebuild,
-  +files/salome-yacs-5.1.4-ac_python_devel.patch:
-  Bump to 5.1.4, ebuild by Michael Riss in bug 330303
-
-  29 Jun 2010; Justin Lecher <jlec@g.o> salome-yacs-5.1.3.ebuild:
-  Python ABI fixes
-
-  04 Apr 2010; Etienne Lorriaux <etienne.lorriaux@×××××.com>
-  salome-yacs-5.1.3.ebuild:
-  changed fetch URL + cleaning
-
-*salome-yacs-5.1.3 (14 Mar 2010)
-
-  14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@×××××.com>
-  +salome-yacs-5.1.3.ebuild, +files/salome-yacs-5.1.3-ac_python_devel.patch,
-  +files/salome-yacs-5.1.3-lib_location.patch,
-  +files/salome-yacs-5.1.3-libdir.patch, +metadata.xml:
-  New entry as a component of salome-5.1.3
-

diff --git a/sci-misc/salome-yacs/files/salome-yacs-5.1.3-ac_python_devel.patch b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-ac_python_devel.patch
deleted file mode 100644
index 6c83be8..0000000
--- a/sci-misc/salome-yacs/files/salome-yacs-5.1.3-ac_python_devel.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Files src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/config_files/.ac_python_devel.m4.swp and src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/.ac_python_devel.m4.swp differ
-diff -ur src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/config_files/ac_python_devel.m4 src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_python_devel.m4
---- src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/config_files/ac_python_devel.m4	2010-03-08 20:51:25.810829226 +0100
-+++ src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_python_devel.m4	2010-03-08 20:53:41.330413913 +0100
-@@ -48,7 +48,7 @@
- 	# Check for Python library path
- 	AC_MSG_CHECKING([for Python library path])
- 	python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
--	for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
-+	for i in "$python_path/lib$LIB_LOCATION_SUFFIX" "$python_path/lib$LIB_LOCATION_SUFFIX/python$PYTHON_VERSION/config/" "$python_path/lib$LIB_LOCATION_SUFFIX/python$PYTHON_VERSION/" "$python_path/lib$LIB_LOCATION_SUFFIX/python/config/" "$python_path/lib$LIB_LOCATION_SUFFIX/python/" "$python_path/" ; do
- 		python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
- 		if test -n "$python_path" ; then
- 			break

diff --git a/sci-misc/salome-yacs/files/salome-yacs-5.1.3-lib_location.patch b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-lib_location.patch
deleted file mode 100644
index 9eb8035..0000000
--- a/sci-misc/salome-yacs/files/salome-yacs-5.1.3-lib_location.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/config_files/ac_linker_options.m4 src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_linker_options.m4
---- src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/config_files/ac_linker_options.m4	2010-03-08 20:39:54.160326435 +0100
-+++ src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_linker_options.m4	2010-03-08 20:40:58.590323448 +0100
-@@ -23,6 +23,10 @@
- 
-   AC_CHECKING(for LIB_LOCATION_SUFFIX)
-   LIB_LOCATION_SUFFIX=""
-+  case "$build_cpu" in
-+  x86_64*)  LIB_LOCATION_SUFFIX="64" ;;
-+  *)        LIB_LOCATION_SUFFIX="" ;;
-+  esac
-   AC_SUBST(LIB_LOCATION_SUFFIX)
-   AC_MSG_RESULT(LIB_LOCATION_SUFFIX is $LIB_LOCATION_SUFFIX)
- 

diff --git a/sci-misc/salome-yacs/files/salome-yacs-5.1.3-libdir.patch b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-libdir.patch
deleted file mode 100644
index b4a2a50..0000000
--- a/sci-misc/salome-yacs/files/salome-yacs-5.1.3-libdir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/make_begin.am	2010-03-10 15:45:32.281101526 +0100
-+++ src5.1.3/YACS_SRC_5.1.3/adm/unix/make_begin.am	2010-03-10 15:46:58.440251953 +0100
-@@ -22,7 +22,7 @@
- 
- # Standard directory for installation
- salomeincludedir   = $(includedir)/salome
--libdir             = $(prefix)/lib/salome
-+libdir             = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome
- bindir             = $(prefix)/bin/salome
- salomescriptdir    = $(bindir)
- salomepythondir    = $(pythondir)/salome
---- src5.1.3.orig/YACS_SRC_5.1.3/src/genericgui/Makefile.am	2010-03-10 16:26:05.424066867 +0100
-+++ src5.1.3/YACS_SRC_5.1.3/src/genericgui/Makefile.am	2010-03-10 16:26:41.450302694 +0100
-@@ -16,7 +16,7 @@
- #
- #  See http://www.salome-platform.org/ or email : webmaster.salome@×××××××××××.com
- #
--libdir             = $(prefix)/lib/salome
-+libdir             = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome
- bindir             = $(prefix)/bin/salome
- 
- lib_LTLIBRARIES = libGenericGui.la

diff --git a/sci-misc/salome-yacs/files/salome-yacs-5.1.4-ac_python_devel.patch b/sci-misc/salome-yacs/files/salome-yacs-5.1.4-ac_python_devel.patch
deleted file mode 100644
index d6ed54d..0000000
--- a/sci-misc/salome-yacs/files/salome-yacs-5.1.4-ac_python_devel.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur src5.1.4.orig/YACS_SRC_5.1.4/adm/unix/config_files/ac_python_devel.m4 src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_python_devel.m4
---- src5.1.4.orig/YACS_SRC_5.1.4/adm/unix/config_files/ac_python_devel.m4	2010-03-08 20:51:25.810829226 +0100
-+++ src5.1.4/YACS_SRC_5.1.4/adm/unix/config_files/ac_python_devel.m4	2010-03-08 20:53:41.330413913 +0100
-@@ -48,7 +48,7 @@
- 	# Check for Python library path
- 	AC_MSG_CHECKING([for Python library path])
- 	python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
--	for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
-+	for i in "$python_path/lib$LIB_LOCATION_SUFFIX" "$python_path/lib$LIB_LOCATION_SUFFIX/python$PYTHON_VERSION/config/" "$python_path/lib$LIB_LOCATION_SUFFIX/python$PYTHON_VERSION/" "$python_path/lib$LIB_LOCATION_SUFFIX/python/config/" "$python_path/lib$LIB_LOCATION_SUFFIX/python/" "$python_path/" ; do
- 		python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
- 		if test -n "$python_path" ; then
- 			break

diff --git a/sci-misc/salome-yacs/metadata.xml b/sci-misc/salome-yacs/metadata.xml
deleted file mode 100644
index 897aa2e..0000000
--- a/sci-misc/salome-yacs/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci</herd>
-</pkgmetadata>

diff --git a/sci-misc/salome-yacs/salome-yacs-5.1.3.ebuild b/sci-misc/salome-yacs/salome-yacs-5.1.3.ebuild
deleted file mode 100644
index c9d26d9..0000000
--- a/sci-misc/salome-yacs/salome-yacs-5.1.3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils python
-
-DESCRIPTION="The Open Source Integration Platform for Numerical Simulation - YACS component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc opengl"
-
-RDEPEND="
-	debug?   ( dev-util/cppunit )
-	opengl?  ( virtual/opengl )
-	>=sci-misc/salome-kernel-${PV}
-	>=sci-misc/salome-gui-${PV}
-	>=dev-python/omniorbpy-3.4
-	>=sci-libs/hdf5-1.6.4
-	>=dev-libs/boost-1.40.0
-	>=dev-qt/qtcore-4.5.2
-	>=dev-qt/qtgui-4.5.2
-	>=dev-qt/qtopengl-4.5.2
-	>=dev-python/PyQt4-4.5.4
-	>=x11-libs/qscintilla-2.4
-	>=net-misc/omniORB-4.1.3
-	dev-libs/expat"
-DEPEND="${RDEPEND}
-	>=app-doc/doxygen-1.5.6
-	media-gfx/graphviz
-	>=dev-python/docutils-0.4
-	dev-lang/swig
-	dev-libs/libxml2:2
-	>=dev-python/celementtree-1.0.5
-	>=dev-python/elementtree-1.2.6
-	doc? ( dev-python/sphinx )"
-
-MODULE_NAME="YACS"
-S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-
-pkg_setup() {
-	[[ $(python_get_version) > 2.4 ]] && \
-		ewarn "Python 2.4 is highly recommended for Salome..."
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/"${P}"-ac_python_devel.patch
-	if use amd64; then
-		epatch "${FILESDIR}"/"${P}"-lib_location.patch
-		epatch "${FILESDIR}"/"${P}"-libdir.patch
-	fi
-
-	rm -r -f autom4te.cache
-	./clean_configure
-	./build_configure
-}
-
-src_configure() {
-	econf \
-		--prefix=${INSTALL_DIR} \
-		--datadir=${INSTALL_DIR}/share/salome \
-		--docdir=${INSTALL_DIR}/doc/salome \
-		--libdir=${INSTALL_DIR}/$(get_libdir)/salome \
-		--infodir=${INSTALL_DIR}/share/info \
-		--with-qt4=/usr \
-		--with-qt4-libraries=/usr/$(get_libdir)/qt4 \
-		--with-qsci4-includes=/usr/include/Qsci \
-		$(use_enable debug ) \
-		$(use_enable !debug production ) \
-		$(use_with debug cppunit /usr )
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
-
-	echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
-	echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
-	echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
-	echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome" >> ./90${P}
-	doenvd 90${P}
-	rm adm/Makefile
-	insinto "${INSTALL_DIR}"
-	doins -r adm
-
-	use doc && dodoc AUTHORS INSTALL NEWS README
-}
-
-pkg_postinst() {
-	elog "Run \`env-update && source /etc/profile\`"
-	elog "now to set up the correct paths."
-	elog ""
-}

diff --git a/sci-misc/salome-yacs/salome-yacs-5.1.4.ebuild b/sci-misc/salome-yacs/salome-yacs-5.1.4.ebuild
deleted file mode 100644
index c9d26d9..0000000
--- a/sci-misc/salome-yacs/salome-yacs-5.1.4.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils python
-
-DESCRIPTION="The Open Source Integration Platform for Numerical Simulation - YACS component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc opengl"
-
-RDEPEND="
-	debug?   ( dev-util/cppunit )
-	opengl?  ( virtual/opengl )
-	>=sci-misc/salome-kernel-${PV}
-	>=sci-misc/salome-gui-${PV}
-	>=dev-python/omniorbpy-3.4
-	>=sci-libs/hdf5-1.6.4
-	>=dev-libs/boost-1.40.0
-	>=dev-qt/qtcore-4.5.2
-	>=dev-qt/qtgui-4.5.2
-	>=dev-qt/qtopengl-4.5.2
-	>=dev-python/PyQt4-4.5.4
-	>=x11-libs/qscintilla-2.4
-	>=net-misc/omniORB-4.1.3
-	dev-libs/expat"
-DEPEND="${RDEPEND}
-	>=app-doc/doxygen-1.5.6
-	media-gfx/graphviz
-	>=dev-python/docutils-0.4
-	dev-lang/swig
-	dev-libs/libxml2:2
-	>=dev-python/celementtree-1.0.5
-	>=dev-python/elementtree-1.2.6
-	doc? ( dev-python/sphinx )"
-
-MODULE_NAME="YACS"
-S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-
-pkg_setup() {
-	[[ $(python_get_version) > 2.4 ]] && \
-		ewarn "Python 2.4 is highly recommended for Salome..."
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/"${P}"-ac_python_devel.patch
-	if use amd64; then
-		epatch "${FILESDIR}"/"${P}"-lib_location.patch
-		epatch "${FILESDIR}"/"${P}"-libdir.patch
-	fi
-
-	rm -r -f autom4te.cache
-	./clean_configure
-	./build_configure
-}
-
-src_configure() {
-	econf \
-		--prefix=${INSTALL_DIR} \
-		--datadir=${INSTALL_DIR}/share/salome \
-		--docdir=${INSTALL_DIR}/doc/salome \
-		--libdir=${INSTALL_DIR}/$(get_libdir)/salome \
-		--infodir=${INSTALL_DIR}/share/info \
-		--with-qt4=/usr \
-		--with-qt4-libraries=/usr/$(get_libdir)/qt4 \
-		--with-qsci4-includes=/usr/include/Qsci \
-		$(use_enable debug ) \
-		$(use_enable !debug production ) \
-		$(use_with debug cppunit /usr )
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
-
-	echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
-	echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
-	echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
-	echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python$(python_get_version)/site-packages/salome" >> ./90${P}
-	doenvd 90${P}
-	rm adm/Makefile
-	insinto "${INSTALL_DIR}"
-	doins -r adm
-
-	use doc && dodoc AUTHORS INSTALL NEWS README
-}
-
-pkg_postinst() {
-	elog "Run \`env-update && source /etc/profile\`"
-	elog "now to set up the correct paths."
-	elog ""
-}