bump, patches add dealing with building external packages, sed statements replaced with patches, key QA issues from gcc msgs fixed, minor ones remain

Package-Manager: portage-2.1.11.30/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

9 files changed, 457 insertions, 13 deletions

diff --git a/app-emulation/xen-pvgrub/ChangeLog b/app-emulation/xen-pvgrub/ChangeLog
index b618ed00952f..80797a58e7af 100644
--- a/app-emulation/xen-pvgrub/ChangeLog
+++ b/app-emulation/xen-pvgrub/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/xen-pvgrub
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.12 2012/04/24 09:49:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.13 2012/12/04 16:31:20 idella4 Exp $
+
+*xen-pvgrub-4.2.0 (05 Dec 2012)
+
+  05 Dec 2012; Ian Delaney <idella4@gentoo.org> +files/newlib-implicits.patch,
+  +files/xen-4-fix_dotconfig-gcc.patch, +files/xen-4.2.0-externals.patch,
+  +files/xen-4.2.0-newlib.patch, +xen-pvgrub-4.2.0.ebuild,
+  xen-pvgrub-4.1.1-r1.ebuild, xen-pvgrub-4.1.2.ebuild:
+  bump, patches add dealing with building external packages, sed statements
+  replaced with patches, key QA issues from gcc msgs fixed, minor ones remain
 
   24 Apr 2012; Michał Górny <mgorny@gentoo.org> xen-pvgrub-4.1.1-r1.ebuild,
   xen-pvgrub-4.1.2.ebuild:
@@ -58,4 +67,3 @@
   +xen-pvgrub-9999.ebuild:
   Initial import. Thanks to newtonian.
   http://forums.gentoo.org/viewtopic-p-6642981.html
-
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index 079c89a600fd..a1809fc7dcd6 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX newlib-implicits.patch 5307 SHA256 34e85aa0380d10271748cdc6cb0ff3f502fe5c3113724ba8a2c2f69668970c46 SHA512 582cfa36dbb44e8abc83120d44af78a7a7cd3f7a009c65858f3d68276bf5f772b18c4692b7e68202f9ec246e29c785fa111b19bcaefc2f04f429f1b69e77d48f WHIRLPOOL 0d36e2f4ac6476522a05842ab1194e6c58d4fa6a03ae53b14b839aa4057ce55fdd6ec5fa47d28ddcaea22fed153ca60f50413cc77f9a4ded2397168395bf336b
+AUX xen-4-fix_dotconfig-gcc.patch 1527 SHA256 ff14b537b72ca74f482e24626b041fbaffe6bb2744ac90968f9e50da8855eb13 SHA512 9e4691f435e4cd0874a19f75600578590968b1c477a5e16f606de58a54686da92faa29b7545e829220dc0dc8fb79e269232557444153b9e7dc814d3bf2e5349e WHIRLPOOL 64625ee28db1ab15002152066f1986326b7c6a55eaae2021e382885d968ded49f930a07a932f52a415da63cd8b3477042c7c7d7c8c5f2925a846b30c3f63d446
+AUX xen-4.2.0-externals.patch 3970 SHA256 5b74be54bdb5a70fd7c2f932515893b1678ddf33b49fc65561ce1667f792db7d SHA512 f9da2f1275e57d7c096c12103d765deb2c6c73e4d83a2e71c6f23377bfdfc09cc73e2c44fd165de81dcef1dbe39962568e7f52e8b6e330d29b57119203f4ff0a WHIRLPOOL 16fa6250c72fb12da55a02e912b4f0058c1a54cab10159cfa8863cdfa0483992e6c4d7b94eb839b28a5621fa8aaeb21da89d6de0204b6e76f37dc42345624daf
+AUX xen-4.2.0-newlib.patch 483 SHA256 dec46af0fd572e41e2893b364721ca2777712a1b712ea01028af8c03e6d74cb7 SHA512 c7195385c2f7db44a877b22ef0044a82e45c6cbdb086ef8c95c8afce44c94472e9c9da1d295c35b10ea6a22e61c6f95e28fb4ae407f0cf40a04c2a6def8b9a59 WHIRLPOOL aa6713ce82e47b661faf0092ea68871d6d7893c4136fc3de5dd2e96f672c817ecc1c431092705eb9f45cf93b7696f025ee812a63b1882aee347accf9712f47e5
 DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb WHIRLPOOL 0ad7f5dc035e2a3ad5fd29b6388f06fd12a8cc694117b4cbd42b5302433aa522db23566222d35219fe17fb95edb5090553156198507f70208eda5d858fd52dd5
 DIST lwip-1.3.0.tar.gz 398933 SHA256 772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f SHA512 1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d WHIRLPOOL 63bdd9eb70f168ba2006a8f4bbe166b68528abe8364b23cdc1d468ccc4b137bb3447bf90695920f016e09d53d3b93ccf6e3697b3c46840f00b794789cb424acc
 DIST newlib-1.16.0.tar.gz 12024353 SHA256 db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3 WHIRLPOOL 47f7afd525f482d79d9e964f0e75ee8a77e59551bd19cd94f9b95ac3af9406afa381c9d8d224f76eb568441ab613b2b194f8e5be50aa222f9ed2d9b9761829db
@@ -5,8 +12,17 @@ DIST ocaml-3.11 11661 SHA256 b919112964cf64bcae841301754402184ceee177ab6681e75bf
 DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 WHIRLPOOL ce801947fcf7ba0b56710029f25e746d3e03a80699af9d3570efcd417b12b546264f286b2e78b1402cca766c08e35bdd0ff0a692ab4ad419295f00bcfe91130e
 DIST xen-4.1.1.tar.gz 10355625 SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b SHA512 0ec84db28af5b1206392b44e2c135859b3393d9c0eb1109f6a983492ba70622a145a08efce54f2943495feb06291d3fd5df9cc8ffea51e6e42aa69450edc87f2 WHIRLPOOL 58d83e71ac0a942830311d7eb5ebc5a7b34b118001f6f607ea7e5d7a959bafd72c9b8b6d010144fdef7417a238382602d948007be90f9ebf583b4d18897344c0
 DIST xen-4.1.2.tar.gz 10365786 SHA256 7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d SHA512 8f50f238b0b474ec5556279cbd51d704b4365033f2541a5d0376f287b26b7e8f0193172041109d97bb76d35ace3adf71e12f89f5766ff79a8ea861e7282f00d7 WHIRLPOOL 93a4bdd05125ef722464ef682798191c8b3db7228cbc0a27bcbe7932a7776491f90e727e1fcc4a9e7ec3eada7f56c567c07ad61cdda2f514109f702800fe5566
+DIST xen-4.2.0.tar.gz 15587687 SHA256 43f4a086e4e0330145a27b7ace8365c42b5afbc95cefadafe067be91bd3e5cfb SHA512 4fb56c79d722fb307bc657f16d02079c6636427e7650c4354193632d38d2d1db8e588f844ff0ca6e757c108ed639a528565ec9fc7c00bb4d5b6fbc9d122d8a70 WHIRLPOOL 369a109375864cb61920b56cf501522051d28513e738f0fd0e7b76244c3e08a8a0a6ff6cf245872d9bbd9c0f22c7da76c9cbc0f852bad6108ca25fd42dc677c0
 DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276
-EBUILD xen-pvgrub-4.1.1-r1.ebuild 4341 SHA256 6c233563ac220fe854ac2da1931aa31237784daa719536cc572d3cce4840702d SHA512 9697bb4712496fd708752712ddaf9a152f8f9289378494c713ebae5839c1e35ea08d6c9a0428ee24b851fa24ac937018b0456e6f892387d24d5695a3aa2ddb75 WHIRLPOOL a2713167e6b293d2fab7a657d36ea09990f86b4392492c1fd9d627c046e7febe610bc7536892e1d58391a7ff60ea1c06e663b2b95d3c43539bbd97f7d2d0bd9b
-EBUILD xen-pvgrub-4.1.2.ebuild 4205 SHA256 38ee70f7e934996d6bfd0c8703ec04b3f7ffd6551b14566681ddc2b32efb1d32 SHA512 b8315f7e044db8d0a531cf62072aab13e7a17167352cdd752d40bca9d7f866614e58705783dceadbd3eedf2453c059926fc4e891105597e72a7688903d878bb3 WHIRLPOOL 04bdf333144289ee99bd91754b05deb1640ab4a6070630776b11e5554dc4966f3f19ae4a9be591b4abe0e0ffd3b1489117e1ec25438aabaa26b4b8c1932728fb
-MISC ChangeLog 2441 SHA256 52a853147df1def21d3aa7e8efea126a9ef542352b2c35a4ab4d81c583e15e98 SHA512 3f66d2ba7a698b5e47163548606f2e7d9300ca2003d7af6f83fbcd9c346798dadff8b2ecc37d15abddda3c789bd9f1eb21f76b9225f67d4168bc552f016304a4 WHIRLPOOL 50566d756a5496405a169704ae745814806dca8a234896ab9615dd8f93d1cc7abafcb53cb14af5ee2393702d9a0df1159fa8a22e03e527d75f7256819e1a10b5
+EBUILD xen-pvgrub-4.1.1-r1.ebuild 4316 SHA256 396776fb4ecaaece0ade7b4a5e70667b73b89b259c171ba80f9bbf65ab175b1e SHA512 5544db3d0da561803666002ae482f1e2af67b4b4dcaf43b64691058fc77a09125773ac1906760a357e1291a1c1bb7b3c44713ca1cfd616cf091ea84225a915c9 WHIRLPOOL 6bbd946fc624309b5d4cf579dd9e17ba865048bbaf27286480dec78e44f57cb0514f2fda141db21d0c4f2326f96165d592d938953b4502ca129b3e2b5df02110
+EBUILD xen-pvgrub-4.1.2.ebuild 4185 SHA256 a550dbd22e33249a432da3375f5662223f6706aa93dd52387b2a52b2417094ab SHA512 dda2ee910ae9d90d03073e4910c6da465a0ab3486b428449e01ff87c6de5895b4bbe3b27a3532ff31dc8d3b079aed41cd4b894d1cbfb66c76c7591458d5c0680 WHIRLPOOL 52f0313a6527db738c52099d6d02c39587edd21d97605f16c4efc95899b63b4c6e8e39d77b09cb0a943f0a06511dbdbdf3fc55a5d0433aadeea712c98faf0d47
+EBUILD xen-pvgrub-4.2.0.ebuild 3600 SHA256 c8127895c37fd2f8ad797cc00cc5f5d9e0280224a21fa7050d433b256df6faac SHA512 a334e3e7d72db6ee010b24b8f1c83b71413b4244c36f6546c2303ac04ff6e19b24c1356d0232487e68d6a80ddd63a56deff38fb576a340248856d615b829bcd2 WHIRLPOOL 936e3122fe07815cee620d09284d9deda4073a7c30015c9e05803f4d0558799c7f2e8cbfe915fb665fe721547b0de265ac176a8952b475ce4a0b6617de287cd4
+MISC ChangeLog 2896 SHA256 98c5cc8439cd63ee7c7efc14db2377c3357c440a994e540e553825bd6274997b SHA512 04ebfe684f3e16c2b572f91f7b55b747d382269d885143efcafeee19548cfacc2919de609b3c70bfd86c64617be92b20d4f808a7886ecd03a9e114b91e87beb7 WHIRLPOOL 41ec8e6b9e8ff4f135f21a3d3ccb00e7ef0ad81e33b6c6fe1b5ed42230c509cc04cc311b1ff1db15e141d8e0bc73a324d647f4dde25b55f1196a01b5387135d5
 MISC metadata.xml 156 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2 SHA512 66b610ce3a3c525f52ad132e0c6cab329866069d8f40cbfc7302b12f8fc1217705ce9d5aab9c08ee3f7eb86bd880b5c3595b10c3eb67932148a109ec11b88c22 WHIRLPOOL e7f151fa553d737c02f8791448170ddd88b9330b1b01a868cd5c32a875b58b36dd1e2b041308f657d35550f22e5798cd96037c3c890c0646119046f984505c23
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlC/BloACgkQso7CE7gHKw1rkQCfUGUfuSEO3ZrE6yQyfo/D54Dp
+wrYAniPy085vzQze3voGW45k7a8cQ4md
+=oaM8
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-pvgrub/files/newlib-implicits.patch b/app-emulation/xen-pvgrub/files/newlib-implicits.patch
new file mode 100644
index 000000000000..73c04931b31d
--- /dev/null
+++ b/app-emulation/xen-pvgrub/files/newlib-implicits.patch
@@ -0,0 +1,149 @@
+diff -ur newlib-1.16.0.orig/newlib/libc/stdlib/wcstoull.c newlib-1.16.0/newlib/libc/stdlib/wcstoull.c
+--- newlib/libc/stdlib/wcstoull.c	2007-07-07 04:03:28.000000000 +0800
++++ newlib/libc/stdlib/wcstoull.c	2012-12-02 14:19:40.905136553 +0800
+@@ -124,7 +124,7 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <reent.h>
+-
++#include <wchar.h>
+ #ifndef _REENT_ONLY
+ 
+ unsigned long long
+diff -ur newlib-1.16.0.orig/newlib/doc/makedoc.c 
+newlib-1.16.0/newlib/doc/makedoc.c
+--- newlib/doc/makedoc.c	2007-01-03 01:59:59.000000000 +0900
++++ newlib/doc/makedoc.c	2012-12-02 16:53:42.700289294 +0800
+@@ -39,7 +39,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <ctype.h>
+-
++#include <string.h>
+ #define DEF_SIZE 5000
+ #define STACK 50
+ 
+diff -ur newlib-1.16.0.orig/newlib/libc/reent/lseek64r.c newlib-1.16.0/newlib/libc/reent/lseek64r.c
+--- newlib/libc/reent/lseek64r.c	2003-06-04 03:48:07.000000000 +0800
++++ newlib/libc/reent/lseek64r.c	2012-12-02 18:29:45.435760985 +0800
+@@ -1,8 +1,8 @@
+ /* Reentrant versions of lseek system call. */
+
+-#include <reent.h>
++#include "../include/reent.h"
+ #include <unistd.h>
+-#include <_syslist.h>
++#include "../include/_syslist.h"
+
+ /* Some targets provides their own versions of this functions.  Those
+    targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS.  */
+diff -ur newlib-1.16.0.orig/newlib/libc/stdio64/fseeko64.c newlib-1.16.0/newlib/libc/stdio64/fseeko64.c
+--- newlib/libc/stdio64/fseeko64.c	2007-07-14 04:37:53.000000000 +0800
++++ newlib/libc/stdio64/fseeko64.c	2012-12-02 18:26:29.955778906 +0800
+@@ -119,7 +119,7 @@
+ 	  ptr->_errno = EOVERFLOW;
+ 	  return EOF;
+ 	}
+-      return (_off64_t) _fseeko_r (ptr, fp, offset, whence);
++      return (_off64_t) _fseeko64_r (ptr, fp, offset, whence);
+     }
+ 
+   /* Make sure stdio is set up.  */
+
+diff -ur newlib-1.16.0.orig/newlib/libc/reent/fstat64r.c newlib-1.16.0/newlib/libc/reent/fstat64r.c
+--- newlib/libc/reent/fstat64r.c	2012-12-03 13:17:26.569703981 +0800
++++ newlib/libc/reent/fstat64r.c	2003-06-04 03:48:07.000000000 +0800
+@@ -1,10 +1,10 @@
+ /* Reentrant versions of fstat system call.  This implementation just
+    calls the fstat system call.  */
+ 
+-#include <reent.h>
++#include "../include/reent.h">
+ #include <unistd.h>
+ #include <sys/stat.h>
+-#include <_syslist.h>
++#include "../include/_syslist.h"
+ 
+ #ifdef __LARGE64_FILES
+ 
+diff -ur newlib-1.16.0.orig/libgloss/i386/cygmon-gmon.c newlib-1.16.0/libgloss/i386/cygmon-gmon.c
+--- libgloss/i386/cygmon-gmon.c	2002-10-26 03:18:46.000000000 +0800
++++ libgloss/i386/cygmon-gmon.c	2012-12-03 14:38:41.454257066 +0800
+@@ -68,6 +68,9 @@
+ 
+ #include "cygmon-gmon.h"
+
++#include <unistd.h>
++#include <stdlib.h>
++#include <strings.h>
+ /*
+  *	froms is actually a bunch of unsigned shorts indexing tos
+ */
+@@ -78,6 +78,8 @@
+ static char		*s_lowpc = 0;
+ static char		*s_highpc = 0;
+ static unsigned long	s_textsize = 0;
++extern void profil_write(int, char*, int);
++extern int moncontrol (int);
+ 
+ static int	ssiz;
+ static char	*sbuf;
+diff -ur newlib-1.16.0.orig/newlib/libc/include/_syslist.h 
+newlib-1.16.0/newlib/libc/include/_syslist.h
+--- newlib/libc/include/_syslist.h   2005-08-23 05:13:35.000000000 +0800
++++ newlib/libc/include/_syslist.h        2012-12-03 17:20:03.092369483 +0800
+@@ -2,6 +2,7 @@
+    and only provide C names, so that we end up in violation of ANSI */
+ #ifndef __SYSLIST_H
+ #define __SYSLIST_H
++#include <sys/types.h>
+
+ #ifdef MISSING_SYSCALL_NAMES
+ #define _close close
+
+#diff -ur newlib-1.16.0.orig/newlib/libc/Makefile.in newlib-1.16.0/newlib/libc/Makefile.in
+#--- newlib/libc/Makefile.in	2007-05-25 01:33:30.000000000 +0800
+#+++ newlib/libc/Makefile.in	2012-12-03 21:52:05.621873084 +0800
+diff -ur newlib-1.16.0.orig/newlib/libc/stdio64/ftello64.c newlib-1.16.0/newlib/libc/stdio64/ftello64.c
+--- newlib/libc/stdio64/ftello64.c	2007-07-14 04:37:53.000000000 +0800
++++ newlib/libc/stdio64/ftello64.c	2012-12-04 18:34:46.491509484 +0800
+@@ -93,7 +93,7 @@
+ 
+   /* Only do 64-bit tell on large file.  */
+   if (!(fp->_flags & __SL64))
+-    return (_off64_t) _ftello_r (ptr, fp);
++    return (_off64_t) _ftello64_r (ptr, fp);
+ 
+   /* Ensure stdio is set up.  */
+ 
+diff -ur newlib-1.16.0.orig/newlib/libc/reent/open64r.c newlib-1.16.0/newlib/libc/reent/open64r.c
+--- newlib/libc/reent/open64r.c	2002-08-27 02:56:06.000000000 +0800
++++ newlib/libc/reent/open64r.c	2012-12-04 20:06:10.044006769 +0800
+@@ -1,8 +1,8 @@
+ /* Reentrant versions of open system call. */
+
+-#include <reent.h>
++#include "../include/reent.h">
+ #include <unistd.h>
+-#include <fcntl.h>
++#include <sys/_default_fcntl.h>
+ #include <_syslist.h>
+ 
+ #ifdef __LARGE64_FILES
+diff -ur newlib-1.16.0.orig/newlib/libc/reent/signalr.c newlib-1.16.0/newlib/libc/reent/signalr.c
+--- newlib/libc/reent/signalr.c 2012-12-05 07:33:25.623393126 +0800
++++ newlib/libc/reent/signalr.c 2012-12-05 07:34:03.943389613 +0800
+@@ -1,10 +1,10 @@
+ /* Reentrant versions of syscalls need to support signal/raise.
+    These implementations just call the usual system calls.  */
+
+-#include <reent.h>
++#include "../include/reent.h"
+ #include <signal.h>
+ #include <unistd.h>
+-#include <_syslist.h>
++#include "../include/_syslist.h"
+
+ /* Some targets provides their own versions of these functions.  Those
+    targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS.  */
+
diff --git a/app-emulation/xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch b/app-emulation/xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch
new file mode 100644
index 000000000000..78eb12b0fc64
--- /dev/null
+++ b/app-emulation/xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch
@@ -0,0 +1,37 @@
+# Fix gcc-4.6
+diff -ur xen-4.2.0.orig/extras/mini-os/minios.mk xen-4.2.0/extras/mini-os/minios.mk
+--- extras/mini-os/minios.mk	2012-09-17 18:21:17.000000000 +0800
++++ extras/mini-os/minios.mk	2012-12-05 14:01:10.653260260 +0800
+@@ -6,7 +6,7 @@
+ 
+ # Define some default flags.
+ # NB. '-Wcast-qual' is nasty, so I omitted it.
+-DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls
++DEF_CFLAGS += -fno-builtin -Wall  -Wredundant-decls -Wno-format -Wno-redundant-decls
+ DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
+ DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
+ DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
+diff -ur xen-4.2.0.orig/tools/libxc/Makefile xen-4.2.0/tools/libxc/Makefile
+--- tools/libxc/Makefile       2012-09-17 18:21:18.000000000 +0800
++++ tools/libxc/Makefile       2012-12-05 14:01:10.653260260 +0800
+@@ -73,7 +73,7 @@
+
+ -include $(XEN_TARGET_ARCH)/Makefile
+
+-CFLAGS   += -Werror -Wmissing-prototypes
++CFLAGS   +=  -Wmissing-prototypes
+ CFLAGS   += -I. $(CFLAGS_xeninclude)
+
+ # Needed for posix_fadvise64() in xc_linux.c
+# Drop .config
+diff -ur xen-4.2.0.orig/Config.mk xen-4.2.0/Config.mk
+--- Config.mk	2012-09-17 18:23:12.000000000 +0800
++++ Config.mk	2012-12-05 14:01:10.641260261 +0800
+@@ -7,7 +7,6 @@
+ # fallback for older make
+ realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))")))
+ 
+--include $(XEN_ROOT)/.config
+ 
+ # A debug build of Xen and tools?
+ debug ?= n
diff --git a/app-emulation/xen-pvgrub/files/xen-4.2.0-externals.patch b/app-emulation/xen-pvgrub/files/xen-4.2.0-externals.patch
new file mode 100644
index 000000000000..70ff7da2f60f
--- /dev/null
+++ b/app-emulation/xen-pvgrub/files/xen-4.2.0-externals.patch
@@ -0,0 +1,112 @@
+# Patch Makefile to patch insource newlib, 
+# Prevent internal downloading of external packages
+diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile
+--- stubdom/Makefile	2012-09-17 18:21:17.000000000 +0800
++++ stubdom/Makefile	2012-12-05 14:01:10.694260256 +0800
+@@ -8,30 +8,30 @@
+ include $(XEN_ROOT)/Config.mk
+ 
+ #ZLIB_URL?=http://www.zlib.net
+-ZLIB_URL=$(XEN_EXTFILES_URL)
++ZLIB_URL=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
+ ZLIB_VERSION=1.2.3
+ 
+ #LIBPCI_URL?=http://www.kernel.org/pub/software/utils/pciutils
+-LIBPCI_URL?=$(XEN_EXTFILES_URL)
++LIBPCI_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
+ LIBPCI_VERSION=2.2.9
+ 
+ #NEWLIB_URL?=ftp://sources.redhat.com/pub/newlib
+-NEWLIB_URL?=$(XEN_EXTFILES_URL)
++NEWLIB_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
+ NEWLIB_VERSION=1.16.0
+ 
+ #LWIP_URL?=http://download.savannah.gnu.org/releases/lwip
+-LWIP_URL?=$(XEN_EXTFILES_URL)
++LWIP_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
+ LWIP_VERSION=1.3.0
+ 
+ #GRUB_URL?=http://alpha.gnu.org/gnu/grub
+-GRUB_URL?=$(XEN_EXTFILES_URL)
++GRUB_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
+ GRUB_VERSION=0.97
+ 
+-#OCAML_URL?=$(XEN_EXTFILES_URL)
++#OCAML_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir
+ OCAML_URL?=http://caml.inria.fr/pub/distrib/ocaml-3.11
+ OCAML_VERSION=3.11.0
+ 
+-WGET=wget -c
++WGET=cp -t . 
+ 
+ GNU_TARGET_ARCH:=$(XEN_TARGET_ARCH)
+ ifeq ($(XEN_TARGET_ARCH),x86_32)
+@@ -95,12 +95,13 @@
+ ##############
+ 
+ newlib-$(NEWLIB_VERSION).tar.gz:
+-	$(WGET) $(NEWLIB_URL)/$@
++#	$(WGET) $(NEWLIB_URL)/$@
+ 
+ newlib-$(NEWLIB_VERSION): newlib-$(NEWLIB_VERSION).tar.gz
+ 	tar xzf $<
+ 	patch -d $@ -p0 < newlib.patch
+ 	patch -d $@ -p0 < newlib-chk.patch
++	patch -d $@ -p0 < newlib-implicits.patch
+ 	patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch
+ 	find $@ -type f | xargs perl -i.bak \
+ 		-pe 's/\b_(tzname|daylight|timezone)\b/$$1/g'
+@@ -112,7 +113,7 @@
+ $(NEWLIB_STAMPFILE): mk-headers-$(XEN_TARGET_ARCH) newlib-$(NEWLIB_VERSION)
+ 	mkdir -p newlib-$(XEN_TARGET_ARCH)
+ 	( cd newlib-$(XEN_TARGET_ARCH) && \
+-	  CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \
++	  CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) LDFLAGS= RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \
+ 	  $(CROSS_MAKE) && \
+ 	  $(CROSS_MAKE) install )
+ 
+@@ -121,7 +122,7 @@
+ ############
+ 
+ zlib-$(ZLIB_VERSION).tar.gz:
+-	$(WGET) $(ZLIB_URL)/$@
++#	$(WGET) $(ZLIB_URL)/$@
+ 
+ zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz 
+ 	tar xzf $<
+@@ -141,7 +142,7 @@
+ ##############
+ 
+ pciutils-$(LIBPCI_VERSION).tar.bz2:
+-	$(WGET) $(LIBPCI_URL)/$@
++#	$(WGET) $(LIBPCI_URL)/$@
+ 
+ pciutils-$(XEN_TARGET_ARCH): pciutils-$(LIBPCI_VERSION).tar.bz2
+ 	tar xjf $<
+@@ -169,7 +170,7 @@
+ ######
+ 
+ lwip-$(LWIP_VERSION).tar.gz:
+-	$(WGET) $(LWIP_URL)/$@
++#	$(WGET) $(LWIP_URL)/$@
+ 
+ lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz
+ 	tar xzf $<
+@@ -325,7 +326,7 @@
+ ######
+ 
+ grub-$(GRUB_VERSION).tar.gz:
+-	$(WGET) $(GRUB_URL)/$@
++#$(WGET) $(GRUB_URL)/$@
+ 
+ grub-upstream: grub-$(GRUB_VERSION).tar.gz
+ 	tar xzf $<
+@@ -392,7 +393,7 @@
+ 	$(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
+ 	$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz"
+ 
+-install-grub: pv-grub
++install-grub:
+ 	$(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
+ 	$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz"
+ 
diff --git a/app-emulation/xen-pvgrub/files/xen-4.2.0-newlib.patch b/app-emulation/xen-pvgrub/files/xen-4.2.0-newlib.patch
new file mode 100644
index 000000000000..6b184db2008e
--- /dev/null
+++ b/app-emulation/xen-pvgrub/files/xen-4.2.0-newlib.patch
@@ -0,0 +1,12 @@
+diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile
+--- stubdom/Makefile	2012-12-05 08:01:01.480241322 +0800
++++ stubdom/Makefile	2012-12-05 08:01:37.432238026 +0800
+@@ -101,6 +101,7 @@
+ 	tar xzf $<
+ 	patch -d $@ -p0 < newlib.patch
+ 	patch -d $@ -p0 < newlib-chk.patch
++	patch -d $@ -p0 < newlib-implicits.patch
+ 	patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch
+ 	find $@ -type f | xargs perl -i.bak \
+ 		-pe 's/\b_(tzname|daylight|timezone)\b/$$1/g'
+
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild
index be76528bc5a9..7a88b8abd0a2 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild,v 1.5 2012/04/24 09:49:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild,v 1.6 2012/12/04 16:31:20 idella4 Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@ SRC_URI="
 		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
 		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
 		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
-                $OCAML_URL/ocaml-3.11
+		$OCAML_URL/ocaml-3.11
 		"
 
 S="${WORKDIR}/xen-${PV}"
@@ -26,7 +26,7 @@ DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest
 HOMEPAGE="http://xen.org/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="custom-cflags"
 
 DEPEND="sys-devel/gettext
@@ -75,14 +75,14 @@ src_prepare() {
 	ls -ld stubdom/zlib-1.2.3.tar.gz
 	ls -ld stubdom/Makefile || die "stubdom/Makefile could not be adjusted"
 
-        sed -e 's:^\t$(WGET) $(LWIP_URL):#\t$(WGET) $(LWIP_URL):' \
+	sed -e 's:^\t$(WGET) $(LWIP_URL):#\t$(WGET) $(LWIP_URL):' \
 		-e 's:^\t$(WGET) $(NEWLIB_URL):#\t$(WGET) $(NEWLIB_URL):' \
 		-e 's:^\t$(WGET) $(ZLIB_URL):#\t$(WGET) $(ZLIB_URL):' \
 		-e 's:^\t$(WGET) $(LIBPCI_URL):#\t$(WGET) $(LIBPCI_URL):' \
 		-e 's:^\t$(WGET) $(OCAML_URL):#\t$(WGET) $(OCAML_URL):' \
 		-e 's:^\t$(WGET) $(GRUB_URL):#$(WGET) $(GRUB_URL):' \
                 -i stubdom/Makefile || die "stubdom/Makefile could not be adjusted"
-        einfo "1st Makefile adjusted"
+	einfo "1st Makefile adjusted"
 }
 
 src_compile() {
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild
index d5240b79ac71..611aa97fa4ee 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild,v 1.3 2012/04/24 09:49:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild,v 1.4 2012/12/04 16:31:20 idella4 Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@ SRC_URI="
 		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
 		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
 		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
-                $OCAML_URL/ocaml-3.11
+		$OCAML_URL/ocaml-3.11
 		"
 
 S="${WORKDIR}/xen-${PV}"
@@ -73,7 +73,7 @@ src_prepare() {
 
 	einfo "files copied to stubdom"
 
-        sed -e 's:^\t$(WGET) $(LWIP_URL):#\t$(WGET) $(LWIP_URL):' \
+	sed -e 's:^\t$(WGET) $(LWIP_URL):#\t$(WGET) $(LWIP_URL):' \
 		-e 's:^\t$(WGET) $(NEWLIB_URL):#\t$(WGET) $(NEWLIB_URL):' \
 		-e 's:^\t$(WGET) $(ZLIB_URL):#\t$(WGET) $(ZLIB_URL):' \
 		-e 's:^\t$(WGET) $(LIBPCI_URL):#\t$(WGET) $(LIBPCI_URL):' \
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.0.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.0.ebuild
new file mode 100644
index 000000000000..01b7112774fc
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.0.ebuild,v 1.1 2012/12/04 16:31:20 idella4 Exp $
+
+EAPI="4"
+
+inherit flag-o-matic eutils multilib toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+SRC_URI="
+		http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+		$GRUB_URL/grub-0.97.tar.gz
+		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
+		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags"
+
+DEPEND="sys-devel/gettext
+	sys-devel/gcc"
+
+RDEPEND="=app-emulation/xen-${PV}"
+
+src_prepare() {
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \;
+	fi
+
+	#Substitute for internal downloading
+	cp $DISTDIR/zlib-1.2.3.tar.gz \
+		$DISTDIR/pciutils-2.2.9.tar.bz2 \
+		$DISTDIR/lwip-1.3.0.tar.gz \
+		$DISTDIR/newlib-1.16.0.tar.gz \
+		$DISTDIR/grub-0.97.tar.gz \
+		./stubdom/ || die "files not coped to stubdom"
+	# Note: tip to patch grub gentoo style, for review soon. This is around 1/3.
+#	cp "${WORKDIR}"/patch/{00[3-6]_all_grub*,010_all_grub*,01[3-9]_all_grub*,0[6-7]0_all_grub*} \
+#		"${WORKDIR}"/patch/{110_all_grub*,300_all_grub*} \
+#		 stubdom/grub.patches/ || die
+	einfo "files copied to stubdom"
+
+	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+	epatch "${FILESDIR}"/${P/-pvgrub/}-externals.patch
+
+	# Drop .config and Fix gcc-4.6
+	epatch 	"${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" -C tools/include
+
+	# TODO; fix those -j1
+	if use x86; then
+		emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" \
+		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+	elif use amd64; then
+		emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" \
+		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+		if use multilib; then
+			multilib_toolchain_setup x86
+			emake -j1 XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+		fi
+	fi
+}
+
+src_install() {
+	if use x86; then
+		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+	fi
+	if use amd64; then
+		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+		if use multilib; then
+			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " http://www.gentoo.org/doc/en/xen-guide.xml"
+	elog " http://en.gentoo-wiki.com/wiki/Xen/"
+}