diff options
| -rw-r--r-- | app-emulation/wine/ChangeLog | 9 | ||||
| -rw-r--r-- | app-emulation/wine/Manifest | 14 | ||||
| -rw-r--r-- | app-emulation/wine/metadata.xml | 4 | ||||
| -rw-r--r-- | app-emulation/wine/wine-1.1.30.ebuild | 154 | ||||
| -rw-r--r-- | app-emulation/wine/wine-9999.ebuild | 21 |
5 files changed, 186 insertions, 16 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index e459ab59f094..8280e1853cd6 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-emulation/wine # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.279 2009/09/11 07:59:11 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.280 2009/09/26 17:12:58 vapier Exp $ + +*wine-1.1.30 (26 Sep 2009) + + 26 Sep 2009; Mike Frysinger <vapier@gentoo.org> +wine-1.1.30.ebuild, + wine-9999.ebuild, metadata.xml: + Version bump #286460 and add support for USE="capi fontconfig gphoto2 + openal". 11 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org> wine-9999.ebuild: Sync live ebuild with latest snapshot. Fixes bug #284416. Non-maintainer diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest index 1805e1f97eb6..479308334bff 100644 --- a/app-emulation/wine/Manifest +++ b/app-emulation/wine/Manifest @@ -33,6 +33,7 @@ DIST wine-1.1.27.tar.bz2 15647460 RMD160 022467bfddd9248b6aeeff0eea5e7c8ccdf7e8e DIST wine-1.1.28.tar.bz2 15687155 RMD160 1ebb47f17f714ae347a9cf9866f4a1cfbf76e079 SHA1 5d999b3964bc1fac8c3decf730895af7b9cc8de5 SHA256 be72801a5f0fca7a2fca76ef83acfdc447ff777514ab7e8d5d0ee494ce493001 DIST wine-1.1.29.tar.bz2 15654585 RMD160 8110d9fe98c8658bf593355402b7092a590b3459 SHA1 66aaf6f57773ede55dee983a22381d46329f5456 SHA256 19ad43b9c1d8b7d0798913c81b5d8735d978b06cfc85f956f17b2d3dc4271650 DIST wine-1.1.3.tar.bz2 14305946 RMD160 890d6eac933ca590856121576a837e057a6e26a5 SHA1 c380d53a5f6a95c4e27dbf4f473facb2d349c522 SHA256 d64763829b38f4c8804b809a3130d1a525d062a33802e46dff33f60f159ac71f +DIST wine-1.1.30.tar.bz2 15780747 RMD160 1e4609e040477896678edabe7c77a3e8de931227 SHA1 8e3e288f077024d67db3c02cec194243d705d2d4 SHA256 de5f228bf7429c283167c131d89b44aaeef8ae25132217efe7c7a6c8faba16fc DIST wine-1.1.4.tar.bz2 14362995 RMD160 e5c3b0037341dab5b234b4ad1a54a64bb659fd56 SHA1 4d8e1b43b0638ab0796abb37d678e1f1199d4561 SHA256 745ae9142dbd11e430410200e09128e3ffe114faade8f97be83fced8e0327230 DIST wine-1.1.5.tar.bz2 14467703 RMD160 b59d8a1d7b2e91c685a1501793f7373c53276175 SHA1 53a9ba0b463bcb492eeccca10d96057ee0fb13fa SHA256 759208a35cb243ab25338d42facf73e21523b1afac074ba4605a66099e454493 DIST wine-1.1.6.tar.bz2 14544064 RMD160 57f57de84e815ed3db4e623d393e80572a4696eb SHA1 431187af5496071d51ebada4fce0fa657cd09cba SHA256 5c14e13dd166a22b3d1e3af0834265d9a5c0e3fa63ed35da6e67861b29a7345e @@ -69,19 +70,20 @@ EBUILD wine-1.1.27.ebuild 3516 RMD160 175d9f9002b229e41138c43566a4cbd701cc02db S EBUILD wine-1.1.28.ebuild 3543 RMD160 3c0fdc519182d144f6a2803078ecd8a12c092a51 SHA1 57f7ad3e6b235b6582bafdf4d0e8c33848c16c1e SHA256 8a5b82b641bcf498a2d1f20d245600ee46fda78ecee72eedfdf46e86d98f8b52 EBUILD wine-1.1.29.ebuild 3603 RMD160 9b41cf8e96285131d54a3c3761703b28d075c0c4 SHA1 e6178495ebae5360725f32a24cc1d346504dce2b SHA256 dec54124aa2eaa83862a3d72091f55d4011ac7fd4d3a39fd01a143094226b4b4 EBUILD wine-1.1.3.ebuild 3828 RMD160 1b77b83dcf3fb3149db933a8aea99e8641408493 SHA1 0c41abf70476a7147e760e88c873722e81e2a0d3 SHA256 eaa53ff79d97ea75481e847bfafc7224846fb8cccc80a04182a55d0c8dadadbc +EBUILD wine-1.1.30.ebuild 3824 RMD160 96cc2177ab2edf8d29af1c2241fc97d767420a60 SHA1 a67fe9293c141b35e5924e7d1b4548615b3a17fc SHA256 dbec68e22a9dfafc333e296472cf54d81d564f25d4fde6637afc0850e5cb7025 EBUILD wine-1.1.4.ebuild 3854 RMD160 d7016986da1005c437577e36bb1f6ab71eb8ba9f SHA1 1601eb4ac0d81238905097aa1c15242f2e05a721 SHA256 6749a9e9428fbdbaa9c8743793cbc1dc92383df1b6eb903dae228e770c54e27e EBUILD wine-1.1.5.ebuild 3801 RMD160 f7c63b66d9eb6686152dbef1bcace4f25b0ae4cc SHA1 d550b522afdae2df52456a7d524dfaee9df6db35 SHA256 c2cfe6fc5f280e44eb942ec6cee3d24353eb94a88a60ed60782a1db099d75ab7 EBUILD wine-1.1.6.ebuild 3837 RMD160 7ba0a57e82a48926fb5211ba4e2c7fb21d3f39af SHA1 abe9243f47da3d7ced42b77a2d43c91298d6c69d SHA256 a95a5c94bf03b742b825904966314b720928f72965b4e1d2621c207f07e9c203 EBUILD wine-1.1.7.ebuild 3860 RMD160 c28fd6f26d74469e7024fb3236a74f362ed01f32 SHA1 d3a2c54ffa8631982a628c7eb3e7df23c23c4b9c SHA256 ddfebae77a4a280223bc1c69eeb816fce4108dc95f4c9e878ef5dc96fa9e12ed EBUILD wine-1.1.8.ebuild 3860 RMD160 9e7f9737945e69669f4520438ee73c2e1ea2ed3b SHA1 b1a6a32ab6c70679b7b78201439bd0bd00297c76 SHA256 43ae44c2fb2fbb9cf796668915d0be96f52e8216d348c591aac76f0a70d18467 EBUILD wine-1.1.9.ebuild 3860 RMD160 0c11de83ed0d4836a10db6c9152b2acdf48c9bb7 SHA1 00bc364fa69aee19164a2104ed5e4ead7ada490a SHA256 d045ee7563270081e99fb97ad1696f249be3226c0a6bbca37a20c7181d141b8f -EBUILD wine-9999.ebuild 3605 RMD160 e4fe284c0cbfbb5ec0bee6c438fb1dc58f22ad60 SHA1 95a287fa394c714ce25c98c85920ea3992baa0cb SHA256 262e0398ae457d3c351628f23279a89a6d7f434d569f459eed51e9761b09ab34 -MISC ChangeLog 48952 RMD160 d96ad95f8b840fb32192d4d485405e14e49397c5 SHA1 b61ff8107e1404a16856305e55ac6d694f1d0bfc SHA256 dfb4d61d1d5b17d8fbe16181355e53c86ccd4a990d70038a2f45d1b86152c597 -MISC metadata.xml 1123 RMD160 168b7d83724ac65a23a10ad8bbe04d4dee180f6f SHA1 f8bb8f4eb1e4dab230f9f8d8b87fe04c6e638334 SHA256 eeee6aabb900286b05e81427597d143fb5fe74cc9b503d58464abd2534eaa569 +EBUILD wine-9999.ebuild 3823 RMD160 790c5e2782932efb33bc4dabc36ee2e63bae7ace SHA1 cd2c6464cf0fe1c41b1448c0f9a197d6f3e19fea SHA256 ed375be1ecafd2f398ea9c3c17220a73a9eac44edd7c3b29e7cde46f1e8ba48e +MISC ChangeLog 49166 RMD160 034799286633df472feb5eb3aa7703191f2f63d8 SHA1 3710313ae104314a9481f1ac1159c8ca39bfe254 SHA256 2ed2bcb99beb5bae7970876b1656cfbf7bda8468663b82319f9b479bd7b930bb +MISC metadata.xml 1176 RMD160 c337d9e3899cdf3b52bc56b3d785464559d17442 SHA1 e9d593c263f1e037bffcc2f7b8414f66b5cf2d68 SHA256 c7389fe9aa772d68aa3968803ca6f0e007c81325ed1d4382e0a587d2c498654e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkqqA1YACgkQHB6c3gNBRYetaQCfUqxfdu+29W4nsCJC2wP9qA2V -MvgAoISwRn91H7qnA8K5s7f4CJNGgOu0 -=iPZ8 +iEYEARECAAYFAkq+S6EACgkQlPl3HsVfCDrIJgCbBWmkSW+eYokLfnP2KjOtNGVx +aJ8An2oMgRlI6FaHUKdvOleQqowjmsmr +=em64 -----END PGP SIGNATURE----- diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml index 90f6e7d828e1..3910db6f718e 100644 --- a/app-emulation/wine/metadata.xml +++ b/app-emulation/wine/metadata.xml @@ -8,8 +8,8 @@ Wine is an Open Source implementation of the Windows API on top of X and Unix. Think of Wine as a compatibility layer for running Windows programs. Wine does not require Microsoft Windows, as it is a completely free alternative implementation of the Windows API consisting of 100% non-Microsoft code, however Wine can optionally use native Windows DLLs if they are available. Wine provides both a development toolkit for porting Windows source code to Unix as well as a program loader, allowing many unmodified Windows programs to run on x86-based Unixes, including Linux, FreeBSD, and Solaris. </longdescription> <use> - <flag name='gecko'>Add support for the Gecko engine when using - iexplore</flag> + <flag name='capi'>Enable ISDN support via CAPI</flag> + <flag name='gecko'>Add support for the Gecko engine when using iexplore</flag> <flag name='samba'>Add support for NTLM auth. see http://wiki.winehq.org/NtlmAuthSetupGuide and http://wiki.winehq.org/NtlmSigningAndSealing</flag> diff --git a/app-emulation/wine/wine-1.1.30.ebuild b/app-emulation/wine/wine-1.1.30.ebuild new file mode 100644 index 000000000000..4facd8c33b82 --- /dev/null +++ b/app-emulation/wine/wine-1.1.30.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.30.ebuild,v 1.1 2009/09/26 17:12:58 vapier Exp $ + +EAPI="2" + +inherit multilib eutils + +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 + +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 )" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="alsa capi cups dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl oss png samba scanner ssl test win64 +X xcomposite xinerama xml" +RESTRICT="test" #72375 + +RDEPEND=">=media-libs/freetype-2.0.0 + media-fonts/corefonts + 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 + ) + alsa? ( media-libs/alsa-lib ) + esd? ( media-sound/esound ) + nas? ( media-libs/nas ) + cups? ( net-print/cups ) + opengl? ( virtual/opengl ) + gsm? ( media-sound/gsm ) + jpeg? ( media-libs/jpeg ) + ldap? ( net-nds/openldap ) + lcms? ( media-libs/lcms ) + mp3? ( media-sound/mpg123 ) + 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? ( >=sys-devel/gcc-4.4.0 ) + !win64? ( amd64? ( + X? ( + >=app-emulation/emul-linux-x86-xlibs-2.1 + >=app-emulation/emul-linux-x86-soundlibs-2.1 + ) + app-emulation/emul-linux-x86-baselibs + >=sys-kernel/linux-headers-2.6 + ) )" +DEPEND="${RDEPEND} + X? ( + x11-proto/inputproto + x11-proto/xextproto + x11-proto/xf86vidmodeproto + ) + sys-devel/bison + sys-devel/flex" + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + git_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 +} + +src_configure() { + export LDCONFIG=/bin/true + + 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_with scanner sane) \ + $(use_enable test tests) \ + $(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 +} diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index c7dfbc17f6fb..819a1ba34b49 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 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.42 2009/09/11 07:59:11 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.43 2009/09/26 17:12:58 vapier Exp $ EAPI="2" @@ -26,15 +26,19 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="0" -IUSE="alsa cups dbus esd +gecko gnutls gsm hal jack jpeg lcms ldap mp3 nas ncurses +opengl oss png samba scanner ssl test win64 +X xcomposite xinerama xml" +IUSE="alsa capi cups dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl oss png samba scanner ssl test win64 +X xcomposite xinerama xml" RESTRICT="test" #72375 RDEPEND=">=media-libs/freetype-2.0.0 media-fonts/corefonts 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 ) @@ -99,28 +103,31 @@ src_configure() { use amd64 && ! use win64 && multilib_toolchain_setup x86 - # XXX: should check out these flags too: - # audioio capi fontconfig freetype gphoto 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 lcms cms) \ $(use_with ldap) \ $(use_with mp3 mpg123) \ $(use_with nas) \ - $(use_with ncurses curses) \ + $(use_with openal) \ $(use_with opengl) \ + $(use_with ssl openssl) \ $(use_with oss) \ $(use_with png) \ + $(use_with threads pthread) \ $(use_with scanner sane) \ - $(use_with ssl openssl) \ $(use_enable test tests) \ $(use_enable win64) \ $(use_with X x) \ |