From: Alexandre Rostovtsev Date: Sat, 14 Jan 2012 03:30:58 +0000 (+0000) Subject: Version bump, see http://www.winehq.org/announce/1.3.37 for the announcement. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5a6f0dfe827c1a71f0169447b390ba66d00290af;p=gentoo.git Version bump, see winehq.org/announce/1.3.37 for the announcement. Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index 8eda016a0970..fe9778142f60 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/wine # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.395 2012/01/14 03:20:51 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.396 2012/01/14 03:30:58 tetromino Exp $ + +*wine-1.3.37 (14 Jan 2012) + + 14 Jan 2012; Alexandre Rostovtsev +wine-1.3.37.ebuild: + Version bump, see http://www.winehq.org/announce/1.3.37 for the announcement. 14 Jan 2012; Alexandre Rostovtsev wine-1.2.ebuild, wine-1.2.1.ebuild, wine-1.2.2.ebuild, wine-1.2.3.ebuild, wine-1.3.0.ebuild, diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest index d0db07ee30d4..15f8b0cdfa53 100644 --- a/app-emulation/wine/Manifest +++ b/app-emulation/wine/Manifest @@ -38,6 +38,7 @@ DIST wine-1.3.33.tar.bz2 19809247 RMD160 4f24203fdd8f4bc0c3402f0c184e3bb7a172d28 DIST wine-1.3.34.tar.bz2 19846255 RMD160 cf37c130b5682c4012bc97c7583e4be3f3869483 SHA1 f5df0e9dec23375269121cffba5ac7e863259de8 SHA256 ac597a63c289bfedd75dcdc1cfaf342ad816669167868ad97490d0c08b7f1c52 DIST wine-1.3.35.tar.bz2 19847696 RMD160 1aae89a1d254cfce13784e799ab6639163327844 SHA1 f59ea14a478b5cb5ae00203ae4d7a5e14f020bb7 SHA256 e23e4da5efebc11206198e9cf2a2638851db4e00a1af0abccd8b6369e99c288b DIST wine-1.3.36.tar.bz2 19788661 RMD160 e541b1e1b60c65d640c858715d20e84566991b1c SHA1 6ad7d18063fea0fdeb2caf20a21ae53ffba13f24 SHA256 a4a1c5224dbf47f10a2a7c601f610e21c7f7be33639eeb4e68b389d4318e9180 +DIST wine-1.3.37.tar.bz2 19904543 RMD160 56d9d3bd441727e79d2fa88d17f82586f3dc3b3c SHA1 667e203acbaad6ce3452c22cadd022cdd159b632 SHA256 708ac19d59828fbe95c309bb2ee6cff74e564353dd4183565e5cb6a07ba71a71 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 @@ -91,6 +92,7 @@ EBUILD wine-1.3.33.ebuild 5484 RMD160 59f4c96ec303144363a00a3f04bc620ed775148c S EBUILD wine-1.3.34.ebuild 5484 RMD160 3a7e0d98fc0e9b555c3d99f2a571f5c250a64be7 SHA1 278c20e6e9c889ecafa45ecec2e007c4ff731564 SHA256 8bfc8fceae1648e1cfe045bc8c92595b5bddcb2a194abc85d81026c1bb1ce032 EBUILD wine-1.3.35.ebuild 5484 RMD160 b7659b99fb364acb23b44f53a4936b6f112ec49b SHA1 faeaadca5bcb44bbea704cd1f5011e874372d52a SHA256 e856e9f9084a6de63323c3a572f4593fe18a640d4a457bdaefc739f2facc41e7 EBUILD wine-1.3.36.ebuild 5536 RMD160 2e05dfdea625a1205da32b651983e4251be8aa69 SHA1 62bb8c5462cfd2ccecf29684d807fba74e99e6d7 SHA256 0571f6423e2592d963af304035e3eda771247c6b570d9c8087858c584780cc2c +EBUILD wine-1.3.37.ebuild 5536 RMD160 01db2c9d967d15fb49d8c9bffcdfbfb14ef09878 SHA1 bae76dafe0f292005849da02fe19275eda2a4f04 SHA256 671df9b8edf9d68bd2e388c6ba3bb6983bbe9422ebbc3a7f87796e61c18aaca4 EBUILD wine-1.3.4.ebuild 5401 RMD160 58d6574686fe8e18162d2cb9692f6181baa201fa SHA1 ce4d01cd7171570cd9267dc6f892ee5f44cb7e55 SHA256 3fbfb24aaf5f4b08f11db8b68c06b9655028a22a310c3c683b0aae94952c9ec8 EBUILD wine-1.3.5.ebuild 5409 RMD160 9ab3f172bf588790ff0f92890e06c102860bb6c9 SHA1 96ddf5f80d93ca60f36b05c7aa3617b82d044ce1 SHA256 90c337277c1b37c9efc2c4896e2380623a0c85224dfc1ad1125405b02dc6cded EBUILD wine-1.3.6.ebuild 5510 RMD160 c50cdf8d539410c25d08c43dd4d45c6ce576f3c2 SHA1 655d30d6e800d361c38f12790f173c3da448a190 SHA256 4840c0d0d669645666e58e9f8b6769f1af880be8657b7303f79c1eaddb800e9b @@ -98,12 +100,12 @@ EBUILD wine-1.3.7.ebuild 5510 RMD160 d3ec49932ca26f333251f8bf067de2e8d4aedf4e SH EBUILD wine-1.3.8.ebuild 5510 RMD160 ad4ef9400c783f96643a6b08903ff61fb44b8159 SHA1 55db95125b39f233f376c4dd164f758fc68a03df SHA256 323b09936524801303e964becdc2279e2e5e417ec2bb5f8d207d38c5137eeb13 EBUILD wine-1.3.9.ebuild 5568 RMD160 f48129920b292abe3bc6c80a45dc73534401ebf4 SHA1 637b7d7b11cd0390f5ba47e7b24f571ad6d8657f SHA256 0140f2676f9032703a6a809c5e3d2b37a99152e1c2b560548fba26ec3589034b EBUILD wine-9999.ebuild 5536 RMD160 0bc2ec4dd92e9b732b9c3357a61ea47ba6a9b5c1 SHA1 dc719cddd51e9bbd64f27e305453dc34e0aac260 SHA256 fffca90fb089f60b8a0c42fc1be39fe89f8ade22dc524d916c4a08ec0a704a50 -MISC ChangeLog 81511 RMD160 68b863653c281e35943907237b15f0a38a9b32fe SHA1 c4cec99e0a69e5af3ddda461e9c4b1c0d1fa2eef SHA256 314bd291a57d60f146dcfc2e1025573513fd71c23d124c9e1f2ac14a7c654a59 +MISC ChangeLog 81700 RMD160 e72ee3fbcaf55d181bf01433492ee8e87c000c26 SHA1 ab8512845d107aae8c88c556b5795985953bc473 SHA256 71c467188fa3534f669dc9891a8c10a8e4d8faa7f808de612637d11cae44f82f MISC metadata.xml 1558 RMD160 54a67744e1e3b273da447b7501bedbd995de7464 SHA1 831b9f52b00d99bac3f10073c9c59be2fd721542 SHA256 fa58b3b055a5f848f6861fa85ca2d5cb922ba9723a8a26d7e69dd78481209616 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk8Q9KMACgkQdjK8w9WeBnC1YAEAlopmFxLEFlgYhDbQR7b8X9KV -cDNeMl1cY3xhziKzkhMA/1Pw+H24550w0eySESfCkeggeQPaVdm6C6u+lQXK6SC3 -=zJ2u +iF4EAREIAAYFAk8Q9vgACgkQdjK8w9WeBnCnDgD+NJ+7+WM/01IDDKulRukU3q2T +gigQeHeDJPYD/9dgS70A/iuyK8MCCgkpOD1xQVMpDS6g7MiANdJez3skn9a6Ixya +=OQe/ -----END PGP SIGNATURE----- diff --git a/app-emulation/wine/wine-1.3.37.ebuild b/app-emulation/wine/wine-1.3.37.ebuild new file mode 100644 index 000000000000..0f7c73ebe890 --- /dev/null +++ b/app-emulation/wine/wine-1.3.37.ebuild @@ -0,0 +1,210 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.37.ebuild,v 1.1 2012/01/14 03:30:58 tetromino Exp $ + +EAPI="4" + +inherit eutils flag-o-matic multilib + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://source.winehq.org/git/wine.git" + inherit git-2 + 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 + +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 elibc_glibc 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 udisks v4l +win32 +win64 +X xcomposite xinerama xml" +REQUIRED_USE="elibc_glibc? ( threads )" #286560 +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 ) + udisks? ( + sys-apps/dbus + sys-fs/udisks + ) + 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? ( virtual/opencl ) + 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 udisks dbus) \ + $(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 + + 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 + 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}" + done + dodoc ANNOUNCE AUTHORS README + if use gecko ; then + insinto /usr/share/wine/gecko + doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi + use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi + 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 +}