Sync live ebuild with latest snapshot. Fixes bug #284416. Non-maintainer commit so if it break stuff Assign it to me.

Package-Manager: portage-2.2_rc38/cvs/Linux i686
RepoMan-Options: --force

3 files changed, 19 insertions, 10 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 48149489cece..e459ab59f094 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.278 2009/09/06 16:01:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.279 2009/09/11 07:59:11 scarabeus Exp $
+
+  11 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org> wine-9999.ebuild:
+  Sync live ebuild with latest snapshot. Fixes bug #284416. Non-maintainer
+  commit so if it break stuff Assign it to me.
 
   06 Sep 2009; Mike Frysinger <vapier@gentoo.org> wine-1.1.29.ebuild:
   Use media-sound/mpg123 as we need the library as pointed out by Samuli
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index e6594710efa0..1805e1f97eb6 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -75,13 +75,13 @@ EBUILD wine-1.1.6.ebuild 3837 RMD160 7ba0a57e82a48926fb5211ba4e2c7fb21d3f39af SH
 EBUILD wine-1.1.7.ebuild 3860 RMD160 c28fd6f26d74469e7024fb3236a74f362ed01f32 SHA1 d3a2c54ffa8631982a628c7eb3e7df23c23c4b9c SHA256 ddfebae77a4a280223bc1c69eeb816fce4108dc95f4c9e878ef5dc96fa9e12ed
 EBUILD wine-1.1.8.ebuild 3860 RMD160 9e7f9737945e69669f4520438ee73c2e1ea2ed3b SHA1 b1a6a32ab6c70679b7b78201439bd0bd00297c76 SHA256 43ae44c2fb2fbb9cf796668915d0be96f52e8216d348c591aac76f0a70d18467
 EBUILD wine-1.1.9.ebuild 3860 RMD160 0c11de83ed0d4836a10db6c9152b2acdf48c9bb7 SHA1 00bc364fa69aee19164a2104ed5e4ead7ada490a SHA256 d045ee7563270081e99fb97ad1696f249be3226c0a6bbca37a20c7181d141b8f
-EBUILD wine-9999.ebuild 3424 RMD160 387bbbc49d896a8ff59a0cca6108f0d823d92d1d SHA1 5fa6dee9d912ca33bd70b74de68a89aad4e31dcb SHA256 a5b64383bf2646593ee30a8b72aece987fb2f62a572b14df927246d631dad0f0
-MISC ChangeLog 48753 RMD160 86b3386e4e08c2ec8b7c7611706208ff826da536 SHA1 61a6d83f6d4ecc05ccfcb67e65d6adbc6d03ca7d SHA256 51b481d9bfd9b3eaa2c4060225d77756e48581ea0c295fb4837cf41d0824240d
+EBUILD wine-9999.ebuild 3605 RMD160 e4fe284c0cbfbb5ec0bee6c438fb1dc58f22ad60 SHA1 95a287fa394c714ce25c98c85920ea3992baa0cb SHA256 262e0398ae457d3c351628f23279a89a6d7f434d569f459eed51e9761b09ab34
+MISC ChangeLog 48952 RMD160 d96ad95f8b840fb32192d4d485405e14e49397c5 SHA1 b61ff8107e1404a16856305e55ac6d694f1d0bfc SHA256 dfb4d61d1d5b17d8fbe16181355e53c86ccd4a990d70038a2f45d1b86152c597
 MISC metadata.xml 1123 RMD160 168b7d83724ac65a23a10ad8bbe04d4dee180f6f SHA1 f8bb8f4eb1e4dab230f9f8d8b87fe04c6e638334 SHA256 eeee6aabb900286b05e81427597d143fb5fe74cc9b503d58464abd2534eaa569
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqj28kACgkQlPl3HsVfCDqDEACeI3UQipk1xNO86oFAWJnoA70P
-ixoAn1FRMhxWFzPMlf+TBXUJUFwJM1uO
-=pZ8v
+iEYEARECAAYFAkqqA1YACgkQHB6c3gNBRYetaQCfUqxfdu+29W4nsCJC2wP9qA2V
+MvgAoISwRn91H7qnA8K5s7f4CJNGgOu0
+=iPZ8
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 218a29a508cc..c7dfbc17f6fb 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 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.41 2009/08/27 11:41:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.42 2009/09/11 07:59:11 scarabeus Exp $
 
 EAPI="2"
 
-inherit multilib
+inherit multilib eutils
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
@@ -18,7 +18,7 @@ else
 	S=${WORKDIR}/${MY_P}
 fi
 
-GV="0.9.1"
+GV="1.0.0-x86"
 DESCRIPTION="free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa cups dbus esd +gecko gnutls hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl test win64 +X xcomposite xinerama xml"
+IUSE="alsa cups dbus esd +gecko gnutls gsm hal jack jpeg lcms ldap mp3 nas ncurses +opengl oss png samba scanner ssl test win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -51,9 +51,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	nas? ( media-libs/nas )
 	cups? ( net-print/cups )
 	opengl? ( virtual/opengl )
+	gsm? ( media-sound/gsm )
 	jpeg? ( media-libs/jpeg )
 	ldap? ( net-nds/openldap )
 	lcms? ( media-libs/lcms )
+	mp3? ( media-sound/mpg123 )
 	samba? ( >=net-fs/samba-3.0.25 )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends )
@@ -86,6 +88,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
@@ -104,11 +107,13 @@ src_configure() {
 		$(use_with cups) \
 		$(use_with esd) \
 		$(use_with gnutls) \
+		$(use_with gsm) \
 		$(! use dbus && echo --without-hal || use_with hal) \
 		$(use_with jack) \
 		$(use_with jpeg) \
 		$(use_with lcms cms) \
 		$(use_with ldap) \
+		$(use_with mp3 mpg123) \
 		$(use_with nas) \
 		$(use_with ncurses curses) \
 		$(use_with opengl) \