[gentoo-dev] [PATCH] Convert virtualgl to cmake-multilib.

[Michał Górny]

---
 ...algl-2.3.2.ebuild => virtualgl-2.3.2-r1.ebuild} | 77 +++++-----------------
 1 file changed, 17 insertions(+), 60 deletions(-)
 copy gx86/x11-misc/virtualgl/{virtualgl-2.3.2.ebuild => virtualgl-2.3.2-r1.ebuild} (52%)

diff --git a/gx86/x11-misc/virtualgl/virtualgl-2.3.2.ebuild b/gx86/x11-misc/virtualgl/virtualgl-2.3.2-r1.ebuild
similarity index 52%
copy from gx86/x11-misc/virtualgl/virtualgl-2.3.2.ebuild
copy to gx86/x11-misc/virtualgl/virtualgl-2.3.2-r1.ebuild
index bd3d565..9e00995 100644
--- a/gx86/x11-misc/virtualgl/virtualgl-2.3.2.ebuild
+++ b/gx86/x11-misc/virtualgl/virtualgl-2.3.2-r1.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/virtualgl-2.3.2.ebuild,v 1.3 2013/02/05 17:38:27 pacho Exp $
 
-EAPI="4"
-inherit cmake-utils multilib
+EAPI=5
+inherit cmake-multilib multilib
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
 HOMEPAGE="http://www.virtualgl.org/"
@@ -16,14 +16,14 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
 SLOT="0"
 LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
 KEYWORDS="~amd64 ~x86"
-IUSE="multilib ssl"
+IUSE="ssl"
 
 RDEPEND="ssl? ( dev-libs/openssl )
 	media-libs/libjpeg-turbo
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXv
-	multilib? ( app-emulation/emul-linux-x86-xlibs
+	abi_x86_32? ( app-emulation/emul-linux-x86-xlibs
 		app-emulation/emul-linux-x86-baselibs
 		app-emulation/emul-linux-x86-opengl )
 	virtual/glu
@@ -31,7 +31,6 @@ RDEPEND="ssl? ( dev-libs/openssl )
 DEPEND="${RDEPEND}"
 
 CMAKE_VERBOSE=1
-build32_dir="${WORKDIR}/${P}_build32"
 
 src_prepare() {
 	# Use /var/lib, bug #428122
@@ -42,69 +41,27 @@ src_prepare() {
 }
 
 src_configure() {
-	# Configure 32bit version on multilib
-	use amd64 && use multilib && (
-		einfo "Configuring 32bit libs..."
-
-		local ABI=x86
-		local CFLAGS="${CFLAGS--O2 -march=native -pipe} -m32"
-		local CXXFLAGS="${CFLAGS}"
-		local LDFLAGS="${LDFLAGS} -m32"
-		local BUILD_DIR="${build32_dir}"
+	local mycmakeargs=(
+		$(cmake-utils_use ssl VGL_USESSL)
+		-DVGL_DOCDIR=/usr/share/doc/${PF}
+		-DTJPEG_INCLUDE_DIR=/usr/include
+	)
 
-		mycmakeargs=(
-			$(cmake-utils_use ssl VGL_USESSL)
-			-DVGL_DOCDIR=/usr/share/doc/"${P}"
+	abi_configure() {
+		local mycmakeargs=(
+			"${mycmakeargs[@]}"
 			-DVGL_LIBDIR=/usr/$(get_libdir)
-			-DTJPEG_INCLUDE_DIR=/usr/include
 			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-			-DCMAKE_LIBRARY_PATH=/usr/lib32
-			-DVGL_FAKELIBDIR=/usr/fakelib/32
+			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+			-DVGL_FAKELIBDIR=/usr/fakelib/${ABI}
 		)
 		cmake-utils_src_configure
-
-		einfo "Configuring 64bit libs..."
-	)
-
-	# Configure native version
-	mycmakeargs=(
-		$(cmake-utils_use ssl VGL_USESSL)
-		-DVGL_DOCDIR=/usr/share/doc/"${P}"
-		-DVGL_LIBDIR=/usr/$(get_libdir)
-		-DTJPEG_INCLUDE_DIR=/usr/include
-		-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-		-DCMAKE_LIBRARY_PATH=/usr/lib64
-		-DVGL_FAKELIBDIR=/usr/fakelib/64
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# Make 32bit version on multilib
-	use amd64 && use multilib && (
-		einfo "Building 32bit libs..."
-		local BUILD_DIR="${build32_dir}"
-		cmake-utils_src_compile
-
-		einfo "Building 64bit libs..."
-	)
-
-	# Make native version
-	cmake-utils_src_compile
+	}
+	multilib_parallel_foreach_abi abi_configure
 }
 
 src_install() {
-	# Install 32bit version on multilib
-	use amd64 && use multilib && (
-		einfo "Installing 32bit libs..."
-		local BUILD_DIR="${build32_dir}"
-		cmake-utils_src_install
-
-		einfo "Installing 64bit libs..."
-	)
-
-	# Install native version
-	cmake-utils_src_install
+	cmake-multilib_src_install
 
 	# Make config dir
 	dodir /var/lib/VirtualGL
-- 
1.8.1.2