[media-libs/oyranos] Drop upstreamed patch, fix SRC_URI, DEPENDs

See also bug 550272
Package has optional support for one of two Qt versions

media-libs/oyranos/Manifest

@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX oyranos-0.3.2-test.patch 963 SHA256 b637e9be5395b9efe8f5ebc5a3255dcdfd4457752672b9087d2f68ab098e8466 SHA512 53273cde26dfc8d254ae59446f3874eb5cf251e6a9f9b703d3bed723b4ca850f492e94bec7a031b38be5997df75decb730961ec202d191484296bc64eea040a5 WHIRLPOOL 78d859d935e0c69f81dbb7032bc1382188cc3723c10e43b1dfae883a9589c6b6b9ab10b6b05d6a67163877c6ff0d579a00e7362e78b97fda9227c7a6f4e751c8
 AUX oyranos-0.4.0-buildsystem.patch 2621 SHA256 6f93da323034d819242c4f71d96ffc873ff58d9fe4f6bbab83206f0d907c9d69 SHA512 0b07affb94928a0136ce81940d1d0e65652d9dd06b658c7539ea6f5f3bafc8f3c2055932580c9edda9bc785b48fb489206ad55fc6d9e1909ba16f2d169a7c10d WHIRLPOOL 56b2a0ea8509cb23e6bfff8c3e5721eabc832cd75b060cc905130ac12aaed034a985da8ea5837ce89d602ddda13645365bfd58d3cee1087bd960a53a13fa26df
 AUX oyranos-0.9.0-array.patch 1154 SHA256 79d4628cb20f310627f50caa76b383e68ccdbde3849c0cefa2389da825078757 SHA512 b48a902f7d09fcf2f08195417aa0e77b21d27659177383d76362e278247376ef6d639ef15abfe8025dcbb68a8e7d3896fd602a74a3ea2671fbde128057299cd9 WHIRLPOOL 66d97d256661884113ee10c988a83b19bb53b35f2426d0f610d7610744102f03c769f220ca1182648fa51a1429892fe9d16c806dbbc9c46a59cfa9246d2e8ea1
@@ -30,30 +27,10 @@ AUX oyranos-0.9.4-omit-profile-with-error.patch 1606 SHA256 06ce34d10e2cb9ca5722
 AUX oyranos-0.9.4-set-xcalib-to-screen-if-ge-xrandr-12.patch 5370 SHA256 3d2f260eb37bee4bbcd65677099076626147f22f17fdc938d26a3b86ceb986b4 SHA512 da7a3c05e161945bab4b8336e6848d06353482351aed45febedcd66f0f1b70276ab42f4a6cbcaff7708fc9ef42d135ec2110550ca66f94aef5c3915a7cf5e176 WHIRLPOOL 89b8264aab7026718694a8f84dfefe5b49af1a912c720165305b6d2d483943c83f5c43d109ffddb90ebfe2133731b87a6fc71ec2f6f4b02c4f705785d68bc2a7
 AUX oyranos-0.9.4-use-more-internal-xrandr-info.patch 1615 SHA256 78d1c45cc18ad555a97d2a6cd50c9ad40cd12c02048f351afc0a3893772c309a SHA512 cf4b42b8e794d19dbbbeab12c97fc80b897bcda26271c943c537f827946ca4a021e818c9fa6971b101aecc10d63e4d12b5781a549b6db62977884fa67134ecbc WHIRLPOOL af3992853631a3464b3ac625628031f63c80cc2da6b0d9b0cbd9f75bc460c4213f6fef5485e55eda8784d1b74c5cc9e7722ed07db10a175654df2b85cabd86ac
 AUX oyranos-0.9.5-buildsystem-r1.patch 6897 SHA256 91b9c94476ac189964c801a30cbb79e348d8a33aa9b38a32091df5175639b406 SHA512 974e1d85a4708591be5b6bed9e9ff0691d6aa606ef90458801332394b68d378f8afc3a519d7ae1ad42b48e2ed2ba1c9b5aa2e4bd6e43d6209ec81ada87816e91 WHIRLPOOL 40286c77fd52f753134c4d1eeef7e0264c5872855d4006b62ba1a71f6c45c1e2386f83ad8397b325f01677931d879e619f8d874c30baa8dc02257328d6adbee1
-AUX oyranos-9999-buildsystem.patch 6753 SHA256 23e249c6818d71e023832b46ab6f692f6c202f8744bbfd63dae2867c10173141 SHA512 10505a5c228eaa92eae15bbfb67336306383e38bcade590ff9d432412c1379aa844b2ff43165d3a0cfcdaef5b135450604e0960cddc6855feb4653b0a6da8260 WHIRLPOOL c6e154861005219fbbf8680b81a564e76f043ddf1717690c741c0c91a6c49c831d49223b019a406992e049e03aaa75be07faba504e62011b9f18eb4971e675a4
 DIST oyranos-0.9.4.tar.bz2 1632276 SHA256 6dcf7f8bef0720077ee55484a5b507ba5f049094f21fbbd2752f2ed120c0768a SHA512 23ded5bac4c16aba8a2d4266981e6ad53cfa2ce720d03751625552a873de8311dda721eb8dd732860ae0a0fcdfc7346f92aaeb8bde281ceeb4895f154d6e6c59 WHIRLPOOL 7ec535e326bf102eb0d154ac995b42b4a8b23a606c35417727b54653424807c47c5a4cf7ece6411627dcffd7ca5d8b1ddc588d97d1a02fb079d27d3d20efd2a5
 DIST oyranos-0.9.5.tar.bz2 1800977 SHA256 75c2681e6d95cb969336f1e9bdfe12a85ae6a5bd438573d7d2955b37ea466e40 SHA512 18ab90f6d80db2c3d3fda64f80d01be2c83c9e86f14b3a3310eea5dd921b7376afb894fea987357b573a4247d5c285bc9f6ccc044e21dbe7da92f25373b9fd99 WHIRLPOOL 32440b53b7da82baa8299c570c3456c35cbffb17998836240640011ff5a13981e7219213b00c0d9afc367f74bf35ffb297363285d060bd72f73f8f75a18ed025
 EBUILD oyranos-0.9.4-r2.ebuild 3573 SHA256 f8095d41b8be26c6f6b417932cc50d834b502df8158fb40a81e395e98832acd9 SHA512 125569f579302f03eac4a5d5c108654353c91185b1967a7b14c0a9e4a0c5098173edb5b9ff98a0ae4beca38bfb08854f642f1e8820bb761c85b0f443a690ce1f WHIRLPOOL 3a466f78031c5b2b12016b26bf80aa23e255deeb08e302a1e796c20efde5f929e365f2519af34b21ad6a2a012e1086788878ff2dee33efe313aa2812787ae17c
 EBUILD oyranos-0.9.5.ebuild 2750 SHA256 5596e500d71cf36ea36a42340b67bf9ee84390f14b608ff3e9e17c1af19b65c7 SHA512 7a7c9f34506eb18e19a3c89946274eac7f1341228f407e146a221b5b2c099b9b5ac49818d73500625ee4ffeaa1b779554d4644972024f1fc0339428999e3ec38 WHIRLPOOL 9cd20bff3134c971be8d8d9e73d9a39eb0805cfb312f283eefb57b67fb0496b42d6329af7e96b9a9588af0d489ab25f08662f4474ea749e62c5bf00530c0f478
-EBUILD oyranos-9999.ebuild 2748 SHA256 9a2f814012e822753b7f2862dfd0f01e6c2b167b7a1b8ed130f910f730a96f94 SHA512 71470f29648fa6ad3108f71cdef30851d80d310811e0eac68b662fb848abc3d900600ec66bf3ffb2c72f392b11d9f7891331aee9dbe598cd04732cb0a77b5327 WHIRLPOOL b60a17f2f9bff81e64e5fd32e33307441af8faa96d85b10642d5c6dcf322b657ef53d2a46566b26af663d862e4702654c13354a6f7495f1107b45a648eeb68e3
+EBUILD oyranos-9999.ebuild 3278 SHA256 0849e2b4c92771dadf801c46119c0f02cf45a0baeddf32384c925efd4559d6bd SHA512 bc9810c88b136e5048eb585a9bf62e6eb440fd1b96dfa5532d048926456d66a679821d9fa42950aabd0ff512d8ed44d7261b0690f2f52e87952212c642075131 WHIRLPOOL 89c7850cef9f01305e6186986c9be6130e0d9defdde9ea6d7be0c94256f140747727a80580ad26cd3f2186eba93592b26f4958527dc15a0962b208900e27e9ef
 MISC ChangeLog 6303 SHA256 65ce2d2f1323d9800824467ab836b8bf1b086009c32b3e1df2d667786582f094 SHA512 d23658e51250d828af2df9bfdb5f24338bdcfc89fce8f49d5e22c7b75c1b8da9f632ad6b87941569fbc8c4604dc1c766edbd5eedb7265d6837b178b6eb81dbe5 WHIRLPOOL 93851a4a64f30084bd5a31d31d84b8e21f22c604427136c99258428d7d57152c4b2c47633a663eba32de00adda750443d18fd54e01b60b1025c018228cb1fd38
-MISC metadata.xml 306 SHA256 33974f6cad4f91c6bc51bd58c86c732c210352c052de045c272c1a9e345bcaa9 SHA512 172a8a72560accc447ffeaa597c9a239548ad759d55eeb2cc3df168cf4c25cc6e1e226f294edb353e2240f5a361a9b7a3251236c6a7f4e9ff517bb3f8e5984eb WHIRLPOOL 8c6e871b635af8ff0fecbc644c564e4223dbea68d6bbfb3978c940c2542d388edcecd1e36a0abe05cd1a7c6b60311eabafccf03f082cd79798515e649382c05d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCgBmBQJVfupqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiQYkP/RB17r9NMq9CsrqsyOnXgvqm
-+Sjq+Daw+Il57y1IO19hVIsaMlY/cROLrz4pMFilBAmkE+Kka+w4H9FAB4fqjmbG
-IU18iKv1+p8CVFmY34aFw1wyqt3mXXjWWWBYoqnClW9XHe1DGjaKboywju8Zw26k
-fc+/9P+ChpZe5YKvlJJZKVRf9VCicgcZcoODrdmWZyjvWgtIAXhXjMqXEUnDui5b
-/jGT57VVhNIoywktsTAkq8KH+wfhkVBdt1cNeL6G5g8uj2dHQFiWhl+Wp9nvtA9z
-i6vSO6xlD6fGchRUUTH8Pl/fbOzxfrGj+UoaSbYcurByln8RNMK+YS6T4J0v1O0s
-dvS4eR6zWyRiq/lJMUebRC7y890xXL94l41FiXWVjLmSTMkzIaxanYmvw7+O7qep
-V5Orun/YXqwzDQYIUiHIFZ4SYiCUPkKZlwn/HIzZ265KHC0ltvmdd89nh34mhmrz
-W/5rBOoIsdWmmZ8fOw6INkoL6wC5H1Llk5+S4hog/Dtzp1istFpW2WIaVCCATA7K
-Y+nZdYPw6W+G/CdhKI2L71vadw3XvpkI2WleGgXzQdJOak+Je2ZbZo3sAGOV2F2y
-RBKtXlalEQIhqMXaUtDyvcFVgNVqsfZDldiQS0vxBKW0DDlajiMEij/nl1pfYU7n
-0UTNz9aGFRutOzQ3RWGF
-=XyV9
------END PGP SIGNATURE-----
+MISC metadata.xml 313 SHA256 8fd011b20598a0bed2f4b91851d3f3454564d886b381bde65e67488e04ff907f SHA512 1eeb21e19aff71a6facb419f9661a9978a1a60d61027928933d03a7d6ebcd76bf86f1e0a867cbd27709a713df9232f63116b27a7b30055f535c0f0a31e6c973d WHIRLPOOL 2de1024abdbd3493e2a5cd976a2afd7bd1215ca665b01c5ba293cd88b1bf8211f131d63f602d436c5e3d312535ad3dece2290d4a23ff00789c6c95648816a271

media-libs/oyranos/metadata.xml

@@ -6,6 +6,6 @@
 		<name>Michael Weber</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">oyranos</remote-id>
+		<remote-id type="github">oyranos-cms/oyranos</remote-id>
 	</upstream>
 </pkgmetadata>

media-libs/oyranos/oyranos-9999.ebuild

@@ -1,55 +1,65 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild,v 1.7 2015/05/27 20:31:04 tamiko Exp $
+# $Header: $
 
 EAPI=5
 
 inherit eutils flag-o-matic cmake-utils cmake-multilib
 
-DESCRIPTION="colour management system allowing to share various settings across applications and services"
+DESCRIPTION="Colour management system allowing to share various settings across applications and services"
 HOMEPAGE="http://www.oyranos.org/"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git"
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.9/${P}.tar.bz2"
+	SRC_URI="https://github.com/oyranos-cms/oyranos/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="X cairo cups doc exif fltk qt4 raw test"
+IUSE="X cairo cups doc exif fltk jpeg qt4 qt5 raw test tiff"
 
-RDEPEND="
+#OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO
+
+COMMON_DEPEND="
 	|| (
 		=app-admin/elektra-0.7*:0[${MULTILIB_USEDEP}]
 		>=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}]
 	)
 	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
 	>=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}]
-	media-libs/icc-profiles-basiccolor-printing2009
-	media-libs/icc-profiles-openicc
 	>=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}]
 	>=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}]
 	>=media-libs/libXcm-0.5.3[${MULTILIB_USEDEP}]
 	cairo? ( >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}] )
 	cups? ( >=net-print/cups-1.7.1-r1[${MULTILIB_USEDEP}] )
 	exif? ( >=media-gfx/exiv2-0.23-r2[${MULTILIB_USEDEP}] )
 	fltk? ( x11-libs/fltk:1 )
-	qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	qt5? (
+		dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
+	)
+	!qt5? (
+		qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
+	)
 	raw? ( >=media-libs/libraw-0.15.4[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
 	X? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
 		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
 		>=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	doc? (
 		app-doc/doxygen
 		media-gfx/graphviz
 	)"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/icc-profiles-basiccolor-printing2009
+	media-libs/icc-profiles-openicc"
 
-DOCS="AUTHORS.md ChangeLog.md README.md"
+DOCS=( AUTHORS.md ChangeLog.md README.md )
 RESTRICT="test"
 
 MULTILIB_CHOST_TOOLS=(
@@ -65,8 +75,6 @@ src_prepare() {
 	einfo remove bundled libs
 	rm -rf elektra* yajl || die
 
-	epatch "${FILESDIR}/${P}"-buildsystem.patch
-
 	if use fltk ; then
 		#src/examples does not include fltk flags
 		append-cflags $(fltk-config --cflags)
@@ -80,17 +88,20 @@ multilib_src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
 		-DLIB_SUFFIX=${libdir#lib}
-
-		$(usex cairo -DWANT_CAIRO=1 "")
-		$(usex cups -DWANT_CUPS=1 "")
-		$(usex doc -DWANT_HTML=1 "")
-		$(usex exif -DWANT_EXIV2=1 "")
-		$(usex raw -DWANT_LIBRAW=1 "")
-		$(usex X -DWANT_X11=1 "")
-
-		# only used in programs
-		$(multilib_native_usex fltk -DWANT_FLTK=1 "")
-		$(multilib_native_usex qt4 -DWANT_QT4=1 "")
+		-DUSE_SYSTEM_ELEKTRA=YES
+		-DUSE_SYSTEM_YAJL=YES
+		-DUSE_Qt4=$(usex '!qt5')
+		-DCMAKE_DISABLE_FIND_PACKAGE_Cairo=$(usex '!cairo')
+		-DCMAKE_DISABLE_FIND_PACKAGE_Cups=$(usex '!cups')
+		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(usex '!doc')
+		-DCMAKE_DISABLE_FIND_PACKAGE_Exif2=$(usex '!exif')
+		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex '!jpeg')
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex '!raw')
+		-DCMAKE_DISABLE_FIND_PACKAGE_TIFF=$(usex '!tiff')
+		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex '!X')
+		-DCMAKE_DISABLE_FIND_PACKAGE_Fltk=$(multilib_native_usex fltk OFF ON)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt4=$(multilib_native_usex qt4 OFF ON)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5=$(multilib_native_usex qt5 OFF ON)
 	)
 
 	cmake-utils_src_configure