Add support for USE=hal/dbus #141532 by Niels van Aert.

Package-Manager: portage-2.1.1_pre3-r1

4 files changed, 32 insertions, 20 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 4a62022839db..d65b13b2badb 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.150 2006/07/30 16:49:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.151 2006/07/30 17:52:17 vapier Exp $
+
+  30 Jul 2006; Mike Frysinger <vapier@gentoo.org> wine-0.9.18.ebuild,
+  wine-9999.ebuild:
+  Add support for USE=hal/dbus #141532 by Niels van Aert.
 
 *wine-0.9.18 (30 Jul 2006)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index dcd5f5a01f3b..66ace76ceec2 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -135,10 +135,10 @@ EBUILD wine-0.9.17.ebuild 3308 RMD160 4e39f0412292b1de05ce16229061a64b5e03769f S
 MD5 d979b9e9917fa3b3c4d2f5f89398b32f wine-0.9.17.ebuild 3308
 RMD160 4e39f0412292b1de05ce16229061a64b5e03769f wine-0.9.17.ebuild 3308
 SHA256 4636c16a19bec1b04b5ca59660c894dddf76cef561a40d55cb99597a7544a708 wine-0.9.17.ebuild 3308
-EBUILD wine-0.9.18.ebuild 3308 RMD160 d58d8c4bfe503697eaa732b4be87341bbaf74f25 SHA1 c2dadb8aaf17abce554daebe29d55a0ce000b12c SHA256 c992fe037ae8eb42c9a4f1f4acdf89eefe98053676699851ae1147832f70b049
-MD5 2409f6c5e0b0dd02742dc4707f5066e3 wine-0.9.18.ebuild 3308
-RMD160 d58d8c4bfe503697eaa732b4be87341bbaf74f25 wine-0.9.18.ebuild 3308
-SHA256 c992fe037ae8eb42c9a4f1f4acdf89eefe98053676699851ae1147832f70b049 wine-0.9.18.ebuild 3308
+EBUILD wine-0.9.18.ebuild 3427 RMD160 5c06fc020a3a6e88fc4a0ac679eb3d0681805005 SHA1 8ce64936a6d8d398b2608ff575d043bcdca4ae45 SHA256 ba208578e72174bd0aa6eb579676683e089b89c94e88851e0e0780a6234340e7
+MD5 b7cbbd20bf5b3da56b5df2258d4acf1d wine-0.9.18.ebuild 3427
+RMD160 5c06fc020a3a6e88fc4a0ac679eb3d0681805005 wine-0.9.18.ebuild 3427
+SHA256 ba208578e72174bd0aa6eb579676683e089b89c94e88851e0e0780a6234340e7 wine-0.9.18.ebuild 3427
 EBUILD wine-0.9.2.ebuild 4161 RMD160 c95545d935fe81d29c72706af402d9345d29e775 SHA1 941e24b3b3c670def76183485354fbf2f03a5214 SHA256 c6b53e3dcdd3faa99416d7cb6aa7d4866dbab086ee0664b3cde8d00486a9cef6
 MD5 df53800aeb0bb44c4428cbd9c65464e1 wine-0.9.2.ebuild 4161
 RMD160 c95545d935fe81d29c72706af402d9345d29e775 wine-0.9.2.ebuild 4161
@@ -215,14 +215,14 @@ EBUILD wine-20050930.ebuild 4268 RMD160 7312415432d2d4137a133110413c8b8e033ea1f5
 MD5 436a6fc6e3671dd7536aeee949a6ba4f wine-20050930.ebuild 4268
 RMD160 7312415432d2d4137a133110413c8b8e033ea1f5 wine-20050930.ebuild 4268
 SHA256 0cc5fdce6de17911b0b77e7a6322f3c83c61357c7f71e11fd7241842032e9652 wine-20050930.ebuild 4268
-EBUILD wine-9999.ebuild 3373 RMD160 c537161f515f283f6bcdc58e0913162da1ed6f7a SHA1 9b5d1ab7e7b9442aa8a9ac9660c62429be10134c SHA256 8e6bfb9842b9506a778a27ce6a78d5abc7688a7437dbafeed4cdeac3bfbfd20e
-MD5 ab384572d8f038f2e32382914d5fb390 wine-9999.ebuild 3373
-RMD160 c537161f515f283f6bcdc58e0913162da1ed6f7a wine-9999.ebuild 3373
-SHA256 8e6bfb9842b9506a778a27ce6a78d5abc7688a7437dbafeed4cdeac3bfbfd20e wine-9999.ebuild 3373
-MISC ChangeLog 27754 RMD160 1234eefa222992df20ffa420cd7a8d73803217cc SHA1 9f01d2d548e1bf02acea9c4ce30f399d64cbb9b9 SHA256 3b263007fd43b160a20b88928e284aaa109c0c3323304065225f1c9a0218f492
-MD5 41752b42d4ad5f762ce440b986872ff1 ChangeLog 27754
-RMD160 1234eefa222992df20ffa420cd7a8d73803217cc ChangeLog 27754
-SHA256 3b263007fd43b160a20b88928e284aaa109c0c3323304065225f1c9a0218f492 ChangeLog 27754
+EBUILD wine-9999.ebuild 3483 RMD160 89b33201d5c6f1ba81a7e2708d6596ecbe3d2f58 SHA1 4093a7927de0cd5d44dc29526ecce3d281dff288 SHA256 87d6a9ea9a92492ae565f6b771c1e596a6893ca311ed27a733d4e175554d0d15
+MD5 51aefca6c99a963a877bfb7e526b4573 wine-9999.ebuild 3483
+RMD160 89b33201d5c6f1ba81a7e2708d6596ecbe3d2f58 wine-9999.ebuild 3483
+SHA256 87d6a9ea9a92492ae565f6b771c1e596a6893ca311ed27a733d4e175554d0d15 wine-9999.ebuild 3483
+MISC ChangeLog 27903 RMD160 47bee04ea8749cfca7ab7d3735ff925ffbd2e06d SHA1 833b7bf4be9911019aaf1a20784dbb92b6d6f9f4 SHA256 af5276e26bd8508a1365440d6b3cdc92414726f3a07fd2027336342cf18a1cdb
+MD5 5f8a510ddd91bef861cd01807695e768 ChangeLog 27903
+RMD160 47bee04ea8749cfca7ab7d3735ff925ffbd2e06d ChangeLog 27903
+SHA256 af5276e26bd8508a1365440d6b3cdc92414726f3a07fd2027336342cf18a1cdb ChangeLog 27903
 MISC metadata.xml 791 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de SHA1 331dfb5419d6b26502b33bc4e00a2fa4b3301a1a SHA256 6ad20d106c155d738b1ac41ccdb5ee8495c42129fd53308e641414e345d7e018
 MD5 78959654c62738e9d3ff3302e974d98a metadata.xml 791
 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de metadata.xml 791
@@ -320,7 +320,7 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEzPDKamhnQswr0vIRAtT7AJ0aT4uQHmYX7tZoi76Ss0gEMtsrQwCbBcIt
-L7IDxC2muvEvtBfn/zBNU4c=
-=yqF7
+iD8DBQFEzPIOamhnQswr0vIRAjrCAJ4/ofX0R9mhnRHP3Uxt/c48LrLYgwCcDQbc
+JjrNxvAC64vlAZz+ogeF1Zk=
+=I+z9
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-0.9.18.ebuild b/app-emulation/wine/wine-0.9.18.ebuild
index 0cf2a5f61de7..2e286202da14 100644
--- a/app-emulation/wine/wine-0.9.18.ebuild
+++ b/app-emulation/wine/wine-0.9.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.18.ebuild,v 1.1 2006/07/30 16:49:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.18.ebuild,v 1.2 2006/07/30 17:52:17 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,13 +11,15 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
+IUSE="alsa arts cups dbus debug esd gif glut hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
+	dbus? ( sys-apps/dbus )
+	hal? ( sys-apps/hal )
 	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
 				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
 		virtual/x11 )
@@ -87,6 +89,8 @@ src_compile() {
 	config_cache ldap ldap.h lber.h
 	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
+	config_cache dbus dbus/dbus.h
+	config_cache hal hal/libhal.h
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
 	config_cache lcms lcms.h
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index ecf9841743f2..055343d5f815 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.13 2006/07/30 17:46:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.14 2006/07/30 17:52:17 vapier Exp $
 
 ECVS_SERVER="cvs.winehq.org:/home/wine"
 ECVS_MODULE="wine"
@@ -16,13 +16,15 @@ SRC_URI=""
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-*"
-IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml X"
+IUSE="alsa arts cups dbus debug esd gif glut hal jack jpeg lcms ldap nas ncurses opengl oss scanner xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
+	dbus? ( sys-apps/dbus )
+	hal? ( sys-apps/hal )
 	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
 				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
 		virtual/x11 )
@@ -94,6 +96,8 @@ src_compile() {
 	config_cache ldap ldap.h lber.h
 	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
+	config_cache dbus dbus/dbus.h
+	config_cache hal hal/libhal.h
 	config_cache jpeg jpeglib.h
 	config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h
 	config_cache lcms lcms.h