Fix dependencies and the multilib support code.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

3 files changed, 162 insertions, 27 deletions

diff --git a/media-libs/oyranos/ChangeLog b/media-libs/oyranos/ChangeLog
index 60e7e74bd7e7..72e1c0e16d42 100644
--- a/media-libs/oyranos/ChangeLog
+++ b/media-libs/oyranos/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/oyranos
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.22 2014/06/18 19:52:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.23 2014/06/22 12:38:50 mgorny Exp $
+
+*oyranos-0.9.4-r2 (22 Jun 2014)
+
+  22 Jun 2014; Michał Górny <mgorny@gentoo.org> +oyranos-0.9.4-r2.ebuild,
+  oyranos-9999.ebuild:
+  Fix dependencies and the multilib support code.
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> oyranos-0.9.4-r1.ebuild:
   Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
diff --git a/media-libs/oyranos/oyranos-0.9.4-r2.ebuild b/media-libs/oyranos/oyranos-0.9.4-r2.ebuild
new file mode 100644
index 000000000000..794de3c20d81
--- /dev/null
+++ b/media-libs/oyranos/oyranos-0.9.4-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.4-r2.ebuild,v 1.1 2014/06/22 12:38:50 mgorny 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="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.4/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X cairo cups doc exif fltk qt4 raw test"
+
+RDEPEND="=app-admin/elektra-0.7*:0[${MULTILIB_USEDEP}]
+	>=app-admin/elektra-0.7.1-r5: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-basiccolor-printing2009
+	|| (
+		>=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}]
+		>=media-libs/lcms-1.19-r1:0[${MULTILIB_USEDEP}]
+	)
+	>=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}]
+	>=media-libs/libXcm-0.5.2-r1[${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 )
+	raw? ( >=media-libs/libraw-0.15.4[${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}
+	app-doc/doxygen
+	media-gfx/graphviz"
+
+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
+
+	epatch "${FILESDIR}/${P}"-buildsystem-r1.patch
+
+	#upstream(ed) fixes, be more verbose, better xrandr handling
+	epatch "${FILESDIR}/${P}"-fix-array-access.patch \
+		"${FILESDIR}/${P}"-fix-oyRankMap-helper-functions-crashes.patch \
+		"${FILESDIR}/${P}"-fix-oyStringSegment-crash.patch \
+		"${FILESDIR}/${P}"-be-more-verbose.patch \
+		"${FILESDIR}/${P}"-use-more-internal-xrandr-info.patch \
+		"${FILESDIR}/${P}"-set-xcalib-to-screen-if-ge-xrandr-12.patch \
+		"${FILESDIR}/${P}"-fix-double-object-release.patch \
+		"${FILESDIR}/${P}"-omit-profile-with-error.patch \
+		"${FILESDIR}/${P}"-fix-typos-and-grammar.patch
+
+	#upstream fix for QA notice, gentoo bug 464254
+	epatch "${FILESDIR}/${P}"-fix-runpaths.patch
+
+	#fix really ugly and prominently visible typo (solved in 0.9.5)
+	sed -e 's/Promt/Prompt/' \
+		-i src/liboyranos_config/oyranos_texts.c po/*.{po,pot} settings/*xml || 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}
+
+		$(usex X -DWANT_X11=1 "")
+		$(usex cairo -DWANT_CAIRO=1 "")
+		$(usex cups -DWANT_CUPS=1 "")
+		$(usex exif -DWANT_EXIV2=1 "")
+		$(usex raw -DWANT_LIBRAW=1 "")
+
+		# only used in programs
+		$(multilib_native_usex fltk -DWANT_FLTK=1 "")
+		$(multilib_native_usex qt4 -DWANT_QT4=1 "")
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS ChangeLog README
+	if use doc ; then
+		mv "${ED}/usr/share/doc/${PN}/*" "${ED}/usr/share/doc/${P}" || die
+	fi
+	rm -rf "${ED}/usr/share/doc/${PN}" || die
+}
diff --git a/media-libs/oyranos/oyranos-9999.ebuild b/media-libs/oyranos/oyranos-9999.ebuild
index 2b001b2878ae..a3ab23f3a82a 100644
--- a/media-libs/oyranos/oyranos-9999.ebuild
+++ b/media-libs/oyranos/oyranos-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.4 2013/08/15 03:38:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild,v 1.5 2014/06/22 12:38:50 mgorny Exp $
 
 EAPI=5
 
-inherit eutils flag-o-matic cmake-utils cmake-multilib git-2
+inherit eutils flag-o-matic cmake-utils cmake-multilib git-r3
 
 DESCRIPTION="colour management system allowing to share various settings across applications and services"
 HOMEPAGE="http://www.oyranos.org/"
@@ -15,32 +15,41 @@ SLOT="0"
 KEYWORDS=""
 IUSE="X cairo cups doc exif fltk qt4 raw test"
 
-RDEPEND="=app-admin/elektra-0.7*
-	dev-libs/libxml2
-	dev-libs/yajl
-	media-gfx/exiv2
+RDEPEND="=app-admin/elektra-0.7*:0[${MULTILIB_USEDEP}]
+	>=app-admin/elektra-0.7.1-r5: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-basiccolor-printing2009
-	|| ( media-libs/lcms:0 media-libs/lcms:2 )
-	media-libs/libpng:0
-	media-libs/libraw
-	>=media-libs/libXcm-0.5.2
+	|| (
+		>=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}]
+		>=media-libs/lcms-1.19-r1:0[${MULTILIB_USEDEP}]
+	)
+	>=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}]
+	>=media-libs/libXcm-0.5.2-r1[${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 )
-	X? ( x11-libs/libXfixes
-		x11-libs/libXrandr
-		x11-libs/libXxf86vm
-		x11-libs/libXinerama )
-	cairo? ( x11-libs/cairo )
-	cups? (	net-print/cups )
-	exif? ( media-gfx/exiv2 )
 	qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
-	raw? ( media-libs/libraw )"
+	raw? ( >=media-libs/libraw-0.15.4[${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}
 	app-doc/doxygen
 	media-gfx/graphviz"
 
 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 FindCUPS"
 
 src_prepare() {
@@ -52,25 +61,32 @@ src_prepare() {
 	if use fltk ; then
 		#src/examples does not include fltk flags
 		append-cflags $(fltk-config --cflags)
-		append-cxxflags $(fltk-confiag --cxxflags)
+		append-cxxflags $(fltk-config --cxxflags)
 	fi
 
 	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIB_SUFFIX=${libdir#lib}
 
-	mycmakeargs=(
 		$(usex X -DWANT_X11=1 "")
 		$(usex cairo -DWANT_CAIRO=1 "")
 		$(usex cups -DWANT_CUPS=1 "")
 		$(usex exif -DWANT_EXIV2=1 "")
-		$(usex fltk -DWANT_FLTK=1 "")
-		$(usex qt4 -DWANT_QT4=1 "")
 		$(usex raw -DWANT_LIBRAW=1 "")
+
+		# only used in programs
+		$(multilib_native_usex fltk -DWANT_FLTK=1 "")
+		$(multilib_native_usex qt4 -DWANT_QT4=1 "")
 	)
-}
 
-src_install() {
-	cmake-multilib_src_install
+	cmake-utils_src_configure
+}
 
+multilib_src_install_all() {
 	dodoc AUTHORS ChangeLog README
 	if use doc ; then
 		mv "${ED}/usr/share/doc/${PN}/*" "${ED}/usr/share/doc/${P}" || die