Version bump and update Gecko #390995 by Andreas Sturmlechner.
authorMike Frysinger <vapier@gentoo.org>
Fri, 2 Dec 2011 23:21:59 +0000 (23:21 +0000)
committerMike Frysinger <vapier@gentoo.org>
Fri, 2 Dec 2011 23:21:59 +0000 (23:21 +0000)
Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64

app-emulation/wine/ChangeLog
app-emulation/wine/Manifest
app-emulation/wine/wine-1.3.33.ebuild [new file with mode: 0644]
app-emulation/wine/wine-1.3.34.ebuild [new file with mode: 0644]
app-emulation/wine/wine-9999.ebuild

index 0fb9ad2faecdf2a8e5453151fcbcd6d77692b703..17a103cf3531cb1ff5bfd78c48b362bd6ee77383 100644 (file)
@@ -1,6 +1,13 @@
 # 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.387 2011/11/07 01:57:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.388 2011/12/02 23:21:59 vapier Exp $
+
+*wine-1.3.34 (02 Dec 2011)
+*wine-1.3.33 (02 Dec 2011)
+
+  02 Dec 2011; Mike Frysinger <vapier@gentoo.org> +wine-1.3.33.ebuild,
+  +wine-1.3.34.ebuild, wine-9999.ebuild:
+  Version bump and update Gecko #390995 by Andreas Sturmlechner.
 
 *wine-1.3.32 (07 Nov 2011)
 *wine-1.3.31 (07 Nov 2011)
index baf2ff50478edda5417ff199050a66ff020bde37..e83b92ccc464a45e5e98257bfd6c999fe2eee8c7 100644 (file)
@@ -37,6 +37,8 @@ DIST wine-1.3.3.tar.bz2 18043631 RMD160 af7044275f62cd81f9491af0639c3868e163693f
 DIST wine-1.3.30.tar.bz2 19662318 RMD160 661293913dee2a7aa324e620c8e5784a5e1ae14b SHA1 4cd568979e8531f2e480c7b380ba977260f330aa SHA256 05edc5b5a214edf6f1d0a3a7f6e2cdbace7d261763b41d832d62b6d3872a543e
 DIST wine-1.3.31.tar.bz2 19637263 RMD160 976a48106c347507ab7202ddb1e997a7b19c57a5 SHA1 4669e004ae77ca2f51292845070a39e462e030ff SHA256 c3827c192ebcc34fbfb7a6e4b6fcdef79ca5d42ad5b6ff8230e98ea238353f5e
 DIST wine-1.3.32.tar.bz2 19678422 RMD160 b45edf8b0a70c24666a3ed7a701bafb14f734d88 SHA1 6881f41443efc13fd8bbb7cea828cc8e6e7da42b SHA256 fe1691ef8e9c5c4afeb345ad0f0b364d055cfe67a7e64b0a4a44da4d85cfa8b6
+DIST wine-1.3.33.tar.bz2 19809247 RMD160 4f24203fdd8f4bc0c3402f0c184e3bb7a172d280 SHA1 d9ae9efa9543e1467708cf47c991affe87a45cf7 SHA256 d49b96e3f999a7380898c3c09cf3d920c369756cb735d9c05295b5bb73c19f8c
+DIST wine-1.3.34.tar.bz2 19846255 RMD160 cf37c130b5682c4012bc97c7583e4be3f3869483 SHA1 f5df0e9dec23375269121cffba5ac7e863259de8 SHA256 ac597a63c289bfedd75dcdc1cfaf342ad816669167868ad97490d0c08b7f1c52
 DIST wine-1.3.4.tar.bz2 18079846 RMD160 ebbbf31aac547ee25ecf6c0171e29ae312c853d8 SHA1 7dbb1716cf83b61232f64bcc25e7e2d109321e49 SHA256 449387f5672cc535548740eef90403afd5d3cd678d3686bccf62813958825fdc
 DIST wine-1.3.5.tar.bz2 18175097 RMD160 026114f86f87abab1cd962b0bcef8ab6f345e8fc SHA1 52b151855087dce69a8b3405d2ad93b24f96c6fb SHA256 bb2d44c1ae488b972f03e8f97c44fe1608240984075ccf75952edddf1dd2b79e
 DIST wine-1.3.6.tar.bz2 18243096 RMD160 d1f9f1dade12f878e90fa01f5a59cc13056d8b06 SHA1 247a416b608fc317bce9fe0644a3103c8abf97d6 SHA256 9a4b7b9d8358b81bb32ed376e817ae86a531bce39663537a1f77d4b4cfa44d27
@@ -50,6 +52,8 @@ DIST wine_gecko-1.2.0-x86.msi 12604928 RMD160 089447eb59eea81c7b1b3d1896a20fe685
 DIST wine_gecko-1.2.0-x86_64.msi 12841472 RMD160 7a6a82772da22a1bc77a2edd7e96b4345b082150 SHA1 3ac3c3e880e40f7763824866372ffc56128f0abd SHA256 ef6a105bcd5a66c0ebe28e8c813de284453a62b277af544e7710a8de8c4e8d8d
 DIST wine_gecko-1.3-x86.msi 13609984 RMD160 3368c7d826da7f0b99c2e4cfa96a2a48a00a3e1b SHA1 acc6a5bc15ebb3574e00f8ef4f23912239658b41 SHA256 4b7559e889eff5ed924d25ce49297aff55f43c4b9d34dafa970261d88c40b5ae
 DIST wine_gecko-1.3-x86_64.msi 13835776 RMD160 a421cb4bbb6ce85426acd94b264e6f02fa901f08 SHA1 5bcf29c48677dffa7a9112d481f7f5474cd255d4 SHA256 07e9885d15ad22629c3854d6bd77094c3f4db1028ebda408ec87b101fa135d75
+DIST wine_gecko-1.4-x86.msi 14732288 RMD160 02363538a77a954f2bf1014b28ec1ed8fe2d1b6e SHA1 c30aa99621e98336eb4b7e2074118b8af8ea2ad5 SHA256 b30e0ac29a91a6fc40c73b5b760a56360a1d5323282545e32efaa40c75d8986d
+DIST wine_gecko-1.4-x86_64.msi 14980096 RMD160 5613e27d474085c31b53c868ed020445bdee37ae SHA1 bf0aaf56a8cf9abd75be02b56b05e5c4e9a4df93 SHA256 ceab7f1866e85175ed4cd3b5d081ee4f77c8d32ac7adf489a19c1f7329187219
 DIST winepulse-0.35-configure.ac.patch 2826 RMD160 e419d43667be01af9b24a0e46822c41572a6ff9d SHA1 4943381128fd9555280884e2bb5867be4a8731d9 SHA256 837bffaaddb6b7b0a474c7262a57f12e250e135cf6228dde1a22849f66de1250
 DIST winepulse-0.36.patch 101815 RMD160 9a20076436a7e49c317bc624dd71b61c93acddff SHA1 aa6a4c9d4619f8452aad8c457c879769cab8f8fc SHA256 7508b171bfecb461ecb464426cb4bcd9c3ff77645b787fcbf61e27dd34fe1b05
 DIST winepulse-0.38-winecfg.patch 13088 RMD160 e7aa8f91c20b6d706fc12e11677440f19890f4c7 SHA1 55b785636d2982f19e0634b26eafffbe46b79c60 SHA256 051ef1cb5598c319152ad28b85733927a711b45e0bfa92f0b0b2331588f5894e
@@ -93,19 +97,21 @@ EBUILD wine-1.3.3.ebuild 5900 RMD160 70176c1cf22422c2bdac8cc0b833f83c65ceadfd SH
 EBUILD wine-1.3.30.ebuild 5577 RMD160 1ab119d2307b912c7e809b1f6b877b0e788fd8f4 SHA1 81a3669ef0ccc37173e6fc9f587b3eee94be5b12 SHA256 e148ac41d43e78d0862f4ff9d442cc79e8023e3b542fe1537f622a006fd22748
 EBUILD wine-1.3.31.ebuild 5577 RMD160 1b4715da44f7a56f0a868d95b839477881168f50 SHA1 88fa8b2573650556a46af38741edf5c90d905058 SHA256 f40f4e225121f8976739111de1004f80d1de49e3da850e8dad741c64877c9230
 EBUILD wine-1.3.32.ebuild 5575 RMD160 2c049c44f0b30fa9fa5019c43461451905246878 SHA1 5ae07892dd86dd2568984bcdb6f65f250d3e6196 SHA256 2aeb13e3193a1ddbd9a7fd3c7cf8b59b976be18edaec539d662ea5b2321e39b2
+EBUILD wine-1.3.33.ebuild 5575 RMD160 f7ca251e2064ca75364bbc804a46e08eada84e84 SHA1 0ed59b713c4dd851665c8254a87cdafc201d420f SHA256 68a4783ad3beec4220267aebc53eb8a87072e6f15540b82d7871cc5f7db4c772
+EBUILD wine-1.3.34.ebuild 5575 RMD160 fee3628804c56d4fa52fee9328066e6750eb520e SHA1 7a944615781154423a9fbf2e0fa53bb9396762e4 SHA256 adf4c0c8876294eabb9a060fdce3215d1fd6eb2f7306280394bd77ac3de380b7
 EBUILD wine-1.3.4.ebuild 5900 RMD160 c1966f47d00e177f5050cf2f76d9d809ad7dd6e3 SHA1 6eb154bd81d77e5c81b4187f6f0a4f8153383eac SHA256 392e2cab41a9323490ed094599d49342506b30ca94b5ce2c64d61c093071376f
 EBUILD wine-1.3.5.ebuild 5900 RMD160 9a6739b9788b8a6618da968d6e0c689cb1c57298 SHA1 b7d80cad18da9325793fc5bcfe03950b1d9c7b71 SHA256 679073ccb5be91831a1527b124800d8bde4f6d0693397539f8e0ff02ab8c9b07
 EBUILD wine-1.3.6.ebuild 6001 RMD160 051130e0ec6587f4a93e570d1e597aeb2733ca97 SHA1 b86facea90d8125e27da7e17c40ab19b639a7c5e SHA256 65c10d8123687ca27105ac3b2fd9752e22cf6c776c95f905f272e5139c24bd13
 EBUILD wine-1.3.7.ebuild 6001 RMD160 f98e71e833207b2f2b914fe6755ef8088e5d3beb SHA1 773892270c6778050ec536c9fab3998481148883 SHA256 ad67420dc0261364aea3c2f599945cf53e69b95b152895c414a2c41dc4fe0f0d
 EBUILD wine-1.3.8.ebuild 6001 RMD160 424c724380374a31f1ee643d9bb45eb15720186f SHA1 beae8ee3a770cb94955fa88c34c9cc8ee836343b SHA256 e48045531102711e4fff7c6d94b5be0d26204ae8639636b7a17db24ff1ea74c9
 EBUILD wine-1.3.9.ebuild 6106 RMD160 95343d098492c4f0f2fb6f9e2ec58e51404cee17 SHA1 f864717c876c70e0d3d58b6d331ca74e9ea9b5ea SHA256 236bf4734b6d8033f4ddc67331d2bfa9a2996694dcdf958bacf4435045aa211e
-EBUILD wine-9999.ebuild 5574 RMD160 01d0badeac4b102f7b084da2f2fd8a9273ff0102 SHA1 17ba88217d00ffe749dc18f2a9169234ab636883 SHA256 c1100023b306f96ba771e08dd8ad5a8a7d2e8ffdb072d3871ee8cb6a16cfd98e
-MISC ChangeLog 77562 RMD160 9d92fc89d63f0dd2573d8582ef0f757e1138e443 SHA1 bdf4aded6f5bfd2cbf26151fbaeea5a8eaeef3fd SHA256 0733bbad2b3600a1427a66f17ee42c91cc97ec6d3cb5ad6f95fa3f9747de5088
+EBUILD wine-9999.ebuild 5574 RMD160 eab0b178c916ead546a1ac5f00026734520b8482 SHA1 9f8931c7d5d3c22b1059c3692241fbb422d835d6 SHA256 504dc714793265715598f4777e45e425706bd59bfb9a078fbe0a4d8f34c9cfca
+MISC ChangeLog 77795 RMD160 fcb15ee351757fd1889ac939996cdab5baf808ba SHA1 5b3a2afa71691efa2059a070cf5bbb57896768d1 SHA256 2a3e3ef7e2da6c86ce1359fc0716d5c9906ab08163190bc9c674ee3286e21583
 MISC metadata.xml 1608 RMD160 96707b5bcd3a716d4d27309bc47bfb1c58569e6b SHA1 a6aa298bf9ff57fb2c0ce8b91327a935e08a9c13 SHA256 a9a2150295a5defe3465c9e2b73f5b188427ec023725d16156fb372369951bd1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk63Ov0ACgkQaC/OocHi7JbPtwD8DUWEW16MzVdudwExwwcRiccS
-zxAxqJof+rkgq5403rUA/2QLWhpxIZcAK6jIhPF8cmNTrFPC/aK871jVrpzz+S24
-=uUbr
+iF4EAREIAAYFAk7ZXZ8ACgkQaC/OocHi7JYfcQEAmqW0rlux1B1aw6Ew3G7B21Hx
+90AMGTZ88Rw9rzQtx18A/iDK7qsIwuWU/IDQDV8HWntvioNvG9vsiRA17CC6Sv6k
+=nWoi
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.3.33.ebuild b/app-emulation/wine/wine-1.3.33.ebuild
new file mode 100644 (file)
index 0000000..d46205f
--- /dev/null
@@ -0,0 +1,206 @@
+# 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.33.ebuild,v 1.1 2011/12/02 23:21:59 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-2 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
+
+GV="1.4"
+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.msi
+               win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi )
+       )"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa capi cups custom-cflags dbus fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +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
+       )
+       mp3? ( app-emulation/emul-linux-x86-soundlibs )
+       openal? ( app-emulation/emul-linux-x86-sdl )
+       opengl? ( app-emulation/emul-linux-x86-opengl )
+       scanner? ( app-emulation/emul-linux-x86-medialibs )
+       v4l? ( app-emulation/emul-linux-x86-medialibs )
+       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 )
+       openal? ( media-libs/openal )
+       dbus? ( sys-apps/dbus )
+       gnutls? ( net-libs/gnutls )
+       gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
+       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 )
+       cups? ( net-print/cups )
+       opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
+       opengl? ( virtual/opengl )
+       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 )
+       v4l? ( media-libs/libv4l )
+       !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 )
+       !hardened? ( sys-devel/prelink )
+       virtual/yacc
+       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-2_src_unpack
+       else
+               unpack ${MY_P}.tar.bz2
+       fi
+}
+
+src_prepare() {
+       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 fontconfig) \
+               $(use_with gnutls) \
+               $(use_with gphoto2 gphoto) \
+               $(use_with gsm) \
+               $(use_with gstreamer) \
+               --without-hal \
+               $(use_with jpeg) \
+               $(use_with ldap) \
+               $(use_with mp3 mpg123) \
+               $(use_with nls gettext) \
+               $(use_with openal) \
+               $(use_with opencl) \
+               $(use_with opengl) \
+               $(use_with ssl openssl) \
+               $(use_with oss) \
+               $(use_with png) \
+               $(use_with threads pthread) \
+               $(use_with scanner sane) \
+               $(use_enable test tests) \
+               $(use_with truetype freetype) \
+               $(use_with v4l) \
+               $(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.msi || die
+               use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || 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
+}
diff --git a/app-emulation/wine/wine-1.3.34.ebuild b/app-emulation/wine/wine-1.3.34.ebuild
new file mode 100644 (file)
index 0000000..627b9a5
--- /dev/null
@@ -0,0 +1,206 @@
+# 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.34.ebuild,v 1.1 2011/12/02 23:21:59 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-2 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
+
+GV="1.4"
+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.msi
+               win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi )
+       )"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa capi cups custom-cflags dbus fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls openal opencl +opengl +oss +perl png samba scanner ssl test +threads +truetype v4l +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
+       )
+       mp3? ( app-emulation/emul-linux-x86-soundlibs )
+       openal? ( app-emulation/emul-linux-x86-sdl )
+       opengl? ( app-emulation/emul-linux-x86-opengl )
+       scanner? ( app-emulation/emul-linux-x86-medialibs )
+       v4l? ( app-emulation/emul-linux-x86-medialibs )
+       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 )
+       openal? ( media-libs/openal )
+       dbus? ( sys-apps/dbus )
+       gnutls? ( net-libs/gnutls )
+       gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
+       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 )
+       cups? ( net-print/cups )
+       opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
+       opengl? ( virtual/opengl )
+       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 )
+       v4l? ( media-libs/libv4l )
+       !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 )
+       !hardened? ( sys-devel/prelink )
+       virtual/yacc
+       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-2_src_unpack
+       else
+               unpack ${MY_P}.tar.bz2
+       fi
+}
+
+src_prepare() {
+       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 fontconfig) \
+               $(use_with gnutls) \
+               $(use_with gphoto2 gphoto) \
+               $(use_with gsm) \
+               $(use_with gstreamer) \
+               --without-hal \
+               $(use_with jpeg) \
+               $(use_with ldap) \
+               $(use_with mp3 mpg123) \
+               $(use_with nls gettext) \
+               $(use_with openal) \
+               $(use_with opencl) \
+               $(use_with opengl) \
+               $(use_with ssl openssl) \
+               $(use_with oss) \
+               $(use_with png) \
+               $(use_with threads pthread) \
+               $(use_with scanner sane) \
+               $(use_enable test tests) \
+               $(use_with truetype freetype) \
+               $(use_with v4l) \
+               $(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.msi || die
+               use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || 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
+}
index 17f8a0535b9673cff50fc9fdb7550d6637acafd6..a0c828a9cbf1a89de8251879932d05f24fdae462 100644 (file)
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.95 2011/11/07 01:57:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.96 2011/12/02 23:21:59 vapier Exp $
 
 EAPI="2"
 
@@ -20,7 +20,7 @@ else
        S=${WORKDIR}/${MY_P}
 fi
 
-GV="1.3"
+GV="1.4"
 DESCRIPTION="free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
 SRC_URI="${SRC_URI}