[proaudio] proaudio/proaudio: [3141] eineasio: use working fork and update to wine new packaging

[subversion@xxxxxxxxxxxxx]

Revision: 3141
Author:   dominique
Date:     2018-08-17 21:09:00 +0200 (Fri, 17 Aug 2018)
Log Message:
-----------
eineasio: use working fork and update to wine new packaging

Modified Paths:
--------------
    trunk/overlays/proaudio/app-emulation/wineasio/ChangeLog
    trunk/overlays/proaudio/app-emulation/wineasio/Manifest
    trunk/overlays/proaudio/app-emulation/wineasio/wineasio-9999.ebuild

Removed Paths:
-------------
    trunk/overlays/proaudio/app-emulation/wineasio/wineasio-0.9.2.ebuild

Modified: trunk/overlays/proaudio/app-emulation/wineasio/ChangeLog
===================================================================
--- trunk/overlays/proaudio/app-emulation/wineasio/ChangeLog	2018-08-15 21:23:23 UTC (rev 3140)
+++ trunk/overlays/proaudio/app-emulation/wineasio/ChangeLog	2018-08-17 19:09:00 UTC (rev 3141)
@@ -1,7 +1,12 @@
 # ChangeLog for app-emulation/wineasio
-# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2018 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  17 Aug 2018: Dominique Michel <dominique@xxxxxxxxxxxxx> -0.7.3 -0.7.4 -0.7.5
+  -0.9.2 9999: 0.9.2 doesn't compile anymore. Use a fork that compile;
+  add path to installed 32 bits wine libs for the linker into Makefile;
+  use path to installed wine dlls in src_install (wine new packaging).
+
   22 Jul 2017: Dominique Michel <dominique@xxxxxxxxxxxxx> -0.7.3 -0.7.4 -0.7.5
   -0.9.0 +0.9.2 9999: remove old versions, add last version; modev to eapi6;
   moved to git; install 32 and 64 bit versions

Modified: trunk/overlays/proaudio/app-emulation/wineasio/Manifest
===================================================================
--- trunk/overlays/proaudio/app-emulation/wineasio/Manifest	2018-08-15 21:23:23 UTC (rev 3140)
+++ trunk/overlays/proaudio/app-emulation/wineasio/Manifest	2018-08-17 19:09:00 UTC (rev 3141)
@@ -1,5 +1,3 @@
-DIST wineasio-0.9.2.tar.gz 30563 SHA256 9fbc2d10a4cec307dc0558bed82b887c864424d16da40a80f1d80f907d92af0b SHA512 5467c4231bf0e37e591086bb9881fad4b42d756833a13e9a28d28dc1916fb17f88f2c31fbf33ecbe07d44bf713f33c525a2eb33032ec9f3c6a780c29513fbcb1 WHIRLPOOL 3bfb507772c5e22784f61598b2012ef6f232a097747f30558e8c3533d7ccd04fe0b02f21adc3e9a92a069db23afe238104090d767232b5ed662c4b5a5dd0db5f
-EBUILD wineasio-0.9.2.ebuild 1406 SHA256 ec9ff342d39aae6793c1a18c9ea9ca800da3d489af17b970d8ca711a314b4b84 SHA512 8bcf934f679cfe129b6760693838440c0e1d2a074490642568878fa56ec5d49c1a8e6c0059da434923acfe6c194f6ce2e772461711b92d69ec137b9ab2da4a74 WHIRLPOOL 50606efa7f8c7dd9dad54971a2c893fbb654420181ab8cf38d760d703b37ccd4ea294d945cab4249878bb27d8a17c5fa08a8a4fc331811d99daad5eb5c05ecec
-EBUILD wineasio-9999.ebuild 1382 SHA256 6a0577ae91e7b96e4f59dec655789cbc383146fc801c008e28e61ca08d61a033 SHA512 82a967c8a56448905b2ab9cdd4ccafcbcb2c39c68babdcad09ad5ae6890dbaa8424f5ef5341b1ae0e75064658fff742f40607dc0e5f2bac0e7c6b24ec98cb329 WHIRLPOOL 375e409a995e5191a585629edac663465627f9b8d18aa748e9f8063a9fedd9c9fae85957c2fbc8259c6822077fd0d1dcaa437853ca93a0d166b03dc78c7d3414
-MISC ChangeLog 1076 SHA256 19df6d87afa33d99306cb114a822a1ead2d8268beed131a43b5d39c9fa49e1b1 SHA512 3245a3f5d1cd3f4c799aa527c5979b3d56de51bf01927b528cb7a23800d1a0eb6d58991818e479ccbe09774f155c8be53cec9713129b4f3a16a3c2452348de1d WHIRLPOOL 6a845ca4ba696c2dad167cb83b158850e3edd5703e9908cf811182519ed3ed79146bd452af40397af45af139b146465c5163e169bffc13d6d7fccb6d8d3db997
-MISC metadata.xml 261 SHA256 3812db1cff66d287c945fc7987f7d2cb37fea10ad28fdae3b7277beb8cfe7392 SHA512 590077890c7cc0e1fd1c8b4388764030dcf95e6bd04f996a73839809b011e666a859417ae2ec91eba8af11e4fe5bbe9c89791e1eccd23b7fc6ec43cca304e0b1 WHIRLPOOL 539e44c7fa67fe66d40aea271af64a7da8cb15c7f990400572ea7372b6268575cf1bf1d536772276b8df4340a7919392d21120a7f7321d198a24460b3b383154
+EBUILD wineasio-9999.ebuild 1949 BLAKE2B d7a1ed5bf296547b7abd8c96b6ebfe2bd8b57d41a4bbb3493e5a5245a35a91baf3ec792e5855e775be893c83398b6fde55c5e1b89445674977b07e4054d50ffc SHA512 c1cceb77454c131b2b8c4f64f145f2616f43617861dc70f9f9f172a88e9037b512302134ce0bbc61aa0c69245e669f809d1571c80b8a02ecd3f26dd1673abc92
+MISC ChangeLog 1370 BLAKE2B e773514997b8873a6e809717f1493976f2d3f2a99ff703b004d7f0db4ab3ddd6091f811e0ac62affb16e87164ae1b8ab1ee9f0451b9424610439ca2e22e0ed3c SHA512 527141cb6f8201a4da4bb18d0c90fb6a822c208947ab721476f2384c552e42e4a0649901321bac35bd32c08496bfc524da5aa9c97da38ee8d5b8a16978b21acb
+MISC metadata.xml 261 BLAKE2B ab09b95e48499595f240d83a5a2328b206d5983b57bbd4f6a0ba5f695a5be713ca35aaa6106a06a83a2e471d646e2ae12069c0779178823f1f9f30bd234a1dfe SHA512 590077890c7cc0e1fd1c8b4388764030dcf95e6bd04f996a73839809b011e666a859417ae2ec91eba8af11e4fe5bbe9c89791e1eccd23b7fc6ec43cca304e0b1

Deleted: trunk/overlays/proaudio/app-emulation/wineasio/wineasio-0.9.2.ebuild
===================================================================
--- trunk/overlays/proaudio/app-emulation/wineasio/wineasio-0.9.2.ebuild	2018-08-15 21:23:23 UTC (rev 3140)
+++ trunk/overlays/proaudio/app-emulation/wineasio/wineasio-0.9.2.ebuild	2018-08-17 19:09:00 UTC (rev 3141)
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib
-
-DESCRIPTION="ASIO driver for WINE"
-HOMEPAGE="http://sourceforge.net/projects/wineasio";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-SLOT="0"
-
-DEPEND="media-libs/asio-sdk"
-RDEPEND=">=app-emulation/wine-0.9.35
-	virtual/jack"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	eapply_user
-	cp /opt/asiosdk2.2/common/asio.h .
-}
-
-src_compile() {
-	# compile 32 bit version
-	emake
-
-	#compile 64 bit version
-	if use amd64 ; then
-		mv ${PN}.dll.so ${PN}.dll.so.32
-		./prepare_64bit_asio
-		make clean
-		emake -f Makefile64
-	fi
-}
-
-src_install() {
-	local mylibdir="lib"
-	# 64 bit install
-	if use amd64 ; then
-		mylibdir="lib64"
-		exeinto /usr/${mylibdir}/wine
-		doexe ${PN}.dll.so
-	        mv ${PN}.dll.so.32 ${PN}.dll.so
-	fi
-	# 32 bit install
-	use amd64 && mylibdir="lib32"
-	exeinto /usr/${mylibdir}/wine
-	doexe ${PN}.dll.so
-
-	dodoc README
-}
-
-pkg_postinst() {
-	echo
-	elog "You need to register the DLL by typing"
-	elog
-	elog "regsvr32 wineasio.dll"
-	elog
-	elog "AS THE USER who uses wine!"
-	elog
-	elog "On a 64 bit system with wine supporting both 32 and 64 bit applications, you must also type"
-	elog
-	elog "wine64 regsvr32 wineasio.dll"
-	elog
-	elog "Then open winecfg -> Audio -> and enable ONLY the ALSA driver!"
-	echo
-}

Modified: trunk/overlays/proaudio/app-emulation/wineasio/wineasio-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/app-emulation/wineasio/wineasio-9999.ebuild	2018-08-15 21:23:23 UTC (rev 3140)
+++ trunk/overlays/proaudio/app-emulation/wineasio/wineasio-9999.ebuild	2018-08-17 19:09:00 UTC (rev 3141)
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,8 @@
 
 DESCRIPTION="ASIO driver for WINE"
 HOMEPAGE="http://sourceforge.net/projects/wineasio";
-EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
+# We use this fork because the 64 bits version compile out of the box and I get the 32 bits version to compile:
+EGIT_REPO_URI="https://github.com/Jajcus/${PN}.git";
 RESTRICT="mirror"
 
 LICENSE="GPL-2"
@@ -15,21 +16,29 @@
 IUSE=""
 SLOT="0"
 
+IUSE="+abi_x86_32 +abi_x86_64"
+
 DEPEND="media-libs/asio-sdk"
-RDEPEND=">=app-emulation/wine-0.9.35
+RDEPEND="virtual/wine[abi_x86_32=,abi_x86_64=]
 	virtual/jack"
 
+
 src_prepare() {
 	eapply_user
 	cp /opt/asiosdk2.2/common/asio.h .
+	WINE_FLAVOR_INSTALLED="$(eselect --brief wine show | sed -e 's:  ::')"
+	echo "Installed wine flavor = ${WINE_FLAVOR_INSTALLED}"
+	sed -i -e "s:-mnocygwin:-mnocygwin -L/usr/lib32/${WINE_FLAVOR_INSTALLED}/wine -L/usr/lib32/${WINE_FLAVOR_INSTALLED}:" Makefile || die "sed Makefile failed"
 }
 
 src_compile() {
 	# compile 32 bit version
+	echo "Compiling wineasio 32 bits"
 	emake
 
 	#compile 64 bit version
 	if use amd64 ; then
+		echo "Compiling wineasio 64 bits"
 		mv ${PN}.dll.so ${PN}.dll.so.32
 		./prepare_64bit_asio
 		make clean
@@ -42,13 +51,13 @@
 	# 64 bit install
 	if use amd64 ; then
 		mylibdir="lib64"
-		exeinto /usr/${mylibdir}/wine
+		exeinto /usr/${mylibdir}/"${WINE_FLAVOR_INSTALLED}"/wine
 		doexe ${PN}.dll.so
 	        mv ${PN}.dll.so.32 ${PN}.dll.so
 	fi
 	# 32 bit install
 	use amd64 && mylibdir="lib32"
-	exeinto /usr/${mylibdir}/wine
+	exeinto /usr/${mylibdir}/"${WINE_FLAVOR_INSTALLED}"/wine
 	doexe ${PN}.dll.so
 
 	dodoc README