Revbump to implement changes of p/r 164 (thanks a17r).

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

5 files changed, 125 insertions, 39 deletions

diff --git a/media-libs/oyranos/ChangeLog b/media-libs/oyranos/ChangeLog
index 36bf23551f3e..4c5f70fd26db 100644
--- a/media-libs/oyranos/ChangeLog
+++ b/media-libs/oyranos/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/oyranos
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.29 2015/07/25 12:34:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.30 2015/08/05 11:03:04 xmw Exp $
+
+*oyranos-0.9.5-r1 (05 Aug 2015)
+
+  05 Aug 2015; Michael Weber <xmw@gentoo.org> +oyranos-0.9.5-r1.ebuild,
+  oyranos-0.9.5.ebuild, oyranos-9999.ebuild:
+  Revbump to implement changes of p/r 164 (thanks a17r).
 
   25 Jul 2015; Michał Górny <mgorny@gentoo.org>
   -files/oyranos-9999-buildsystem.patch, metadata.xml, oyranos-9999.ebuild:
diff --git a/media-libs/oyranos/Manifest b/media-libs/oyranos/Manifest
index d75f6b44d084..d4f4a57d21d8 100644
--- a/media-libs/oyranos/Manifest
+++ b/media-libs/oyranos/Manifest
@@ -32,27 +32,17 @@ AUX oyranos-0.9.4-use-more-internal-xrandr-info.patch 1615 SHA256 78d1c45cc18ad5
 AUX oyranos-0.9.5-buildsystem-r1.patch 6897 SHA256 91b9c94476ac189964c801a30cbb79e348d8a33aa9b38a32091df5175639b406 SHA512 974e1d85a4708591be5b6bed9e9ff0691d6aa606ef90458801332394b68d378f8afc3a519d7ae1ad42b48e2ed2ba1c9b5aa2e4bd6e43d6209ec81ada87816e91 WHIRLPOOL 40286c77fd52f753134c4d1eeef7e0264c5872855d4006b62ba1a71f6c45c1e2386f83ad8397b325f01677931d879e619f8d874c30baa8dc02257328d6adbee1
 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
+DIST oyranos-0.9.5.tar.gz 1801954 SHA256 7cf8d41c3019e91608837cc40de801348b35963853e6d62b3e6dcd46bf24cafa SHA512 836bb7324cd300608cb13381704b6b28aae93485140d2e3f6c7dc21f1d35f9acc44427c861814b13c60cc499ba5495068b1069f6843909744f18ac8998d17ae9 WHIRLPOOL 69b676c6cae8eb878b5e0ea73358ffc59ba78541c9de89d10667a52141d0b37399ea733e1e2aa69bf90208a12e93c63b0b8bb63e6eb2efccc0151b745469491f
 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 3378 SHA256 546617331949ac6041152a17f50975e3ffcab3da270da6f3eeb643d9d82f6605 SHA512 d768da494f3099ffb0f70ba11ec59b83e582f8f20203670fb5645fff019dc41571e17821d4e5ebab56dfc7c312d5c09c8595a868c1ceac16847e36bf0df790a3 WHIRLPOOL 5d3b1552edac3c042658be968244b4ab00f7bcdfa6235da00416d4f11534dd6454b90dfb2ce03d82d70cf24f37a23bfa8e8b7f3a96d6b1a3012e6714029a6d47
-MISC ChangeLog 6531 SHA256 e05233d081e35aa32428d67357b669c191341bc05988b4b1afb6ec30d965455f SHA512 9b2f9aff00987716299b3b9f1241ddef6a29efe4d0b5f490ef565361c6ca729e91825aa145b130726f0c66753acfe4aa37d7a5f2013e05c8c67b8fda75adac20 WHIRLPOOL 21dc41b2119852c76c2d8703801b239e368448288089de5acb96db0b57b027d23f0fa43bd4103e3e805c39f91d6f2e2ef527bad7fa5aa7ea30ca1c0347c5e1c4
+EBUILD oyranos-0.9.5-r1.ebuild 3252 SHA256 fb9a55f95bd517473bf27b852834edb5b043e2065f08d926bdc74025267dedd2 SHA512 bbe691559e116427f67f3066278a445ccc39abe922881f0ca74bf1f2e6fd7bcc7bb2f621b126ea9fb532751341bc25896712b980ad1074fd1902d48d7b3a52e1 WHIRLPOOL e643b2aae41fd78b206a67d969aa2e8c5e3e59920409ff8bf604d86b2f3da56c2a2efc782d43e8202f08a11ee0489939fb2b93ae4da20a51ee89e1ec7c3886c5
+EBUILD oyranos-0.9.5.ebuild 2620 SHA256 8afc9856aadcd41efeb16057c05bf322f7dd779954509156f1c6aa9ed2f752f1 SHA512 a290aaea129f92ae491e08dca0995052a589e99cddaeb7d1e4341ea6bec0658f60d31fc3849d2bb2b43f9c6854e03eff66dd0e2572f5d512f94b8d44c2d11a7a WHIRLPOOL 859665a6d099dde0de446c89d1e0e8050ecb4594560f658d4aa7da2105d45fc337adbeb069567f3a2e93aeae9a4f2db80170b11ca8043fd64d646f3b65957ca4
+EBUILD oyranos-9999.ebuild 3214 SHA256 73298ee0706820501b33dc13ebb09777751a567246427d80cd3d5169370ad045 SHA512 2c024c6718c4352e667945f90b59fd3b2db76d95de76ae813dbed845f3c86942f299f57fdc87a79ad685c57f8162c501a1609bb6b8fa2abf797c3836087d0959 WHIRLPOOL 69ac4e5b6593304455242cb954cbfe2d847e35bda13f7e6001bf6dedb6a49813a39a127b0019365c1bb4549f7f19f8cbb7fa8da994e8c4904d50529a54cb9668
+MISC ChangeLog 6736 SHA256 5f9c01bb082dcc13ff8a83a28f68d4fdc024c00ccdec793046a32e760160dc39 SHA512 a06c8229ad9b2d300ba520efd8dc8887dc9c5bb5881d262b8aa13f25cdf822c78e74c31f19500b59da0daad2931312d68d6b0ed0a20596f90a06762827b93996 WHIRLPOOL 052cccd2fec412638e7757bb98bd0aa3957228b82abd38f47414ec4ace1bdcf9f0f986d5c04f01c622c4d1f97661da577a926f9bea8a73b6539d8de055871934
 MISC metadata.xml 313 SHA256 8fd011b20598a0bed2f4b91851d3f3454564d886b381bde65e67488e04ff907f SHA512 1eeb21e19aff71a6facb419f9661a9978a1a60d61027928933d03a7d6ebcd76bf86f1e0a867cbd27709a713df9232f63116b27a7b30055f535c0f0a31e6c973d WHIRLPOOL 2de1024abdbd3493e2a5cd976a2afd7bd1215ca665b01c5ba293cd88b1bf8211f131d63f602d436c5e3d312535ad3dece2290d4a23ff00789c6c95648816a271
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVs4JcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOMMQP/23+JN8hItZgOQepXQtyvQWn
-SCNod0mPMR8i1xAfBVbjVSlK3U2/thCbytqEjuNmTeS/CPetD5BdNro1UOyM7rMH
-ZmQ8enXaUEQ8SigdBHc3rWbwS0KqIBs3yYvzjxrS2+bewc+k1v1rNrPCzRpS09qk
-DLVgBtXSlqGM1QapZr0UVVwFUu18/sRG4XnaOR5Fbs+Gv+NPnzAOctTZbi/uiSUw
-dXS75LbtoA01t1mRlVnJHzHnZdrGjr4zQgCl48Gf1mOlMYH2LsiwuWLDfxsybSRh
-sxtjFBn3T8rwugAx5Q2Xwf97Kt1JXLUwfeQGK8YPWGpJPliVPNKd/8IgdBaU6sQo
-qa7WDymvFlzdhbEGy5FW8Z1ZtMO/UEesHRpgibdDLKM5veEfGIcg4BULFKiP/k1l
-NxpGb7EfUNs7O9p/xLxCOnW1z6S9WJwulUWICL+iWMqr1puPfuc3yx0O0PeaqKlN
-jnx659HbwC/8XCHl2B2hvY0PqN9XMsyYRqJr7u0TDIbD4BzO8kEwJT/CXCsDspqc
-KSda433MAYe73HWHbVFDLcCCKnsCk4XKN/uost/zy7flk7UdfiVcKM7Ixv+uvEJ4
-XAvRrDRaxhrA52ClSKW7a35dqgn+pXwqQ0VPBdWnWmLNtkJsfZn7+VgCnaiRL2Lz
-GewspZYYnvJKmV7F6/Dm
-=xAMw
+iF4EAREIAAYFAlXB7WkACgkQknrdDGLu8JB8HwEAgyFtliuu8N5JxbkVs8nbQ/xE
+BOaI07LvLpda86Lp5SwA/0N44p5KXXttZclyGq8LlyfN3m+sPU1YUnkBkzVpxuzj
+=D0qe
 -----END PGP SIGNATURE-----
diff --git a/media-libs/oyranos/oyranos-0.9.5-r1.ebuild b/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..57893e6b83df
--- /dev/null
+++ b/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
@@ -0,0 +1,102 @@
+# 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-0.9.5-r1.ebuild,v 1.1 2015/08/05 11:03:04 xmw Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic cmake-utils cmake-multilib
+
+DESCRIPTION="Colour management system allowing to share various settings across applications and services"
+HOMEPAGE="http://www.oyranos.org/"
+SRC_URI="https://github.com/oyranos-cms/oyranos/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD"
+SLOT="0"
+IUSE="X cairo cups doc exif fltk jpeg qt4 qt5 raw test tiff"
+
+#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/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 )
+	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="${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 )
+RESTRICT="test"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/oyranos-config
+)
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/oyranos/oyranos_version.h
+)
+
+CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindFltk FindXcm FindCUPS"
+
+src_prepare() {
+	einfo remove bundled libs
+	rm -rf elektra* yajl || die
+
+	if use fltk ; then
+		#src/examples does not include fltk flags
+		append-cflags $(fltk-config --cflags)
+		append-cxxflags $(fltk-config --cxxflags)
+	fi
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIB_SUFFIX=${libdir#lib}
+		-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
+}
diff --git a/media-libs/oyranos/oyranos-0.9.5.ebuild b/media-libs/oyranos/oyranos-0.9.5.ebuild
index 9f824f6c7eee..c67b3d3a7d78 100644
--- a/media-libs/oyranos/oyranos-0.9.5.ebuild
+++ b/media-libs/oyranos/oyranos-0.9.5.ebuild
@@ -1,22 +1,16 @@
 # 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-0.9.5.ebuild,v 1.3 2015/05/27 20:31:04 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.5.ebuild,v 1.4 2015/08/05 11:03:04 xmw Exp $
 
 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"
-	KEYWORDS="~amd64 ~x86"
-fi
+SRC_URI="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.9/${P}.tar.bz2"
 
+KEYWORDS="~amd64 ~x86"
 LICENSE="BSD"
 SLOT="0"
 IUSE="X cairo cups doc exif fltk qt4 raw test"
diff --git a/media-libs/oyranos/oyranos-9999.ebuild b/media-libs/oyranos/oyranos-9999.ebuild
index 167c3e48784a..f485ced7d4f0 100644
--- a/media-libs/oyranos/oyranos-9999.ebuild
+++ b/media-libs/oyranos/oyranos-9999.ebuild
@@ -1,22 +1,16 @@
 # 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.8 2015/07/25 12:34:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild,v 1.9 2015/08/05 11:03:04 xmw Exp $
 
 EAPI=5
 
-inherit eutils flag-o-matic cmake-utils cmake-multilib
+inherit eutils flag-o-matic git-r3 cmake-utils cmake-multilib
 
 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="https://github.com/oyranos-cms/oyranos/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git"
 
+KEYWORDS=""
 LICENSE="BSD"
 SLOT="0"
 IUSE="X cairo cups doc exif fltk jpeg qt4 qt5 raw test tiff"