diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
deleted file mode 100644
index daa775c..0000000
--- a/media-libs/opencollada/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX opencollada-0_p864-expat.patch 353 SHA256 e7d7f303921b09db1b92a0299ad464d6185ac1f470e028829443785ed98bf1a2 SHA512 f407314eeed7a7caeef674e9cfd9029cb82f29b608b83e971b4662594842a1e0fe1f81e3aa6928cb537460da17e7768a7ee70af2c5464d7224eec3d14b7f1a37 WHIRLPOOL 750f698a05db378add3c13e882d57c349e671e01b71d7d200afcf4605a494681c5af4e5ef95da528a0bfd6d8498eba7aa5186181804e83b9ce1c9d61b52d932f
-AUX opencollada-1.2.2-libdir.patch 1258 SHA256 778d931d652275bd6b5425c3e75fcfa1c4330ef35238910020cb0514b7950708 SHA512 28798609b2ca3daef7fe657cd1d086953b6834612d6857696516f805977298fd2f67507d1288bfb3afef57a55828b11370d933e33e3857502c04b56b6fec5481 WHIRLPOOL 9a6a9da814848df74b7504de0f24e884c791ddf22b63ad114aebbfe09f6fc0c341613eaad0e2086a2722ecc95ca0d47320b663c020c86196bcd0f4e677fc148b
-AUX opencollada-1.2.2-no-undefined.patch 1361 SHA256 5d86f5c509518b85da59fb261fb0f1fb0cb74e6e8f5bda01c5a30f2bf6dc986d SHA512 7ca496722fb6c7734dc82c2bba9dff28753f4ecdf361f74bc5cc96c49ab1dacc7accc8e4834e1ecdbc9d7b2a8ccf236f5c606c6a7a670baed2c43cfd0afa8ea3 WHIRLPOOL 71313f93faf353e6f52f79a7a11df6dc32104a4c09a2d0c2d08cfd2b30fb5b877720ed777fc2be07d06d3d0251312135fb0542258b614fa9696f35c4ae26eb64
-AUX opencollada-1.2.2-soversion.patch 753 SHA256 c18a4867f61ea9ab386818494c9249ada4e05bd27abd899849884ab8f9d15518 SHA512 891b0c63400c65929e72a2e78b331f5b94ef319c3a533b63194f52788bbc8f087a38589442b7a13c606db6188e381d036fb3d9241006fae9298f351012060a2c WHIRLPOOL 2d78e538c42750a08a4629b2949a27a7bea6422e31a71a51e59ad4ba8d1b992cc8855b76fa2235a8b714e2328c4ba5945029c54ce512cc4cde6f105d47517933
-AUX opencollada-1.6.18-clang.patch 769 SHA256 8d0ec8c0f602c280c5780298af00d43325b9f706ddf287ede755590036d8c5df SHA512 3e76ecfca0aaa8baea36e418eaef6f595cca498027730b79cf99f4671196710b24ec991190a8ec85bef74be9c22f3fd0257cbcd27e1339e643f6a2ec032c0940 WHIRLPOOL 19de7af168bc43903702ffe9dd377751947b7d12d97438a74fa3d2cc842ad07536be25d60cccb90b400122ada4b7f103c94e678916e7bc2bc8bf6ff2c6ae9f8b
-DIST opencollada-1.6.18.tar.gz 11807970 SHA256 9835aa0b6efdb6602e58a84ee245a443002dc7196af3b7660e6888680d5d5990 SHA512 e4f72c41c8c619bbfb842517fb1217f616ebe6d9576ef0b7fd8bcb26443b66245107e8d04475c32946b7b73bf093977d1911d486f2d2ae92a165cfde55f67baa WHIRLPOOL 7d35758667c7a1293c376712d47cae0f87ea243e04de9fc526297805fa59f405510584ac6d79c13f77f80f1ef0e6cbea05692b3c65a09d88031dd220b4132ead
-EBUILD opencollada-1.6.18-r1.ebuild 1865 SHA256 cff1a2b9fcc850f29aef31340bd857f48c137d18f3a4a5602da06b257600927a SHA512 597652b3ca3cf44cdb1ad0408e0e47ce6bfc5a9d350e6127c12b81bb9c3d6997efc02023906895924f81a0ba3b48fc95d3fe451573a6a785d3a05cca7ec561ea WHIRLPOOL 28ae69fafb8aa1d08383362830c3f001686ab17627ec7f1cf4703cc96fcedf0b6427e2b9dd8fdf19eb6c57626116f95dd0dff482e5e3811f81c0b1e6c7e0d914
diff --git a/media-libs/opencollada/files/opencollada-0_p864-expat.patch b/media-libs/opencollada/files/opencollada-0_p864-expat.patch
deleted file mode 100644
index 6d9c778..0000000
--- a/media-libs/opencollada/files/opencollada-0_p864-expat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt	2012-01-15 23:14:49.478520648 +0100
-+++ b/CMakeLists.txt	2012-01-15 23:15:06.947302261 +0100
-@@ -208,8 +208,7 @@
- 
- if (USE_EXPAT)
- 	add_definitions(-DGENERATEDSAXPARSER_XMLPARSER_EXPAT)
--	message("FATAL: EXPAT support not implemented")
--	# TODO:: use externals
-+	set(LIBEXPAT_LIBRARIES expat)
- endif ()
- 
- #adding PCRE
diff --git a/media-libs/opencollada/files/opencollada-1.2.2-libdir.patch b/media-libs/opencollada/files/opencollada-1.2.2-libdir.patch
deleted file mode 100644
index cc413f3..0000000
--- a/media-libs/opencollada/files/opencollada-1.2.2-libdir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 96ccb32..c2673f0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -146,6 +146,9 @@ set(OPENCOLLADA_VERSION_MINOR 1)
- set(OPENCOLLADA_VERSION_PATCH 0)
- set(OPENCOLLADA_VERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}.${OPENCOLLADA_VERSION_PATCH})
- 
-+#-----------------------------------------------------------------------------
-+# Generic install paths
-+include(GNUInstallDirs)
- 
- #-----------------------------------------------------------------------------
- # Compiler warnings.
-@@ -178,9 +181,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_WARNINGS}")
- #-----------------------------------------------------------------------------
- # Install vars
- 
--set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_PREFIX}/include/opencollada)
--set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/opencollada)
--set(OPENCOLLADA_INST_CMAKECONFIG ${OPENCOLLADA_INST_LIBRARY}/cmake)
-+set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_FULL_INCLUDEDIR}/opencollada)
-+set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_FULL_LIBDIR}/opencollada)
-+set(OPENCOLLADA_INST_CMAKECONFIG ${CMAKE_INSTALL_FULL_LIBDIR}/opencollada/cmake)
- 
- 
- #-----------------------------------------------------------------------------
diff --git a/media-libs/opencollada/files/opencollada-1.2.2-no-undefined.patch b/media-libs/opencollada/files/opencollada-1.2.2-no-undefined.patch
deleted file mode 100644
index e3cbf0d..0000000
--- a/media-libs/opencollada/files/opencollada-1.2.2-no-undefined.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Source: https://build.opensuse.org/package/show/graphics/openCOLLADA
-
-Index: OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/common/libBuffer/CMakeLists.txt
-===================================================================
---- OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c.orig/common/libBuffer/CMakeLists.txt
-+++ OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/common/libBuffer/CMakeLists.txt
-@@ -28,7 +28,10 @@ set(SRC
- 	include/performanceTest/performanceTest.h
- )
- 
--set(TARGET_LIBS ftoa)
-+set(TARGET_LIBS
-+	ftoa
-+	UTF
-+)
- 
- include_directories(
- 	${libBuffer_include_dirs}
-Index: OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/CMakeLists.txt
-===================================================================
---- OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c.orig/CMakeLists.txt
-+++ OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/CMakeLists.txt
-@@ -244,10 +244,10 @@ else ()  # if pcre not found building it
- endif ()
- 
- # building required libs
-+add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)                                    
-+add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
- add_subdirectory(common/libftoa)
- add_subdirectory(common/libBuffer)
--add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)
--add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
- 
- # building OpenCOLLADA libs
- add_subdirectory(COLLADABaseUtils)
diff --git a/media-libs/opencollada/files/opencollada-1.2.2-soversion.patch b/media-libs/opencollada/files/opencollada-1.2.2-soversion.patch
deleted file mode 100644
index beef355..0000000
--- a/media-libs/opencollada/files/opencollada-1.2.2-soversion.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source:
-https://build.opensuse.org/package/show/graphics/openCOLLADA
-
-diff -Naur OpenCOLLADA.orig/CMakeLists.txt OpenCOLLADA/CMakeLists.txt
---- OpenCOLLADA.orig/CMakeLists.txt	2013-08-10 02:00:51.000000000 -0500
-+++ OpenCOLLADA/CMakeLists.txt	2013-08-28 10:34:50.122102989 -0500
-@@ -77,7 +77,7 @@
- 			message(${name} " WARNING: Shared library support implemented for UNIX-like OS only")
- 		endif ()
- 		add_library(${name}_shared SHARED ${sources})
--		set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME ${name})
-+		set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${soversion})
- 		foreach(target_lib ${target_libs})
- 			if(TARGET ${target_lib}_shared)
- 				target_link_libraries(${name}_shared ${target_lib}_shared)
diff --git a/media-libs/opencollada/files/opencollada-1.6.18-clang.patch b/media-libs/opencollada/files/opencollada-1.6.18-clang.patch
deleted file mode 100644
index f2a6a5e..0000000
--- a/media-libs/opencollada/files/opencollada-1.6.18-clang.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uri OpenCOLLADA-1.6.18.orig/COLLADABaseUtils/include/COLLADABUhash_map.h OpenCOLLADA-1.6.18/COLLADABaseUtils/include/COLLADABUhash_map.h
---- OpenCOLLADA-1.6.18.orig/COLLADABaseUtils/include/COLLADABUhash_map.h	2016-05-09 10:57:11.000000000 -0500
-+++ OpenCOLLADA-1.6.18/COLLADABaseUtils/include/COLLADABUhash_map.h	2016-07-08 18:56:45.000000000 -0500
-@@ -70,7 +70,7 @@
-     #define COLLADABU_HASH_NAMESPACE_CLOSE
-     #define COLLADABU_HASH_FUN hash
- #else   // Linux or Mac or FreeBSD with GCC
--    #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)
-+    #if !defined(__clang__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3))
-         #include <ext/hash_map>
-         #include <ext/hash_set>
-     #if !(defined(__APPLE__) && defined(__MACH__))
diff --git a/media-libs/opencollada/opencollada-1.6.18-r1.ebuild b/media-libs/opencollada/opencollada-1.6.18-r1.ebuild
deleted file mode 100644
index 595d6ae..0000000
--- a/media-libs/opencollada/opencollada-1.6.18-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/KhronosGroup/OpenCOLLADA.git"
-inherit multilib cmake-utils
-[[ ${PV} == "9999" ]] && inherit git-r3
-
-DESCRIPTION="Stream based read/write library for COLLADA files"
-HOMEPAGE="http://www.opencollada.org/"
-[[ ${PV} == "9999" ]] || \
-	SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-[[ ${PV} == "9999" ]] || \
-	KEYWORDS="~amd64 ~ppc64 ~x86" \
-	S="${WORKDIR}"/OpenCOLLADA-${PV}
-
-IUSE="expat static-libs"
-
-# This is still needed to have so version numbers
-MY_SOVERSION="1.6"
-
-RDEPEND="dev-libs/libpcre
-	dev-libs/zziplib
-	media-libs/lib3ds
-	sys-libs/zlib
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}"
-
-# This is needed or you get an error on install
-BUILD_DIR="${S}"/build
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0_p864-expat.patch
-	"${FILESDIR}"/${PN}-1.2.2-soversion.patch
-	"${FILESDIR}"/${PN}-1.2.2-no-undefined.patch
-	"${FILESDIR}"/${PN}-1.2.2-libdir.patch
-	"${FILESDIR}"/${PN}-1.6.18-clang.patch
-)
-
-src_prepare() {
-	edos2unix CMakeLists.txt
-
-	default
-
-	# Remove bundled depends that have portage equivalents
-	rm -R Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die
-
-	# Remove unused build systems
-	rm Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
-	find "${S}" -name SConscript -delete || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SHARED=ON
-		-DUSE_STATIC=$(usex static-libs ON OFF)
-		-DUSE_EXPAT=$(usex expat ON OFF)
-		-DUSE_LIBXML=$(usex !expat ON OFF)
-		-Dsoversion=${MY_SOVERSION}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	echo "LDPATH=/usr/$(get_libdir)/opencollada" > "${T}"/99${PN}; \
-		doenvd "${T}"/99${PN}
-
-	dobin build/bin/OpenCOLLADAValidator
-}
diff --git a/x11-libs/libump/Manifest b/x11-libs/libump/Manifest
index 91fd830..a65420c 100644
--- a/x11-libs/libump/Manifest
+++ b/x11-libs/libump/Manifest
@@ -1,2 +1,2 @@
 DIST libump-3.0-git.tar.gz 25572 BLAKE2B 66c2371f384dc06cfcd8042dbccea2defe53333ac59119be3260169ba36e120a9f0ad124904705bcf3420788e3c4040e6db70ea11daa8e63b737f3eda19e0c98 SHA512 3fc206ee1ccd4b6a22c848232748e14797716a6b54134e07d8ac72bcdc95e01d735786c21fbf05a735b1bd97dae60a4036b2a8078f6c00fe0ec3e873e0831e67
-EBUILD libump-3.0.ebuild 684 BLAKE2B 653bd5cbb1d7bc871f4b85bb3e156b718f36ac2077c36968e5ecee100fa876f9871f9c7c0a090cb93aaccd21f590fe4f484e7fc769c18ec68d4197357d7605d2 SHA512 97eb7ccccf3d56c75be994abe0858f6ae94d064b15c00e9cb68f49108a3288f905de947b7c689b0e5d947682b65e5b918862a6525bccf899ebcc35f9d6c873c1
+EBUILD libump-3.0.ebuild 693 BLAKE2B d5d312fe9bec14f3d8a2399971fc048f76299c596658e92eda7b0c05224109807e21c4de8cea14458745ad12544ded6787fde78babcc1e566b06cfa95fc33f5c SHA512 4e6867f24dcbc71c49935c6fa5d02169e992155e766e225bc511bce64e2de537692e6328ff73602bfefd8d1036c276b0ea7f5c55253bd06614741dd951964e04
diff --git a/x11-libs/libump/libump-3.0.ebuild b/x11-libs/libump/libump-3.0.ebuild
index 409af2f..bbf2590 100644
--- a/x11-libs/libump/libump-3.0.ebuild
+++ b/x11-libs/libump/libump-3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=5
+EAPI=7
 
 inherit autotools
 if [ "${PV}" = "9999" ]; then
@@ -27,5 +27,6 @@ DEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	eautoreconf
+	default
 }