Version bump #343359.

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

3 files changed, 228 insertions, 2 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 68725d58ad3f..aff0eeb3a7af 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.335 2010/11/07 21:57:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.336 2010/11/10 11:14:36 vapier Exp $
+
+*wine-1.3.6 (10 Nov 2010)
+
+  10 Nov 2010; Mike Frysinger <vapier@gentoo.org> +wine-1.3.6.ebuild:
+  Version bump #343359.
 
   07 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> wine-1.1.10.ebuild,
   wine-1.1.11.ebuild, wine-1.1.12.ebuild, wine-1.1.13.ebuild,
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index d63dd934b2c0..e58b87e45cdf 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX wine-1.1.15-configure-host.patch 314 RMD160 1c8d09d5265a23b1931eba949a614eaeff251ac7 SHA1 af887b963cf154e8bcf1e9b8b19731bbdda5f487 SHA256 c281217f6e221a6235485918750907b02aa1e40fa68e45133cc4c14ebb40bfe9
 AUX wine-1.1.15-winegcc.patch 1556 RMD160 ca7e0df0a45507e7d31ed81c5712111b83ed9bfa SHA1 4b155fe7cb5e831b7f92757d52aa1ab12569b232 SHA256 dbd89db561d7583faf317d795b8c11231575d885e21c6414add39079604dbd0d
 AUX wine-gentoo-no-ssp.patch 532 RMD160 fd5de0dd965ec58aa53f0ec1fb74ce7cd498a24e SHA1 6fc776bd96438c65a44a03c8adb3fedb0aaa70bf SHA256 6408ae3ed9bacc895677a5b2302bc27afc549ea99f54a9ab4594afb34c629e9e
@@ -43,6 +46,7 @@ DIST wine-1.3.2.tar.bz2 17906953 RMD160 dfb03ab39e9b01a182c2751be955ae56bdb852e7
 DIST wine-1.3.3.tar.bz2 18043631 RMD160 af7044275f62cd81f9491af0639c3868e163693f SHA1 b19455987f0a71adf691046898a1ca6b3ed7d155 SHA256 455b6ec2f881f54d89d3e6dd9d04318a9eeb3c40f8c66b53e5bf73fc4765fcce
 DIST wine-1.3.4.tar.bz2 18079846 RMD160 ebbbf31aac547ee25ecf6c0171e29ae312c853d8 SHA1 7dbb1716cf83b61232f64bcc25e7e2d109321e49 SHA256 449387f5672cc535548740eef90403afd5d3cd678d3686bccf62813958825fdc
 DIST wine-1.3.5.tar.bz2 18175097 RMD160 026114f86f87abab1cd962b0bcef8ab6f345e8fc SHA1 52b151855087dce69a8b3405d2ad93b24f96c6fb SHA256 bb2d44c1ae488b972f03e8f97c44fe1608240984075ccf75952edddf1dd2b79e
+DIST wine-1.3.6.tar.bz2 18243096 RMD160 d1f9f1dade12f878e90fa01f5a59cc13056d8b06 SHA1 247a416b608fc317bce9fe0644a3103c8abf97d6 SHA256 9a4b7b9d8358b81bb32ed376e817ae86a531bce39663537a1f77d4b4cfa44d27
 DIST wine_gecko-0.1.0.cab 5746895 RMD160 61f85ee39e96f88783541460d2fce31db7cc0183 SHA1 c16f1072dc6b0ced20935662138dcf019a38cd56 SHA256 4ef0bffa49a9abc86f74257aa8d7f5db806e8e8bd780149244149aa3f9292d10
 DIST wine_gecko-0.9.0.cab 7806669 RMD160 6cd55a76dea2fa5b50adf98423d0e38a207fde92 SHA1 5cf410ff7fdd3f9d625f481f9d409968728d3d09 SHA256 8ed1aec2b9255cd1baaaf8933b7bdbc1ea20f1f1513797144ec5c9b9482d3d74
 DIST wine_gecko-0.9.1.cab 7806837 RMD160 8b16a4d065cd28d87a2e226400fa0a3ed600c2f1 SHA1 9a49fc691740596517e381b47096a4bdf19a87d8 SHA256 76345852b844c4b624a1beaf3f47f261ad956dbee97316ea26b3c587b363be84
@@ -99,6 +103,14 @@ EBUILD wine-1.3.2.ebuild 5688 RMD160 2e4d32456a4eb96ea1f1824a7ccee1c2adcdf7e8 SH
 EBUILD wine-1.3.3.ebuild 5688 RMD160 cf9b269c302f56321898af275e72d6c170a6c92c SHA1 891525b3a8abcdfdccea9005edde34ef6ae457ae SHA256 295a7033ab1baba5137752ccfaeafaa0818d0f401c65507650011e60c005a9bc
 EBUILD wine-1.3.4.ebuild 5688 RMD160 1a98f376eb42ee7ba36297a593c7624eb03183f3 SHA1 726e434a132576c9a3cfc79f2eeb69d82d2267fa SHA256 5574c644c439faf8de78c4ff3e220e38d77e37fb7df25ff25a8aabdb0f6d0c86
 EBUILD wine-1.3.5.ebuild 5688 RMD160 38eb335deb7faee7db1f9e6d4947882227c229c9 SHA1 a9e27fa8f3fd4b6b0b3776516b505e796fe54443 SHA256 200e3b672ce02afda3f1529bb26cb085eb16dc612cc652cb179a8e44c9db4f73
+EBUILD wine-1.3.6.ebuild 5685 RMD160 e485daa052b510dd25434bf8654f10e7874c140c SHA1 a6ff0bf378892b7dee87c3b554edcd1a198d699b SHA256 7a9a35cc3ad6f7ed78ea57b1a979f60ce398d0e16f0a9c2e3c6a859aef810333
 EBUILD wine-9999.ebuild 5688 RMD160 b4b197ca89f0dcaa5ea43c542c4fbcac1e5f70e4 SHA1 9ffa6f5722d136a3a87c28fef78b7a2a9e5af637 SHA256 adbed069c757c74736fd992afc9400212fdd5b3fdda6067384f7299dabde4ed9
-MISC ChangeLog 64991 RMD160 a3f2e511c66dbce8268967d29acf8f503995efc5 SHA1 b53a1f9033b164b579a059e17c54c769a0ce7b25 SHA256 8cf0bc82ee050750c358ec019871278833306c6f3a2ed5a8693c796756a91879
+MISC ChangeLog 65110 RMD160 bf0575a90e756157e184e74240a4f17132229230 SHA1 d841ec4a85589c8ef93b623cec64e471266c2abb SHA256 9a694db28e5e1c5fa96e2e77ca55f34930f4cfcd95c9b8b540a07769a914f89d
 MISC metadata.xml 1417 RMD160 6956a69da8c1a72542e91d63b9e194247df3b781 SHA1 0a050a0047bbd4d750b57600b6f608c7411a7d0b SHA256 dc1c6fda02c66f6edf0b3095b1edc57e3730eece0b7eb4d15e67e0daa1bc9c50
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAkzafpIACgkQTwhj9JtAlp7NfgEAv6uapZDm2QJbxuSS7CAEnPxY
+Eo2l5XnUo4BiTaeGBfIBAKEEw0EuRHbLERdbtWxa9izBTDaM1nT6CnRPkaTWN5OV
+=qi6H
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.3.6.ebuild b/app-emulation/wine/wine-1.3.6.ebuild
new file mode 100644
index 000000000000..ab83b274865e
--- /dev/null
+++ b/app-emulation/wine/wine-1.3.6.ebuild
@@ -0,0 +1,209 @@
+# 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.3.6.ebuild,v 1.1 2010/11/10 11:14:36 vapier Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+	inherit git autotools
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	AUTOTOOLS_AUTO_DEPEND="no"
+	inherit autotools
+	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.39,0.39-configure.ac,0.38-winecfg}.patch ; }
+GV="1.1.0"
+DESCRIPTION="free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? (
+		mirror://sourceforge/wine/wine_gecko-${GV}-x86.cab
+		win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.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 +win32 +win64 +X xcomposite xinerama xml"
+RESTRICT="test" #72375
+
+MLIB_DEPS="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 )
+	opengl? ( app-emulation/emul-linux-x86-opengl )
+	app-emulation/emul-linux-x86-baselibs
+	>=sys-kernel/linux-headers-2.6
+	)"
+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? ( virtual/jpeg )
+	ldap? ( net-nds/openldap )
+	lcms? ( =media-libs/lcms-1* )
+	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? ( ${MLIB_DEPS} )
+	win32? ( ${MLIB_DEPS} )
+	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 use win64 ; then
+		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
+			&& 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_OPTS=-p1 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
+}
+
+do_configure() {
+	local builddir="${WORKDIR}/wine$1"
+	mkdir -p "${builddir}"
+	pushd "${builddir}" >/dev/null
+
+	ECONF_SOURCE=${S} \
+	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 pulseaudio && use_with pulseaudio pulse) \
+		$(use_with scanner sane) \
+		$(use_enable test tests) \
+		$(use_with truetype freetype) \
+		$(use_with X x) \
+		$(use_with xcomposite) \
+		$(use_with xinerama) \
+		$(use_with xml) \
+		$(use_with xml xslt) \
+		$2
+
+	emake -j1 depend || die "depend"
+
+	popd >/dev/null
+}
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	if use win64 ; then
+		do_configure 64 --enable-win64
+		use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
+	else
+		ABI=x86 do_configure 32 --disable-win64
+	fi
+}
+
+src_compile() {
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" all || die
+	done
+}
+
+src_install() {
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" install DESTDIR="${D}" || die
+	done
+	dodoc ANNOUNCE AUTHORS README
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab || die
+		use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.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
+}