diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-07-30 17:46:53 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-07-30 17:46:53 +0000 |
| commit | 847f4881c667ba205bebce86fe6ff48cf83b1ce1 (patch) | |
| tree | 884edea7cf2b2618b563c3b8881a6decd75dce07 /app-emulation/wine | |
| parent | bless all gcc ebuilds with USE=test #141798 (diff) | |
| download | historical-847f4881c667ba205bebce86fe6ff48cf83b1ce1.tar.gz historical-847f4881c667ba205bebce86fe6ff48cf83b1ce1.tar.bz2 historical-847f4881c667ba205bebce86fe6ff48cf83b1ce1.zip | |
merge latest wine changes
Package-Manager: portage-2.1.1_pre3-r1
Diffstat (limited to 'app-emulation/wine')
| -rw-r--r-- | app-emulation/wine/Manifest | 14 | ||||
| -rw-r--r-- | app-emulation/wine/wine-9999.ebuild | 19 |
2 files changed, 14 insertions, 19 deletions
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest index d714039ae1fd..dcd5f5a01f3b 100644 --- a/app-emulation/wine/Manifest +++ b/app-emulation/wine/Manifest @@ -215,10 +215,10 @@ EBUILD wine-20050930.ebuild 4268 RMD160 7312415432d2d4137a133110413c8b8e033ea1f5 MD5 436a6fc6e3671dd7536aeee949a6ba4f wine-20050930.ebuild 4268 RMD160 7312415432d2d4137a133110413c8b8e033ea1f5 wine-20050930.ebuild 4268 SHA256 0cc5fdce6de17911b0b77e7a6322f3c83c61357c7f71e11fd7241842032e9652 wine-20050930.ebuild 4268 -EBUILD wine-9999.ebuild 3523 RMD160 b75d08f52440c5c89359025944b74272e6ba5f2c SHA1 82568eeaecf160861334edf266de41a872983eaa SHA256 58818d72cfc52d6d0c7b2c38bb175b4a584aee0434cf9c9277da6c0634924279 -MD5 75badeb4f955e780fcfb8237aaa2933d wine-9999.ebuild 3523 -RMD160 b75d08f52440c5c89359025944b74272e6ba5f2c wine-9999.ebuild 3523 -SHA256 58818d72cfc52d6d0c7b2c38bb175b4a584aee0434cf9c9277da6c0634924279 wine-9999.ebuild 3523 +EBUILD wine-9999.ebuild 3373 RMD160 c537161f515f283f6bcdc58e0913162da1ed6f7a SHA1 9b5d1ab7e7b9442aa8a9ac9660c62429be10134c SHA256 8e6bfb9842b9506a778a27ce6a78d5abc7688a7437dbafeed4cdeac3bfbfd20e +MD5 ab384572d8f038f2e32382914d5fb390 wine-9999.ebuild 3373 +RMD160 c537161f515f283f6bcdc58e0913162da1ed6f7a wine-9999.ebuild 3373 +SHA256 8e6bfb9842b9506a778a27ce6a78d5abc7688a7437dbafeed4cdeac3bfbfd20e wine-9999.ebuild 3373 MISC ChangeLog 27754 RMD160 1234eefa222992df20ffa420cd7a8d73803217cc SHA1 9f01d2d548e1bf02acea9c4ce30f399d64cbb9b9 SHA256 3b263007fd43b160a20b88928e284aaa109c0c3323304065225f1c9a0218f492 MD5 41752b42d4ad5f762ce440b986872ff1 ChangeLog 27754 RMD160 1234eefa222992df20ffa420cd7a8d73803217cc ChangeLog 27754 @@ -320,7 +320,7 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.4 (GNU/Linux) -iD8DBQFEzONlamhnQswr0vIRAi4JAKC1HB/nA9j6ifubdukr12hBJpjZEQCeIqgG -SAGliuz7th5bQ8FphsJSxNg= -=SA37 +iD8DBQFEzPDKamhnQswr0vIRAtT7AJ0aT4uQHmYX7tZoi76Ss0gEMtsrQwCbBcIt +L7IDxC2muvEvtBfn/zBNU4c= +=yqF7 -----END PGP SIGNATURE----- diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index 71cda0cffbe0..ecf9841743f2 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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.12 2006/06/24 07:46:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.13 2006/07/30 17:46:53 vapier Exp $ ECVS_SERVER="cvs.winehq.org:/home/wine" ECVS_MODULE="wine" @@ -39,7 +39,7 @@ RDEPEND=">=media-libs/freetype-2.0.0 glut? ( virtual/glut ) lcms? ( media-libs/lcms ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) - truetype? ( media-libs/freetype media-gfx/fontforge ) + >=media-gfx/fontforge-20060406 scanner? ( media-gfx/sane-backends ) amd64? ( >=app-emulation/emul-linux-x86-xlibs-2.1 @@ -60,10 +60,6 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${ECVS_MODULE} -pkg_setup() { - use amd64 && has_multilib_profile && export ABI=x86 -} - src_unpack() { cvs_src_unpack cd "${S}" @@ -87,9 +83,9 @@ config_cache() { src_compile() { export LDCONFIG=/bin/true - use arts || export ARTSCCONFIG="" - use esd || export ESDCONFIG="" - use scanner || export sane_devel="no" + use arts || export ac_cv_path_ARTSCCONFIG="" + use esd || export ac_cv_path_ESDCONFIG="" + use scanner || export ac_cv_path_sane_devel="no" config_cache jack jack/jack.h config_cache cups cups/cups.h config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open @@ -101,14 +97,13 @@ src_compile() { config_cache jpeg jpeglib.h config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h config_cache lcms lcms.h - use x86 && config_cache truetype freetype:FT_Init_FreeType strip-flags - use lcms && append-flags -I"${ROOT}"/usr/include/lcms + + use amd64 && multilib_toolchain_setup x86 # $(use_enable amd64 win64) econf \ - CC=$(tc-getCC) \ --sysconfdir=/etc/wine \ $(use_with ncurses curses) \ $(use_with opengl) \ |