Version bump.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

3 files changed, 235 insertions, 4 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 16ec4f99e4a3..f6257ac997b1 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,11 @@
 # 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.348 2011/02/05 09:23:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.349 2011/02/05 09:24:05 vapier Exp $
+
+*wine-1.3.12 (05 Feb 2011)
+
+  05 Feb 2011; Mike Frysinger <vapier@gentoo.org> +wine-1.3.12.ebuild:
+  Version bump.
 
   05 Feb 2011; Mike Frysinger <vapier@gentoo.org> wine-9999.ebuild:
   Update winepulse patches #353251 by Murray Colpman.
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 4bbaee67241a..3d260a2dbc84 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
@@ -7,6 +10,7 @@ DIST wine-1.2.tar.bz2 17543630 RMD160 57b8a89cc074e2fa490222eedfa21a9f7a3f6545 S
 DIST wine-1.3.0.tar.bz2 17764429 RMD160 6ce5c89179f211e74e19dfab57f5a999ca225369 SHA1 955c8cbf6fe85de179e9b6c8bea9940363166e51 SHA256 b4c6edb68a255be39013ff30c330d838e6143786f1fc13ccf9edfd52f0ac5510
 DIST wine-1.3.1.tar.bz2 17871968 RMD160 e4e62e7b063a467df88a2644841fa8db192bcb70 SHA1 f2e88dd990c553a434b9156c8bfd90583d27c0b8 SHA256 bd9c088c56ce431a2a9d8cf098b837edfb1f0d4bcfe182c03f366cf84e2cf0ae
 DIST wine-1.3.10.tar.bz2 18366433 RMD160 c897d5b55febca451db42de7ca4d020ff08acd69 SHA1 90de64bb15cdb83aac3af9258a95730a114030ed SHA256 f7a2c0565ba7fd765f9498cf023ffb75c96caa999ae25ae16416eb09899b5038
+DIST wine-1.3.11.tar.bz2 18516236 RMD160 7926c09e342a162c6fbd348111ab69cb1cd8d3ec SHA1 fa6ad9375697129486c225f363c74d87cf1e68ad SHA256 f0a88a288418f405ad975840f14abfad1fc5741aaf572a12843ad0842feefea3
 DIST wine-1.3.12.tar.bz2 18689003 RMD160 7d80c53d69ee31428215890c6cfb41ab4830cce8 SHA1 4bcad723cbeab4d1417675595100d0b7874795a8 SHA256 2922734913e240c009d3d7a92c3e1b84f9acbda7b3aeb288035452b459dd1c35
 DIST wine-1.3.2.tar.bz2 17906953 RMD160 dfb03ab39e9b01a182c2751be955ae56bdb852e7 SHA1 876043a93aa834f926a26235b34e72364bc9876e SHA256 eacefbc88bd2b7d3c934239809ba1df8076f455823c3dfd54f9f5892385161c5
 DIST wine-1.3.3.tar.bz2 18043631 RMD160 af7044275f62cd81f9491af0639c3868e163693f SHA1 b19455987f0a71adf691046898a1ca6b3ed7d155 SHA256 455b6ec2f881f54d89d3e6dd9d04318a9eeb3c40f8c66b53e5bf73fc4765fcce
@@ -33,7 +37,8 @@ EBUILD wine-1.2.ebuild 5024 RMD160 0a4947bb34a8fc6e18ef1caa261fc13c9bac52a1 SHA1
 EBUILD wine-1.3.0.ebuild 5566 RMD160 af7b2ea96c6c97d420957fb449a10473b67eecd8 SHA1 64dfa341f85e654895034ec6bd5233dd6f19ad14 SHA256 51dd25779f724c3599a059662d7f0acb4e11ec0f68341175349013d7139593b1
 EBUILD wine-1.3.1.ebuild 5566 RMD160 cd5379bc3a9c1652a6c14237aac401db942883ee SHA1 c36d5431480c3356af517a67d47b1c336075f1a1 SHA256 d1883a669ddf6c296778590d7995d87caddc1779b8366d6ba0ed39ede291515f
 EBUILD wine-1.3.10.ebuild 5819 RMD160 28fe75b6528e7e251193fa8b6ee2d80a3dbf641e SHA1 b2868cf62f8e6e777691b7abe727bf3763fb5e80 SHA256 fd522e8f2b969cd5ad2799a0d3e0d6cd24f0f1aec88f1281f4c6378ba3ef5c5d
-EBUILD wine-1.3.12.ebuild 5883 RMD160 4c2d7d15afaeb2947dfc440d2c194a9fd19beb2f SHA1 5c6a84484f96b06eaa7aa569b1973def4093b64d SHA256 64f3c7e47f3de04fb3a3da92b11a0fef35e794b53b9bb922e804b6a944bec86b
+EBUILD wine-1.3.11.ebuild 5881 RMD160 56b5660adaba5a39df0fee14503a85bb03c649eb SHA1 3dd158b9ebefedd7ca91d3d754e9ded98d59c428 SHA256 45d68cc23faa04d981cc7e1e7b6c90b145f277237ab3de81b1a299bb1655033e
+EBUILD wine-1.3.12.ebuild 5883 RMD160 679ffa51ace4886e547b522fbde7c57bacb68adf SHA1 03f7dca2d1bd1e7c3e9d11f3737da09fd1ed5afa SHA256 b485e74d6fc8ae0bcccbb4ac339b389ecaa8ff0a6220870c2122cc3fc37ca52e
 EBUILD wine-1.3.2.ebuild 5715 RMD160 375a817e5e5bf8d385a1d2bc08faee1c780f49e0 SHA1 f93e5c72560d49139ea76b52ffc61641687538b9 SHA256 858aa83a689ec48745ee22dc95747f66892cb92f638a4cfc667dd17af761ee15
 EBUILD wine-1.3.3.ebuild 5715 RMD160 0921d74c23c352a54c385d43e98f233d63e272a5 SHA1 f74c85a0662749a4fdbd2858ba607a477cb080d6 SHA256 7ed82390d2b1d9f18164e540793b820840cdc16945f52790556e4ae6fac4dc85
 EBUILD wine-1.3.4.ebuild 5715 RMD160 e457e78d2b5262110bfdbda0ff824e15135e5cb8 SHA1 770e6dbd5fcf08f7e8a5acc96d5e2d6a4b071d10 SHA256 122916aecc0212f8a47c18059ba1baeafcc92b8213b3f69964e27ae32bda9b1b
@@ -42,6 +47,13 @@ EBUILD wine-1.3.6.ebuild 5816 RMD160 1592bfcf93abf31b758c4d2f61dc23be34bd5e12 SH
 EBUILD wine-1.3.7.ebuild 5816 RMD160 5e04a8e9fd4ce819cb64413f5ff9136e7d366ef0 SHA1 d599da9c4594b747a72a464603fa02b6e7aaffe8 SHA256 38f2df4ab8d0e238ead323718f58926e36f87a7204ffef776a5b36367ef37a2d
 EBUILD wine-1.3.8.ebuild 5816 RMD160 851de949bbf7909b4f9bca9ce14dddbed1c0c5c6 SHA1 41a5f7be3535d2508ed607a3b55fae3920df0b7d SHA256 8f4e2c645ae692a820092ff047f3ca4cd9693298831314d8c44cd91a48b16a60
 EBUILD wine-1.3.9.ebuild 5816 RMD160 9d6b3b04a575c7f7dc557097b3d88a69852595b1 SHA1 9a571c0bb42229c7d841c5029488e3ebc8b1a34d SHA256 3458ba56b4850be14b061bb880ac8cf897cdffea8c9786f3bbd1159a98478784
-EBUILD wine-9999.ebuild 5882 RMD160 545a300875d5616e2ee209511fe28e214cddf245 SHA1 3231035d9c54a0c60997724646083d34c71d7580 SHA256 b1b8e15f64a039c75a313f11aa65b5ea34a0652e375f68c1576397add758c7e9
-MISC ChangeLog 67302 RMD160 25f51260104061d5dd1f9ffd28f3db06aad65470 SHA1 4651af65268cf5c053983c7ed1a7f59b1d04bf70 SHA256 74b38ec42e90bfb2364f3e1957d88c5d4941d6ddb2040b559a1919febdf45a1c
+EBUILD wine-9999.ebuild 5882 RMD160 2989f16035060a2f86112af908f854228607f730 SHA1 03b5773c9da5a8f0c40dd2d695ad258206c16ddc SHA256 7cdfc1309267c08b62d0a122979413f00393e1c0fb99dfecf0d37818faa04d2a
+MISC ChangeLog 67541 RMD160 ebf89308d9bc7aa3bcf422830fc25f739471e074 SHA1 be2699082ac6d4b35da86e049f939cf83abc9626 SHA256 5a76ee91c63a38201cdc99cfbb2ecc20b1ac19d3edeaaa5687a923ce62183980
 MISC metadata.xml 1417 RMD160 6956a69da8c1a72542e91d63b9e194247df3b781 SHA1 0a050a0047bbd4d750b57600b6f608c7411a7d0b SHA256 dc1c6fda02c66f6edf0b3095b1edc57e3730eece0b7eb4d15e67e0daa1bc9c50
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk1NF0AACgkQaC/OocHi7JbdmQD8CO9tj0kDh3gbBIsqLO5gOpRJ
+Ag+NMcBZc8FY2SdcQLgA/2FNJJLMzi8F2mj3TMeJ+QEw2enTXHYnV78cJnkfLKws
+=jWEG
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.3.12.ebuild b/app-emulation/wine/wine-1.3.12.ebuild
new file mode 100644
index 000000000000..e39d633a7b56
--- /dev/null
+++ b/app-emulation/wine/wine-1.3.12.ebuild
@@ -0,0 +1,214 @@
+# 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.12.ebuild,v 1.1 2011/02/05 09:24:05 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,configure.ac-1.3.10,winecfg-1.3.11}.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 gstreamer hal jack jpeg lcms ldap mp3 nas ncurses nls 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[pulseaudio?]
+	)
+	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 )
+	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 )
+	esd? ( media-sound/esound )
+	nas? ( media-libs/nas )
+	cups? ( net-print/cups )
+	opengl? ( virtual/opengl )
+	pulseaudio? ( media-sound/pulseaudio )
+	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 )
+	!win64? ( ${MLIB_DEPS} )
+	win32? ( ${MLIB_DEPS} )
+	xcomposite? ( x11-libs/libXcomposite ) "
+DEPEND="${RDEPEND}
+	pulseaudio? ( ${AUTOTOOLS_DEPEND} )
+	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_with gstreamer) \
+		$(! 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 nls gettextpo) \
+		$(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
+}