Version bump #342917 by Peter Volkov.

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

3 files changed, 217 insertions, 5 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index aff0eeb3a7af..6a3a7abadabd 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.336 2010/11/10 11:14:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.337 2010/11/14 00:40:30 vapier Exp $
+
+*wine-1.2.1 (14 Nov 2010)
+
+  14 Nov 2010; Mike Frysinger <vapier@gentoo.org> +wine-1.2.1.ebuild:
+  Version bump #342917 by Peter Volkov.
 
 *wine-1.3.6 (10 Nov 2010)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index e58b87e45cdf..f95f22c663fd 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -39,6 +39,7 @@ DIST wine-1.1.41.tar.bz2 16305386 RMD160 fa66ed48ccb005bdd539b8a2b89f9630cde1c0b
 DIST wine-1.1.42.tar.bz2 16393778 RMD160 c23f490298de14fdc390e601d8c5b7cd2a498850 SHA1 ea932f19528a22eacc49f16100dbf2251cb4ad5c SHA256 924ce4eb68cda985b4c350031f8fd69f30f5a030341d6ca54699c11ee09a4af9
 DIST wine-1.1.43.tar.bz2 16760374 RMD160 043e49e12e0892bd08b4c6ba6adee267f6e8d8d3 SHA1 2f77eab13f29b7942d5507ef925c40ff1ecfd3a5 SHA256 20656ac69a628341ecce55a72d02ee93e20e0c2a4bf6df94336738f1f1ff793a
 DIST wine-1.1.44.tar.bz2 17002412 RMD160 b5bea9bf7ba64f9fb5d131b2874c35fb64f0ea11 SHA1 60f11693161b28ff9814949f2b6bbccee1d07a2c SHA256 268deeba52b1e6b5210e502cc584fbffa323252ce239a1545d3ab1abb9b0f22e
+DIST wine-1.2.1.tar.bz2 17629106 RMD160 8652ac4f7c4fd2b3da22a840706b3adcb9901467 SHA1 02df427698de8a6d937e722923c8ac1cf886ca27 SHA256 43d1c4d8441221708e6e15ddcddf113308ce875c87f5a8c0f380c6a5b8b63701
 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
@@ -96,6 +97,7 @@ EBUILD wine-1.1.41.ebuild 5001 RMD160 dd00e05bb15ed54afb12955ab42f84a592b1aba6 S
 EBUILD wine-1.1.42.ebuild 5001 RMD160 e5dd9089d3c5768fe5a4c2d1aaf7611a19732f85 SHA1 4e403139344aa22558f1555c7d6e8350c16248a4 SHA256 2215d33321db606edbcd5f283c3913884bbb511e80249b45dcaf7f7f786aaa3d
 EBUILD wine-1.1.43.ebuild 5001 RMD160 da173c8f06017c1cf34acce3f9abc732938229bb SHA1 cc4f87349af5d913de2195cfe3df85dcfe51ab1d SHA256 ac3f96ba5c277c13cc0bae62d1fa8bd94f42703cc55368f827c7b3bcf085f28f
 EBUILD wine-1.1.44.ebuild 5001 RMD160 fa24cef4d274b2921bb90de70be30e77f60edace SHA1 44bd9605ead791f46c13e40c639bfdd15f81eda3 SHA256 aa02f42ad45b09a092f97a5dab2432b2b1319dea7f4422b09f377eed887518c4
+EBUILD wine-1.2.1.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
@@ -105,12 +107,12 @@ EBUILD wine-1.3.4.ebuild 5688 RMD160 1a98f376eb42ee7ba36297a593c7624eb03183f3 SH
 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 65110 RMD160 bf0575a90e756157e184e74240a4f17132229230 SHA1 d841ec4a85589c8ef93b623cec64e471266c2abb SHA256 9a694db28e5e1c5fa96e2e77ca55f34930f4cfcd95c9b8b540a07769a914f89d
+MISC ChangeLog 65248 RMD160 88128facaf40b7cb31e1f359b987ff0568dd6f82 SHA1 a26b214371162362676c373f046a6230965c8dd4 SHA256 d3c20cefcab970a281f3febde55325ef2c400ab3c9048ea61a7eb9743c7dc55f
 MISC metadata.xml 1417 RMD160 6956a69da8c1a72542e91d63b9e194247df3b781 SHA1 0a050a0047bbd4d750b57600b6f608c7411a7d0b SHA256 dc1c6fda02c66f6edf0b3095b1edc57e3730eece0b7eb4d15e67e0daa1bc9c50
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkzafpIACgkQTwhj9JtAlp7NfgEAv6uapZDm2QJbxuSS7CAEnPxY
-Eo2l5XnUo4BiTaeGBfIBAKEEw0EuRHbLERdbtWxa9izBTDaM1nT6CnRPkaTWN5OV
-=qi6H
+iF4EAREIAAYFAkzfL9YACgkQTwhj9JtAlp54QgD+LI3MtdrF4mqAf//HG4q5b/SR
+zitaEMTE0kqJa7lCjEoA/38GRbM6Br3VzloYqLFz00wyo5oTNqdmzqiVD7TpTUjX
+=kgT2
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.2.1.ebuild b/app-emulation/wine/wine-1.2.1.ebuild
new file mode 100644
index 000000000000..01cfeb497f1d
--- /dev/null
+++ b/app-emulation/wine/wine-1.2.1.ebuild
@@ -0,0 +1,205 @@
+# 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.1.ebuild,v 1.1 2010/11/14 00:40:30 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
+}