commit: e9f9a2409a414183e3b3afc1b26b44dd4b73bdda Author: layman <layman <AT> localhost> AuthorDate: Sun Mar 13 22:30:56 2016 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Mon Mar 14 01:39:16 2016 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=e9f9a240
app-emulation/wine: remove since its broken Package-Manager: portage-2.2.26 app-emulation/wine/Manifest | 15 - .../wine/files/wine-1.4_rc2-multilib-portage.patch | 40 -- app-emulation/wine/files/wine-1.5.19-file_h.patch | 12 - .../wine/files/wine-1.5.19-getdents.patch | 12 - app-emulation/wine/files/wine-1.5.26-winegcc.patch | 59 --- app-emulation/wine/files/wine-1.6-memset-O3.patch | 21 - app-emulation/wine/files/wine-1.6.2-ipx.patch | 20 - .../wine/files/wine-1.7.2-osmesa-check.patch | 38 -- app-emulation/wine/metadata.xml | 42 -- app-emulation/wine/wine-1.6.2-r99.ebuild | 443 --------------------- 10 files changed, 702 deletions(-) diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest deleted file mode 100644 index 5b1741f..0000000 --- a/app-emulation/wine/Manifest +++ /dev/null @@ -1,15 +0,0 @@ -AUX wine-1.4_rc2-multilib-portage.patch 1256 SHA256 9d0acd304d11d1bf73f56699754aaa1bfe1facba90648ee330fdbe08d9ff4938 SHA512 ac0b29e2b4c9b04bb6694a4e4da654446f68efbf90cda6809b45dad51e6679ac5410398763fde7e9505ef959493a037aa588cee58d14906563a4746702d2b0e9 WHIRLPOOL 8ea26266c327bc8313eca9b5d39c9741b226037750ca2d1d33262420093e05c306e7f004656c362c3c50b330d050cf9e5fceaa2b024a82809aae8b3617b0ae18 -AUX wine-1.5.19-file_h.patch 309 SHA256 e94e711bbee19bc152653183c89245a8615686838a8f5cdeee264a0d8464190f SHA512 3bb1463d4fea35d047a1abff99c7dd3bb5ed4e5b1d3b095139d118ea74c4813d39de6a28ca30f7cf24e40670fcca43f7ae5a71d5a5cad43806a7dfdfd8f431a7 WHIRLPOOL 519dee8641d0b03e9140aed954c05e2584bd41c1903b60a6fef9002a6c1f3211b8d213e66dead9f76647789f1fdbac62e0ec5d78b63a9cc98d96c9129573fec5 -AUX wine-1.5.19-getdents.patch 460 SHA256 85981b6fa8b5b980ffb9e3f1e4cd25af469b929020d6a7768d045a3ad43bfea3 SHA512 af114c50fa0ac1499515d1d0c5cbd28fada4a59a79b3f92ea2b994af0fb96d78a9b9a2ed4d241f4d403c4743864988245c3ec87dd4e6207a8c06792d576042bc WHIRLPOOL 8e9e620ae304442355eb4db0a4cf10e4c4a35993c87ebe17837d85285114f65147442378a7dacc7db16d77673835ff656e2043791befc8b5bfdd03542426263b -AUX wine-1.5.26-winegcc.patch 1808 SHA256 91c1012059b93a421b2eae9f2ea46b7b327d6d3d58ba0cb47021c8a57f6d8228 SHA512 fce9daf40a96f4a7502c249a30107c8dfc5d8edd4a171b863d2bf14c3ad46d18e4c29932ab4a6ede7da5d589d777b962d2f577f5360ee4db8019d71362c51d47 WHIRLPOOL 71cbe36c6bac87071472541b7f5cd3ed1b08f05479bc0016262b3f86e75738e467dad197563b4898f2b24fd0ab4e27c40dce04f244a3e7f5ea1582b4db1c5cc2 -AUX wine-1.6-memset-O3.patch 695 SHA256 1f04496713e8a401ba068702c5c3e104b18635bfb54808e5641a3c48a9b9bad4 SHA512 ad7231f8dedf98f9e9b91fcb8bbe72a716d78285127b0c33396de0b1e17a191f91f9a4a377c0e90671bb5f4e57bfb087ef7e80c9537c6c73b3c9bb90b3885968 WHIRLPOOL 91689c31054b896609493e2b0b4fe67e3d752d889f4ccae9c3e15229543341998809fd19a2040457e04fbdbd45505f0f2b49052844004193872713053d7239f8 -AUX wine-1.6.2-ipx.patch 453 SHA256 db4eb14336e2bb57916fd0b1fe07e0db5515cf9bb2e9b99d0a8097da86e009dd SHA512 17117c5f0e48a7bf2b98d50f4b672b68fe07cb3b610329d279b2fe6b1077c6d0984af93a7105b4979cbb19dd984d07206446ef2158af98fe6492578a11b554ed WHIRLPOOL 46c7ba0855d75178e02fd6c55d2fcfb73708232bb0ceeb200c49d4a4c6dbf0c3eee99467fc42b939d3e9c5c81aff22a72f94c716ff4f75d15bf5aaf6e196aa87 -AUX wine-1.7.2-osmesa-check.patch 1740 SHA256 5264ac291435eb64c70cef4bdccbf8d4448472b4f014ab15ede35bcceebb6579 SHA512 4738a381923df7b45ea68092efb7ccb967907976d6d2f8bb0167af4211c377a73e296481b94092ac232f9ae09edf21447da92a134ebfff9b32acdd9e20340b95 WHIRLPOOL 95a90f8ff5a649833b39cb28de997c3b516cd09a53cf71d616c4fd412dfa6e71c47a1255a4d0597d85a62966cd9d6b9fae1c21c88e67d8650d31d414fca8fd42 -DIST wine-1.6.2.tar.bz2 21252985 SHA256 f0ab9eede5a0ccacbf6e50682649f9377b9199e49cf55641f1787cf72405acbe SHA512 81c83566dc2cab276ab7b9cfb5edc5fbca0f003dcb78044a0197c9a4d9a05a40f9045e5b4981c9219c3c39dab52fe519ef3cb338d79ee01e1fe66e3c056e8397 WHIRLPOOL 7d2d995a9996d63e17ff3ef5871f3818945dcd90c4a22798506f0d0c31ed999462bc5718f5cc562b9da64fdd7af6b240380bfa2901eabd23fb036aebfc7c554c -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_gecko-2.21-x86.msi 20871680 SHA256 f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8 SHA512 f4ca9ca5b876dc39e906991e58c6da8ef4103782f83ba781ff27556c0ebdab7fe10c14f0551e900442a5d57a2c619da6e5ed6ed42323edcdd55ce9789c4c83ac WHIRLPOOL d1db97175b047652499c97c968b71c08c5b44774423f22ae626f89b4dde3d03b46295e5caae228f1f8614209e943e8246854b478eef3abb186e8de4c341b0a0d -DIST wine_gecko-2.21-x86_64.msi 21646336 SHA256 bc370bdc899f66d98f31c4d410a6952aa82c0c9c0a0ec27f2a11243c9b412c3f SHA512 2a48a7697beba4e45816a9eff09e181de353d8c93e02a70108fa77d27136cd5cd75b21c42caa7702a09f86544669ae2bbfc6975b1fc0d7fcb20150a4bc4ea514 WHIRLPOOL 2fce9b9a190a52c173551d47428dd8b8dc54d5878682733e0006a3f06f216cd9f47a88ada49f92fa5697ece8b2942a88f937bd2722b4cb85d2c35c19bda29b85 -DIST winepulse-patches-1.7.8.tar.bz2 49140 SHA256 0fd31ea7fec8817561a7b304bbfad6bdd014eb566b0c533e15773064bca555ad SHA512 18c88d4da37714d0216c01929eb92c99161fdf7024d8516512fc2585bc8d5a700fb1b5eb9fb667149e104305f366c867973f41b688a04f63e7cce76f5d85389a WHIRLPOOL 60dfeeb1d51c9ea7730ff1e9263d44fbcf3509e6ae68df1e3d30d965999f19525979f64617494bb1c3e1712c7117f30bebfbcbc75b1b08ba1f1e033720b0cacc -EBUILD wine-1.6.2-r99.ebuild 12826 SHA256 4f302089b05c65462b349de65c089fa34284f54c026991bbd15e182ad7058e3b SHA512 8a6b8682e7bfa5630708700d163ec8b88d3fe7689d39b0656f9c1659498b350591639c317c3fad154b996cff68318ed34e35e848e5dd4acdf523f8f94c90724d WHIRLPOOL 0c3f9d00311831694fba9f617429b7d329a3c20e62b0619aff32389b2a0e6fb118d3e8a55ae4490955bcb782236b797f91654d378dcfc69b37d5d6c07301abc2 -MISC metadata.xml 2940 SHA256 f8f0316d044fd150f3d7b71eea33527ed166814f90056a7e5705189408bd741a SHA512 1ff4ea522bc8e8e2503beb0cf295cfdcc6667ab89484dc0da6d22f2352fb33c3e88345ea2be2f9546f6afbba4b63089e053bf54bcccd4a0b077a67eed24a4109 WHIRLPOOL cf7bf627dc2dbaa31ac97206a4f40b8f30d2c376ecb4ad6aa65ef09a155b8be50e2d56c429b67c81e589cf1cd50d60cbe32b02bcb0ec6a656b1584819b2e6205 diff --git a/app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch b/app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch deleted file mode 100644 index be6ffc5..0000000 --- a/app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=395615 - -Explicitly add the required -m32/m64 to *FLAGS; this overrides any -arch-specific -m* flags that may have been appended by multilib-portage. - -Even though -m32/m64 is now added to *FLAGS, -m32/m64 still has to be -explicitly added to CC and CXX due to wine's build system. For example, -winegcc saves the build-time value of CC and uses it at runtime. - ---- a/configure.ac -+++ b/configure.ac -@@ -133,12 +133,18 @@ - then - CC="$CC -m64" - CXX="$CXX -m64" -+ CFLAGS="$CFLAGS -m64" -+ LDFLAGS="$LDFLAGS -m64" -+ CXXFLAGS="$CXXFLAGS -m64" - host_cpu="x86_64" - notice_platform="64-bit " - AC_SUBST(TARGETFLAGS,"-m64") - else - CC="$CC -m32" - CXX="$CXX -m32" -+ CFLAGS="$CFLAGS -m32" -+ LDFLAGS="$LDFLAGS -m32" -+ CXXFLAGS="$CXXFLAGS -m32" - host_cpu="i386" - notice_platform="32-bit " - AC_SUBST(TARGETFLAGS,"-m32") -@@ -150,6 +156,9 @@ - then - CC="$CC -m32" - CXX="$CXX -m32" -+ CFLAGS="$CFLAGS -m32" -+ LDFLAGS="$LDFLAGS -m32" -+ CXXFLAGS="$CXXFLAGS -m32" - AC_MSG_CHECKING([whether $CC works]) - AC_LINK_IFELSE([AC_LANG_PROGRAM()],AC_MSG_RESULT([yes]), - [AC_MSG_RESULT([no]) diff --git a/app-emulation/wine/files/wine-1.5.19-file_h.patch b/app-emulation/wine/files/wine-1.5.19-file_h.patch deleted file mode 100644 index aa2aca4..0000000 --- a/app-emulation/wine/files/wine-1.5.19-file_h.patch +++ /dev/null @@ -1,12 +0,0 @@ -taken from sabotage linux ---- wine-1.5.19/server/file.h 2012-12-07 19:17:32.000000000 +0000 -+++ wine-1.5.19.patched/server/file.h 2012-12-19 03:29:07.092000002 +0000 -@@ -22,7 +22,7 @@ - #define __WINE_SERVER_FILE_H - - #include "object.h" -- -+#include <fcntl.h> - struct fd; - struct mapping; - struct async_queue; diff --git a/app-emulation/wine/files/wine-1.5.19-getdents.patch b/app-emulation/wine/files/wine-1.5.19-getdents.patch deleted file mode 100644 index b1b5dad..0000000 --- a/app-emulation/wine/files/wine-1.5.19-getdents.patch +++ /dev/null @@ -1,12 +0,0 @@ -taken from sabotage linux ---- wine-1.5.19/dlls/ntdll/directory.c 2012-12-07 19:17:32.000000000 +0000 -+++ wine-1.5.19.patched/dlls/ntdll/directory.c 2012-12-19 04:47:29.148000002 +0000 -@@ -119,7 +119,7 @@ - char d_name[256]; - } KERNEL_DIRENT64; - --static inline int getdents64( int fd, char *de, unsigned int size ) -+static inline int BUG_getdents64( int fd, char *de, unsigned int size ) - { - return syscall( SYS_getdents64, fd, de, size ); - } diff --git a/app-emulation/wine/files/wine-1.5.26-winegcc.patch b/app-emulation/wine/files/wine-1.5.26-winegcc.patch deleted file mode 100644 index 2045e34..0000000 --- a/app-emulation/wine/files/wine-1.5.26-winegcc.patch +++ /dev/null @@ -1,59 +0,0 @@ -http://bugs.gentoo.org/260726 - -diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c -index 16b4165..5c77267 100644 ---- a/tools/winebuild/main.c -+++ b/tools/winebuild/main.c -@@ -48,10 +48,13 @@ int link_ext_symbols = 0; - int force_pointer_size = 0; - int unwind_tables = 0; - -+#undef FORCE_POINTER_SIZE - #ifdef __i386__ - enum target_cpu target_cpu = CPU_x86; -+#define FORCE_POINTER_SIZE - #elif defined(__x86_64__) - enum target_cpu target_cpu = CPU_x86_64; -+#define FORCE_POINTER_SIZE - #elif defined(__powerpc__) - enum target_cpu target_cpu = CPU_POWERPC; - #elif defined(__arm__) -@@ -611,6 +614,10 @@ int main(int argc, char **argv) - signal( SIGTERM, exit_on_signal ); - signal( SIGINT, exit_on_signal ); - -+#ifdef FORCE_POINTER_SIZE -+ force_pointer_size = sizeof(size_t); -+#endif -+ - output_file = stdout; - argv = parse_options( argc, argv, spec ); - -diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c -index 06aa200..c44d2e3 100644 ---- a/tools/winegcc/winegcc.c -+++ b/tools/winegcc/winegcc.c -@@ -213,10 +213,13 @@ struct options - strarray* files; - }; - -+#undef FORCE_POINTER_SIZE - #ifdef __i386__ - static const enum target_cpu build_cpu = CPU_x86; -+#define FORCE_POINTER_SIZE - #elif defined(__x86_64__) - static const enum target_cpu build_cpu = CPU_x86_64; -+#define FORCE_POINTER_SIZE - #elif defined(__powerpc__) - static const enum target_cpu build_cpu = CPU_POWERPC; - #elif defined(__arm__) -@@ -1258,6 +1261,9 @@ int main(int argc, char **argv) - opts.linker_args = strarray_alloc(); - opts.compiler_args = strarray_alloc(); - opts.winebuild_args = strarray_alloc(); -+#ifdef FORCE_POINTER_SIZE -+ opts.force_pointer_size = sizeof(size_t); -+#endif - - /* determine the processor type */ - if (strendswith(argv[0], "winecpp")) opts.processor = proc_cpp; diff --git a/app-emulation/wine/files/wine-1.6-memset-O3.patch b/app-emulation/wine/files/wine-1.6-memset-O3.patch deleted file mode 100644 index 75372f8..0000000 --- a/app-emulation/wine/files/wine-1.6-memset-O3.patch +++ /dev/null @@ -1,21 +0,0 @@ -Avoid "undefined reference to `memset'" error when building with -USE=custom-cflags and -O3 in CFLAGS with gcc-4.8. - -See: - -http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56888 -http://bugs.winehq.org/show_bug.cgi?id=33521 -https://bugs.gentoo.org/show_bug.cgi?id=480508 - -diff --git a/configure.ac b/configure.ac -index d8033cf..fe7cc7d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1767,6 +1767,7 @@ then - - dnl Check for some compiler flags - WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")]) -+ WINE_TRY_CFLAGS([-fno-tree-loop-distribute-patterns]) - WINE_TRY_CFLAGS([-fno-strict-aliasing]) - dnl clang needs to be told to fail on unknown options - saved_CFLAGS=$CFLAGS diff --git a/app-emulation/wine/files/wine-1.6.2-ipx.patch b/app-emulation/wine/files/wine-1.6.2-ipx.patch deleted file mode 100644 index 9b515b4..0000000 --- a/app-emulation/wine/files/wine-1.6.2-ipx.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/wine-1.6.2/dlls/ws2_32/socket.c -+++ b/wine-1.6.2/dlls/ws2_32/socket.c -@@ -2835,7 +2835,7 @@ - return SOCKET_ERROR; - } /* end switch(optname) */ - }/* end case WS_SOL_SOCKET */ --#ifdef HAS_IPX -+#if 0 - case NSPROTO_IPX: - { - struct WS_sockaddr_ipx addr; -@@ -4372,7 +4372,7 @@ - } - break; /* case WS_SOL_SOCKET */ - --#ifdef HAS_IPX -+#if 0 - case NSPROTO_IPX: - switch(optname) - { diff --git a/app-emulation/wine/files/wine-1.7.2-osmesa-check.patch b/app-emulation/wine/files/wine-1.7.2-osmesa-check.patch deleted file mode 100644 index e20ea2c..0000000 --- a/app-emulation/wine/files/wine-1.7.2-osmesa-check.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b7eb1ff48dd1210aa3e1002afc503d5df75d50b9 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetrom...@gentoo.org> -Date: Tue, 7 Aug 2012 01:29:01 -0400 -Subject: [PATCH] Do not check for libGL symbols when checking libOSMesa - -If mesa had been built with shared glapi, glAccum is not available in -libOSMesa without explicitly linking to libGL. In addition, in -mesa-8.0.x and earlier, libOSMesa needs to be explicitly linked to -libglapi if mesa was built with shared glapi, see -https://bugs.gentoo.org/show_bug.cgi?id=399813 -And in mesa-8.1.x, libOSMesa in addition needs libdl, libpthread, and -libstdc++, see https://bugs.gentoo.org/show_bug.cgi?id=431832 ---- - configure.ac | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 66b4dd6..0303d87 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1213,7 +1213,13 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c - - if test "x$with_osmesa" != "xno" - then -- WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $XLIB -lm $X_EXTRA_LIBS]) -+ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS $XLIB -lm $X_EXTRA_LIBS]) -+ if test "x$ac_cv_lib_soname_OSMesa" = "x"; then -+ osmesa_save_CC=$CC -+ CC=$CXX -+ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[-lglapi -lpthread -ldl $X_LIBS $XLIB -lm $X_EXTRA_LIBS]) -+ CC=$osmesa_save_CC -+ fi - WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"], - [libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.]) - fi --- -1.8.3.2 - diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml deleted file mode 100644 index 6efa58c..0000000 --- a/app-emulation/wine/metadata.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>w...@gentoo.org</email> - <name>Wine</name> - </maintainer> - <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 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="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality; - For versions less than wine-1.9.2, uses experimental patch which may break some apps</flag> - <flag name="mono">Add support for .NET using Wine's Mono add-on</flag> - <flag name="netapi">Use libnetapi from <pkg>net-fs/samba</pkg> to support Windows networks in netapi32.dll</flag> - <flag name="opencl">Enable OpenCL support</flag> - <flag name="osmesa">Add support for OpenGL in bitmaps using libOSMesa</flag> - <flag name="pcap">Support packet capture software (e.g. wireshark)</flag> - <flag name="perl">Install helpers written in perl (winedump/winemaker)</flag> - <flag name="pipelight">Apply Wine-Staging patches for Pipelight/Silverlight support</flag> - <flag name="prelink">Run prelink on DLLs during build; - For versions less than wine-1.7.55 or hardened, 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="s3tc">Pull in <pkg>media-libs/libtxc_dxtn</pkg> for DXTn texture compression, needed for many games</flag> - <flag name="samba">Add support for NTLM auth. see - http://wiki.winehq.org/NtlmAuthSetupGuide and - http://wiki.winehq.org/NtlmSigningAndSealing</flag> - <flag name="staging">Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet - For versions less than wine-1.8, this patchset is unofficial.</flag> - </use> - <upstream> - <remote-id type="github">wine-compholio/wine-staging</remote-id> - <remote-id type="sourceforge">wine</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-emulation/wine/wine-1.6.2-r99.ebuild b/app-emulation/wine/wine-1.6.2-r99.ebuild deleted file mode 100644 index ea68ee2..0000000 --- a/app-emulation/wine/wine-1.6.2-r99.ebuild +++ /dev/null @@ -1,443 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.2.ebuild,v 1.3 2014/03/12 05:16:55 phajdan.jr Exp $ - -EAPI="5" - -AUTOTOOLS_AUTORECONF=1 -PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW" -PLOCALE_BACKUP="en" - -inherit autotools-multilib eutils fdo-mime flag-o-matic gnome2-utils l10n multilib pax-utils toolchain-funcs virtualx - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://source.winehq.org/git/wine.git" - inherit git-2 - SRC_URI="" - #KEYWORDS="" -else - MY_P="${PN}-${PV/_/-}" - SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2" - KEYWORDS="-* x86" - S=${WORKDIR}/${MY_P} -fi - -GV="2.21" -MV="0.0.8" -PULSE_PATCHES="winepulse-patches-1.7.8" -WINE_GENTOO="wine-gentoo-2013.06.24" -DESCRIPTION="Free implementation of Windows(tm) on Unix" -HOMEPAGE="http://www.winehq.org/"; -SRC_URI="${SRC_URI} - gecko? ( - abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi ) - 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 ) - 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" -SLOT="0" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml" -REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) - test? ( abi_x86_32 ) - elibc_glibc? ( threads ) - mono? ( abi_x86_32 ) - osmesa? ( opengl )" #286560 - -# FIXME: the test suite is unsuitable for us; many tests require net access -# or fail due to Xvfb's opengl limitations. -RESTRICT="test" - -NATIVE_DEPEND=" - truetype? ( >=media-libs/freetype-2.0.0 ) - capi? ( net-dialup/capi4k-utils ) - ncurses? ( >=sys-libs/ncurses-5.2:= ) - udisks? ( sys-apps/dbus ) - fontconfig? ( media-libs/fontconfig:= ) - gphoto2? ( media-libs/libgphoto2:= ) - openal? ( media-libs/openal:= ) - gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) - X? ( - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libXi - x11-libs/libXxf86vm - ) - xinerama? ( x11-libs/libXinerama ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups:= ) - opencl? ( virtual/opencl ) - opengl? ( - virtual/glu - virtual/opengl - ) - gsm? ( media-sound/gsm:= ) - jpeg? ( virtual/jpeg:0= ) - ldap? ( net-nds/openldap:= ) - lcms? ( media-libs/lcms:2= ) - mp3? ( >=media-sound/mpg123-1.5.0 ) - nls? ( sys-devel/gettext ) - odbc? ( dev-db/unixODBC:= ) - osmesa? ( media-libs/mesa[osmesa] ) - pulseaudio? ( media-sound/pulseaudio ) - xml? ( dev-libs/libxml2 dev-libs/libxslt ) - scanner? ( media-gfx/sane-backends:= ) - ssl? ( net-libs/gnutls:= ) - png? ( media-libs/libpng:0= ) - v4l? ( media-libs/libv4l ) - xcomposite? ( x11-libs/libXcomposite )" - -COMMON_DEPEND=" - !amd64? ( ${NATIVE_DEPEND} ) - amd64? ( - abi_x86_64? ( ${NATIVE_DEPEND} ) - abi_x86_32? ( - truetype? ( || ( - >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.0.0[abi_x86_32] - ) ) - ncurses? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - sys-libs/ncurses[abi_x86_32] - ) ) - 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] - ) ) - gphoto2? ( - app-emulation/emul-linux-x86-medialibs[development] - ) - openal? ( || ( - app-emulation/emul-linux-x86-sdl[development] - media-libs/openal[abi_x86_32] - ) ) - gstreamer? ( - app-emulation/emul-linux-x86-gstplugins - app-emulation/emul-linux-x86-medialibs[development] - ) - X? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - ( - x11-libs/libXcursor[abi_x86_32] - x11-libs/libXext[abi_x86_32] - x11-libs/libXrandr[abi_x86_32] - x11-libs/libXi[abi_x86_32] - x11-libs/libXxf86vm[abi_x86_32] - ) - ) ) - xinerama? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXinerama[abi_x86_32] - ) ) - alsa? ( || ( - app-emulation/emul-linux-x86-soundlibs[alsa,development] - media-libs/alsa-lib[abi_x86_32] - ) ) - cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( virtual/opencl[abi_x86_32] ) - opengl? ( || ( - app-emulation/emul-linux-x86-opengl[development] - ( - virtual/glu[abi_x86_32] - virtual/opengl[abi_x86_32] - ) - ) ) - gsm? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - media-sound/gsm[abi_x86_32] - ) ) - jpeg? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - virtual/jpeg:0[abi_x86_32] - ) ) - ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) - lcms? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - media-libs/lcms:2[abi_x86_32] - ) ) - mp3? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.5.0[abi_x86_32] - ) ) - nls? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - sys-devel/gettext[abi_x86_32] - ) ) - odbc? ( app-emulation/emul-linux-x86-db[development] ) - osmesa? ( || ( - >=app-emulation/emul-linux-x86-opengl-20121028[development] - media-libs/mesa[osmesa,abi_x86_32] - ) ) - pulseaudio? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32] - ) ) - xml? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20130224[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? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - media-libs/libpng:0[abi_x86_32] - ) ) - v4l? ( || ( - app-emulation/emul-linux-x86-medialibs[development] - media-libs/libv4l[abi_x86_32] - ) ) - xcomposite? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXcomposite[abi_x86_32] - ) ) - ) - )" - -RDEPEND="${COMMON_DEPEND} - dos? ( games-emulation/dosbox ) - perl? ( dev-lang/perl dev-perl/XML-Simple ) - samba? ( >=net-fs/samba-3.0.25 ) - selinux? ( sec-policy/selinux-wine ) - udisks? ( sys-fs/udisks:2 ) - pulseaudio? ( realtime? ( sys-auth/rtkit ) )" - -DEPEND="${COMMON_DEPEND} - amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) ) - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) - xinerama? ( x11-proto/xineramaproto ) - prelink? ( sys-devel/prelink ) - >=sys-kernel/linux-headers-2.6 - virtual/pkgconfig - virtual/yacc - sys-devel/flex" - -# These use a non-standard "Wine" category, which is provided by -# /etc/xdg/applications-merged/wine.menu -QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop -usr/share/applications/wine-notepad.desktop -usr/share/applications/wine-uninstaller.desktop -usr/share/applications/wine-winecfg.desktop" - -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 && [[ 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 - unpack ${MY_P}.tar.bz2 - fi - - use pulseaudio && unpack "${PULSE_PATCHES}.tar.bz2" - unpack "${WINE_GENTOO}.tar.bz2" - - l10n_find_plocales_changes "${S}/po" "" ".po" -} - -src_prepare() { - local md5="$(md5sum server/protocol.def)" - local PATCHES=( - "${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726 - "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615 - "${FILESDIR}"/${PN}-1.7.2-osmesa-check.patch #429386 - "${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508 - "${FILESDIR}"/${PN}-1.5.19-getdents.patch #for musl - "${FILESDIR}"/${PN}-1.5.19-file_h.patch #for musl - "${FILESDIR}"/${PN}-1.6.2-ipx.patch #for musl - ) - use pulseaudio && PATCHES+=( - "../${PULSE_PATCHES}"/*.patch #421365 - ) - - autotools-utils_src_prepare - - if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then - einfo "server/protocol.def was patched; running tools/make_requests" - tools/make_requests || die #432348 - fi - sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die - if ! use run-exes; then - sed -i '/^MimeType/d' tools/wine.desktop || die #117785 - fi - - # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652 - cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die - - l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS -} - -do_configure() { - local myeconfargs=( "${myeconfargs[@]}" ) - - if use amd64; then - if [[ ${ABI} == amd64 ]]; then - myeconfargs+=( --enable-win64 ) - else - myeconfargs+=( --disable-win64 ) - fi - - # Note: using --with-wine64 results in problems with multilib.eclass - # CC/LD hackery. We're using separate tools instead. - fi - - autotools-utils_src_configure -} - -src_configure() { - export LDCONFIG=/bin/true - use custom-cflags || strip-flags - - append-cppflags -DNETDB_INTERNAL=-1 - - local myeconfargs=( # common - --sysconfdir=/etc/wine - $(use_with alsa) - $(use_with capi) - $(use_with lcms cms) - $(use_with cups) - $(use_with ncurses curses) - $(use_with udisks dbus) - $(use_with fontconfig) - $(use_with ssl gnutls) - $(use_with gphoto2 gphoto) - $(use_with gsm) - $(use_with gstreamer) - --without-hal - $(use_with jpeg) - $(use_with ldap) - $(use_with mp3 mpg123) - $(use_with nls gettext) - $(use_with openal) - $(use_with opencl) - $(use_with opengl) - $(use_with osmesa) - $(use_with oss) - $(use_with png) - $(use_with threads pthread) - $(use_with scanner sane) - $(use_enable test tests) - $(use_with truetype freetype) - $(use_with v4l) - $(use_with X x) - $(use_with xcomposite) - $(use_with xinerama) - $(use_with xml) - $(use_with xml xslt) - ) - - use pulseaudio && myeconfargs+=( --with-pulse ) - - if use amd64 && use abi_x86_32; then - # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 - # set AR and RANLIB to make QA scripts happy; #483342 - tc-export PKG_CONFIG AR RANLIB - fi - - multilib_parallel_foreach_abi do_configure -} - -src_compile() { - autotools-multilib_src_compile depend - autotools-multilib_src_compile all -} - -src_test() { - if [[ $(id -u) == 0 ]]; then - ewarn "Skipping tests since they cannot be run under the root user." - ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf" - return - fi - - # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" - multilib_toolchain_setup x86 - local BUILD_DIR="${S}-${ABI}" - cd "${BUILD_DIR}" || die - WINEPREFIX="${T}/.wine-${ABI}" Xemake test -} - -src_install() { - local DOCS=( ANNOUNCE AUTHORS README ) - add_locale_docs() { - local locale_doc="documentation/README.$1" - [[ ! -e ${locale_doc} ]] || DOCS=( "${DOCS[@]}" ${locale_doc} ) - } - l10n_for_each_locale_do add_locale_docs - autotools-multilib_src_install - - emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}" - if use gecko ; then - insinto /usr/share/wine/gecko - use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi - use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi - fi - if use mono ; then - insinto /usr/share/wine/mono - doins "${DISTDIR}"/wine-mono-${MV}.msi - fi - if ! use perl ; then - rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die - fi - - use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055 - use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader} - - if use abi_x86_64 && ! use abi_x86_32; then - dosym /usr/bin/wine{64,} # 404331 - dosym /usr/bin/wine{64,}-preloader - fi - - # respect LINGUAS when installing man pages, #469418 - for l in de fr pl; do - use linguas_${l} || rm -r "${D}"usr/share/man/${l}* - done -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -}
