Version bump #380873 by Andrew Savchenko and updated gecko ver.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 223 insertions, 8 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index acb3ed496aaa..533ef497b209 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.380 2011/08/20 19:23:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.381 2011/08/28 02:57:01 vapier Exp $
+
+*wine-1.3.27 (28 Aug 2011)
+
+  28 Aug 2011; Mike Frysinger <vapier@gentoo.org> +wine-1.3.27.ebuild,
+  wine-9999.ebuild:
+  Version bump #380873 by Andrew Savchenko and updated gecko ver.
 
   20 Aug 2011; Mike Frysinger <vapier@gentoo.org> wine-1.2.ebuild,
   wine-1.2.1.ebuild, wine-1.2.2.ebuild, wine-1.2.3.ebuild, wine-1.3.0.ebuild,
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index f70547486fb6..9eceb2562ffa 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -30,6 +30,7 @@ DIST wine-1.3.23.tar.bz2 19474860 RMD160 b430f0042e152652eb8cb76153924b394043b31
 DIST wine-1.3.24.tar.bz2 19525444 RMD160 6567c8cbc646f5f447375046c3f25b4036689a58 SHA1 cc0dfc2255d1bc19e1975e5e2f680740d9c2825a SHA256 5ded950c14989feb248333d2ed43e35c06fe13c55db35c4c8baa54d9b298ee9b
 DIST wine-1.3.25.tar.bz2 19580506 RMD160 a7fde0bf819df1bb2025a47f7b39bc01f88887a1 SHA1 df5f16a2497b370761f2da5be257eae7407c8d6a SHA256 f5525a966efd2f973c9a0fd6391d0d3e5817432e59598fe47c494b240d7e1caa
 DIST wine-1.3.26.tar.bz2 19540784 RMD160 c1d98690ff16a63cea6c04c64444c075ad7ab472 SHA1 a609ebb1f8c0908fb86948edcb1f7f9ccca47e7f SHA256 6cadb2d80c0cd12c44fa26147041a32f61066dd39e748c83dad48af79ecd4e74
+DIST wine-1.3.27.tar.bz2 19566507 RMD160 753dd245f2a77f9923795504d44bb96a5f294649 SHA1 5323bdb9eda5c53650f4d16dff16e11e3e53dfa3 SHA256 6163a4734f47453cf9cee996efcf9d55ee49bb4a055f5b28a3907e4135edbeed
 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
@@ -42,6 +43,8 @@ DIST wine_gecko-1.1.0-x86.cab 8868851 RMD160 1867734d6ab35f4e66f717789832e69aac0
 DIST wine_gecko-1.1.0-x86_64.cab 8940997 RMD160 76364b01b6756db79989feea9de14aeec4ba4675 SHA1 55b4b60cd2a48631d6236fb411c3a94d806d9906 SHA256 b8bea5b6400d191c05b2295c79285309fe331283648457bed48f7e2387773b7a
 DIST wine_gecko-1.2.0-x86.msi 12604928 RMD160 089447eb59eea81c7b1b3d1896a20fe68586cd96 SHA1 6964d1877668ab7da07a60f6dcf23fb0e261a808 SHA256 d6ccdb32b5867df207c7cd89513297ceb89cfa93696bece470467845c6c4d3ee
 DIST wine_gecko-1.2.0-x86_64.msi 12841472 RMD160 7a6a82772da22a1bc77a2edd7e96b4345b082150 SHA1 3ac3c3e880e40f7763824866372ffc56128f0abd SHA256 ef6a105bcd5a66c0ebe28e8c813de284453a62b277af544e7710a8de8c4e8d8d
+DIST wine_gecko-1.3-x86.msi 13609984 RMD160 3368c7d826da7f0b99c2e4cfa96a2a48a00a3e1b SHA1 acc6a5bc15ebb3574e00f8ef4f23912239658b41 SHA256 4b7559e889eff5ed924d25ce49297aff55f43c4b9d34dafa970261d88c40b5ae
+DIST wine_gecko-1.3-x86_64.msi 13835776 RMD160 a421cb4bbb6ce85426acd94b264e6f02fa901f08 SHA1 5bcf29c48677dffa7a9112d481f7f5474cd255d4 SHA256 07e9885d15ad22629c3854d6bd77094c3f4db1028ebda408ec87b101fa135d75
 DIST winepulse-0.35-configure.ac.patch 2826 RMD160 e419d43667be01af9b24a0e46822c41572a6ff9d SHA1 4943381128fd9555280884e2bb5867be4a8731d9 SHA256 837bffaaddb6b7b0a474c7262a57f12e250e135cf6228dde1a22849f66de1250
 DIST winepulse-0.36.patch 101815 RMD160 9a20076436a7e49c317bc624dd71b61c93acddff SHA1 aa6a4c9d4619f8452aad8c457c879769cab8f8fc SHA256 7508b171bfecb461ecb464426cb4bcd9c3ff77645b787fcbf61e27dd34fe1b05
 DIST winepulse-0.38-winecfg.patch 13088 RMD160 e7aa8f91c20b6d706fc12e11677440f19890f4c7 SHA1 55b785636d2982f19e0634b26eafffbe46b79c60 SHA256 051ef1cb5598c319152ad28b85733927a711b45e0bfa92f0b0b2331588f5894e
@@ -78,6 +81,7 @@ EBUILD wine-1.3.23.ebuild 6133 RMD160 8249317df8db897aab34f2f5b7c7837d63bd2e20 S
 EBUILD wine-1.3.24.ebuild 6132 RMD160 0657e4ec797292754a565ef13f38416d7bef3163 SHA1 a21cc31c5414bb6ec0bac78247536f65ee271b48 SHA256 f666016b54ecdd929e3340852bed632de9b61153a6b43f5bc2d4d819acfce0aa
 EBUILD wine-1.3.25.ebuild 5542 RMD160 d70ee35c86bc39f8f861dafcd05d8a7ca487b8d9 SHA1 53ff9895596a09a06f6f95b9a6fe8c9d59013840 SHA256 097a8236160d965245eb10ff6a64353d68a2d6921badb73423e444f10ec753d7
 EBUILD wine-1.3.26.ebuild 5542 RMD160 f619dc61a842b50d4542d1eb537246103a323956 SHA1 5609bf4735878e7c4642378ce932fc7758668ab2 SHA256 2b082091129e2131c2f605b5212840369359a384c6471b40e02ef38fdc564145
+EBUILD wine-1.3.27.ebuild 5540 RMD160 aca5212c981555e3408aeb195a596a842ac75688 SHA1 c9fcc2a09d4461cbda89a3bc68356343af0e2b9e SHA256 d0778e1feafb7fcfae478defe846fe4503782f310bcac8aa8e0c890e064b361c
 EBUILD wine-1.3.3.ebuild 5860 RMD160 e0b78a924e370631658f0e5ce39332d9dce71f4a SHA1 ef115c8a1c725e53746b7c61120d4eab9cf5a06f SHA256 d718fa309031e21c71b118ec035c726bec745f3fee5349531d8e00925eeb0974
 EBUILD wine-1.3.4.ebuild 5860 RMD160 92f8918145ee60fc1eb04a210261f72bf70ce24c SHA1 e3d0aa5c56198263e963abcd7c4511f95a7df576 SHA256 82a8c2b014f1ea2501ed64b6e69e8787b4d851601186b48aadfca22f0e6e69ae
 EBUILD wine-1.3.5.ebuild 5860 RMD160 0c70c50ba7a719887815b28c18e38ba7ed810e67 SHA1 59d82748ab1791401c46e5d852f4f94466b80e8d SHA256 9b122450a687608fd99e7f17282fd343d3076b5b9bdb56256a1e509d370629e7
@@ -85,13 +89,13 @@ EBUILD wine-1.3.6.ebuild 5961 RMD160 85ef80018c81b9fc8d11d66b9db3686eb5f9f31c SH
 EBUILD wine-1.3.7.ebuild 5960 RMD160 917c97c64828b86673c6072a02e5f6fd36751a39 SHA1 32aacad8f10feb6da4a80b60d9198c3c1d6df5ac SHA256 3f0ecaedc32f26bee791a71048058abf6e557c9568319fb526cb48697f31fd42
 EBUILD wine-1.3.8.ebuild 5960 RMD160 454b255a0e0f1c905494aec117ac81416be0b738 SHA1 9bb731a3dc91088c2c5a6e075a79db0dc79836a1 SHA256 3398a80d59e47349f018568fa0cbd30bdfb5fa42f81e322531d25ebbaf3aac2c
 EBUILD wine-1.3.9.ebuild 6066 RMD160 80efddcd5034725b29a662002161f493f6f9dcf9 SHA1 50e63187f57e9f4787b46cea85b6a73be0eeb2d3 SHA256 f7f3fd022415f49381fc7da8318947dabaa47da7207d0ab56864de34dbb2f3ec
-EBUILD wine-9999.ebuild 5541 RMD160 99b31b12f99df8c462e94f4f466772bbecc66f36 SHA1 a81f17f7eff7119c2a15947547de5e7fc3b99bc7 SHA256 283708f68993cdc28b82fda7d94c60bb243e7cc967dab3a6cd75ffa1614712b9
-MISC ChangeLog 75165 RMD160 ff078a5649e3998eb5438c4bdc224a47e415edf4 SHA1 217df5e16a3ba2a7513ce0422dd9335c9dcb3463 SHA256 b197d90c76562ef5ec1227fdd7910e20fb96de6081e15e888bb20231e351598b
+EBUILD wine-9999.ebuild 5539 RMD160 c60b79e138c1cfd8c61a68690a38dd0c6d9d5bb9 SHA1 6b85506b78e6584e723556930ac158207cd9e4f5 SHA256 8cb191bfe4d8ac655f37df005571525a118d694128decaee9235a7c5f3e1c977
+MISC ChangeLog 75351 RMD160 04461d417786c95750237106b147c3dcd4228e6f SHA1 691b14cacc57cb45c080ad33dae2a4dc9e8d7d21 SHA256 dd585111d575fd3461651a7512bde52d4bd399be83452d74e5dbb1ac3158f07d
 MISC metadata.xml 1681 RMD160 9c7ce105ac87de7a09f92cbb6a797f5f60576014 SHA1 80d03dc33ad3e8d1e73e8b02ff8b84f61df40912 SHA256 48a829d453b2910192cbd399a8a0ac6bb2354ec54bd0cdd6a8072d0b215aa85a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5QCd0ACgkQaC/OocHi7JZFYgD/QJQjkJ37sZCC6PU45+FKaCYS
-w5cy9lenWVO4RIeGO6cA/3iMwbMwgvLRIapBw3BaaIXkWMdRyweW0rEIqC1NIlMS
-=uds7
+iF4EAREIAAYFAk5ZrnMACgkQaC/OocHi7Ja/9gD9HWoD5AjyWFAOmstCMwYUZEii
+aIWP9KcPXlZFS2hO9b0BAIX9usTCufbtlZzQBSeYELMFF97RUjxrJaDApmuqrEiz
+=18yz
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.3.27.ebuild b/app-emulation/wine/wine-1.3.27.ebuild
new file mode 100644
index 000000000000..408242b236e9
--- /dev/null
+++ b/app-emulation/wine/wine-1.3.27.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.27.ebuild,v 1.1 2011/08/28 02:57:01 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-2 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
+
+GV="1.3"
+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.msi
+		win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi )
+	)"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa capi cups custom-cflags dbus fontconfig +gecko gnutls gphoto2 gsm gstreamer hal hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +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 )
+	v4l? ( app-emulation/emul-linux-x86-medialibs )
+	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 )
+	openal? ( media-libs/openal )
+	dbus? ( sys-apps/dbus )
+	gnutls? ( net-libs/gnutls )
+	gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
+	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 )
+	cups? ( net-print/cups )
+	opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
+	opengl? ( virtual/opengl )
+	gsm? ( media-sound/gsm )
+	jpeg? ( virtual/jpeg )
+	ldap? ( net-nds/openldap )
+	lcms? ( =media-libs/lcms-1* )
+	mp3? ( >=media-sound/mpg123-1.5.0 )
+	nls? ( sys-devel/gettext )
+	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 )
+	v4l? ( media-libs/libv4l )
+	!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 )
+	!hardened? ( sys-devel/prelink )
+	virtual/yacc
+	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-2_src_unpack
+	else
+		unpack ${MY_P}.tar.bz2
+	fi
+}
+
+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
+}
+
+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 fontconfig) \
+		$(use_with gnutls) \
+		$(use_with gphoto2 gphoto) \
+		$(use_with gsm) \
+		$(use_with gstreamer) \
+		$(! use dbus && echo --without-hal || use_with hal) \
+		$(use_with jpeg) \
+		$(use_with ldap) \
+		$(use_with mp3 mpg123) \
+		$(use_with nls gettextpo) \
+		$(use_with openal) \
+		$(use_with opencl) \
+		$(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_with v4l) \
+		$(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.msi || die
+		use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || 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
+}
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 72630eb9aabf..305c5ef4241d 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.91 2011/08/20 19:23:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.92 2011/08/28 02:57:01 vapier Exp $
 
 EAPI="2"
 
@@ -20,7 +20,7 @@ else
 	S=${WORKDIR}/${MY_P}
 fi
 
-GV="1.2.0"
+GV="1.3"
 DESCRIPTION="free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}