Version bump #351454 by Christian Faulhammer.

3 files changed, 213 insertions, 11 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 4c02017101f3..64877b6ac509 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.343 2011/01/08 22:01:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.344 2011/01/12 18:17:09 vapier Exp $
+
+*wine-1.2.2 (12 Jan 2011)
+
+  12 Jan 2011; Mike Frysinger <vapier@gentoo.org> +wine-1.2.2.ebuild:
+  Version bump #351454 by Christian Faulhammer.
 
 *wine-1.3.11 (08 Jan 2011)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 700f426b1bf6..3b49a927e8fe 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,10 +1,8 @@
------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
 DIST wine-1.2.1.tar.bz2 17629106 RMD160 8652ac4f7c4fd2b3da22a840706b3adcb9901467 SHA1 02df427698de8a6d937e722923c8ac1cf886ca27 SHA256 43d1c4d8441221708e6e15ddcddf113308ce875c87f5a8c0f380c6a5b8b63701
+DIST wine-1.2.2.tar.bz2 17665449 RMD160 0388547d56d0676354406d52e62de0b843d8be5d SHA1 8b37c8e0230dd6a665d310054f4e36dcbdab7330 SHA256 c3daead3d40a7c00111200a8e9271d4647369ee4eee2d5d866c2032ef37c09db
 DIST wine-1.2.tar.bz2 17543630 RMD160 57b8a89cc074e2fa490222eedfa21a9f7a3f6545 SHA1 dc37a32edb274167990ca7820f92c2d85962e37d SHA256 c388724e8f20a6e014a1f95662128a9f9c6ebc90137ca4afc623486c5a7d985f
 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
@@ -29,6 +27,7 @@ DIST winepulse-0.39.patch 102058 RMD160 a7d662dfe043f9b57a16bee6c4002c065943a8a0
 DIST winepulse-0.40-configure.ac.patch 2574 RMD160 8b9b9afb42ce7a19dee50409fffacfbafba213db SHA1 a007a7fb526572d265e8a1ff45b35fa7341ddbcf SHA256 0b37dca095200e60ffc18754131b0cc70e395da440835feccafc5c5ab9b40d65
 DIST winepulse-configure.ac-1.3.10.patch 2688 RMD160 194155da111e413451e74fe8000be09b43a85f5c SHA1 e9c44d0e6aa248ca75c7629242bc27bd0056cafb SHA256 2005369745b06807999f157aa20022d6c1730edf25aa43e8f7a66b5427b33167
 EBUILD wine-1.2.1.ebuild 5536 RMD160 99fdafdf934ea1239f84d7c0c94be81647e9a233 SHA1 e910121ce9533be9a6e4120e936b910108d0ed07 SHA256 1dcc12e3ce7eae192636e97bdbbeff17f3a9aa4c715d6c1e0704b8aee0ea51dc
+EBUILD wine-1.2.2.ebuild 5536 RMD160 99fdafdf934ea1239f84d7c0c94be81647e9a233 SHA1 e910121ce9533be9a6e4120e936b910108d0ed07 SHA256 1dcc12e3ce7eae192636e97bdbbeff17f3a9aa4c715d6c1e0704b8aee0ea51dc
 EBUILD wine-1.2.ebuild 4997 RMD160 a5ba7b4731f6b3533934329478c2b41eb791e47d SHA1 bed521201b392e858b95006c62b71b5ea61faa69 SHA256 0cb78756056d7a410cc935c727f2457245bdaba4907eb775fbb060fd68484272
 EBUILD wine-1.3.0.ebuild 5539 RMD160 56ef4baa960ed9592a76cf9854646ac9515fb5b4 SHA1 78aa824c6fe17400c35904621edfbff18832a2cc SHA256 e016158a7be074e10de3433ced2ed81d53ed4103af3521f89851c65064fb04b8
 EBUILD wine-1.3.1.ebuild 5539 RMD160 16d0457c41243abe611c44b563a8d100dbb85c34 SHA1 d9fd658703a88d279a5ffb59dcb43e95c2c6d7bb SHA256 6383ee6a7012c61edf012a370bbe6ba85011723123e7a92a4cae34bd5280cb13
@@ -45,10 +44,3 @@ EBUILD wine-1.3.9.ebuild 5786 RMD160 99dc0463e46a1f686814bf8303d9a3c9a131b0b8 SH
 EBUILD wine-9999.ebuild 5850 RMD160 b3b71fe5a9a2c1adcbe23567588f09ce227bbbed SHA1 b83a383fcd8d4332000295c72f5f8c2ddc1c425d SHA256 3abf11ea029005ff9b9927d4ddc4d8275af86608ee3a9deada8cbadb5d6d502d
 MISC ChangeLog 66155 RMD160 21a4cdedd9f40ec8d377388cea1e88b3d9e83630 SHA1 5d297bc32a4c3bdd1eb984854c273c460c057d46 SHA256 35a34a0a8e83237882765ccfa259c13d2fab6900ca9e60a2e71658bde0f44433
 MISC metadata.xml 1417 RMD160 6956a69da8c1a72542e91d63b9e194247df3b781 SHA1 0a050a0047bbd4d750b57600b6f608c7411a7d0b SHA256 dc1c6fda02c66f6edf0b3095b1edc57e3730eece0b7eb4d15e67e0daa1bc9c50
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iF4EAREIAAYFAk0o3sUACgkQaC/OocHi7Jb88gD+OJQTe5DP0gEmDHB09L32Oa6x
-ByJbeuB14PWm62WLo+EA/3sf0kKyGVl7US2CHSDpmImfe6ojTBEC3OwN0QfFpbVi
-=dDUP
------END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.2.2.ebuild b/app-emulation/wine/wine-1.2.2.ebuild
new file mode 100644
index 000000000000..6735084ef7df
--- /dev/null
+++ b/app-emulation/wine/wine-1.2.2.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.2.2.ebuild,v 1.1 2011/01/12 18:17:09 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.36,0.35-configure.ac,0.38-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 +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}.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
+}