From: Mike Frysinger Date: Sat, 17 Jul 2010 19:22:03 +0000 (+0000) Subject: Version bump #328687 by fLiNg. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9c53825667efd64ab37510611c67a15d82923611;p=gentoo.git Version bump #328687 by fLiNg. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index 734d2f277723..91541629ee4d 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.315 2010/06/29 06:33:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.316 2010/07/17 19:22:03 vapier Exp $ + +*wine-1.2 (17 Jul 2010) + + 17 Jul 2010; Mike Frysinger +wine-1.2.ebuild: + Version bump #328687 by fLiNg. 29 Jun 2010; Mike Frysinger wine-1.2_rc5.ebuild: Update USE=pulseaudio patch #325655. diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest index 3553863b9f7a..40fb30d7308f 100644 --- a/app-emulation/wine/Manifest +++ b/app-emulation/wine/Manifest @@ -57,6 +57,7 @@ DIST wine-1.2-rc2.tar.bz2 17158642 RMD160 53daa6202ee9b6c427f6c62c7875b1ec3bc8b5 DIST wine-1.2-rc3.tar.bz2 17377977 RMD160 567031318fe77185c76029d6e65c062d62a933b3 SHA1 cfe848f76a0ea4983bb04b63008b63829f881703 SHA256 af1b19cf0285ce0b422a6356a71aa51166ccd0933295adfa985f25ca6c2ad7b0 DIST wine-1.2-rc4.tar.bz2 17452041 RMD160 f01ce0e0ddb1428dbc4e7ea667a4b926072230f4 SHA1 808cdd4f8e2d29736393efc42e422f1bae2ca8e5 SHA256 620fcb8e8da0601e65c01206680145705f29599eac41d279d45e36e9ef60048a DIST wine-1.2-rc5.tar.bz2 17521989 RMD160 2968c6ee533ebcb47d61197185b56b0f8275a232 SHA1 bdae575d50608ec1c0d932070a2a6f7c6c7819d9 SHA256 e76a17f383d99b1d11fc777caad25f03261abe66de1b113d1726f9a841eac08c +DIST wine-1.2.tar.bz2 17543630 RMD160 57b8a89cc074e2fa490222eedfa21a9f7a3f6545 SHA1 dc37a32edb274167990ca7820f92c2d85962e37d SHA256 c388724e8f20a6e014a1f95662128a9f9c6ebc90137ca4afc623486c5a7d985f 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 @@ -115,18 +116,19 @@ EBUILD wine-1.1.6.ebuild 3879 RMD160 7860df29a3abaed9d5cf26125224fbc2d1f9dce5 SH EBUILD wine-1.1.7.ebuild 3902 RMD160 4c8f5d8e208a314265d28b8dc70460035ae26b88 SHA1 b104701e9553aaed8d1cbe45abe7b5a7eb4bbcce SHA256 a8cdbedaa02eb205c49499ddbefd6d9b194b8b046bd32d6d85544773236e7385 EBUILD wine-1.1.8.ebuild 3902 RMD160 0c2a90cf083fbd998c84374fdd59e1d10564b075 SHA1 b77e13481cb41307d0ab6615e14a2ae4aa7f5703 SHA256 5c361a87c8ad647f05c571a0bb0f7ba000caaa590ed92520971cf4b051b6e4a6 EBUILD wine-1.1.9.ebuild 3902 RMD160 abe35c610a91fbb8a78b59bc74e731751b7d4ab0 SHA1 ed06d22d1aa45b2712c3d7789e4525abdcd3fd53 SHA256 463b6ad134fac1cb83daccd9bf3379008f9da2ececab493ce1fe45e972c63d16 +EBUILD wine-1.2.ebuild 4949 RMD160 77e8d1351b2715a9bdcbca0159a6c33f491e4e3c SHA1 3ab3a12531e8b628ded632905174e8852d2e9c70 SHA256 c36808436fe8a96886d853b9ac0b7f5ef324b875ab74baecb6b1b475fe3a5983 EBUILD wine-1.2_rc1.ebuild 4953 RMD160 5d129ec455fbdd8879a1073176b988b01ba1cbb5 SHA1 40c1a01bb1216e86861bad840f366cc875426d99 SHA256 d6317a28aa6c2f497ee6e26f361cfa5ef0073df9b02198bd3f236b7f0322fca3 EBUILD wine-1.2_rc2.ebuild 4953 RMD160 b999013d49c5a84a40a55ce71667a8e2d78140d8 SHA1 8a26d29ed908fbff552e37703a59e6819d158157 SHA256 4b4f99a8afcf8805b342788cc8908f0cb4af6425512f0dad6bc26f8d2c4caaf4 EBUILD wine-1.2_rc3.ebuild 4953 RMD160 93800d4f5a1d7f77adaae9c2eeaf196c0d9623b6 SHA1 da81172c8a14e089591447db0313b8b18b029be0 SHA256 25dc8102a9b80dc6067acb204da47daf0a1722c26b26e1c3243d970501ef24bd EBUILD wine-1.2_rc4.ebuild 4953 RMD160 246155de2d78600bf5d2e3b3ca5d7465e7ccf19f SHA1 809118f318640f02366cfc8b50d064b822fb8439 SHA256 7aed07a6bde825e26ebd6cb53a9a715714190f15f68b12b283bc24bbf5759615 EBUILD wine-1.2_rc5.ebuild 4953 RMD160 966792ad5eceafe23242cb7da5f3c0771e5482a9 SHA1 7fa88e723589cf4037816df64c68b85a624b3498 SHA256 0a1fd47415463a84c7074ceba56664ec890434470a226f1de63a622cb0138328 EBUILD wine-9999.ebuild 4538 RMD160 59c8a7310cb96a46119a1414cf13b6f01744cce9 SHA1 7ad46e92b930600789ab3da3ed87011722ae9912 SHA256 61b7475f880e76f79de8d7562c702006ba451416760f5dcf0d6171c28c3f4205 -MISC ChangeLog 58418 RMD160 072db0bd162a3a515dc8070afb96d0af0519813c SHA1 ba4d5fb3c28582f19fd96786d7e0884ac0382223 SHA256 4d6a4a0d31638d9ea8d060bef5d9ab2fd2ea3cde646a4981aa4dd8fad8341da7 +MISC ChangeLog 58545 RMD160 d8772c42b01ceb9aa96345676333d974c8fbc37c SHA1 3ba7c062a538c78dbf0c753ff103a70785400f02 SHA256 21365284ae2b8f3e747eec672d37d8a455441a08c666edc72813cf1ac1906749 MISC metadata.xml 1333 RMD160 fe0a0c8ec639987ff6c06f7a9e47a391defb5478 SHA1 421e3087a3f122fa15283d82429f1d315fba313a SHA256 edaaae36cc5924ea3be49d2d3628e5de555b87b2bee44685797efee72f599902 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iF4EAREIAAYFAkwpk5wACgkQTwhj9JtAlp79sAEAldgMGEEK0YI4TSK8UGFaMOY0 -653BS4FvR+glFy6aFw0A/0cz/g4ncKA47mZaHAfOQi84m+QG0XCtB16zQu2d6MFH -=Tfvo +iF4EAREIAAYFAkxCAjIACgkQTwhj9JtAlp7ENgEArLfZO/MwTaQg/1RzZH4it8Ol +yJcP2Hn6DG83vX5CKawA/3fKsTUyYcFeGxPLzF22sWT1v2PR9mEMftB1SBDbWRWa +=jSb3 -----END PGP SIGNATURE----- diff --git a/app-emulation/wine/wine-1.2.ebuild b/app-emulation/wine/wine-1.2.ebuild new file mode 100644 index 000000000000..7fd64fb3f8b8 --- /dev/null +++ b/app-emulation/wine/wine-1.2.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.ebuild,v 1.1 2010/07/17 19:22:03 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.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 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-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? ( 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 pulseaudio && 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 +}