Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/wine: ChangeLog wine-9999.ebuild
Date: Fri, 11 Sep 2009 07:59:14
Message-Id: E1Mm12F-0002E5-Ru@stork.gentoo.org
1 scarabeus 09/09/11 07:59:11
2
3 Modified: ChangeLog wine-9999.ebuild
4 Log:
5 Sync live ebuild with latest snapshot. Fixes bug #284416. Non-maintainer commit so if it break stuff Assign it to me.
6 (Portage version: 2.2_rc38/cvs/Linux i686, RepoMan options: --force)
7
8 Revision Changes Path
9 1.279 app-emulation/wine/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.279&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.279&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/wine/ChangeLog?r1=1.278&r2=1.279
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v
18 retrieving revision 1.278
19 retrieving revision 1.279
20 diff -u -r1.278 -r1.279
21 --- ChangeLog 6 Sep 2009 16:01:01 -0000 1.278
22 +++ ChangeLog 11 Sep 2009 07:59:11 -0000 1.279
23 @@ -1,6 +1,10 @@
24 # ChangeLog for app-emulation/wine
25 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.278 2009/09/06 16:01:01 vapier Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.279 2009/09/11 07:59:11 scarabeus Exp $
28 +
29 + 11 Sep 2009; Tomáš Chvátal <scarabeus@g.o> wine-9999.ebuild:
30 + Sync live ebuild with latest snapshot. Fixes bug #284416. Non-maintainer
31 + commit so if it break stuff Assign it to me.
32
33 06 Sep 2009; Mike Frysinger <vapier@g.o> wine-1.1.29.ebuild:
34 Use media-sound/mpg123 as we need the library as pointed out by Samuli
35
36
37
38 1.42 app-emulation/wine/wine-9999.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/wine/wine-9999.ebuild?rev=1.42&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/wine/wine-9999.ebuild?rev=1.42&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/wine/wine-9999.ebuild?r1=1.41&r2=1.42
43
44 Index: wine-9999.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v
47 retrieving revision 1.41
48 retrieving revision 1.42
49 diff -u -r1.41 -r1.42
50 --- wine-9999.ebuild 27 Aug 2009 11:41:32 -0000 1.41
51 +++ wine-9999.ebuild 11 Sep 2009 07:59:11 -0000 1.42
52 @@ -1,10 +1,10 @@
53 # Copyright 1999-2009 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.41 2009/08/27 11:41:32 vapier Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.42 2009/09/11 07:59:11 scarabeus Exp $
57
58 EAPI="2"
59
60 -inherit multilib
61 +inherit multilib eutils
62
63 if [[ ${PV} == "9999" ]] ; then
64 EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
65 @@ -18,7 +18,7 @@
66 S=${WORKDIR}/${MY_P}
67 fi
68
69 -GV="0.9.1"
70 +GV="1.0.0-x86"
71 DESCRIPTION="free implementation of Windows(tm) on Unix"
72 HOMEPAGE="http://www.winehq.org/"
73 SRC_URI="${SRC_URI}
74 @@ -26,7 +26,7 @@
75
76 LICENSE="LGPL-2.1"
77 SLOT="0"
78 -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"
79 +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"
80 RESTRICT="test" #72375
81
82 RDEPEND=">=media-libs/freetype-2.0.0
83 @@ -51,9 +51,11 @@
84 nas? ( media-libs/nas )
85 cups? ( net-print/cups )
86 opengl? ( virtual/opengl )
87 + gsm? ( media-sound/gsm )
88 jpeg? ( media-libs/jpeg )
89 ldap? ( net-nds/openldap )
90 lcms? ( media-libs/lcms )
91 + mp3? ( media-sound/mpg123 )
92 samba? ( >=net-fs/samba-3.0.25 )
93 xml? ( dev-libs/libxml2 dev-libs/libxslt )
94 scanner? ( media-gfx/sane-backends )
95 @@ -86,6 +88,7 @@
96 }
97
98 src_prepare() {
99 + epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
100 epatch_user #282735
101 sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
102 sed -i '/^MimeType/d' tools/wine.desktop || die #117785
103 @@ -104,11 +107,13 @@
104 $(use_with cups) \
105 $(use_with esd) \
106 $(use_with gnutls) \
107 + $(use_with gsm) \
108 $(! use dbus && echo --without-hal || use_with hal) \
109 $(use_with jack) \
110 $(use_with jpeg) \
111 $(use_with lcms cms) \
112 $(use_with ldap) \
113 + $(use_with mp3 mpg123) \
114 $(use_with nas) \
115 $(use_with ncurses curses) \
116 $(use_with opengl) \