Version bump.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 153 insertions, 5 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 0ae9bc7e2671..ff2ed395b76e 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,11 @@
 # 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.265 2009/06/05 21:08:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.266 2009/06/19 19:11:37 vapier Exp $
+
+*wine-1.1.24 (19 Jun 2009)
+
+  19 Jun 2009; Mike Frysinger <vapier@gentoo.org> +wine-1.1.24.ebuild:
+  Version bump.
 
 *wine-1.1.23 (05 Jun 2009)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 92f1a403110d..5d78322ba4e7 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -26,6 +26,7 @@ DIST wine-1.1.20.tar.bz2 15313549 RMD160 475e5894c473a5abad80a8a1513c85c8fc146e7
 DIST wine-1.1.21.tar.bz2 15335158 RMD160 f98ffb9372da9204b3454b61d43a76b3882722e5 SHA1 2ad73d3bd583cdc99e92743cdf93cc2c554d77a4 SHA256 76f99898f9894a2a77b6820be9e20f8dc09c86e9dfeeeded9c5f2b5b970f9c21
 DIST wine-1.1.22.tar.bz2 15354522 RMD160 e863bcfcd880a86e8d1e9a14a45d68ecdbb297c4 SHA1 c46ab1be0d22dc87c644f50d70d9b93994a06fa3 SHA256 a7843842a4d54a4052b6b54394f168173357ce97a248ff77159cda3e6ed87e4e
 DIST wine-1.1.23.tar.bz2 15402015 RMD160 11e558c0b2357d3d7c877aefbdb6a737f0430660 SHA1 e1fedbfa92be8462d23fb603872b73b4b05bce47 SHA256 b7ecbc16835037248145ec0edeacdea6402635c0051ceebce4ab9c84fcd0e839
+DIST wine-1.1.24.tar.bz2 15456041 RMD160 e685708a503166df6109b3d6c1a775272fb20610 SHA1 30d4a7bef0f6876b202fa1c159beb3a338f31400 SHA256 49d89e0d4b4ed20d735600142dae103c33a382b5ebbd7429c8789ca6db4b873d
 DIST wine-1.1.3.tar.bz2 14305946 RMD160 890d6eac933ca590856121576a837e057a6e26a5 SHA1 c380d53a5f6a95c4e27dbf4f473facb2d349c522 SHA256 d64763829b38f4c8804b809a3130d1a525d062a33802e46dff33f60f159ac71f
 DIST wine-1.1.4.tar.bz2 14362995 RMD160 e5c3b0037341dab5b234b4ad1a54a64bb659fd56 SHA1 4d8e1b43b0638ab0796abb37d678e1f1199d4561 SHA256 745ae9142dbd11e430410200e09128e3ffe114faade8f97be83fced8e0327230
 DIST wine-1.1.5.tar.bz2 14467703 RMD160 b59d8a1d7b2e91c685a1501793f7373c53276175 SHA1 53a9ba0b463bcb492eeccca10d96057ee0fb13fa SHA256 759208a35cb243ab25338d42facf73e21523b1afac074ba4605a66099e454493
@@ -55,6 +56,7 @@ EBUILD wine-1.1.20.ebuild 3440 RMD160 62575537b42f62adda669f3e3171b5c90e450b13 S
 EBUILD wine-1.1.21.ebuild 3440 RMD160 bf47c46ce33bb60791b51ba54142651c2895c11f SHA1 70835aa1e563db041d8c1bd5e70aeaf9a037ed07 SHA256 fcc0e3f458bdda2fc030a6ded977d346947ceb054567a531cafb40e9d86b3111
 EBUILD wine-1.1.22.ebuild 3440 RMD160 558f29856da500416100e3ce5f6880c75b1ce6d9 SHA1 ae0907636dcf29ec4157d8e75c51cc0aa765157c SHA256 20eaa89fce0b5bfca729e65a203bb1c2fd75aa8f8099cfabcdeb19f4d538dd94
 EBUILD wine-1.1.23.ebuild 3440 RMD160 e38ce33c70a27598c6cd0030a67363ee7c020f08 SHA1 5a818723b74b993425d1efdc9a785082767ccc85 SHA256 f027af4e332c7ce5b4819c4a12f3cb5a6964fa82d20bbbb07df2762cd0c19228
+EBUILD wine-1.1.24.ebuild 3440 RMD160 34c571c48ee383d1ba2533d5435afb40225357a4 SHA1 3b23a3e2b7e92de783f48de73842c802a9e1bc84 SHA256 051142c6724bcdb22887c32e610a0ca04c2903f96bff4705f28235e8b21a3670
 EBUILD wine-1.1.3.ebuild 3807 RMD160 5bf8e7935e486e084124e146282703aa451fcadf SHA1 ac555b2294f86b51d90856d9f76fa86ed7034ec7 SHA256 5fa97d0b2a68196a3af55d293737198079c2863491ea25e6b01d0741506effbe
 EBUILD wine-1.1.4.ebuild 3833 RMD160 e0b7f6a001950cde3fd31fb18b6791aeb988fae7 SHA1 fef583fc9af5ef8a497211571b1b887d36010bc9 SHA256 7089b96fe8aa35787551688853b821be1106bc6a76745ae1b27a36e7d89b5512
 EBUILD wine-1.1.5.ebuild 3780 RMD160 d375108fd25c262aed00dcd73104ed940d310b41 SHA1 c554aece023a52e915a8169d3007f91d9bd4f163 SHA256 4dc3b64e845c03cdce3eab18e2ab617269708ddcf0a443f7ca4a06aa0868f809
@@ -63,12 +65,12 @@ EBUILD wine-1.1.7.ebuild 3839 RMD160 89806ca181642c43685805204a668fbf63d66b05 SH
 EBUILD wine-1.1.8.ebuild 3839 RMD160 e21be90b14430cde7cf15f0d8a50c7651e690378 SHA1 c7f508382e749290f752ccd357577a0f2511845d SHA256 9fb7de165a7dc8a84d6aaef20cd537a4ff1d7a2cd2583e9f9a62f6610377cbb5
 EBUILD wine-1.1.9.ebuild 3839 RMD160 eabc031df57ad0e9d33f616b6f5f7ee116a08eed SHA1 f4cd75385acdacbf0e47e2dc75f0bf06efc66480 SHA256 c667e6a433d115935428f05d67f4d7029953549fa724e05a4145f835f49328c1
 EBUILD wine-9999.ebuild 3375 RMD160 9f8792927cf2eed6770d864d6f05d56550d705c4 SHA1 c822605b001350061145a356b8964cb7a6e236b8 SHA256 8977180ba5e6285f1a26ad6c771692852660aa835b6ed8dc329a27c430c67f75
-MISC ChangeLog 46119 RMD160 86d424c16ccee3bff2e5dede881ed3592c99473b SHA1 d5e102fe2df6cbd2b9004ee784637fd0e362280e SHA256 00f73e46a5b9fdcfcd7649f34a3951f005d1debc056ecb847534c041933e6bb0
+MISC ChangeLog 46235 RMD160 286901ba7686727d097e824b4a7459beca9b91eb SHA1 658b93ef03dd4d4ebae012f1a31b4183d94ffbf9 SHA256 0bd115e9932160bb1de3dc35f5b7663363ffacdebea8d41b020aae9fe89f6bfa
 MISC metadata.xml 1123 RMD160 168b7d83724ac65a23a10ad8bbe04d4dee180f6f SHA1 f8bb8f4eb1e4dab230f9f8d8b87fe04c6e638334 SHA256 eeee6aabb900286b05e81427597d143fb5fe74cc9b503d58464abd2534eaa569
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkopiXEACgkQn/5bYzqsSmEHnwCfSatKk8grUPBcSkQIU2QkYSrT
-xvMAoMLrgeWTF0NzbB5h208jhPRZnVvJ
-=AdTI
+iEYEARECAAYFAko74u8ACgkQn/5bYzqsSmHLzwCgmV9E5iXAqkrbdBx+1vm/Ej1s
+98AAoJiWoEwqjNMeEMkKrXC5/cvM92Ts
+=1oSP
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.1.24.ebuild b/app-emulation/wine/wine-1.1.24.ebuild
new file mode 100644
index 000000000000..dea0c2967b45
--- /dev/null
+++ b/app-emulation/wine/wine-1.1.24.ebuild
@@ -0,0 +1,141 @@
+# 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-1.1.24.ebuild,v 1.1 2009/06/19 19:11:37 vapier Exp $
+
+EAPI="2"
+
+inherit multilib eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+	inherit git
+	SRC_URI=""
+	KEYWORDS=""
+else
+	MY_P="${PN}-${PV/_/-}"
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	S=${WORKDIR}/${MY_P}
+fi
+
+GV="0.9.1"
+DESCRIPTION="free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? ( mirror://sourceforge/wine/wine_gecko-${GV}.cab )"
+
+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 win64 +X xcomposite xinerama xml"
+RESTRICT="test" #72375
+
+RDEPEND=">=media-libs/freetype-2.0.0
+	media-fonts/corefonts
+	dev-lang/perl
+	dev-perl/XML-Simple
+	ncurses? ( >=sys-libs/ncurses-5.2 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	dbus? ( sys-apps/dbus )
+	gnutls? ( net-libs/gnutls )
+	hal? ( sys-apps/hal )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
+	)
+	alsa? ( media-libs/alsa-lib[midi] )
+	esd? ( media-sound/esound )
+	nas? ( media-libs/nas )
+	cups? ( net-print/cups )
+	opengl? ( virtual/opengl )
+	jpeg? ( media-libs/jpeg )
+	ldap? ( net-nds/openldap )
+	lcms? ( media-libs/lcms )
+	samba? ( >=net-fs/samba-3.0.25 )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
+	scanner? ( media-gfx/sane-backends )
+	ssl? ( dev-libs/openssl )
+	png? ( media-libs/libpng )
+	win64? ( >=sys-devel/gcc-4.4.0 )
+	!win64? ( amd64? (
+		X? (
+			>=app-emulation/emul-linux-x86-xlibs-2.1
+			>=app-emulation/emul-linux-x86-soundlibs-2.1
+		)
+		app-emulation/emul-linux-x86-baselibs
+		>=sys-kernel/linux-headers-2.6
+	) )"
+DEPEND="${RDEPEND}
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	sys-devel/bison
+	sys-devel/flex"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+	else
+		unpack ${MY_P}.tar.bz2
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+
+	use amd64 && ! use win64 && multilib_toolchain_setup x86
+
+	# XXX: should check out these flags too:
+	#	audioio capi fontconfig freetype gphoto
+	econf \
+		--sysconfdir=/etc/wine \
+		$(use_with alsa) \
+		$(use_with cups) \
+		$(use_with esd) \
+		$(use_with gnutls) \
+		$(! use dbus && echo --without-hal || use_with hal) \
+		$(use_with jack) \
+		$(use_with jpeg) \
+		$(use_with lcms cms) \
+		$(use_with ldap) \
+		$(use_with nas) \
+		$(use_with ncurses curses) \
+		$(use_with opengl) \
+		$(use_with oss) \
+		$(use_with png) \
+		$(use_with scanner sane) \
+		$(use_with ssl openssl) \
+		$(use_enable win64) \
+		$(use_with X x) \
+		$(use_with xcomposite) \
+		$(use_with xinerama) \
+		$(use_with xml) \
+		$(use_with xml xslt) \
+		|| die "configure failed"
+
+	emake -j1 depend || die "depend"
+}
+
+src_compile() {
+	emake all || die "all"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ANNOUNCE AUTHORS README
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		doins "${DISTDIR}"/wine_gecko-${GV}.cab || die
+	fi
+}