[patch] wine-1.7.21.ebuild USE=multislot patch v2

file_310611.txt (text/plain), 4.82 KB, created by eroen on 2014-09-11 20:03:52 UTC

--- /usr/portage/app-emulation/wine/wine-1.7.21.ebuild	2014-06-29 02:42:47.000000000 +0200
+++ wine-1.7.21-r3.ebuild	2014-09-10 01:38:59.256098624 +0200
@@ -41,8 +41,8 @@
 	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
 
 LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pipelight +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
+SLOT=${PV}
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 +multislot ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pipelight +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	test? ( abi_x86_32 )
 	elibc_glibc? ( threads )
@@ -235,6 +235,10 @@
 	)"
 
 RDEPEND="${COMMON_DEPEND}
+	multislot? ( >=app-admin/eselect-wine-0.2
+		app-emulation/wine-gentoo )
+	!multislot? ( !<${CATEGORY}/${PF}
+		!>${CATEGORY}/${PF} )
 	dos? ( games-emulation/dosbox )
 	perl? ( dev-lang/perl dev-perl/XML-Simple )
 	samba? ( >=net-fs/samba-3.0.25 )
@@ -285,6 +289,13 @@
 }
 
 pkg_setup() {
+	if use multislot; then
+		MY_PREFIX=/usr/lib/wine-${SLOT}
+		MY_DATADIR=${MY_PREFIX}
+	else
+		MY_PREFIX=/usr
+		MY_DATADIR=${MY_PREFIX}/share
+	fi
 	wine_build_environment_check || die
 }
 
@@ -354,6 +365,11 @@
 		sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 	fi
 
+	if use multislot; then
+		sed -e "/^Exec=/s/wine /wine-${SLOT} /" \
+			-i tools/wine.desktop || die
+	fi
+
 	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
 
@@ -368,7 +384,15 @@
 }
 
 multilib_src_configure() {
-	local myconf=(
+	local myconf=()
+	if use multislot; then
+		myconf+=(
+			--prefix="${MY_PREFIX}"
+			--datadir="${MY_DATADIR}"
+			--mandir="${MY_DATADIR}"/man
+		)
+	fi
+	myconf+=(
 		--sysconfdir=/etc/wine
 		$(use_with alsa)
 		$(use_with capi)
@@ -444,6 +468,9 @@
 }
 
 multilib_src_install_all() {
+	# Prefixed installation double-installs libwine
+	use multislot && rm -rf "${D}"usr/lib{32,64} || die
+
 	local DOCS=( ANNOUNCE AUTHORS README )
 	local l
 	add_locale_docs() {
@@ -455,44 +482,55 @@
 	einstalldocs
 	prune_libtool_files --all
 
-	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
+	# Moved to wine-gentoo for multislot
+	if ! use multislot; then
+		emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
+	fi
 	if use gecko ; then
-		insinto /usr/share/wine/gecko
+		insinto "${MY_DATADIR}"/wine/gecko
 		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
 		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
 	fi
 	if use mono ; then
-		insinto /usr/share/wine/mono
+		insinto "${MY_DATADIR}"/wine/mono
 		doins "${DISTDIR}"/wine-mono-${MV}.msi
 	fi
 	if ! use perl ; then
-		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} "${D%/}${MY_DATADIR}"/man/man1/wine{dump,maker}.1 || die
 	fi
 
-	use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
 
 	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym /usr/bin/wine{64,} # 404331
-		dosym /usr/bin/wine{64,}-preloader
+		dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
+		dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+	fi
+
+	if use multislot; then
+		for b in "${D%/}${MY_PREFIX}"/bin/*; do
+			make_wrapper ${b##*/}-${SLOT} "${MY_PREFIX}"/bin/${b##*/}
+		done
 	fi
 
 	# respect LINGUAS when installing man pages, #469418
 	for l in de fr pl; do
-		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
+		use linguas_${l} || rm -r "${D%/}${MY_DATADIR}"/man/${l}*
 	done
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
+	! use multislot && gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	! use multislot && gnome2_icon_cache_update
 	fdo-mime_desktop_database_update
+	use multislot && eselect wine update --if-unset
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	! use multislot && gnome2_icon_cache_update
 	fdo-mime_desktop_database_update
+	use multislot && eselect wine update --if-unset
 }