Version bump #323795 by George.

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

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 2d6f03c639de65afee2e8f82e4c0092fd5377e6d..de341e8a7d062ec8ffa4abc981c53cc9950f4b31 100644 (file)
--- 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.310 2010/06/20 04:48:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.311 2010/06/20 04:49:00 vapier Exp $
+
+*wine-1.2_rc3 (20 Jun 2010)
+
+  20 Jun 2010; Mike Frysinger <vapier@gentoo.org> +wine-1.2_rc3.ebuild:
+  Version bump #323795 by George.
 
   20 Jun 2010; Mike Frysinger <vapier@gentoo.org> wine-1.1.44.ebuild:
   Stabilize.

diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 545ed42a4c21d27dcbb0e4e2a1ad785fd2e5043e..fa8c739b67df2021dd8e76a23e7623b3bdf2d89f 100644 (file)
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -54,6 +54,7 @@ DIST wine-1.1.8.tar.bz2 14665390 RMD160 13501a94f3eeeb8e75be25e4dc5c178414d473c3
 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-1.2-rc3.tar.bz2 17377977 RMD160 567031318fe77185c76029d6e65c062d62a933b3 SHA1 cfe848f76a0ea4983bb04b63008b63829f881703 SHA256 af1b19cf0285ce0b422a6356a71aa51166ccd0933295adfa985f25ca6c2ad7b0
 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
@@ -104,7 +105,7 @@ EBUILD wine-1.1.40.ebuild 4939 RMD160 925d3866b39c5117c00ead5ac149d9a0a16ca8ed S
 EBUILD wine-1.1.41.ebuild 4941 RMD160 aa4ab78c68076cdec928af00a2267682f722ec55 SHA1 3ee3fa49091316bad6c4beeb58cb1f8890a92d0c SHA256 b5c02f1dad489dac7d9c3e18478fa75cc47e21a072d2d60abef6a95c4e408838
 EBUILD wine-1.1.42.ebuild 4941 RMD160 9b4209f958d01cb477ee0341a6461f4c6d2ac3a2 SHA1 f308aa136c8f2c451629378fc085571ed7f9f8e5 SHA256 1e38c775a6dea8654f926f16bcdd8d6cba0bcbe632ac168a7207ad3cca6f829c
 EBUILD wine-1.1.43.ebuild 4941 RMD160 2aff80d9412bddeddf24e92ca535a5792ab909f9 SHA1 1ed88f9bdc38f656612a05d4cf00e3374529b8c7 SHA256 5751c3d9a795a3b8ca10bc982e5208fae84d02d7cc3a66c604120364e5d91522
-EBUILD wine-1.1.44.ebuild 4943 RMD160 98ec702f9b143bf837534993721b1580ac1c5753 SHA1 f664d07ea24fc43c2dc7b5e46f36cd19a4e3261a SHA256 d4ad7a6cb89bb07a91d58d0ff8e71f700c2ab803c794ecd367a7aa712e6d3624
+EBUILD wine-1.1.44.ebuild 4941 RMD160 da57c2460b2927afbd5b06875a2cda5d989fb386 SHA1 5597e2506732abffb0975aaf8ddd2ff042f9c56b SHA256 a89db92c38bc62ff4b1106db7dff82844179f589b33734b769fb15581fec34c1
 EBUILD wine-1.1.5.ebuild 3836 RMD160 8ff0061bfd528d12e32409a05594ad78dbdc187c SHA1 7d8a3ed043df0188f9746450221aee4c0259eae4 SHA256 856cbdd7d044808f2a318609408f16c0d62368ee07d00c3866d6ce401e127bb7
 EBUILD wine-1.1.6.ebuild 3872 RMD160 6186d14d02691b1956d2a7fdafe26c23ca548fdb SHA1 faa26b53ecc588fcd1b18c2738499c9746f01b6e SHA256 ed9787c77a11c45c82c72a44a5f89a53ce5bd44b32dfb7a12be3a08eaaa8983a
 EBUILD wine-1.1.7.ebuild 3895 RMD160 010013374e69a69bbbb630d16ab9235432a2787c SHA1 ce7694f1540808d16d51f4fd8c0013de253fe48a SHA256 cc04f4d8117eb07ab77d2d311f3f364892c8b51e8228a977a7934ababc2deae1
@@ -112,13 +113,14 @@ EBUILD wine-1.1.8.ebuild 3895 RMD160 22b873b4197214347ee317dc01f6239979c4721c SH
 EBUILD wine-1.1.9.ebuild 3895 RMD160 bf1b658748a956dfb10237617fa86a3073acdbf5 SHA1 30b494eb2a5d55625d5eb0f5b45f609cf8a5966e SHA256 932c1af7eb2e451443571f752072e8ae2f1f1ae145378b0910648a98380713bb
 EBUILD wine-1.2_rc1.ebuild 4944 RMD160 e359b2997f44551b93d27d56ebba7a88472dd4a0 SHA1 5d34c20a1a33effed36b19ed12f6106a542b3b1f SHA256 1782dd7f02fc7e451385f609fd88ce72c15d5c18249cce31b1a516c884940c31
 EBUILD wine-1.2_rc2.ebuild 4944 RMD160 302c7a56d744b1133cb3e2b88bbaac1f992794d9 SHA1 0161bff7d37e7587c5261e61605e8c0a6de41a72 SHA256 10dd826d7ae904292381082c39e19558fff7ffd0403b7aebdcd59a2e7c846cef
+EBUILD wine-1.2_rc3.ebuild 4944 RMD160 d93d3521790973875b7028e32bf5e08499194f43 SHA1 c94166008213c61c9070985fbb8af6b3779e144b SHA256 34e1da91b201e551308dcf924297fc056c21de8f77653fde6d83b31171f4eb60
 EBUILD wine-9999.ebuild 4531 RMD160 2805a2945ae1054ac7a16def9eaf2b148aeba478 SHA1 ebed37994bf84cdc4e3f46b6ec4b0902a33b9cf2 SHA256 dc04b6d2c0d63e1eccd4bfa147095d6d224b826b6fe90c968ca6bcaf8ebd416d
-MISC ChangeLog 56648 RMD160 3bbea17bdf072105f0663abc239eb6be6a2eb112 SHA1 584e22f24300b445919c0574952df0d6f9b0d147 SHA256 4c58f8ab50c00a1a7b0058e8ec69c0cd0dd811ce463ab832fc53eafc8be589c4
+MISC ChangeLog 56868 RMD160 6cbdc035c17ee8e3b741956bd08903bc1e5deb52 SHA1 0d706cddff1854f2dd7bf4dbb581a1601cc3df77 SHA256 f896803770b0fed1073e8e1d71b7a6a16717340cf91c9f95df57e44f1c16cb25
 MISC metadata.xml 1333 RMD160 fe0a0c8ec639987ff6c06f7a9e47a391defb5478 SHA1 421e3087a3f122fa15283d82429f1d315fba313a SHA256 edaaae36cc5924ea3be49d2d3628e5de555b87b2bee44685797efee72f599902
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkwdnHUACgkQTwhj9JtAlp5iRgD+McnRUXmci9jnuDRMmzqGsnB6
-hNveuNwmT6S2Ud0sSBQBAJ5Gs14MP5kfu3r9+NJnXMMByOd6oRlLhU1lgHhz22Zo
-=Wj4+
+iF4EAREIAAYFAkwdncEACgkQTwhj9JtAlp7nowEAxkMC7Yoi/mlLTZbnSZK/nEJN
+H+C0We4SByvl0P3gnjoA/0Erud39KJ8Ljfe8LkQ555PHhwjGEMRXPab6XuY5J7xB
+=JAjw
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/wine/wine-1.2_rc3.ebuild b/app-emulation/wine/wine-1.2_rc3.ebuild
new file mode 100644 (file)
index 0000000..25b3c43
--- /dev/null
+++ b/app-emulation/wine/wine-1.2_rc3.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_rc3.ebuild,v 1.1 2010/06/20 04:49:00 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 pulse && 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
+}