[patch] ebuild multilib patch v3

1.8.18-multilib.patch (text/plain), 2.63 KB, created by Kai Krakow on 2015-05-05 05:35:33 UTC

--- /usr/portage/x11-themes/qtcurve/qtcurve-1.8.18.ebuild	2014-08-25 23:01:20.000000000 +0200
+++ qtcurve-1.8.18.ebuild	2015-05-05 07:30:50.956208037 +0200
@@ -4,7 +4,7 @@
 
 EAPI=5
 KDE_REQUIRED="optional"
-inherit kde4-base
+inherit kde4-base cmake-multilib multilib-minimal
 
 DESCRIPTION="A set of widget styles for Qt and GTK2"
 HOMEPAGE="https://github.com/QtCurve/qtcurve"
@@ -26,12 +26,12 @@
 	windeco? ( kde X )
 	|| ( gtk qt4 qt5 )"
 
-RDEPEND="X? ( x11-libs/libxcb
-		x11-libs/libX11 )
-	gtk? ( x11-libs/gtk+:2 )
-	qt4? ( dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
+RDEPEND="X? ( x11-libs/libxcb[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
+	qt4? ( dev-qt/qtdbus:4[${MULTILIB_USEDEP}]
+		dev-qt/qtgui:4[${MULTILIB_USEDEP}]
+		dev-qt/qtsvg:4[${MULTILIB_USEDEP}]
 	)
 	qt5? ( dev-qt/qtdeclarative:5
 		dev-qt/qtgui:5
@@ -57,6 +57,13 @@
 	"${FILESDIR}/${P}-remove_qt_filedialog_api.patch"
 	)
 
+pkg_pretend() {
+	if [[ "$(multilib_get_enabled_abis)" != "${DEFAULT_ABI}" ]]; then
+		use qt5 && elog "Qt5 is not (yet) multilib-aware, qtcurve will be built for Qt5 with native ABI only"
+		use kde && elog "KDE is not (yet) multilib-aware, qtcurve will be built for KDE with native ABI only"
+	fi
+}
+
 pkg_setup() {
 	# bug #498776
 	if ! version_is_at_least 4.7 $(gcc-version) ; then
@@ -66,16 +73,31 @@
 	use kde && kde4-base_pkg_setup
 }
 
-src_configure() {
+multilib_src_configure() {
 	local mycmakeargs
 	mycmakeargs=(
 		$(cmake-utils_use_enable gtk GTK2)
 		$(cmake-utils_use_enable qt4 QT4)
-		$(cmake-utils_use_enable qt5 QT5)
-		$(cmake-utils_use X QTC_ENABLE_X11 )
-		$(cmake-utils_use kde QTC_QT4_ENABLE_KDE )
-		$(cmake-utils_use windeco QTC_QT4_ENABLE_KWIN )
-		$(cmake-utils_use nls QTC_INSTALL_PO )
+		$(cmake-utils_use X QTC_ENABLE_X11)
+		$(multilib_is_native_abi && cmake-utils_use_enable qt5 QT5 || echo -DENABLE_QT5=OFF)
+		$(multilib_is_native_abi && cmake-utils_use kde QTC_QT4_ENABLE_KDE || echo -DQTC_QT4_ENABLE_KDE=OFF)
+		$(multilib_is_native_abi && cmake-utils_use windeco QTC_QT4_ENABLE_KWIN || echo -DQTC_QT4_ENABLE_KWIN=OFF)
+		$(is_final_abi && cmake-utils_use nls QTC_INSTALL_PO || echo -DQTC_INSTALL_PO=OFF)
 	)
+	if ! multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+			-DLIB_INSTALL_DIR=/usr/$(get_libdir)
+		)
+		if use qt4; then
+			mycmakeargs+=(
+				-DQT_LIBRARY_DIR=/usr/$(get_libdir)/qt4
+				-DQT_BINARY_DIR=/usr/$(get_libdir)/qt4/bin
+				-DQT_PLUGINS_DIR=/usr/$(get_libdir)/qt4/plugins
+				-DQT_IMPORTS_DIR=/usr/$(get_libdir)/qt4/imports
+				-DGTK2_LIBDIR=$(get_libdir)
+			)
+		fi
+	fi
 	cmake-utils_src_configure
 }