Version bump #322591 by vp.

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

3 files changed, 190 insertions, 5 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 4bdac151469e..0c9f3e09a27f 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.306 2010/06/03 03:31:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.307 2010/06/04 05:50:20 vapier Exp $
+
+*wine-1.2_rc2 (04 Jun 2010)
+
+  04 Jun 2010; Mike Frysinger <vapier@gentoo.org> +wine-1.2_rc2.ebuild:
+  Version bump #322591 by vp.
 
 *wine-1.2_rc1 (03 Jun 2010)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 3e145da1e1d5..50306b316090 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -53,6 +53,7 @@ DIST wine-1.1.7.tar.bz2 14623875 RMD160 77f4552f22850ee50602f095c777cd8f679cd231
 DIST wine-1.1.8.tar.bz2 14665390 RMD160 13501a94f3eeeb8e75be25e4dc5c178414d473c3 SHA1 a01bea15352e4c9026109f8ba0cfe66e7167c3d6 SHA256 dbadd980d3ab1d3f188c5972c980312324aedf5681494732a45c0459b17d0c1e
 DIST wine-1.1.9.tar.bz2 14731804 RMD160 3a366c6b5c8f07d61d67b278000bbe0131fa7d99 SHA1 a9d5938b76198d244f0950e843dd4347661f4e74 SHA256 fed77069751d9a0d026b4f927672237cbd283971e08062932831cb800b3d1eca
 DIST wine-1.2-rc1.tar.bz2 17183442 RMD160 1ec7d5d51ce346d678681da16f64f3a94344d02b SHA1 31ea3a75ea560cd486fb58825242ac0a6fc664ca SHA256 2b24f10862eda9803df4c6c1fb17a50da9d4916db2ea9caa56fb1cc10ab2af34
+DIST wine-1.2-rc2.tar.bz2 17158642 RMD160 53daa6202ee9b6c427f6c62c7875b1ec3bc8b594 SHA1 6952b5036f218e0be917184933cf0a252b8f8e86 SHA256 b1e193e46593611ed0e791fc914234fb4c0f73bbc3390314f228e849137ac918
 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
@@ -110,13 +111,14 @@ EBUILD wine-1.1.7.ebuild 3894 RMD160 bb495cece36b7a08a13e35ef83efc3e763165e30 SH
 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-1.2_rc1.ebuild 4930 RMD160 0bd47e159dc4fa4730ce8c1ef4e4093caffef78b SHA1 99b81a7e641290abba5a31638fbc13aa14933124 SHA256 b6fbe9b5b6b57df3b8a2a9e8134babd2a51ed959fa9325bf5a608385e511d0dc
+EBUILD wine-1.2_rc2.ebuild 4930 RMD160 1f9631e8776f9cac3484d2892b75c2c275da0c52 SHA1 e72913f5db52afeaeceb8cc06e1be64b0b086dc7 SHA256 58a1c40f8ae9db526d4c0fcd17e8c5a00dc79a426de1df5341bf74fc5ce1aa95
 EBUILD wine-9999.ebuild 4530 RMD160 509f6ae62b0bc9336c9a534e11b60cf57a3a254f SHA1 9f443d1c1fb870250fff821c3f7babc5341a9c77 SHA256 36249dac9a7b2750553f393fea94056f29790beb6c97a961cc4613e637291547
-MISC ChangeLog 55105 RMD160 eb853eca94fcf30558d053c98ef25b224cc7e49f SHA1 e7bd77142ff85cd5d598194a3bc803fe5f6ffc74 SHA256 7ce58990a45ffbac01577070d8ab2fb274350297b76a810f899ea0d728b4372e
+MISC ChangeLog 55237 RMD160 9390d532739208ebd9a4c82c101749d849e5e53e SHA1 a035d928ca7394e4ec7e4968ef24839ee4f1bde8 SHA256 f6786b660c50a9f9f1a373e5a3cb5481d6a80131f64bfb9a59832109cdeedfa7
 MISC metadata.xml 1333 RMD160 fe0a0c8ec639987ff6c06f7a9e47a391defb5478 SHA1 421e3087a3f122fa15283d82429f1d315fba313a SHA256 edaaae36cc5924ea3be49d2d3628e5de555b87b2bee44685797efee72f599902
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkwHIjcACgkQTwhj9JtAlp6ZHwD/Z03Fq+F0GsbfZLf23TKwqX/s
-QJcniOY5WYx3EPofgkEA/inoX6PnHIRO0YqPYaWmUwpbaehtxYXByoIL55bsfHf6
-=lknC
+iF4EAREIAAYFAkwIlAAACgkQTwhj9JtAlp7g1gEArryE/YIvKJnmUPIjfUQaiE7W
+aibmxIQ+sooz9PXWDUcA/RptAjbiTj2cJIFzi615/mg6/9fhXFMhhjFBtaGOzsaK
+=auNy
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.2_rc2.ebuild b/app-emulation/wine/wine-1.2_rc2.ebuild
new file mode 100644
index 000000000000..fba20ccb5422
--- /dev/null
+++ b/app-emulation/wine/wine-1.2_rc2.ebuild
@@ -0,0 +1,178 @@
+# 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.2_rc2.ebuild,v 1.1 2010/06/04 05:50:20 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.36,0.35-configure.ac,0.36-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_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
+}
+
+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 pulseaudio pulse) \
+		$(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
+}