summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-emulation/wine/Manifest8
-rw-r--r--app-emulation/wine/metadata.xml5
-rw-r--r--app-emulation/wine/metadata.xml.new28
-rw-r--r--app-emulation/wine/wine-1.7.8.ebuild (renamed from app-emulation/wine/wine-1.7.4.ebuild)27
4 files changed, 26 insertions, 42 deletions
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index ad2cfe56..ed2d9033 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -10,10 +10,11 @@ DIST wine-1.5.20.tar.bz2 21012282 SHA256 75e3073a62a933af5beaa8e8591298325edb57f
DIST wine-1.5.21.tar.bz2 21088257 SHA256 ac77c1dd1a31ccc67f0391b4965959096aeb98745f52c4d91b7bd280e3c8b350 SHA512 3d9847da09f5227d0118f0fc1468134e69ee66dfec3cfee5e069050a4e2b848647d2247264d7f2e9e35f434676be97f4104be170fd02915bb3061b4057c11bb9 WHIRLPOOL 67b5b0693cea4998e48d1e4163b1cd8506401252c268854d559c7a323af082cc635ec10752440e0945b7988b85537af92f204ef645e9e4916e01fc476d19eb85
DIST wine-1.5.22.tar.bz2 21238224 SHA256 db08a40a5e6fce050b5cca7782d396ed3a9b1dfb23b9915dad93efb886fc6739 SHA512 19e337729542991d0b984c69657c4a3437cd17abe78e9ff21ccd7c1d96097598d790e9ea5d95def355ca4af58cfcbc1e61e15c9845a01e664303182878e456a0 WHIRLPOOL 77a5289705f7579b1d0bf6824031bdd7fa8a86913e438bfbf6bf938f9e7e1807b100b6caa46be9fe37cd0eae4547a5404f9f1dbb6f49e6e4c50b92b6e1445c09
DIST wine-1.5.28.tar.bz2 22151210 SHA256 0bf84b97213b07b7339543abcdfccc9da22bebcc4d20ce9ca22fdc1502136046 SHA512 6951430cfd71b4d6e14ffa928ac77c4788ee8436fc012ed6787cc89fdb0c054e06a42b75b4ea42f94cdd9e267cc4daddec11e724f4bf8c42282b72cb9e56be56 WHIRLPOOL 95c98db867a263ae615a17f3f3e3ff6d23595dfdb56551a90c8e782d8c1fbd433ae09eea1e639574c1235bda334683dc9e7b04c982529b0519347312e0848c55
-DIST wine-1.7.4.tar.bz2 21500746 SHA256 517b3465dbf5b516d3fe886c0f9d4f310dc1d4a38ca4e5580c5d66bab3fb6969 SHA512 4267eb43311fe53537a1864a70e88e4bf444b8979dc858725a1170ed06af4e727604a22bafb3deb448eeb62c170ce67ce8eb8082bce040f5488b1a4c4bc6bb95 WHIRLPOOL 7bb14e0dfd4f9a7411e1d5484dba62f8584a0e03997cc3c6192893dccbc7de316eb79a1e5b0ccf96d20e74cf512ebc79e760076ff4882625bc81b410ad8be0bf
+DIST wine-1.7.8.tar.bz2 21463503 SHA256 30e17f5f863a09416f3d229666566b318dbb40f683d4ca6630012c60bb511804 SHA512 1fdaddb7909f818050854bf351d20f445cf6a5906b1bcc789c96ee8d5058c90815a91bbbc6444f3e4527748764f03ab5297585c174b433093a3354a827402fea WHIRLPOOL 3b5b18384ff04b80b936160c2c6e03676d69663c023f484981305c9272d0601b74cda5c5f7d56008b3900d702b1a4fe1929f16b1fba304a6480b076ffede663a
DIST wine-gentoo-2012.11.24.tar.bz2 57481 SHA256 164248d7ff8cf06053576a3ecc1f6fe88a52763b04058ae53a9a4d5cfb6e7e22 SHA512 2a626ccbd408204dc6d1710ebb524a7961f4f417abc4cf1b65b4954a7b3033592febc8e9886ab47b000fc97dd3fe016a5833079f6bff84cd1d5aeb57a5167e07 WHIRLPOOL c638d0b0d8632d99f34cc4a294c4ddc7b69812af2ef536b3586fcfb41aab88a545d4c85c5a41020911dcb244eb7ed512cc6a957c6efd7ed06bd840f38e91f61d
DIST wine-gentoo-2013.06.24.tar.bz2 85442 SHA256 bfbf6b25e98f717320de2ede467e3628fbc749d936b8449f8477c9dc6f41e04b SHA512 b6819889314f6a6ea16c1332f4b177c43623116763969c31b23b61754cd304dd085f5d3eafbe847159331eb97dddd9b4c10699430129ea4a71da418c1fe175f0 WHIRLPOOL 227e0ac6569736d4ad5813cef49f775dae956f4fc9255de95753d5d3cba1bf6cf3db31d23d3702bb54d2e60c5a6f779b602f0efb2096e4c827c924565b273d00
DIST wine-mono-0.0.8.msi 46967296 SHA256 3dfc23bbc29015e4e538dab8b83cb825d3248a0e5cf3b3318503ee7331115402 SHA512 d3009f2301b0a006136e880025a736f24612faa7a954956896124ec7282d35b678f02658e8be12b1c02ee217e594a2c728a9258c36ccb346b186a4781951adbd WHIRLPOOL 1d4b2e88ebab1f603326a238cc908982c7e135a33340087e8645572838d2b6034764e9fe787bb890792dea4c0531d26f9a6a811a7c200edb99ab82f975179389
+DIST wine-mono-4.5.2.msi 52502528 SHA256 d9124edb41ba4418af10eba519dafb25ab4338c567d25ce0eb4ce1e1b4d7eaad SHA512 73c907f63b73836d5afd0753197358aaea43a74a47800f929ef0627112298256f1fa46d1b9ff297b117468d953cdeab21fb5962db13c5debbcb71004462df609 WHIRLPOOL 18d3544c6753c5a01917bfc1b694f31ce45213108527f13317ec0bb8b2d2339ce41800534967e067cd15cd186ef9e186a5d3252275e443dfa1a6ae3641d4d17c
DIST wine_gecko-1.8-x86.msi 17774592 SHA256 28f3b7e497e1f884a64b2d982b61dda3167efac4c843de198654a1c9144ff9dc SHA512 81cfa990dde3f19e263ecf2957892201a88fd3c683d448d915348f7d8469e03d21c1c724b982f7a65b931857498822d8f6f6cc724205948b462013c0df6064dd WHIRLPOOL 98824a561892a3e0111d7a3becb9a8f4ac7e9dc02c4b612c7c074b2e77ea2f56d85c0666c9cb22f95f6a79b2f43c74f27b533837ffb0ae19e514f5709c2a24ea
DIST wine_gecko-1.8-x86_64.msi 18238976 SHA256 53a600a4767225469fd68431263baac0672ceaec29eb2c7747b4363fd2856db2 SHA512 336527adbc6342fe149d706a05e23a51eb25e54e8ce88e67aa98717a1486bc85d36989315b6a2a428ddc10844bbc9130e76625741d997230a541756b429db1e9 WHIRLPOOL 0f40c5d5177335c6736983d37ee677b4ea183260df07d516bca17ff8327d6024693dec3707db934632bf253cf94614127e60c4e7399de764a3a6c5d59e37c54d
DIST wine_gecko-1.9-x86.msi 19060224 SHA256 2f1df59287a4f21ec0f1322ae10520c8e6a95de10f8ef7339ab217e4b46ce782 SHA512 6bbcbd79f4eb95bcc9ad1902b3b86059f18127c7fbff0f87f7875de2bcdd543441b9dad12d641926e22ba610df2801d82b3c63ef2b62323b5f4bc4f8bd85b124 WHIRLPOOL 5431d42abdefd48cefb5f6ead9324ba7d2a40a305393120beb544f83571974006f4208180c38ea800cc96157523cca16daec5b7b51ea8b5aead9379a4f6ec53a
@@ -31,6 +32,5 @@ EBUILD wine-1.5.20.ebuild 8141 SHA256 7a26a6026067d621288615a17c122cf2e92f7766ef
EBUILD wine-1.5.21.ebuild 8130 SHA256 1ff747f69a9d2356cc2b77e4b35a3dc72d3c5d56bd5ea5ad25e83d372d35a03f SHA512 77dd17589b607e4c0db8ee6f0f23f5bb32be8a6f0c828bf0077da4b33f1b633ee0f316e5ba17277fdc04aa231e97472487d58b48c1eaf2ebff90cc522dcc48ba WHIRLPOOL e56297d1e238076bfa1c322a322bc07f06d71e4ed40a620dff523f74495c5e8430de6e9c11d0c3976b4b06893e535f611a9e65114f6f25809494b86d85f78110
EBUILD wine-1.5.22.ebuild 8149 SHA256 d8433deee9d007a7098cda0e9a0b349c8306beff8b65bca3b48777c1737ddc12 SHA512 8fe61b7efd24c9dd1a75e3020f89cf1e099f1ec85e18296fc43991847531900b82fbbe6f808ccbcd6dd1fec2020429024e390151731952cfcb1aa5e0d3f6401f WHIRLPOOL 5a8086ba3e7d1b96647138eb1fd0723dc1c4cc21556885f6407ba760aa9a495f92cf8729e16077a471d8b26099543a4fafd9417a5bf5fb86dc6d579f9d4a4623
EBUILD wine-1.5.28.ebuild 9081 SHA256 1ab6669739f791fe4f7e689312e255ed2fad1319bd6b0ba353869c3bb3a65c68 SHA512 bce3b9578bc9cc6de988b3faa6c3c7918f23b2d02216ac30930801041af8e9d5d814cdef49c26a6257d8cf5341a1655508720b4ab246e02cfc0eb1d2b32cf237 WHIRLPOOL d92701f449d877c0dcef676ac961113669bdebf59e14c055009706cb85e676dcc342b978c7afd69355f902237035375b21c5c779d5e977171236c0cad0b14fe9
-EBUILD wine-1.7.4.ebuild 12623 SHA256 bfd515e4c98ac0ab01106e71b0182d3e832e62feb02ee0b940c191f660969a66 SHA512 69e50cdfd5195f13ded1c3799365794b946ac80cc8f902560258851e36152d639410cf6851d455e995df487f08cfdb5022000c7b27e59eece7a7d90385f229c4 WHIRLPOOL c3b1ec3503b17a0db7dbe2f2e4ca5dc2318ee4192e250a65704d1394defc4a25a2baa5cffe5cc54888c271a4bea38451f680fd3d98bee05783133fdc6c60cd42
-MISC metadata.xml 1998 SHA256 4f1d099c3ee67c4bb50ce5dc2cb2dd377c55f394e6f5f634f5d81c547fa92e7b SHA512 d1ae3ae9e37beefca69be509b1ae58f726b0310218d297c8044a73252b83e73e3b9adabd76de9ffc646f0cc64e9ac03008deba680e5cf55663d971d478b649fc WHIRLPOOL 698441545d8afb142e570afe1f28d9eec2fe1bd4ae54637081aa4a4c14246c41b3afad3179bec5298aa226816d698bc6a63e2f746aa15b57a323576632209ebb
-MISC metadata.xml.new 1998 SHA256 4f1d099c3ee67c4bb50ce5dc2cb2dd377c55f394e6f5f634f5d81c547fa92e7b SHA512 d1ae3ae9e37beefca69be509b1ae58f726b0310218d297c8044a73252b83e73e3b9adabd76de9ffc646f0cc64e9ac03008deba680e5cf55663d971d478b649fc WHIRLPOOL 698441545d8afb142e570afe1f28d9eec2fe1bd4ae54637081aa4a4c14246c41b3afad3179bec5298aa226816d698bc6a63e2f746aa15b57a323576632209ebb
+EBUILD wine-1.7.8.ebuild 12837 SHA256 330cd38d81764949ab4c6cb1a54b9e2d0a2c48170021aa9fa5094dea4e264f17 SHA512 af4d19ef628fc50aa7f0ee1bfde8ea24839d14f8ef8871678a3a2e8175509c0070cb9dca4cd9ccf40d841ecc05becce9338c82a380021fb6c0196751011df058 WHIRLPOOL faf8d43b4cb3cd1c652087e790c5a2531a84e21eb8f019d8b0f6f923295fb889bd14b6534a74e8d8a7f86bcf608af9727c92a6c23e52f230ac5631602d9ce4ba
+MISC metadata.xml 2262 SHA256 1aa84770023faa49c494d6983665907e2eef0a22327051dd6250bc0f721c1a97 SHA512 c65a609a4d301776abc4ba870fcc3006d42c22833effd3e6d739b78ed75edd35887c779ec895f692d0dffee16c598c5693d1dae02dbdd32ed2f9b8f396867af5 WHIRLPOOL d35d1da95ad246b9c6368352c7585dc6ea9edc4f81627dde2a1032b2dc18a274402bc8a4f0a953e01517d505332714e6d4a172d9bb7b43f34a1ae05f5d784e41
diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
index 83067e4b..1bccb99c 100644
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@@ -9,7 +9,8 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n
</longdescription>
<use>
<flag name='capi'>Enable ISDN support via CAPI</flag>
- <flag name='custom-cflags'>Bypass strip-flags; use are your own peril</flag>
+ <flag name='custom-cflags'>Bypass strip-flags; use at your own peril</flag>
+ <flag name='dos'>Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag>
<flag name='gecko'>Add support for the Gecko engine when using iexplore</flag>
<flag name='mono'>Add support for .NET using Wine's Mono add-on</flag>
<flag name='opencl'>Enable OpenCL support</flag>
@@ -17,6 +18,8 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n
<flag name='pathofexile'>Enable patch to fix slow installation of Path of Exile</flag>
<flag name='perl'>Install helpers written in perl (winedump/winemaker)</flag>
<flag name='prelink'>Run prelink on DLLs during build -- do not disable if you do not know what this means as it can break things at runtime</flag>
+ <flag name='realtime'>Pull in <pkg>sys-auth/rtkit</pkg> for low-latency pulseaudio support</flag>
+ <flag name='run-exes'>Use Wine to open and run .EXE and .MSI files</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/metadata.xml.new b/app-emulation/wine/metadata.xml.new
deleted file mode 100644
index 83067e4b..00000000
--- a/app-emulation/wine/metadata.xml.new
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>wine</herd>
-<longdescription>
-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='capi'>Enable ISDN support via CAPI</flag>
- <flag name='custom-cflags'>Bypass strip-flags; use are your own peril</flag>
- <flag name='gecko'>Add support for the Gecko engine when using iexplore</flag>
- <flag name='mono'>Add support for .NET using Wine's Mono add-on</flag>
- <flag name='opencl'>Enable OpenCL support</flag>
- <flag name='osmesa'>Add support for OpenGL in bitmaps using libOSMesa</flag>
- <flag name='pathofexile'>Enable patch to fix slow installation of Path of Exile</flag>
- <flag name='perl'>Install helpers written in perl (winedump/winemaker)</flag>
- <flag name='prelink'>Run prelink on DLLs during build -- do not disable if you do not know what this means as it can break things at runtime</flag>
- <flag name='samba'>Add support for NTLM auth. see
- http://wiki.winehq.org/NtlmAuthSetupGuide and
- http://wiki.winehq.org/NtlmSigningAndSealing</flag>
- <flag name='swtor'>Enable patch to run SWTOR</flag>
- <flag name='udisks'>Support dynamic storage devices using <pkg>sys-fs/udisks</pkg></flag>
- <flag name='win32'>Build a 32bit version of Wine (won't run Win64 binaries)</flag>
- <flag name='win64'>Build a 64bit version of Wine (won't run Win32 binaries)</flag>
-</use>
-</pkgmetadata>
diff --git a/app-emulation/wine/wine-1.7.4.ebuild b/app-emulation/wine/wine-1.7.8.ebuild
index 21444eed..856408eb 100644
--- a/app-emulation/wine/wine-1.7.4.ebuild
+++ b/app-emulation/wine/wine-1.7.8.ebuild
@@ -23,7 +23,7 @@ else
fi
GV="2.24"
-MV="0.0.8"
+MV="4.5.2"
PULSE_PATCHES="winepulse-patches-1.7.4"
WINE_GENTOO="wine-gentoo-2013.06.24"
DESCRIPTION="Free implementation of Windows(tm) on Unix"
@@ -34,7 +34,7 @@ SRC_URI="${SRC_URI}
abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
)
mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
- http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2
+ pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 )
http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
LICENSE="LGPL-2.1"
@@ -105,7 +105,10 @@ COMMON_DEPEND="
app-emulation/emul-linux-x86-baselibs[development]
sys-libs/ncurses[abi_x86_32]
) )
- udisks? ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] )
+ udisks? ( || (
+ >=app-emulation/emul-linux-x86-baselibs-20130224[development]
+ sys-apps/dbus[abi_x86_32]
+ ) )
fontconfig? ( || (
app-emulation/emul-linux-x86-xlibs[development]
media-libs/fontconfig[abi_x86_32]
@@ -171,7 +174,13 @@ COMMON_DEPEND="
>=app-emulation/emul-linux-x86-opengl-20121028[development]
media-libs/mesa[osmesa,abi_x86_32]
) )
- xml? ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] )
+ xml? ( || (
+ >=app-emulation/emul-linux-x86-baselibs-20131008[development]
+ (
+ dev-libs/libxml2[abi_x86_32]
+ dev-libs/libxslt[abi_x86_32]
+ )
+ ) )
scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
png? ( || (
@@ -257,7 +266,7 @@ src_unpack() {
unpack ${MY_P}.tar.bz2
fi
- unpack "${PULSE_PATCHES}.tar.bz2"
+ use pulseaudio && unpack "${PULSE_PATCHES}.tar.bz2"
unpack "${WINE_GENTOO}.tar.bz2"
l10n_find_plocales_changes "${S}/po" "" ".po"
@@ -271,9 +280,9 @@ src_prepare() {
"${FILESDIR}"/${PN}-1.7.2-osmesa-check.patch #429386
"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
)
- [[ ${PV} == "9999" ]] || PATCHES+=(
- "../${PULSE_PATCHES}"/*.patch #421365
- )
+ if [[ ${PV} == "9999" ]] ; then
+ use pulseaudio && PATCHES+="../${PULSE_PATCHES}"/*.patch #421365
+ fi
autotools-utils_src_prepare
@@ -349,7 +358,7 @@ src_configure() {
$(use_with xml xslt)
)
- [[ ${PV} == "9999" ]] || myeconfargs+=( $(use_with pulseaudio pulse) )
+ [[ ${PV} == "9999" ]] || use pulseaudio && myeconfargs+=( $(use_with pulseaudio pulse) )
if use amd64 && use abi_x86_32; then
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038