summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreroen2013-12-08 22:23:21 +0100
committereroen2013-12-08 22:23:21 +0100
commit59afc8dbb9b7a07f762eeb91e0f54ea7e83f7c78 (patch)
treecf7edcef2a707a0ed07fcc3a0a5dd9ee19b36b72
parentb45300a443fa70731f6df50486b675b05bc4f96e (diff)
downloaderoen-overlay-59afc8dbb9b7a07f762eeb91e0f54ea7e83f7c78.tar.gz
eroen-overlay-59afc8dbb9b7a07f762eeb91e0f54ea7e83f7c78.tar.bz2
eroen-overlay-59afc8dbb9b7a07f762eeb91e0f54ea7e83f7c78.tar.xz
wine-1.5.21 - update from gentoo
-rw-r--r--app-emulation/wine/Manifest2
-rw-r--r--app-emulation/wine/wine-1.5.21.ebuild34
2 files changed, 26 insertions, 10 deletions
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index f6f2322b..8fa2f1f7 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -29,7 +29,7 @@ DIST winepulse-patches-1.5.25.tar.bz2 46795 SHA256 375c94dc4d12ab6b41da478104a1c
DIST winepulse-patches-1.7.4.tar.bz2 49182 SHA256 26cc1ab6d91c45b4d83f07bbd7f43c9824470700a58325f0a1bfc1b76bfe419f SHA512 55095dcd3ebd1560316382ee5f625203589ba8ac2437f7993bee0edf61004d3c0cdba0aabc2e9aed3d195d8eda4088241766dde4c44564e81ea99cc47404cdff WHIRLPOOL 978f3bcc3cc14098b604cd737d9fa6911a5c3b76773a060586ba183a055cdc25e3b436c262c813094c7c2158ae607bcb3020738da16bbe2c48c595728755f98c
EBUILD wine-1.5.19.ebuild 8260 SHA256 df1ae78441177e5c577d57fc57dcca77a3cc66c2466fbbe414981affec705946 SHA512 0eb83f6cdd8ca661a1ae9b3db75c89bf2ac266d59b3d88cd3679b71e8f8955ca2877bef9c433fd2a8224970f1d89c24f3861704b879b454b75dc53434fc81da2 WHIRLPOOL d74baa37e6712ed3ddfb8ab3730e204899a4f73485d3a422821141cd64f0161ae07c76155d84d36625295bc10f1522e495ef29c9998e9e2f874a613ce5affc85
EBUILD wine-1.5.20.ebuild 8446 SHA256 df39ddf265027aa42b1a92d7e063cbff2e96554055b57c5bd2f91cf44de1d25d SHA512 bf7a949f241fdc88cb2dba4035f67888dce11232c1d855fc529c35392306d8196c6ac961097667fd85b1013224fa8789485df53f7db7e7cb0bbf9c0295544941 WHIRLPOOL 3cb553dc1a46cec0b2c3864851e8dbee70e6fb4fe81a4e1a0e51d029944ed776ca88294ab2ce4f07f93f9f41b6f811d912b38a024b5139011d70198c4ec1394e
-EBUILD wine-1.5.21.ebuild 8130 SHA256 1ff747f69a9d2356cc2b77e4b35a3dc72d3c5d56bd5ea5ad25e83d372d35a03f SHA512 77dd17589b607e4c0db8ee6f0f23f5bb32be8a6f0c828bf0077da4b33f1b633ee0f316e5ba17277fdc04aa231e97472487d58b48c1eaf2ebff90cc522dcc48ba WHIRLPOOL e56297d1e238076bfa1c322a322bc07f06d71e4ed40a620dff523f74495c5e8430de6e9c11d0c3976b4b06893e535f611a9e65114f6f25809494b86d85f78110
+EBUILD wine-1.5.21.ebuild 8435 SHA256 a5064b878c5d5044d19fcb3012c6bd75535caf92dc6e815bcac2286b39d24ee1 SHA512 06bdea46240ee1c55ffa3bba948b75240db45d26ab30ad75ce491ff9b6c81527edb74663b8380b30ac4f8663b94bfa948ffbf1819198d84b706b030e4c3ba8bc WHIRLPOOL 5aeb8fa207d92785e2c8bb749881e10687dbbbe3c49f86cdc7e5751e47c7e91551dfba434e57e608bee1d8f5444873bbb73495436ed6601c28a601199de00b3c
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.8.ebuild 12837 SHA256 330cd38d81764949ab4c6cb1a54b9e2d0a2c48170021aa9fa5094dea4e264f17 SHA512 af4d19ef628fc50aa7f0ee1bfde8ea24839d14f8ef8871678a3a2e8175509c0070cb9dca4cd9ccf40d841ecc05becce9338c82a380021fb6c0196751011df058 WHIRLPOOL faf8d43b4cb3cd1c652087e790c5a2531a84e21eb8f019d8b0f6f923295fb889bd14b6534a74e8d8a7f86bcf608af9727c92a6c23e52f230ac5631602d9ce4ba
diff --git a/app-emulation/wine/wine-1.5.21.ebuild b/app-emulation/wine/wine-1.5.21.ebuild
index 90f281dd..e110c43f 100644
--- a/app-emulation/wine/wine-1.5.21.ebuild
+++ b/app-emulation/wine/wine-1.5.21.ebuild
@@ -59,7 +59,7 @@ MLIB_DEPS="amd64? (
app-emulation/emul-linux-x86-baselibs
>=sys-kernel/linux-headers-2.6
)"
-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:= )
@@ -73,11 +73,12 @@ RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
gnutls? ( net-libs/gnutls:= )
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 )
@@ -130,17 +131,32 @@ usr/share/applications/wine-notepad.desktop
usr/share/applications/wine-uninstaller.desktop
usr/share/applications/wine-winecfg.desktop"
-src_unpack() {
- if use win64 ; 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 win64 && [[ $(( $(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 win32 && use opencl; then
- [[ x$(eselect opencl show) = "xintel" ]] &&
- die "Cannot build wine[opencl,win32]: intel-ocl-sdk is 64-bit only" # 403947
+ if use win32 && 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