Added pipelight / Updated android dev tools

2014-05-23 10:39:02 +02:00 · 2014-05-23 10:39:02 +02:00 · 82a96982fb
commit 82a96982fb
parent 613405a912
20 changed files with 1867 additions and 2 deletions
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@ -0,0 +1,21 @@
 AUX wine-1.1.15-winegcc.patch 1556 SHA256 dbd89db561d7583faf317d795b8c11231575d885e21c6414add39079604dbd0d SHA512 a6a6dbde16c1f850a5cb4d6b6fe1a8129bb267c44c19de63a4eb26933fd69ff98e440d257e467d766a6a6ac326d72dd621cae37fb593c8c62e43f588ccef3f25 WHIRLPOOL 3aea848b17217ab215f860c3526c44a5d9bd9e7adfe35c02bb5c841461bdaf4bd8ac4f8e8b990c0558980381fc1b2441b79edc3ff6dcde7455203fbd1fc3f49c
 AUX wine-1.2.3-msxml3-libxml2-headers.patch 14328 SHA256 0a046e532343f9a4508307434a2f39e0a3a50a66c165b69e56dd671488d4ba7d SHA512 837bde9cfefa12b81197c9fa2978c8b17f760594eb9d6b8fe96ab4baf2f34b5d2330db245c0ee180a9d5aa59657f52b8500fd976bb70b111d0f32d4103f71f94 WHIRLPOOL e74ff9ad63b95878337d4eac342e9abbc60c73af2f4017cdd87671c472c49bee953759b9786d5b245669352dc23ac338178b415d2c4f01516c385fee66a167b5
 AUX wine-1.4_rc2-multilib-portage.patch 1256 SHA256 9d0acd304d11d1bf73f56699754aaa1bfe1facba90648ee330fdbe08d9ff4938 SHA512 ac0b29e2b4c9b04bb6694a4e4da654446f68efbf90cda6809b45dad51e6679ac5410398763fde7e9505ef959493a037aa588cee58d14906563a4746702d2b0e9 WHIRLPOOL 8ea26266c327bc8313eca9b5d39c9741b226037750ca2d1d33262420093e05c306e7f004656c362c3c50b330d050cf9e5fceaa2b024a82809aae8b3617b0ae18
 AUX wine-1.5.11-osmesa-check.patch 1888 SHA256 8aa70a10a215d5a10e70a404701cf70c0efc674ca6e2f093bbd243f70153e3bb SHA512 5c53e19efa4e080e4bc46c955d2f53beaaa55726e3ee528a5d41374452d6a75817f2145df4a2b05e0d168ed78fe81da35bab1322d6fcc736bf59ba6282e7ff9b WHIRLPOOL d35b52ddcace0fcb043894f00b14a90ecef8af87ff16d2ff091e64b34d8629a5d49ff59cae355c0457b7b9213f1ec66ae53747cb096b23c4f0a2ec8b7c8c8431
 AUX wine-1.5.17-osmesa-check.patch 1774 SHA256 dc7dde67c416bb067e528b85228cff01833a2a20c802248ef56d74184014e50e SHA512 12325e75db5e63e1d4c4e2463c3e164b1eba0d3d88455cfcd698a8bb790d7c0b3c947a06e7a09e232b1a14202e64ea2dc9331cbc4b503833f78a7c1034410c79 WHIRLPOOL 2d9bb86a5d683301c75ea275302f67616a8e9c6ebfc436b05f8f1b3d5d815c310999ca9518747abcf4d248bd18f34388dcb323c526d633c50e66ffb4bf94e5d6
 AUX wine-1.5.23-winebuild-CCAS.patch 6101 SHA256 34143c55618870dd31eea1e260ae973572d99557a20f24a4f217bb0ff1d615eb SHA512 f44580efcf4a406517a2fc65d7509a42b0b0b180a4c63f5980c894e708934d60155d87634e406763426415d00c1ea2f8f3894ac4797a2e2527ca0d9ed23430af WHIRLPOOL d62fb5c27fba3b8297ae2151a432f80d9655c0c2ccee9dee12beea84a2186c0e7965a6902d6bc5638cdb1c853c188a49b790825c8741a9dc4bb1516ff6ca9a53
 AUX wine-1.5.26-winegcc.patch 1808 SHA256 91c1012059b93a421b2eae9f2ea46b7b327d6d3d58ba0cb47021c8a57f6d8228 SHA512 fce9daf40a96f4a7502c249a30107c8dfc5d8edd4a171b863d2bf14c3ad46d18e4c29932ab4a6ede7da5d589d777b962d2f577f5360ee4db8019d71362c51d47 WHIRLPOOL 71cbe36c6bac87071472541b7f5cd3ed1b08f05479bc0016262b3f86e75738e467dad197563b4898f2b24fd0ab4e27c40dce04f244a3e7f5ea1582b4db1c5cc2
 AUX wine-1.5.30-libwine.patch 1777 SHA256 2f0155c2c1d11fd9a06deab54dd753c1161e32217eae82604f8c1d542e87af4f SHA512 e6d566f75632065def197cf27b5705a3f2f736a7b3bb4ae03df19fea00fd980a5b5d0517981469fef0fa5347c1c3b9651894fb23d937b5dbbd993cd292f67183 WHIRLPOOL 62ed15db6bddda47dcf74d846e15a9904c11abdf63e0321e7e2bc3197f60c819992b3a95a4395f85edeef9181a1866749194b9744be8d42bd94acab37470aad6
 AUX wine-1.5.31-gnutls-3.2.0.patch 1616 SHA256 3ce82009b05fe997b0d198ad83533026d6410811ecfc6254c1505d0b9d18caf0 SHA512 09de6ff03da996197cd6833c1f53e9f39b43fc43e02ad3b4e12648a57288c1fa200886a805e6811372e12665f9a5d463603f9a9ba39cb1392b2cf4d11f3f9a65 WHIRLPOOL 590a9206913a51eae81e236057bbed346dae8f895575dcc948ba7168edf5c0605db6278344fad727c2a828a2aeef258f72a57a12b5dca244a3b7b82cfe43452a
 AUX wine-1.6-memset-O3.patch 695 SHA256 1f04496713e8a401ba068702c5c3e104b18635bfb54808e5641a3c48a9b9bad4 SHA512 ad7231f8dedf98f9e9b91fcb8bbe72a716d78285127b0c33396de0b1e17a191f91f9a4a377c0e90671bb5f4e57bfb087ef7e80c9537c6c73b3c9bb90b3885968 WHIRLPOOL 91689c31054b896609493e2b0b4fe67e3d752d889f4ccae9c3e15229543341998809fd19a2040457e04fbdbd45505f0f2b49052844004193872713053d7239f8
 AUX wine-1.7.12-osmesa-check.patch 1722 SHA256 42648efa15040011ef868f92fd615924a83b5a30dab25505928226d8bc48159d SHA512 faca80f9747f3d7bfd05c3410bcccfaf17b3f397e30dd9ec382eccc326de346d195d6a184ec78e44b26d5e5e4b2af749ce58a0e6bad0b15a4fd1f2ea610d3124 WHIRLPOOL c5314849d15a53dc00af80f44249c10107b17825c4a2ab4510a5799b154bb1cdb516b3b632e1e959802588f673b9eac8ed6de2dfb59bde34acdd5b752115f695
 AUX wine-1.7.2-osmesa-check.patch 1740 SHA256 5264ac291435eb64c70cef4bdccbf8d4448472b4f014ab15ede35bcceebb6579 SHA512 4738a381923df7b45ea68092efb7ccb967907976d6d2f8bb0167af4211c377a73e296481b94092ac232f9ae09edf21447da92a134ebfff9b32acdd9e20340b95 WHIRLPOOL 95a90f8ff5a649833b39cb28de997c3b516cd09a53cf71d616c4fd412dfa6e71c47a1255a4d0597d85a62966cd9d6b9fae1c21c88e67d8650d31d414fca8fd42
 DIST v1.7.16-1.tar.gz 729163 SHA256 ebe35b35e8ec28800f979baf732ecb31c25eae4026200eab76afacc87df00b75 SHA512 674e954582f3b00e9c0a0c491ba96c5c13d3a0da43509cbb8fc8178ac087f63ef8f961567fd22445f5785de456a2e626bcedc519c65333ec07b3e563e3de6580 WHIRLPOOL 1750ae8f6d23c5718f90b8482e70be4c66d7f79c39308d0ac89740be7fa2fbd1c20918f838fa9a4dea472b86c120f6ced19f61ab79d0e6d6ab9b4ce7be87e355
 DIST wine-1.7.16.tar.bz2 21478085 SHA256 071ed89d9c76219aa73df6472b99f9f0b35e4977235e2b8e388c11416a2d1c6a SHA512 7baa99280f78eb8881dba470c3a17ab093f9cfb0950eb4dea1a89849ee0794ddda373049fda2fde5551963b231e4548345892e759cf4690ab047c49147fa504e WHIRLPOOL b6ef7a096837d406b0f9a67f6719dae85c12e2f0d00dc9fdcefacd9db5485fccacdfa788e68abf0a279c20daee246ab7d25aeb14f1e96c5bb3187f38550157c1
 DIST wine-gentoo-2013.06.24.tar.bz2 85442 SHA256 bfbf6b25e98f717320de2ede467e3628fbc749d936b8449f8477c9dc6f41e04b SHA512 b6819889314f6a6ea16c1332f4b177c43623116763969c31b23b61754cd304dd085f5d3eafbe847159331eb97dddd9b4c10699430129ea4a71da418c1fe175f0 WHIRLPOOL 227e0ac6569736d4ad5813cef49f775dae956f4fc9255de95753d5d3cba1bf6cf3db31d23d3702bb54d2e60c5a6f779b602f0efb2096e4c827c924565b273d00
 DIST wine-mono-4.5.2.msi 52502528 SHA256 d9124edb41ba4418af10eba519dafb25ab4338c567d25ce0eb4ce1e1b4d7eaad SHA512 73c907f63b73836d5afd0753197358aaea43a74a47800f929ef0627112298256f1fa46d1b9ff297b117468d953cdeab21fb5962db13c5debbcb71004462df609 WHIRLPOOL 18d3544c6753c5a01917bfc1b694f31ce45213108527f13317ec0bb8b2d2339ce41800534967e067cd15cd186ef9e186a5d3252275e443dfa1a6ae3641d4d17c
 DIST wine_gecko-2.24-x86.msi 22373888 SHA256 6e38acae87ea66e2c1e8f2f0afe88f89eed3e6e0b431cd3da38dea814b71202c SHA512 f158d28ca09bc900a2680892e7ac10770e06050a9251e1ec3a953fee0bf9b1c326e166f92fb88a4648297b6587c91a5ef5af35f267bb2ba5f679da4c8fdb6898 WHIRLPOOL bbe7a2572d89dc5e0347ba11b2014bac79fc4427d7551655313a46b147a79c1607b7f46596877c459ddaa0e202337fb3d217429ddd6a4df49ee33b373a788487
 DIST wine_gecko-2.24-x86_64.msi 23608320 SHA256 47557da68bcb2aedaebb93af73275aac96ba23e896bd98f25f2acbfd216d9cc8 SHA512 45ce0dcf42c3e2fe2198092812242e3467b19db4a4946e0b1a2d6327fd48aa936fb85cc1930bace6eaba0c61bff3a6536767ba0a91a0f085f307d1bddd171f0c WHIRLPOOL b6ba7c784d3a79d7afc11f0e12f0372b52b9f194eedfd083abed36a461e7301d2dd936be3be12619364f6ac5aae9cfbfb7fc47141bff92b62826f209365210ec
 DIST winepulse-patches-1.7.12.tar.bz2 49171 SHA256 6c5b3f46ea1c4615c49ee0f6f65936cf650cce6640f0feb4236c707064a9d392 SHA512 ec41f6024d6e2325f14f8caa15bbe38c8dca6c69beb5343063365f58dd8b7edbbc4d24ad176de72cf0e37acae03eb9769b68fcbd40a672680e06156f4a59b12c WHIRLPOOL de8a33ee784606e76a60166e3e29a1fb748ce4b3af1db136558888bd09bb0a044e4a1a9a61ce3de59d55f93c98575ac8d77c3ff17de4d69cda3b8fbd8f6c33c5
 EBUILD wine-1.7.16.ebuild 13430 SHA256 3e8e6453f24612607204540dc20d57ee0cccda744c1059ff8179999eb2ca2e30 SHA512 d5e292b66abadec40744d9f61d17a7e1cd81b8a2be364b776bbc8d45a8e2ac18099670c95dea15a8471bd6c69cc281235ebb218dba68e0583e1e46d2add5b78c WHIRLPOOL 5258dd59ea5e5ddfe139f2582c3b3266f689a0fb77d859d52611aab6405ddb66ebf4076f60c7c538e73a24ec89b6c4e325551cb1a87cb3f16c56e07e579fb52d
 MISC metadata.xml 2140 SHA256 e8225539d8f936aa53dac82fb8e9be8aa7cc927bb4a35ee3167c0b8b99664d7b SHA512 766de816a5a43bea96f30abc8d2af603507c42017d215190c7fd7edfcb0bcc8005e235b5a14bed06f3647a9a72e3f8bfd65d77cb7614bd54ee7af9d2caed04b0 WHIRLPOOL 1be00991622964d97c642be73a300d47a3320ff8eaa82c7782c618009a977b8f09c79eb12ddf7a38c3cc4c8fc3497c9aa75a8ee8e0545a0f616428d82822c49c
--- a/app-emulation/wine/files/wine-1.1.15-winegcc.patch
+++ b/app-emulation/wine/files/wine-1.1.15-winegcc.patch
@ -0,0 +1,55 @@
 http://bugs.gentoo.org/260726
 --- wine-1.1.15/tools/winegcc/winegcc.c
 +++ wine-1.1.15/tools/winegcc/winegcc.c
@@ -215,10 +215,13 @@
     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(__sparc__)
 static const enum target_cpu build_cpu = CPU_SPARC;
 #elif defined(__ALPHA__)
@@ -968,6 +971,9 @@
     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;
 --- wine-1.1.15/tools/winebuild/main.c
 +++ wine-1.1.15/tools/winebuild/main.c
@@ -50,10 +50,13 @@
 int link_ext_symbols = 0;
 int force_pointer_size = 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(__sparc__)
 enum target_cpu target_cpu = CPU_SPARC;
 #elif defined(__ALPHA__)
@@ -574,6 +577,10 @@
     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 );
--- a/app-emulation/wine/files/wine-1.2.3-msxml3-libxml2-headers.patch
+++ b/app-emulation/wine/files/wine-1.2.3-msxml3-libxml2-headers.patch
@ -0,0 +1,574 @@
 From 26603f25f73142a45b5b964bb9bb2e59bc0908d4 Mon Sep 17 00:00:00 2001
 From: Alexandre Julliard <julliard@winehq.org>
 Date: Thu, 24 Feb 2011 13:11:53 +0100
 Subject: [PATCH] msxml3: Include the system libxml headers before the Windows
 headers.
 [Alexandre Rostovtsev <tetromino@gentoo.org>: backport to wine-1.2.3]
 ---
 dlls/msxml3/attribute.c     |    6 ++++++
 dlls/msxml3/bsc.c           |    6 ++++++
 dlls/msxml3/cdata.c         |    5 +++++
 dlls/msxml3/comment.c       |    5 +++++
 dlls/msxml3/dispex.c        |    5 +++++
 dlls/msxml3/docfrag.c       |    5 +++++
 dlls/msxml3/domdoc.c        |   11 +++++++++--
 dlls/msxml3/domimpl.c       |    5 +++++
 dlls/msxml3/element.c       |    5 +++++
 dlls/msxml3/entityref.c     |    5 +++++
 dlls/msxml3/factory.c       |    5 +++++
 dlls/msxml3/httprequest.c   |    6 ++++++
 dlls/msxml3/main.c          |   15 +++++++++++++++
 dlls/msxml3/msxml_private.h |   23 -----------------------
 dlls/msxml3/node.c          |   31 +++++++++++++++++++++++++++----
 dlls/msxml3/nodelist.c      |    5 +++++
 dlls/msxml3/nodemap.c       |    5 +++++
 dlls/msxml3/parseerror.c    |    5 +++++
 dlls/msxml3/pi.c            |    5 +++++
 dlls/msxml3/queryresult.c   |    9 +++++++--
 dlls/msxml3/regsvr.c        |    4 ++++
 dlls/msxml3/saxreader.c     |   10 +++++++---
 dlls/msxml3/schema.c        |   12 ++++++++++++
 dlls/msxml3/text.c          |    5 +++++
 dlls/msxml3/xmldoc.c        |    5 +++++
 dlls/msxml3/xmlelem.c       |    5 +++++
 26 files changed, 174 insertions(+), 34 deletions(-)
 diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c
 index d78fa47..3df93d6 100644
 --- a/dlls/msxml3/attribute.c
 +++ b/dlls/msxml3/attribute.c
@@ -23,6 +23,12 @@
 #include "config.h"
 #include <stdarg.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +# include <libxml/HTMLtree.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c
 index b24e04c..01a09a5 100644
 --- a/dlls/msxml3/bsc.c
 +++ b/dlls/msxml3/bsc.c
@@ -23,6 +23,12 @@
 #include <stdarg.h>
 #include <assert.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +# include <libxml/HTMLtree.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c
 index 3fba66c..caf8cd8 100644
 --- a/dlls/msxml3/cdata.c
 +++ b/dlls/msxml3/cdata.c
@@ -23,6 +23,11 @@
 #include "config.h"
 #include <stdarg.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c
 index e74de07..1cabfa3 100644
 --- a/dlls/msxml3/comment.c
 +++ b/dlls/msxml3/comment.c
@@ -23,6 +23,11 @@
 #include "config.h"
 #include <stdarg.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c
 index 09b71fe..6b01b15 100644
 --- a/dlls/msxml3/dispex.c
 +++ b/dlls/msxml3/dispex.c
@@ -22,6 +22,11 @@
 #include <stdarg.h>
 #include <assert.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c
 index fff3f62..bebd252 100644
 --- a/dlls/msxml3/docfrag.c
 +++ b/dlls/msxml3/docfrag.c
@@ -23,6 +23,11 @@
 #include "config.h"
 #include <stdarg.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
 index 0007503..e6a61e4 100644
 --- a/dlls/msxml3/domdoc.c
 +++ b/dlls/msxml3/domdoc.c
@@ -25,6 +25,15 @@
 #include <stdarg.h>
 #include <assert.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +# include <libxml/xpathInternals.h>
 +# include <libxml/xmlsave.h>
 +# include <libxml/SAX2.h>
 +# include <libxml/parserInternals.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
@@ -47,8 +56,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
 #ifdef HAVE_LIBXML2
 -#include <libxml/xmlsave.h>
 -
 /* not defined in older versions */
 #define XML_SAVE_FORMAT     1
 #define XML_SAVE_NO_DECL    2
 diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c
 index dd518a1..c6794ac 100644
 --- a/dlls/msxml3/domimpl.c
 +++ b/dlls/msxml3/domimpl.c
@@ -23,6 +23,11 @@
 #include "config.h"
 #include <stdarg.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c
 index 617c008..1b5c693 100644
 --- a/dlls/msxml3/element.c
 +++ b/dlls/msxml3/element.c
@@ -23,6 +23,11 @@
 #include "config.h"
 #include <stdarg.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c
 index db46193..1baea6e 100644
 --- a/dlls/msxml3/entityref.c
 +++ b/dlls/msxml3/entityref.c
@@ -23,6 +23,11 @@
 #include "config.h"
 #include <stdarg.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
 index 3fd229c..45df9f0 100644
 --- a/dlls/msxml3/factory.c
 +++ b/dlls/msxml3/factory.c
@@ -24,6 +24,11 @@
 #include "config.h"
 #include <stdarg.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
 index 4585484..be1a5f7 100644
 --- a/dlls/msxml3/httprequest.c
 +++ b/dlls/msxml3/httprequest.c
@@ -22,6 +22,12 @@
 #include "config.h"
 #include <stdarg.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +# include <libxml/encoding.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c
 index 60b0cbd..47a89b1 100644
 --- a/dlls/msxml3/main.c
 +++ b/dlls/msxml3/main.c
@@ -25,6 +25,21 @@
 #define COBJMACROS
 #include <stdarg.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +# ifdef SONAME_LIBXSLT
 +#  ifdef HAVE_LIBXSLT_PATTERN_H
 +#   include <libxslt/pattern.h>
 +#  endif
 +#  ifdef HAVE_LIBXSLT_TRANSFORM_H
 +#   include <libxslt/transform.h>
 +#  endif
 +#  include <libxslt/xsltutils.h>
 +#  include <libxslt/xsltInternals.h>
 +# endif
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h
 index e0279f1..e1fbb59 100644
 --- a/dlls/msxml3/msxml_private.h
 +++ b/dlls/msxml3/msxml_private.h
@@ -102,10 +102,6 @@ BOOL dispex_query_interface(DispatchEx*,REFIID,void**);
 #ifdef HAVE_LIBXML2
 -#ifdef HAVE_LIBXML_PARSER_H
 -#include <libxml/parser.h>
 -#endif
 -
 /* constructors */
 extern IUnknown         *create_domdoc( xmlNodePtr document );
 extern IUnknown         *create_xmldoc( void );
@@ -184,25 +180,6 @@ static inline BSTR bstr_from_xmlChar(const xmlChar *str)
 #endif
 -void* libxslt_handle;
 -#ifdef SONAME_LIBXSLT
 -# ifdef HAVE_LIBXSLT_PATTERN_H
 -#  include <libxslt/pattern.h>
 -# endif
 -# ifdef HAVE_LIBXSLT_TRANSFORM_H
 -#  include <libxslt/transform.h>
 -# endif
 -# include <libxslt/xsltutils.h>
 -# include <libxslt/xsltInternals.h>
 -
 -# define MAKE_FUNCPTR(f) extern typeof(f) * p##f
 -MAKE_FUNCPTR(xsltApplyStylesheet);
 -MAKE_FUNCPTR(xsltCleanupGlobals);
 -MAKE_FUNCPTR(xsltFreeStylesheet);
 -MAKE_FUNCPTR(xsltParseStylesheetDoc);
 -# undef MAKE_FUNCPTR
 -#endif
 -
 extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText,
                                              LONG line, LONG linepos, LONG filepos );
 extern HRESULT DOMDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj );
 diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
 index bbdcb5d..2980566 100644
 --- a/dlls/msxml3/node.c
 +++ b/dlls/msxml3/node.c
@@ -24,6 +24,23 @@
 #include <stdarg.h>
 #include <assert.h>
 +
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +# include <libxml/HTMLtree.h>
 +# ifdef SONAME_LIBXSLT
 +#  ifdef HAVE_LIBXSLT_PATTERN_H
 +#   include <libxslt/pattern.h>
 +#  endif
 +#  ifdef HAVE_LIBXSLT_TRANSFORM_H
 +#   include <libxslt/transform.h>
 +#  endif
 +#  include <libxslt/xsltutils.h>
 +#  include <libxslt/xsltInternals.h>
 +# endif
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
@@ -33,16 +50,22 @@
 #include "msxml_private.h"
 -#ifdef HAVE_LIBXML2
 -# include <libxml/HTMLtree.h>
 -#endif
 -
 #include "wine/debug.h"
 WINE_DEFAULT_DEBUG_CHANNEL(msxml);
 #ifdef HAVE_LIBXML2
 +#ifdef SONAME_LIBXSLT
 +extern void* libxslt_handle;
 +# define MAKE_FUNCPTR(f) extern typeof(f) * p##f
 +MAKE_FUNCPTR(xsltApplyStylesheet);
 +MAKE_FUNCPTR(xsltCleanupGlobals);
 +MAKE_FUNCPTR(xsltFreeStylesheet);
 +MAKE_FUNCPTR(xsltParseStylesheetDoc);
 +# undef MAKE_FUNCPTR
 +#endif
 +
 static const WCHAR szBinBase64[]  = {'b','i','n','.','b','a','s','e','6','4',0};
 static const WCHAR szString[]     = {'s','t','r','i','n','g',0};
 static const WCHAR szNumber[]     = {'n','u','m','b','e','r',0};
 diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c
 index f643c5e..4b2bba9 100644
 --- a/dlls/msxml3/nodelist.c
 +++ b/dlls/msxml3/nodelist.c
@@ -23,6 +23,11 @@
 #include "config.h"
 #include <stdarg.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c
 index 7d23ec8..d3d9c38 100644
 --- a/dlls/msxml3/nodemap.c
 +++ b/dlls/msxml3/nodemap.c
@@ -23,6 +23,11 @@
 #define COBJMACROS
 #include <stdarg.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c
 index 4b0dc57..89f14ca 100644
 --- a/dlls/msxml3/parseerror.c
 +++ b/dlls/msxml3/parseerror.c
@@ -25,6 +25,11 @@
 #include <stdarg.h>
 #include <assert.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
 diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c
 index 0baefe4..3ebc1bf 100644
 --- a/dlls/msxml3/pi.c
 +++ b/dlls/msxml3/pi.c
@@ -23,6 +23,11 @@
 #include "config.h"
 #include <stdarg.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c
 index 2c6f23e..8613b20 100644
 --- a/dlls/msxml3/queryresult.c
 +++ b/dlls/msxml3/queryresult.c
@@ -24,6 +24,13 @@
 #include "config.h"
 #include <stdarg.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +# include <libxml/xpath.h>
 +# include <libxml/xpathInternals.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
@@ -48,8 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
 #ifdef HAVE_LIBXML2
 -#include <libxml/xpath.h>
 -
 typedef struct _queryresult
 {
     DispatchEx dispex;
 diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c
 index 415e5af..864d61e 100644
 --- a/dlls/msxml3/regsvr.c
 +++ b/dlls/msxml3/regsvr.c
@@ -24,6 +24,10 @@
 #include <stdarg.h>
 #include <string.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +#endif
 #define COBJMACROS
 diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
 index eca9f1d..f2d340e 100644
 --- a/dlls/msxml3/saxreader.c
 +++ b/dlls/msxml3/saxreader.c
@@ -24,6 +24,13 @@
 #include <stdarg.h>
 #include <assert.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +# include <libxml/SAX2.h>
 +# include <libxml/parserInternals.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
@@ -43,9 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
 #ifdef HAVE_LIBXML2
 -#include <libxml/SAX2.h>
 -#include <libxml/parserInternals.h>
 -
 typedef struct _saxreader
 {
     const struct IVBSAXXMLReaderVtbl *lpVBSAXXMLReaderVtbl;
 diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c
 index 72d7854..c1465c0 100644
 --- a/dlls/msxml3/schema.c
 +++ b/dlls/msxml3/schema.c
@@ -23,6 +23,18 @@
 #include "config.h"
 #include <stdarg.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +# include <libxml/tree.h>
 +# include <libxml/xmlschemas.h>
 +# include <libxml/schemasInternals.h>
 +# include <libxml/hash.h>
 +# include <libxml/parser.h>
 +# include <libxml/parserInternals.h>
 +# include <libxml/xmlIO.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c
 index fdcb06b..72b2ffd 100644
 --- a/dlls/msxml3/text.c
 +++ b/dlls/msxml3/text.c
@@ -24,6 +24,11 @@
 #include "config.h"
 #include <stdarg.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c
 index d1a010f..0d1006e 100644
 --- a/dlls/msxml3/xmldoc.c
 +++ b/dlls/msxml3/xmldoc.c
@@ -23,6 +23,11 @@
 #include "config.h"
 #include <stdarg.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c
 index a71b18b..a818d14 100644
 --- a/dlls/msxml3/xmlelem.c
 +++ b/dlls/msxml3/xmlelem.c
@@ -23,6 +23,11 @@
 #include "config.h"
 #include <stdarg.h>
 +#ifdef HAVE_LIBXML2
 +# include <libxml/parser.h>
 +# include <libxml/xmlerror.h>
 +#endif
 +
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 -- 
 1.7.8.3
--- a/app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch
+++ b/app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch
@ -0,0 +1,40 @@
 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])
--- a/app-emulation/wine/files/wine-1.5.11-osmesa-check.patch
+++ b/app-emulation/wine/files/wine-1.5.11-osmesa-check.patch
@ -0,0 +1,38 @@
 From 22fcf835dfe713ad93f649a901973208e0f7b62d Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@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 files changed, 7 insertions(+), 1 deletions(-)
 diff --git a/configure.ac b/configure.ac
 index 15ada86..6eab75e 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -1133,7 +1133,13 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
                  if test "$ac_cv_header_GL_osmesa_h" = "yes"
                  then
 -                    WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
 +                    WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS $X_PRE_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 $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
 +                       CC=$osmesa_save_CC
 +                    fi
                  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.])
 -- 
 1.7.8.6
--- a/app-emulation/wine/files/wine-1.5.17-osmesa-check.patch
+++ b/app-emulation/wine/files/wine-1.5.17-osmesa-check.patch
@ -0,0 +1,38 @@
 From 1ede664b18bd8a88359a3cebb291ad49833ee033 Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@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 cc32c24..275b792 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -1128,7 +1128,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 $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
 +            WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS $X_PRE_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 $X_PRE_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.0
--- a/app-emulation/wine/files/wine-1.5.23-winebuild-CCAS.patch
+++ b/app-emulation/wine/files/wine-1.5.23-winebuild-CCAS.patch
@ -0,0 +1,214 @@
 From 57c57e9dfae50f045503ae9f3107fa3748512483 Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@gentoo.org>
 Date: Sun, 3 Feb 2013 19:19:36 -0500
 Subject: [PATCH] winebuild: Use $CCAS to assemble if found
 Commit c14bdaf1 made winebuild use Clang to assemble if found.
 However, just because a user has some version of Clang installed, it
 does not mean that she wants to use Clang to assemble Wine. For example,
 a user who has both Clang and GAS installed may want to use GAS to avoid
 textrels (see https://bugs.gentoo.org/show_bug.cgi?id=455308).
 This patch allows the user to override which assembler gets used by
 exporting CCAS at Wine configure time; the name CCAS was chosen for
 compatibility with automake's standard AM_PROG_AS macro.
 ---
 configure                   | 106 ++++++++++++++++++++++++++++++++++++++++++++
 configure.ac                |   4 ++
 tools/winebuild/Makefile.in |   5 ++-
 tools/winebuild/utils.c     |  12 +++++
 4 files changed, 126 insertions(+), 1 deletion(-)
 diff --git a/configure b/configure
 index e3253ee..d0b7777 100755
 --- a/configure
 +++ b/configure
@@ -732,6 +732,8 @@ FLEX
 TOOLSDIR
 WOW64_DISABLE
 TARGETFLAGS
 +ac_ct_CCAS
 +CCAS
 CPPBIN
 ac_ct_CXX
 CXXFLAGS
@@ -861,6 +863,7 @@ CPPFLAGS
 CXX
 CXXFLAGS
 CCC
 +CCAS
 CPP
 XMKMF'
@@ -1549,6 +1552,7 @@ Some influential environment variables:
               you have headers in a nonstandard directory <include dir>
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
 +  CCAS        Assembler command
   CPP         C preprocessor
   XMKMF       Path to xmkmf, Makefile generator for X Window System
@@ -4075,6 +4079,108 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 +
 +if test -n "$ac_tool_prefix"; then
 +  for ac_prog in clang gas as
 +  do
 +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_CCAS+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$CCAS"; then
 +  ac_cv_prog_CCAS="$CCAS" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_CCAS="$ac_tool_prefix$ac_prog"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +CCAS=$ac_cv_prog_CCAS
 +if test -n "$CCAS"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCAS" >&5
 +$as_echo "$CCAS" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +    test -n "$CCAS" && break
 +  done
 +fi
 +if test -z "$CCAS"; then
 +  ac_ct_CCAS=$CCAS
 +  for ac_prog in clang gas as
 +do
 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 +set dummy $ac_prog; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_ac_ct_CCAS+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$ac_ct_CCAS"; then
 +  ac_cv_prog_ac_ct_CCAS="$ac_ct_CCAS" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_CCAS="$ac_prog"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +ac_ct_CCAS=$ac_cv_prog_ac_ct_CCAS
 +if test -n "$ac_ct_CCAS"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CCAS" >&5
 +$as_echo "$ac_ct_CCAS" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +  test -n "$ac_ct_CCAS" && break
 +done
 +
 +  if test "x$ac_ct_CCAS" = x; then
 +    CCAS=""$CC""
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    CCAS=$ac_ct_CCAS
 +  fi
 +fi
 +
 +
 case $host in
   *-darwin*)
     if test "x$enable_win64" = "xyes"
 diff --git a/configure.ac b/configure.ac
 index c93cd08..760f325 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -126,6 +126,10 @@ dnl We can't use AC_PROG_CPP for winegcc, it uses by default $(CC) -E
 AC_CHECK_TOOL(CPPBIN,cpp,cpp)
 AC_DEFINE_UNQUOTED(EXEEXT,["$ac_exeext"],[Define to the file extension for executables.])
 +dnl Analogous to AM_PROG_AS
 +AC_ARG_VAR([CCAS],[Assembler command])
 +AC_CHECK_TOOLS(CCAS,[clang gas as],["$CC"])
 +
 case $host in
   *-darwin*)
     if test "x$enable_win64" = "xyes"
 diff --git a/tools/winebuild/Makefile.in b/tools/winebuild/Makefile.in
 index 2017129..3fe47a3 100644
 --- a/tools/winebuild/Makefile.in
 +++ b/tools/winebuild/Makefile.in
@@ -1,4 +1,7 @@
 -DEFS      = -D__WINESRC__ $(EXTRADEFS)
 +DEFS      = \
 +	-DCCAS="\"@CCAS@\"" \
 +	-D__WINESRC__ \
 +	$(EXTRADEFS)
 PROGRAMS = winebuild$(EXEEXT)
 MANPAGE  = winebuild.man
 diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c
 index 262ff3a..1c5f918 100644
 --- a/tools/winebuild/utils.c
 +++ b/tools/winebuild/utils.c
@@ -352,6 +352,18 @@ struct strarray *get_as_command(void)
     static int as_is_clang = 0;
     struct strarray *args = strarray_init();
 +    if (!as_command && strlen( CCAS ))
 +    {
 +        struct stat st;
 +
 +        if (!stat( CCAS, &st ))
 +            as_command = CCAS;
 +        else
 +            as_command = find_tool( CCAS, NULL );
 +
 +        if (as_command && strstr( as_command, "clang" )) as_is_clang = 1;
 +    }
 +
     if (!as_command)
     {
         as_command = find_tool( "clang", NULL );
 -- 
 1.8.1.2
--- a/app-emulation/wine/files/wine-1.5.26-winegcc.patch
+++ b/app-emulation/wine/files/wine-1.5.26-winegcc.patch
@ -0,0 +1,59 @@
 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;
--- a/app-emulation/wine/files/wine-1.5.30-libwine.patch
+++ b/app-emulation/wine/files/wine-1.5.30-libwine.patch
@ -0,0 +1,45 @@
 commit ce4b6451aabbe83809c7483c748cfa009cc090d6
 Author: Alexandre Julliard <julliard@winehq.org>
 Date:   Fri May 10 22:01:44 2013 +0200
    configure: Add explicit install targets in libs/wine for make_makefiles.
 diff --git a/configure b/configure
 index d4c1f8e..ef38bfd 100755
 --- a/configure
 +++ b/configure
@@ -16379,7 +16379,7 @@ wine_fn_config_makefile documentation enable_documentation
 wine_fn_config_makefile fonts enable_fonts install-lib
 wine_fn_config_makefile include enable_include install-dev
 wine_fn_config_makefile libs/port enable_libs_port
 -wine_fn_config_makefile libs/wine enable_libs_wine
 +wine_fn_config_makefile libs/wine enable_libs_wine install-dev,install-lib
 wine_fn_config_makefile libs/wpp enable_libs_wpp
 wine_fn_config_makefile loader enable_loader install-lib,manpage
 wine_fn_config_program aspnet_regiis enable_aspnet_regiis install
 diff --git a/configure.ac b/configure.ac
 index 6dd2348..b44673e 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -3173,7 +3173,7 @@ WINE_CONFIG_MAKEFILE([documentation])
 WINE_CONFIG_MAKEFILE([fonts],,[install-lib])
 WINE_CONFIG_MAKEFILE([include],,[install-dev])
 WINE_CONFIG_MAKEFILE([libs/port])
 -WINE_CONFIG_MAKEFILE([libs/wine])
 +WINE_CONFIG_MAKEFILE([libs/wine],,[install-dev,install-lib])
 WINE_CONFIG_MAKEFILE([libs/wpp])
 WINE_CONFIG_MAKEFILE([loader],,[install-lib,manpage])
 WINE_CONFIG_PROGRAM(aspnet_regiis,,[install])
 diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
 index b8dc385..7de7799 100644
 --- a/libs/wine/Makefile.in
 +++ b/libs/wine/Makefile.in
@@ -111,4 +111,8 @@ version.c: dummy
 $(RELPATH):
 	@cd $(TOOLSDIR)/tools && $(MAKE) relpath$(TOOLSEXT)
 +# Make sure that make_makefiles sees the install rules
 +install install-lib::
 +install install-dev::
 +
 @LIBWINE_RULES@
--- a/app-emulation/wine/files/wine-1.5.31-gnutls-3.2.0.patch
+++ b/app-emulation/wine/files/wine-1.5.31-gnutls-3.2.0.patch
@ -0,0 +1,44 @@
 From 9fb3de8e9268e8e81128fc77328495567140e082 Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@gentoo.org>
 Date: Sat, 25 May 2013 23:57:04 -0400
 Subject: [PATCH] configure, secur32: In gnutls-3.2, gnutls_mac_get_key_size()
 moved to crypto.h
 Based on a patch by Ben Kohler <bkohler@gmail.com>
 https://bugs.gentoo.org/show_bug.cgi?id=471077
 http://bugs.winehq.org/show_bug.cgi?id=33649
 ---
 configure.ac                   | 3 ++-
 dlls/secur32/schannel_gnutls.c | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
 diff --git a/configure.ac b/configure.ac
 index 1941be1..2c10734 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -1344,7 +1344,8 @@ then
     ac_save_CPPFLAGS="$CPPFLAGS"
     WINE_PACKAGE_FLAGS(GNUTLS,[gnutls])
     AC_CHECK_HEADER(gnutls/gnutls.h,
 -        [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])],
 +        [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>
 +#include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])],
             [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS])])],
         [GNUTLS_CFLAGS=""])
     CPPFLAGS="$ac_save_CPPFLAGS"
 diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c
 index 70b8276..cbe64e8 100644
 --- a/dlls/secur32/schannel_gnutls.c
 +++ b/dlls/secur32/schannel_gnutls.c
@@ -25,6 +25,7 @@
 #include <stdarg.h>
 #ifdef SONAME_LIBGNUTLS
 #include <gnutls/gnutls.h>
 +#include <gnutls/crypto.h>
 #endif
 #include "windef.h"
 -- 
 1.8.2.1
--- a/app-emulation/wine/files/wine-1.6-memset-O3.patch
+++ b/app-emulation/wine/files/wine-1.6-memset-O3.patch
@ -0,0 +1,21 @@
 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
--- a/app-emulation/wine/files/wine-1.7.12-osmesa-check.patch
+++ b/app-emulation/wine/files/wine-1.7.12-osmesa-check.patch
@ -0,0 +1,38 @@
 From 6932b9a17c4f64c13f7060895d46334bc7022430 Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@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 de807d2..a2e8684 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -1233,7 +1233,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 -lm $X_EXTRA_LIBS])
 +            WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS -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 -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.5.3
--- a/app-emulation/wine/files/wine-1.7.2-osmesa-check.patch
+++ b/app-emulation/wine/files/wine-1.7.2-osmesa-check.patch
@ -0,0 +1,38 @@
 From b7eb1ff48dd1210aa3e1002afc503d5df75d50b9 Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@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
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@ -0,0 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>ryao@gentoo.org</email>
 		<name>Richard Yao</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 are 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='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='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>
 	<flag name='udisks'>Support dynamic storage devices using <pkg>sys-fs/udisks</pkg></flag>
 </use>
 </pkgmetadata>
--- a/app-emulation/wine/wine-1.7.16.ebuild
+++ b/app-emulation/wine/wine-1.7.16.ebuild
@ -0,0 +1,462 @@
 # 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.7.14.ebuild,v 1.1 2014/03/08 04:35:53 tetromino 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 versionator virtualx
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
 	inherit git-2
 	SRC_URI=""
 	#KEYWORDS=""
 else
 	MY_PN='wine'
 	MY_P="${MY_PN}-$(get_version_component_range 1-3 ${PV/_/-})"
 	SRC_URI="mirror://sourceforge/${MY_PN}/Source/${MY_P}.tar.bz2"
 	KEYWORDS="-* ~amd64 ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
 GV="2.24"
 MV="4.5.2"
 COMPHOLIO_PATCHES="v${PV}-1"
 PULSE_PATCHES="winepulse-patches-1.7.12"
 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
 	compholio? ( https://github.com/compholio/wine-compholio-daily/archive/${COMPHOLIO_PATCHES}.tar.gz )"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="+abi_x86_32 +abi_x86_64 +alsa capi +compholio cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi 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 )
 	netapi? ( net-fs/samba[netapi(+)] )
 	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-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? ( || (
 				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"
 	use compholio && unpack "${COMPHOLIO_PATCHES}.tar.gz"
 	l10n_find_plocales_changes "${S}/po" "" ".po"
 }
 src_prepare() {
 	local md5="$(md5sum server/protocol.def)"
 	local PATCHES=(
 		"${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
 		"${FILESDIR}"/${MY_PN}-1.4_rc2-multilib-portage.patch #395615
 		"${FILESDIR}"/${MY_PN}-1.7.12-osmesa-check.patch #429386
 		"${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
 	)
 	if use pulseaudio ; then
 		if ! use compholio; then
 			 PATCHES+=(
 				"../${PULSE_PATCHES}"/*.patch #421365
 			)
 		fi
 	fi
 	# Compholio patches
 	if use compholio ; then
 		if [ ${PV} != "9999" ] ; then
 			cd "${WORKDIR}"/wine-compholio-daily-${PV}-1/patches/
 			make DESTDIR=${S} install || die
 			cd "${S}"
 		fi
 	fi
 	autotools-utils_src_prepare
 	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
 		einfo "server/protocol.def was patched; running tools/make_requests"
 		(cd "${S}" && 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
 			use netapi && ewarn "Disabling netapi in wine32; see https://bugs.gentoo.org/494394"
 			# We currently don't have 32-bit libnetapi on amd64; #494394
 			myeconfargs+=(
 				--without-netapi
 				--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
 	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 netapi)
 		$(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 ${MY_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
 }
--- a/dev-android/adb/Manifest
+++ b/dev-android/adb/Manifest
@ -1,2 +1,2 @@
 AUX Makefile 981 SHA256 cdbc2573e361a7e8c4e79ae3d17f569bb5812b2bbe56a09e1c78080d4f55de16 SHA512 c63e5b4bb42d44558db80e7609db167a56579383715a84497b454889777e295b81c857203023c620f6445c71581f24fd1f77b7570c8ea59c38d3f1aa03bc3f72 WHIRLPOOL 680d9615a43de6b68bd010e3b0a4db3015355c3cd920378c5264d53aceb0ca8dadfe5466a3e67cd2cd89131238ef0afc4fe2f306e6737ba8eaf0ce1b4bb86d9a
-EBUILD adb-9999.ebuild 550 SHA256 fd9051b09e218d8e45f76a174f42ffde5b5d3ae37a16546c9e23adf6cc92fe20 SHA512 6a24d7f3f865af814a68f09489aa81f8e366c89b4ad6d230458bbb1ba4f42102a33234b702a4d5ee61bd762db418360b9febe66be95f1282bb15e15c2f71c4ba WHIRLPOOL 11101738f2ccc1c0c5b19c4cf00df8b53eecb7e93bbf67f3129a6a360e50805bfc2eba87dddc83d678a236107db1d5d8ab9da998ab21a6dfc32104734afdb1c8
+EBUILD adb-9999.ebuild 574 SHA256 9a70ae34715d53909ae4ed662e57dd6f0b9ed4901192d848c13b5712b20a5882 SHA512 35c0c7b65108f779ae0aec988fe4186f226762ed02f8839e6d3f6db628f4befc0696fb400c26fd4256388f53c8e7379e4d740bcfd916d6646a9c613a357f4ceb WHIRLPOOL 26598fa0f199ddb7ce7bbb303c8b17137ee69b1005141d3623781a499c6d815ecb94cbe8e1123a02ce99118239402973faab30961a3e40793a14b48b2ae9b7e6
--- a/dev-android/adb/adb-9999.ebuild
+++ b/dev-android/adb/adb-9999.ebuild
@ -10,7 +10,7 @@ DESCRIPTION="android debug bridge"
 HOMEPAGE="android.googlesource.com"
 EGIT_REPO_URI="http://android.googlesource.com/platform/system/core.git"
-EGIT_BRANCH="jb-mr1.1-release"
+EGIT_COMMIT="4f247d753a8865cd16292ff0b720b72c28049786"
 LICENSE="Apache-2.0"
 SLOT="0"
--- a/profiles/categories
+++ b/profiles/categories
@ -7,3 +7,4 @@ net-misc
 net-p2p
 net-voip
 www-apps
 cross-i686-w64-mingw32
--- a/www-plugins/pipelight/Manifest
+++ b/www-plugins/pipelight/Manifest
@ -0,0 +1,3 @@
 DIST pipelight-0.2.6.tar.gz 138153 SHA256 79fa11ed70b98d82f723b7825236489a5bdf2109ca5cb16f8aa226fc81db129a SHA512 27d64d3cdb0bf4a04d1abf13906ed7a740eb0956b4d21bf26f9743dda985b0d8241c7e1f87d8de905f97e98fcdc29924a91667fc0affd66fcd6ca7bb9eeee380 WHIRLPOOL 2839c0cf24afad873305f704aac3ae2a8620b3b5514711863f1cb200d9defb6dcf3335f3489fdbb3647f6e9182b57ad212b0c9917a2cb94ea049aa542c22710e
 DIST pluginloader-prebuilt-v0.2.6.tar.gz 467738 SHA256 afb6a3a50861b3700901c8c21f5c79a6e1beaffa59e949a0d6150ee9a03bfe27 SHA512 e3892243ca40950dfff2a916bb3fce16eca6936ec0bd419945a585513526d4b9c380ecb1d1cf418ae08422fc59ab3948e2b256ce989bb33334f2038bb391970e WHIRLPOOL 75ce2c8391b0966b889aef8abebdc16c9f3b464b439ec9e55d6c69cbfc4334c28e986db42719024ddb83b69c398a670dd7f87b1be40db50671fd75383f13b00a
 EBUILD pipelight-0.2.6.ebuild 6897 SHA256 89b879393ea4c7af68f935482278b8dd5f0118f3efa19d528a6e1303526d73e4 SHA512 1c08171029d692ea94c430e6116edb7a4e51f7ac0af4fc2915c811231d67d346c9bab9b99f762199e5102854de38f4e4c34bb98e6e119220b9d2092b1a6dce4d WHIRLPOOL 381343bfc97e000b69678c1dbb6795bc197e5a534fbc20c4a8dd64bfb9644bf2b2b5238c25b13b91b9bd6760f1d05b02449108e204f7d3fce11f4869778fe4fb
--- a/www-plugins/pipelight/pipelight-0.2.6.ebuild
+++ b/www-plugins/pipelight/pipelight-0.2.6.ebuild
@ -0,0 +1,143 @@
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 inherit eutils multilib
 DESCRIPTION="A browser plugin which allows one to use windows-only plugins inside Linux browsers."
 HOMEPAGE="http://fds-team.de/cms/index.html https://launchpad.net/pipelight"
 SRC_URI="https://bitbucket.org/mmueller2012/pipelight/get/v${PV}.tar.gz -> ${P}.tar.gz
 binary-pluginloader? ( http://repos.fds-team.de/pluginloader/v${PV}/pluginloader.tar.gz -> pluginloader-prebuilt-v${PV}.tar.gz )"
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="adobereader +binary-pluginloader flash foxitpdf grandstream installation-dialogs npactivex roblox shockwave +silverlight static unity3d"
 DEPEND="app-arch/cabextract
 	>=app-emulation/wine-1.7.16[compholio]
 	x11-apps/mesa-progs"
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/mmueller2012-pipelight-487f8db5a03d"
 src_prepare() {
 	if use binary-pluginloader; then
 		mv ${WORKDIR}/src/windows/pluginloader.exe ${S}/src/windows/pluginloader.exe
 	fi
 }
 src_configure() {
 	local myargs
 	if use binary-pluginloader; then
 		myargs+="--win32-prebuilt"
 	elif use !binary-pluginloader; then
 		if use static; then
 			myargs+=" --win32-static"
 		else
 			myargs+=" --win32-cxx=$(/usr/bin/which wineg++)"
 		fi
 	fi
 	if use installation-dialogs; then
 		myargs+=" --show-installation-dialogs"
 	fi
 	# We're not using econf because this is not an autotools configure script
 	./configure \
 		--prefix=/usr \
 		--wine-path=/usr/bin/wine \
 		--moz-plugin-path=/usr/$(get_libdir)/nsbrowser/plugins \
 		${myargs}
 }
 src_install() {
 	default
 	#LICENSE is taken from src/linux/basicplugin.c in the pipelight source code.
 	sed -n -e '/BEGIN LICENSE/,/END LICENSE/p' ${S}/src/linux/basicplugin.c >> ${S}/LICENSE
 	dodoc ${S}/LICENSE debian/changelog
 }
 pkg_postinst() {
 	einfo "Creating copies of libpipelight.so..."
 	pipelight-plugin --create-mozilla-plugins
 	#The following plugins are not created by "pipelight-plugin --create-mozilla-plugins" and must be "unlocked"
    use adobereader && pipelight-plugin --unlock-plugin adobereader
 	use foxitpdf && pipelight-plugin --unlock-plugin foxitpdf
 	use grandstream && pipelight-plugin --unlock-plugin grandstream	
 	use npactivex && pipelight-plugin --unlock-plugin npactivex
 	use roblox && pipelight-plugin --unlock-plugin roblox
 	use shockwave && pipelight-plugin --unlock-plugin shockwave
 	einfo "Enabling plugins..."
        # Setup symlinks to enable plugins based on USE flags
        use adobereader && ln -sf /usr/$(get_libdir)/pipelight/libpipelight-adobereader.so /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-adobereader.so
 		use flash && ln -sf /usr/$(get_libdir)/pipelight/libpipelight-flash.so /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-flash.so
 		use foxitpdf && ln -sf /usr/$(get_libdir)/pipelight/libpipelight-foxitpdf.so /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-foxitpdf.so
 		use grandstream && ln -sf /usr/$(get_libdir)/pipelight/libpipelight-grandstream.so /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-grandstream.so
 		use npactivex && ln -sf /usr/$(get_libdir)/pipelight/libpipelight-npactivex.so /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-npactivex.so
 		use roblox && ln -sf /usr/$(get_libdir)/pipelight/libpipelight-roblox.so /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-roblox.so
 		use shockwave && ln -sf /usr/$(get_libdir)/pipelight/libpipelight-shockwave.so /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-shockwave.so
        use silverlight && ln -sf /usr/$(get_libdir)/pipelight/libpipelight-silverlight5.1.so /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-silverlight5.1.so
        use unity3d && ln -sf /usr/$(get_libdir)/pipelight/libpipelight-unity3d.so /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-unity3d.so
 	echo
 	elog "When you first start your browser after installing Pipelight, Pipelight will    "
 	elog "download and install any enabled plugins. This may take a few minutes to        "
 	elog "complete.                                                                       "
 	elog
 	elog "Some web sites will check what operating system you are using and will not      "
 	elog "function properly if they detect Linux. For these sites, you will need to       "
 	elog "install and enable a user agent string editor. The user agent string            "
 	elog "recommended by upstream for many Silverlight apps is                            "
 	elog "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:15.0) Gecko/20120427 Firefox/15.0a1      "
 	elog "and for many Unity 3D apps is                                                   "
 	elog "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/534.55.3 (KHTML, like"
 	elog " Gecko) Version/5.1.3 Safari/534.53.10                                          "
 	elog "See https://answers.launchpad.net/pipelight/+faq/2351 for more information.     "
 	elog
 	elog "GPU acceleration is not enabled by default for all graphics cards. See          "
 	elog "https://answers.launchpad.net/pipelight/+faq/2364 for more information.         "
 	echo
 }
 pkg_prerm() {
 	einfo "Removing copies of libpipelight.so..."
 	pipelight-plugin --remove-mozilla-plugins
 	einfo "Disabling plugins..."
 	if [ -h /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-adobereader.so ] ; then
        rm /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-adobereader.so
 	fi
 	if [ -h /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-flash.so ] ; then
 		rm /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-flash.so
 	fi
 	if [ -h /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-foxitpdf.so ] ; then
 		rm /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-foxitpdf.so
 	fi
 	if [ -h /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-grandstream.so ] ; then
 		rm /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-grandstream.so
 	fi
 	if [ -h /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-npactivex.so ] ; then
        rm /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-npactivex.so
 	fi
 	if [ -h /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-roblox.so ] ; then
        rm /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-roblox.so
    fi
 	if [ -h /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-shockwave.so ] ; then
 		rm /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-shockwave.so
 	fi
 	if [ -h /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-silverlight4.so ] ; then
 		rm /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-silverlight4.so
 	fi
 	if [ -h /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-silverlight5.0.so ] ; then
 		rm /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-silverlight5.0.so
 	fi
 	if [ -h /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-silverlight5.1.so ] ; then
 		rm /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-silverlight5.1.so
 	fi
 	if [ -h /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-unity3d.so ] ; then
 		rm /usr/$(get_libdir)/nsbrowser/plugins/libpipelight-unity3d.so
 	fi
 }
`@ -1,2 +1,2 @@`
	`AUX Makefile 981 SHA256 cdbc2573e361a7e8c4e79ae3d17f569bb5812b2bbe56a09e1c78080d4f55de16 SHA512 c63e5b4bb42d44558db80e7609db167a56579383715a84497b454889777e295b81c857203023c620f6445c71581f24fd1f77b7570c8ea59c38d3f1aa03bc3f72 WHIRLPOOL 680d9615a43de6b68bd010e3b0a4db3015355c3cd920378c5264d53aceb0ca8dadfe5466a3e67cd2cd89131238ef0afc4fe2f306e6737ba8eaf0ce1b4bb86d9a`	`AUX Makefile 981 SHA256 cdbc2573e361a7e8c4e79ae3d17f569bb5812b2bbe56a09e1c78080d4f55de16 SHA512 c63e5b4bb42d44558db80e7609db167a56579383715a84497b454889777e295b81c857203023c620f6445c71581f24fd1f77b7570c8ea59c38d3f1aa03bc3f72 WHIRLPOOL 680d9615a43de6b68bd010e3b0a4db3015355c3cd920378c5264d53aceb0ca8dadfe5466a3e67cd2cd89131238ef0afc4fe2f306e6737ba8eaf0ce1b4bb86d9a`
	`EBUILD adb-9999.ebuild 550 SHA256 fd9051b09e218d8e45f76a174f42ffde5b5d3ae37a16546c9e23adf6cc92fe20 SHA512 6a24d7f3f865af814a68f09489aa81f8e366c89b4ad6d230458bbb1ba4f42102a33234b702a4d5ee61bd762db418360b9febe66be95f1282bb15e15c2f71c4ba WHIRLPOOL 11101738f2ccc1c0c5b19c4cf00df8b53eecb7e93bbf67f3129a6a360e50805bfc2eba87dddc83d678a236107db1d5d8ab9da998ab21a6dfc32104734afdb1c8`	`EBUILD adb-9999.ebuild 574 SHA256 9a70ae34715d53909ae4ed662e57dd6f0b9ed4901192d848c13b5712b20a5882 SHA512 35c0c7b65108f779ae0aec988fe4186f226762ed02f8839e6d3f6db628f4befc0696fb400c26fd4256388f53c8e7379e4d740bcfd916d6646a9c613a357f4ceb WHIRLPOOL 26598fa0f199ddb7ce7bbb303c8b17137ee69b1005141d3623781a499c6d815ecb94cbe8e1123a02ce99118239402973faab30961a3e40793a14b48b2ae9b7e6`