summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreroen2013-12-08 22:29:27 +0100
committereroen2013-12-08 22:29:27 +0100
commit9959541640259c49be89da3a68903c31ce8ff716 (patch)
treeefb1e58534d62f93f585c1015f287747dad5a18b
parent5b052f10222ca1f0b1b522b0dcabf7885e9a914e (diff)
downloaderoen-overlay-9959541640259c49be89da3a68903c31ce8ff716.tar.gz
eroen-overlay-9959541640259c49be89da3a68903c31ce8ff716.tar.bz2
eroen-overlay-9959541640259c49be89da3a68903c31ce8ff716.tar.xz
wine-1.5.28 - update from gentoo
-rw-r--r--app-emulation/wine/Manifest2
-rw-r--r--app-emulation/wine/wine-1.5.28.ebuild34
2 files changed, 26 insertions, 10 deletions
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index d4ffb8ee..95c2a3ca 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -31,6 +31,6 @@ EBUILD wine-1.5.19.ebuild 8260 SHA256 df1ae78441177e5c577d57fc57dcca77a3cc66c246
EBUILD wine-1.5.20.ebuild 8446 SHA256 df39ddf265027aa42b1a92d7e063cbff2e96554055b57c5bd2f91cf44de1d25d SHA512 bf7a949f241fdc88cb2dba4035f67888dce11232c1d855fc529c35392306d8196c6ac961097667fd85b1013224fa8789485df53f7db7e7cb0bbf9c0295544941 WHIRLPOOL 3cb553dc1a46cec0b2c3864851e8dbee70e6fb4fe81a4e1a0e51d029944ed776ca88294ab2ce4f07f93f9f41b6f811d912b38a024b5139011d70198c4ec1394e
EBUILD wine-1.5.21.ebuild 8435 SHA256 a5064b878c5d5044d19fcb3012c6bd75535caf92dc6e815bcac2286b39d24ee1 SHA512 06bdea46240ee1c55ffa3bba948b75240db45d26ab30ad75ce491ff9b6c81527edb74663b8380b30ac4f8663b94bfa948ffbf1819198d84b706b030e4c3ba8bc WHIRLPOOL 5aeb8fa207d92785e2c8bb749881e10687dbbbe3c49f86cdc7e5751e47c7e91551dfba434e57e608bee1d8f5444873bbb73495436ed6601c28a601199de00b3c
EBUILD wine-1.5.22.ebuild 8454 SHA256 aa997d2e7593b53513a840b0699127bcfab4f1742cf4ca2f709f539b4c4a544c SHA512 5c63dcf28e72cf310607ed9b1dbd4eefd496ee5a1a0792e5df8f19888c1fabe35f446d53c6dc85cb272c71fedaf184b19909a945584caa75764d87cb4c287373 WHIRLPOOL 2c5b82862fccff6aa8609f7f16ade9d649f4b3d5b00631ec464ac8b3e4d57c903216be01a1f4f19c2b52374efe424981ace154e0bc55608733986c230f19878f
-EBUILD wine-1.5.28.ebuild 9081 SHA256 1ab6669739f791fe4f7e689312e255ed2fad1319bd6b0ba353869c3bb3a65c68 SHA512 bce3b9578bc9cc6de988b3faa6c3c7918f23b2d02216ac30930801041af8e9d5d814cdef49c26a6257d8cf5341a1655508720b4ab246e02cfc0eb1d2b32cf237 WHIRLPOOL d92701f449d877c0dcef676ac961113669bdebf59e14c055009706cb85e676dcc342b978c7afd69355f902237035375b21c5c779d5e977171236c0cad0b14fe9
+EBUILD wine-1.5.28.ebuild 9382 SHA256 e5320ad753042fa9bf4684e19562bdf353ab34860eceb26d2e542c4b1487a6ca SHA512 38adc2ea3d03f5e072a8324b90971e6e211aec0473158917f8460fef766c3f436fcee6d41961cd4959967af3d752ddfc8ffe6ccf44e6f2c04488951955474f54 WHIRLPOOL d38dc63f7a4a8e504a545d585e4d2a4516f5033c7167b151983313d1feb8e1a104b810ba1b5c732a87143cd589383244ba715692908657284847fa2738b5b2d4
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/wine-1.5.28.ebuild b/app-emulation/wine/wine-1.5.28.ebuild
index 9a014987..0c06d824 100644
--- a/app-emulation/wine/wine-1.5.28.ebuild
+++ b/app-emulation/wine/wine-1.5.28.ebuild
@@ -48,7 +48,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
# or fail due to Xvfb's opengl limitations.
RESTRICT="test"
-RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
+RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 )
perl? ( dev-lang/perl dev-perl/XML-Simple )
capi? ( net-dialup/capi4k-utils )
ncurses? ( >=sys-libs/ncurses-5.2:= )
@@ -61,11 +61,12 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
)
gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
X? (
+ x11-libs/libICE
+ x11-libs/libSM
x11-libs/libXcursor
x11-libs/libXext
x11-libs/libXrandr
x11-libs/libXi
- x11-libs/libXmu
x11-libs/libXxf86vm
)
xinerama? ( x11-libs/libXinerama )
@@ -138,17 +139,32 @@ usr/share/applications/wine-notepad.desktop
usr/share/applications/wine-uninstaller.desktop
usr/share/applications/wine-winecfg.desktop"
-src_unpack() {
- if use abi_x86_64; then
- [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
- && die "you need gcc-4.4+ to build 64bit wine"
+wine_build_environment_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
+ eerror "You need gcc-4.4+ to build 64-bit wine"
+ eerror
+ return 1
fi
- if use abi_x86_32 && use opencl; then
- [[ x$(eselect opencl show) = "xintel" ]] &&
- die "Cannot build wine[opencl,abi_x86_32]: intel-ocl-sdk is 64-bit only" # 403947
+ if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+ eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+ eerror "See https://bugs.gentoo.org/487864 for more details."
+ eerror
+ return 1
fi
+}
+
+pkg_pretend() {
+ wine_build_environment_check || die
+}
+
+pkg_setup() {
+ wine_build_environment_check || die
+}
+src_unpack() {
if [[ ${PV} == "9999" ]] ; then
git-2_src_unpack
else