Version bump #306463 by ScytheMan.

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

3 files changed, 189 insertions, 5 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 9a8f14821dad..5e6e15be1800 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.296 2010/03/05 18:09:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.297 2010/03/05 20:17:12 vapier Exp $
+
+*wine-1.1.40 (05 Mar 2010)
+
+  05 Mar 2010; Mike Frysinger <vapier@gentoo.org> +wine-1.1.40.ebuild:
+  Version bump #306463 by ScytheMan.
 
 *wine-1.1.39 (05 Mar 2010)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 9cbd295b7cae..fd0d11e6a72a 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -42,6 +42,7 @@ DIST wine-1.1.37.tar.bz2 16141072 RMD160 f45553f1e87d40b1ecf0e4644dd45b5340d746b
 DIST wine-1.1.38.tar.bz2 16198816 RMD160 1702bf86a72c60c1c9d8db5a242a2167773b9009 SHA1 96eac0edc410c0b59dad2a7b2fddbefdabe41c07 SHA256 63f1929c47de8be7bcc72d8019628bc8b9ce1269d2e1e10379fb6a66cb45b3be
 DIST wine-1.1.39.tar.bz2 16262746 RMD160 95ddeea71186a974838979e92b22c05870d00074 SHA1 608c5514c7b0c9d171898b322ab98fa1f44ddec2 SHA256 b7a58eb0ce8f6231cc0f020ae47b8625a63dd56838b487877950133715e03918
 DIST wine-1.1.4.tar.bz2 14362995 RMD160 e5c3b0037341dab5b234b4ad1a54a64bb659fd56 SHA1 4d8e1b43b0638ab0796abb37d678e1f1199d4561 SHA256 745ae9142dbd11e430410200e09128e3ffe114faade8f97be83fced8e0327230
+DIST wine-1.1.40.tar.bz2 16313235 RMD160 333d62fe8829df2105debfc73ed0baae098a0395 SHA1 9819dd49c1eefe48ec03de00753a38e9fcc1daf5 SHA256 2b24204f28498f7c3aa532bb9aa498cd90df5769003df2c6862efa59496e73ee
 DIST wine-1.1.5.tar.bz2 14467703 RMD160 b59d8a1d7b2e91c685a1501793f7373c53276175 SHA1 53a9ba0b463bcb492eeccca10d96057ee0fb13fa SHA256 759208a35cb243ab25338d42facf73e21523b1afac074ba4605a66099e454493
 DIST wine-1.1.6.tar.bz2 14544064 RMD160 57f57de84e815ed3db4e623d393e80572a4696eb SHA1 431187af5496071d51ebada4fce0fa657cd09cba SHA256 5c14e13dd166a22b3d1e3af0834265d9a5c0e3fa63ed35da6e67861b29a7345e
 DIST wine-1.1.7.tar.bz2 14623875 RMD160 77f4552f22850ee50602f095c777cd8f679cd231 SHA1 96fee7a5ba23688c5e951586e86639b6d3c6c8e5 SHA256 5c08d548b9d651dc7e88bd9dbb4a52b12d3e4a25eedd1d563ba2a361fe0542f2
@@ -91,18 +92,19 @@ EBUILD wine-1.1.37.ebuild 4531 RMD160 da4b46e467fe78f1bcd40b3c8ec8cba339da2423 S
 EBUILD wine-1.1.38.ebuild 4531 RMD160 72832d9382e6af3a548c6e0343eeb790329f5717 SHA1 3050662fef4a84f2158fa890a86a33df2555efc2 SHA256 90a69ab1f4f40d6616bd99e3dcb0fd5562d72d5923ff285b147baa8acd3f5f4e
 EBUILD wine-1.1.39.ebuild 4878 RMD160 5b0b45c842adb0318da0c8a1d9ac68721cd31573 SHA1 a328a50f7ba24e38cc430f6c373021a6889830c4 SHA256 462cb773a9c909e9fd9b7add0a3bb62b87d77fbc146c389fa318d11078d14ebd
 EBUILD wine-1.1.4.ebuild 3888 RMD160 93be4e30494f146fe6db491d7d09fa41030f05fa SHA1 421a6fec6d9faeaefcf2ae4d6431987188a9787b SHA256 ead7b3bc75b9c0b3802ce8f9e5f5a3ed883a13c80e0136cda1cac1f5088841e8
+EBUILD wine-1.1.40.ebuild 4878 RMD160 d89ea2b6f7534347c650721d2d0d93e52d74d8b3 SHA1 2582e801cb5c89b364c5c9066c46d59276e50e21 SHA256 43c70d86edc85b13f505a37e864b5f29990b685528146b5fd3459aa6c0e528f1
 EBUILD wine-1.1.5.ebuild 3835 RMD160 7b79439212cd5e9b49bd31a2652ee60089ef6419 SHA1 abaf1a7cfaa1858f0d30bf17a59a33f685e1aa32 SHA256 b0feffd4f9603c0b6f916889a52fae612ddbb18f41e50316151bf43b5106ce43
 EBUILD wine-1.1.6.ebuild 3871 RMD160 9e704f4efa5a8fc8818fb2331d545765d6f72ea3 SHA1 17b05d4e9cdda8a3d3eddc55f65f4266bdf359f4 SHA256 02b9571bb4e89afb6d46f2ea47f3d3664bc27f6f6512a6560bdf05bc2a9d9b77
 EBUILD wine-1.1.7.ebuild 3894 RMD160 bb495cece36b7a08a13e35ef83efc3e763165e30 SHA1 13b2af9f51c72322242316f0839c2a462d159180 SHA256 149dbf664b183c3ebbe0555ec014f36bdfb988b2ed09a49cd08d16e2070b71ce
 EBUILD wine-1.1.8.ebuild 3894 RMD160 6ceda8cb1be9baa5c0ca34c298f39516ce4ea371 SHA1 15f7a68441b69e09186ceb3662b80f0a6db406df SHA256 62b888ee26d4a2728cfc21335e1fb3e01ffb4e98d83ce9c62a60efe4b2ce1567
 EBUILD wine-1.1.9.ebuild 3894 RMD160 d13bd0ee943655f18a22dda248834574869ead65 SHA1 53d282f86267df8e1e7f0d8f4678ee0eb95c6e85 SHA256 9599d5350adf1000ad5c0e62b4c905ca4f2a7d0f9d0dd4188a5e2e6913e24281
 EBUILD wine-9999.ebuild 4530 RMD160 509f6ae62b0bc9336c9a534e11b60cf57a3a254f SHA1 9f443d1c1fb870250fff821c3f7babc5341a9c77 SHA256 36249dac9a7b2750553f393fea94056f29790beb6c97a961cc4613e637291547
-MISC ChangeLog 53708 RMD160 3d298b08fa18e56cc0930a894b02c4eb0c9b6757 SHA1 7d23383da8908d8a0bb7df0ca4d135c93c7a9b89 SHA256 de8d086335e214bf7fe1ba668951e6a1588c9a74b1203c0f3355e816dd032c19
+MISC ChangeLog 53845 RMD160 1b654e0cd10b3ccf8a811b75fa234eafccac3222 SHA1 696f778b9d46d2748990e6722d402d05506076c8 SHA256 6a9c0c8504f376c65b13e86ac27ae3333a88f667e4ead7ff26a87d47b36450bd
 MISC metadata.xml 1333 RMD160 fe0a0c8ec639987ff6c06f7a9e47a391defb5478 SHA1 421e3087a3f122fa15283d82429f1d315fba313a SHA256 edaaae36cc5924ea3be49d2d3628e5de555b87b2bee44685797efee72f599902
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF4EAREIAAYFAkuRSNYACgkQTwhj9JtAlp6s3QD8DIla6fO/rp+toZizNXevgRIR
-P5yYlcinXBbj2uS18S4A/0wR4qTmuwTgNnfTu0E+MAt7C79w9ilsbl7ULEFdOsML
-=rUXT
+iF4EAREIAAYFAkuRZs0ACgkQTwhj9JtAlp62yQD/dFIPDGJKHL9CYzfv5r5C3ZQh
+3QQ/N53pRzJuOGzYMHoA/jpIZX9NuXHzOtxkCEzUd1F/CLmBfHhnc8eO6opuSXr0
+=KyO3
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.1.40.ebuild b/app-emulation/wine/wine-1.1.40.ebuild
new file mode 100644
index 000000000000..26f6b9f8a098
--- /dev/null
+++ b/app-emulation/wine/wine-1.1.40.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.40.ebuild,v 1.1 2010/03/05 20:17:12 vapier Exp $
+
+EAPI="2"
+
+AUTOTOOLS_AUTO_DEPEND="no"
+inherit eutils flag-o-matic multilib autotools
+
+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
+
+pulse_patches() { echo "$1"/winepulse-{0.35{,-configure.ac},0.34-winecfg}.patch ; }
+GV="1.0.0-x86"
+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 )
+	pulseaudio? ( `pulse_patches http://art.ified.ca/downloads/winepulse` )"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl oss +perl png pulseaudio samba scanner ssl test +threads +truetype win64 +X xcomposite xinerama xml"
+RESTRICT="test" #72375
+
+RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
+	perl? ( dev-lang/perl dev-perl/XML-Simple )
+	capi? ( net-dialup/capi4k-utils )
+	ncurses? ( >=sys-libs/ncurses-5.2 )
+	fontconfig? ( media-libs/fontconfig )
+	gphoto2? ( media-libs/libgphoto2 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	openal? ( media-libs/openal )
+	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
+	)
+	xinerama? ( x11-libs/libXinerama )
+	alsa? ( media-libs/alsa-lib )
+	esd? ( media-sound/esound )
+	nas? ( media-libs/nas )
+	cups? ( net-print/cups )
+	opengl? ( virtual/opengl )
+	pulseaudio? ( media-sound/pulseaudio ${AUTOTOOLS_DEPEND} )
+	gsm? ( media-sound/gsm )
+	jpeg? ( media-libs/jpeg )
+	ldap? ( net-nds/openldap )
+	lcms? ( media-libs/lcms )
+	mp3? ( >=media-sound/mpg123-1.5.0 )
+	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? ( amd64? (
+		truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
+		X? (
+			>=app-emulation/emul-linux-x86-xlibs-2.1
+			>=app-emulation/emul-linux-x86-soundlibs-2.1
+		)
+		openal? ( app-emulation/emul-linux-x86-sdl )
+		app-emulation/emul-linux-x86-baselibs
+		>=sys-kernel/linux-headers-2.6
+	) )
+	xcomposite? ( x11-libs/libXcomposite ) "
+DEPEND="${RDEPEND}
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	sys-devel/bison
+	sys-devel/flex"
+
+src_unpack() {
+	if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then
+		use win64 && die "you need gcc-4.4+ to build 64bit wine"
+	fi
+
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+	else
+		unpack ${MY_P}.tar.bz2
+	fi
+}
+
+src_prepare() {
+	if use pulseaudio ; then
+		epatch `pulse_patches "${DISTDIR}"`
+		eautoreconf
+	fi
+	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
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+
+	use custom-cflags || strip-flags
+	use amd64 && ! use win64 && multilib_toolchain_setup x86
+
+	econf \
+		--sysconfdir=/etc/wine \
+		$(use_with alsa) \
+		$(use_with capi) \
+		$(use_with lcms cms) \
+		$(use_with cups) \
+		$(use_with ncurses curses) \
+		$(use_with esd) \
+		$(use_with fontconfig) \
+		$(use_with gnutls) \
+		$(use_with gphoto2 gphoto) \
+		$(use_with gsm) \
+		$(! use dbus && echo --without-hal || use_with hal) \
+		$(use_with jack) \
+		$(use_with jpeg) \
+		$(use_with ldap) \
+		$(use_with mp3 mpg123) \
+		$(use_with nas) \
+		$(use_with openal) \
+		$(use_with opengl) \
+		$(use_with ssl openssl) \
+		$(use_with oss) \
+		$(use_with png) \
+		$(use_with threads pthread) \
+		$(use_with scanner sane) \
+		$(use_enable test tests) \
+		$(use_with truetype freetype) \
+		$(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
+	if ! use perl ; then
+		rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
+	fi
+}
+
+pkg_postinst() {
+	paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
+}