From dd5b557281802c95acb5181c262996591656ea63 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 13 Oct 2011 01:26:33 +0000 Subject: [PATCH] Version bump #386781 by tman. Package-Manager: portage-2.2.0_alpha65/cvs/Linux x86_64 --- app-emulation/wine/ChangeLog | 7 +- app-emulation/wine/Manifest | 10 +- app-emulation/wine/wine-1.3.30.ebuild | 206 ++++++++++++++++++++++++++ 3 files changed, 218 insertions(+), 5 deletions(-) create mode 100644 app-emulation/wine/wine-1.3.30.ebuild diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index f761e3b80072..07dd0af80f35 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,11 @@ # 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.385 2011/09/26 18:26:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.386 2011/10/13 01:26:33 vapier Exp $ + +*wine-1.3.30 (13 Oct 2011) + + 13 Oct 2011; Mike Frysinger +wine-1.3.30.ebuild: + Version bump #386781 by tman. *wine-1.3.29 (26 Sep 2011) diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest index f9e7cd8ed742..9a61dfd708ec 100644 --- a/app-emulation/wine/Manifest +++ b/app-emulation/wine/Manifest @@ -34,6 +34,7 @@ DIST wine-1.3.27.tar.bz2 19566507 RMD160 753dd245f2a77f9923795504d44bb96a5f29464 DIST wine-1.3.28.tar.bz2 19626794 RMD160 15366a4c1710a130d153127ba6149f7cadef3d7e SHA1 240778556a4103c40bb59a986203a2111ed0350d SHA256 9a311124a1a911066ab9d3a742dda888487ee516a18eda946be105a1d1135a38 DIST wine-1.3.29.tar.bz2 19642438 RMD160 514df9f87b1441839477914ec2070d10407341ad SHA1 9826f3d354f2249bf09e839b95276d9fb362c185 SHA256 41fa0f7a9d67de65bd5813405a49b3f6b91a1672cde85570b22a567cd7ef24d6 DIST wine-1.3.3.tar.bz2 18043631 RMD160 af7044275f62cd81f9491af0639c3868e163693f SHA1 b19455987f0a71adf691046898a1ca6b3ed7d155 SHA256 455b6ec2f881f54d89d3e6dd9d04318a9eeb3c40f8c66b53e5bf73fc4765fcce +DIST wine-1.3.30.tar.bz2 19662318 RMD160 661293913dee2a7aa324e620c8e5784a5e1ae14b SHA1 4cd568979e8531f2e480c7b380ba977260f330aa SHA256 05edc5b5a214edf6f1d0a3a7f6e2cdbace7d261763b41d832d62b6d3872a543e 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 @@ -87,6 +88,7 @@ EBUILD wine-1.3.27.ebuild 5580 RMD160 4872aabd2b46b4ba4ecfc319fa28b79ee87ab28b S EBUILD wine-1.3.28.ebuild 5580 RMD160 e600b9f08e4b8561d4e16462344c25b68a62a8ce SHA1 c5adf42a56482f3b9ae9920f993cc982cbc4f409 SHA256 b736cb98a3424c5779b2e789195edbff0c749a003df6d91819833ab2124488c0 EBUILD wine-1.3.29.ebuild 5577 RMD160 8ced348a544fb8a0f6d162fbdf3735e99888cb67 SHA1 b92726107defbd7317ed4603469daca7bdbb4cbb SHA256 6633673d21cc0d86b9d358a806b13dbb1bff4fb37f299dc0f08b3b3af4c2fa0e EBUILD wine-1.3.3.ebuild 5900 RMD160 70176c1cf22422c2bdac8cc0b833f83c65ceadfd SHA1 d7ca05c60769b77f48a779881341ce7c16d31178 SHA256 0999180802d9c12a3a1ff7299343ee2ae2777977967697a50f9ad6a79ae65f70 +EBUILD wine-1.3.30.ebuild 5577 RMD160 1ab119d2307b912c7e809b1f6b877b0e788fd8f4 SHA1 81a3669ef0ccc37173e6fc9f587b3eee94be5b12 SHA256 e148ac41d43e78d0862f4ff9d442cc79e8023e3b542fe1537f622a006fd22748 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 @@ -94,12 +96,12 @@ EBUILD wine-1.3.7.ebuild 6001 RMD160 f98e71e833207b2f2b914fe6755ef8088e5d3beb SH 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 5579 RMD160 2cde8385f6b023c0b95388394e4affaf040e1588 SHA1 23681c27425e871db20ed5f95ce55803ca8cbfb6 SHA256 ef062da2579e1a6464d97c89e598bda7982ef1fb2456ce3409f3a9842b4a74f1 -MISC ChangeLog 77225 RMD160 f8c1b5fc191daa99dad938b9697c9dc907f0d456 SHA1 8af55b13b010491b9e0d25f6e892d2cfc9de3038 SHA256 38010c05832e19d2acebcb73a2b371cf2c725bb6cadba73b5e8a77b031f765e5 +MISC ChangeLog 77357 RMD160 9d07dbce3befc0b1ae6b01b734d014ceb777b452 SHA1 9191a791a9ba842b71eebf5804f3ba9480830e13 SHA256 34a8e873df5cb0cf5d42833b8d3736aa82ceda8451b172a7c94237d7628509f7 MISC metadata.xml 1608 RMD160 96707b5bcd3a716d4d27309bc47bfb1c58569e6b SHA1 a6aa298bf9ff57fb2c0ce8b91327a935e08a9c13 SHA256 a9a2150295a5defe3465c9e2b73f5b188427ec023725d16156fb372369951bd1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk6Aw/YACgkQaC/OocHi7JZOhgD/WJC26fh6Pgtbh/+97RVBYGZj -3rXRnGKnFNwvs0xiQl0A/j+nG2MrC2AxGtvFtL2B9/SOpEVFCtHGEsafV8oCpiWs -=Tb8u +iF4EAREIAAYFAk6WPlEACgkQaC/OocHi7JYuEwD9H8BySm5upwPI8V04zjb8Ktlm +9LLDOVl9ObAgyI79BHsA/0OlpU3OqH7tLfup5xzGHKBsiXc1ek5MXTWCeHVz7fft +=vp5+ -----END PGP SIGNATURE----- diff --git a/app-emulation/wine/wine-1.3.30.ebuild b/app-emulation/wine/wine-1.3.30.ebuild new file mode 100644 index 000000000000..29385bfd889c --- /dev/null +++ b/app-emulation/wine/wine-1.3.30.ebuild @@ -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.30.ebuild,v 1.1 2011/10/13 01:26:33 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.3" +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 gettextpo) \ + $(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 +} -- 2.26.2