Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

glorious funtoo updates

merged:

  funtoo-overlay: 3d5cb8ed4833bc26baf62af90e96d6568be290c0
  foo-overlay: ac623317c1476ac0bddf715649d4e9eb2d33e49e
  bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
  flora: 9f5063d65aa33b13ddda8cbaa763c312dd842b3b
  mythtv: d5133545c1814f01e74fe9079ba83d3cd21140f4
  • Loading branch information...
commit 62e06b38efcbd42e8d9401d9e76511043aabccd2 1 parent 5f63ea2
@danielrobbins danielrobbins authored
Showing with 2,298 additions and 1,223 deletions.
  1. +0 −2  .gitignore
  2. +2 −2 app-admin/durep/durep-0.9-r4.ebuild
  3. +2 −2 app-arch/libpar2/libpar2-0.2.1.ebuild
  4. +3 −3 app-emulation/qemu/qemu-9999.ebuild
  5. +4 −4 app-emulation/virtualbox-bin/files/10-virtualbox.rules
  6. +9 −6 app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild
  7. +9 −6 app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild
  8. +1 −0  app-emulation/xen-pvgrub/Manifest
  9. +149 −0 app-emulation/xen-pvgrub/files/newlib-implicits.patch
  10. +37 −0 app-emulation/xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch
  11. +112 −0 app-emulation/xen-pvgrub/files/xen-4.2.0-externals.patch
  12. +12 −0 app-emulation/xen-pvgrub/files/xen-4.2.0-newlib.patch
  13. +5 −5 app-emulation/xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild
  14. +3 −3 app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild
  15. +110 −0 app-emulation/xen-pvgrub/xen-pvgrub-4.2.0.ebuild
  16. +1 −0  app-emulation/xen/Manifest
  17. +0 −21 app-emulation/xen/files/xen-3.3.0-unexported-target-fix.patch
  18. +0 −87 app-emulation/xen/files/xen-3.4.2-CVE-2011-1583.patch
  19. +0 −19 app-emulation/xen/files/xen-3.4.2-dump_registers-watchdog-fix.patch
  20. +0 −101 app-emulation/xen/files/xen-3.4.2-fix-__addr_ok-limit.patch
  21. +0 −71 app-emulation/xen/files/xen-3.4.2-no-DMA.patch
  22. +0 −429 app-emulation/xen/files/xen-3.4.2-werror-idiocy.patch
  23. +2 −2 app-emulation/xen/xen-4.1.1-r2.ebuild
  24. +120 −0 app-emulation/xen/xen-4.2.0.ebuild
  25. +2 −2 app-misc/reptyr/reptyr-0.4.ebuild
  26. +3 −0  app-office/libreoffice/Manifest
  27. +580 −0 app-office/libreoffice/libreoffice-3.6.4.3.ebuild
  28. +583 −0 app-office/libreoffice/libreoffice-4.0.9999.ebuild
  29. +2 −2 app-vim/align/align-42.ebuild
  30. +2 −2 app-vim/automatictexplugin/automatictexplugin-12.1.ebuild
  31. +2 −2 app-vim/dbext/dbext-16.0.ebuild
  32. +2 −2 app-vim/minibufexpl/minibufexpl-6.4.4.ebuild
  33. +3 −3 app-vim/perl-support/perl-support-4.14.ebuild
  34. +3 −3 app-vim/perl-support/perl-support-4.8.ebuild
  35. +2 −2 app-vim/perl-support/perl-support-5.1.ebuild
  36. +2 −2 app-vim/supertab/supertab-2.0.ebuild
  37. +2 −2 app-vim/vimpress/vimpress-3.2.0.ebuild
  38. +2 −2 app-vim/wikipedia-syntax/wikipedia-syntax-20101113.ebuild
  39. +2 −2 app-vim/zencoding-vim/zencoding-vim-0.74.ebuild
  40. +2 −2 app-vim/zoomwin/zoomwin-24.ebuild
  41. +2 −2 dev-cpp/gstreamermm/gstreamermm-0.10.11.ebuild
  42. +2 −2 dev-db/libzdb/libzdb-2.10.5.ebuild
  43. +2 −2 dev-games/clanlib/clanlib-2.3.6.ebuild
  44. +2 −2 dev-lang/orc/orc-0.4.16-r1.ebuild
  45. +2 −2 dev-lang/vala/vala-0.10.4-r2.ebuild
  46. +2 −2 dev-lang/vala/vala-0.12.1-r1.ebuild
  47. +2 −2 dev-lang/vala/vala-0.14.2-r2.ebuild
  48. +2 −2 dev-lang/vala/vala-0.16.1-r2.ebuild
  49. +2 −2 dev-lang/vala/vala-0.18.0.ebuild
  50. +2 −2 dev-libs/jthread/jthread-1.2.1.ebuild
  51. +2 −2 dev-libs/openct/openct-0.6.20-r3.ebuild
  52. +2 −2 dev-libs/vala-common/vala-common-0.18.0.ebuild
  53. +2 −2 dev-perl/Alien-SDL/Alien-SDL-1.436.0.ebuild
  54. +2 −2 dev-php/pecl-geoip/pecl-geoip-1.0.8-r1.ebuild
  55. +2 −2 dev-python/django-pipeline/django-pipeline-1.2.9.ebuild
  56. +2 −2 dev-python/python-exec/python-exec-0.1.1.ebuild
  57. +2 −2 dev-ruby/allison/allison-2.0.3-r1.ebuild
  58. +2 −2 dev-ruby/ruby-augeas/ruby-augeas-0.4.1.ebuild
  59. +1 −0  dev-ruby/simple_oauth/Manifest
  60. +27 −0 dev-ruby/simple_oauth/simple_oauth-0.2.0.ebuild
  61. +1 −0  dev-ruby/test-unit-rr/Manifest
  62. +28 −0 dev-ruby/test-unit-rr/test-unit-rr-1.0.2.ebuild
  63. +1 −1  dev-util/rpmdevtools/Manifest
  64. +1 −1  dev-util/rpmdevtools/{rpmdevtools-8.2.ebuild → rpmdevtools-8.3.ebuild}
  65. +2 −2 games-arcade/afternoonstalker/afternoonstalker-1.1.5.ebuild
  66. +2 −2 games-board/domination/domination-1.1.1.1.ebuild
  67. +2 −2 games-board/gnubg/gnubg-20120806.ebuild
  68. +2 −2 games-emulation/openmsx/openmsx-0.9.1.ebuild
  69. +2 −2 games-engines/frobtads/frobtads-1.2.2.ebuild
  70. +2 −2 games-engines/scummvm/scummvm-1.5.0.ebuild
  71. +2 −2 games-fps/sauerbraten/sauerbraten-2010.07.28.ebuild
  72. +2 −2 games-puzzle/gweled/gweled-0.9.1.ebuild
  73. +2 −2 games-simulation/openttd/openttd-1.2.2.ebuild
  74. +8 −0 licenses/baudline
  75. +2 −1  mail-filter/bogofilter/Manifest
  76. +115 −0 mail-filter/bogofilter/bogofilter-1.2.3.ebuild
  77. +0 −1  mail-filter/maildrop/Manifest
  78. +0 −36 mail-filter/maildrop/files/maildrop-2.5.4-reformime.patch
  79. +0 −141 mail-filter/maildrop/maildrop-2.5.5-r1.ebuild
  80. +1 −1  media-gfx/pngcheck/Manifest
  81. +5 −4 media-gfx/pngcheck/pngcheck-2.3.0.ebuild
  82. +2 −1  media-gfx/povray/povray-3.7.0_rc6.ebuild
  83. +1 −1  media-gfx/xli/Manifest
  84. +3 −3 media-gfx/xli/xli-1.17.0-r4.ebuild
  85. +1 −1  media-libs/libmikmod/Manifest
  86. +4 −3 media-libs/libmikmod/libmikmod-3.2.0.ebuild
  87. +3 −3 media-libs/opengl-apple/opengl-apple-3.ebuild
  88. +3 −3 media-libs/opengl-apple/opengl-apple-4.ebuild
  89. +2 −2 media-libs/opengtl/opengtl-0.9.17.ebuild
  90. +2 −2 media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild
  91. +2 −2 media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-0.10.31.ebuild
  92. +2 −3 media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.0.3.ebuild
  93. +4 −2 media-plugins/gst-plugins-vorbis/gst-plugins-vorbis-0.10.36.ebuild
  94. +2 −2 media-sound/baudline/baudline-1.08-r1.ebuild
  95. +2 −2 media-sound/fluidsynth/fluidsynth-1.1.6.ebuild
  96. +2 −2 media-sound/mangler/mangler-1.2.4.ebuild
  97. +1 −1  media-sound/podracer/Manifest
  98. +3 −3 media-sound/podracer/podracer-1.4.ebuild
  99. +2 −2 media-video/vcdimager/vcdimager-0.7.23-r1.ebuild
  100. +1 −1  metadata/dtd/timestamp.chk
  101. +1 −1  metadata/glsa/timestamp.chk
  102. +2 −2 metadata/md5-cache/app-admin/durep-0.9-r4
  103. +2 −2 metadata/md5-cache/app-arch/libpar2-0.2.1
  104. +3 −3 metadata/md5-cache/app-emulation/qemu-9999
  105. +3 −3 metadata/md5-cache/app-emulation/virtualbox-bin-4.2.2
  106. +3 −3 metadata/md5-cache/app-emulation/virtualbox-bin-4.2.4
  107. +2 −2 metadata/md5-cache/app-emulation/xen-4.1.1-r2
  108. +15 −0 metadata/md5-cache/app-emulation/xen-4.2.0
  109. +2 −2 metadata/md5-cache/app-emulation/xen-pvgrub-4.1.1-r1
  110. +1 −1  metadata/md5-cache/app-emulation/xen-pvgrub-4.1.2
  111. +13 −0 metadata/md5-cache/app-emulation/xen-pvgrub-4.2.0
  112. +2 −2 metadata/md5-cache/app-misc/reptyr-0.4
  113. +15 −0 metadata/md5-cache/app-office/libreoffice-3.6.4.3
  114. +14 −0 metadata/md5-cache/app-office/libreoffice-4.0.9999
  115. +2 −2 metadata/md5-cache/app-vim/align-42
  116. +2 −2 metadata/md5-cache/app-vim/automatictexplugin-12.1
  117. +2 −2 metadata/md5-cache/app-vim/dbext-16.0
  118. +2 −2 metadata/md5-cache/app-vim/minibufexpl-6.4.4
  119. +2 −2 metadata/md5-cache/app-vim/perl-support-4.14
  120. +2 −2 metadata/md5-cache/app-vim/perl-support-4.8
  121. +2 −2 metadata/md5-cache/app-vim/perl-support-5.1
  122. +2 −2 metadata/md5-cache/app-vim/supertab-2.0
  123. +2 −2 metadata/md5-cache/app-vim/vimpress-3.2.0
  124. +2 −2 metadata/md5-cache/app-vim/wikipedia-syntax-20101113
  125. +2 −2 metadata/md5-cache/app-vim/zencoding-vim-0.74
  126. +2 −2 metadata/md5-cache/app-vim/zoomwin-24
  127. +3 −3 metadata/md5-cache/dev-cpp/gstreamermm-0.10.11
  128. +2 −2 metadata/md5-cache/dev-db/libzdb-2.10.5
  129. +2 −2 metadata/md5-cache/dev-games/clanlib-2.3.6
  130. +2 −2 metadata/md5-cache/dev-lang/orc-0.4.16-r1
  131. +2 −2 metadata/md5-cache/dev-lang/vala-0.10.4-r2
  132. +2 −2 metadata/md5-cache/dev-lang/vala-0.12.1-r1
  133. +2 −2 metadata/md5-cache/dev-lang/vala-0.14.2-r2
  134. +2 −2 metadata/md5-cache/dev-lang/vala-0.16.1-r2
  135. +2 −2 metadata/md5-cache/dev-lang/vala-0.18.0
  136. +2 −2 metadata/md5-cache/dev-libs/jthread-1.2.1
  137. +2 −2 metadata/md5-cache/dev-libs/openct-0.6.20-r3
  138. +2 −2 metadata/md5-cache/dev-libs/vala-common-0.18.0
  139. +2 −2 metadata/md5-cache/dev-perl/Alien-SDL-1.436.0
  140. +2 −2 metadata/md5-cache/dev-php/pecl-geoip-1.0.8-r1
  141. +2 −2 metadata/md5-cache/dev-python/django-pipeline-1.2.9
  142. +2 −2 metadata/md5-cache/dev-python/python-exec-0.1.1
  143. +2 −2 metadata/md5-cache/dev-ruby/allison-2.0.3-r1
  144. +2 −2 metadata/md5-cache/dev-ruby/ruby-augeas-0.4.1
  145. +14 −0 metadata/md5-cache/dev-ruby/simple_oauth-0.2.0
  146. +14 −0 metadata/md5-cache/dev-ruby/test-unit-rr-1.0.2
  147. +2 −2 metadata/md5-cache/dev-util/{rpmdevtools-8.2 → rpmdevtools-8.3}
  148. +2 −2 metadata/md5-cache/games-arcade/afternoonstalker-1.1.5
  149. +2 −2 metadata/md5-cache/games-board/domination-1.1.1.1
  150. +2 −2 metadata/md5-cache/games-board/gnubg-20120806
  151. +2 −2 metadata/md5-cache/games-emulation/openmsx-0.9.1
  152. +2 −2 metadata/md5-cache/games-engines/frobtads-1.2.2
  153. +2 −2 metadata/md5-cache/games-engines/scummvm-1.5.0
  154. +2 −2 metadata/md5-cache/games-fps/sauerbraten-2010.07.28
  155. +2 −2 metadata/md5-cache/games-puzzle/gweled-0.9.1
  156. +2 −2 metadata/md5-cache/games-simulation/openttd-1.2.2
  157. +13 −0 metadata/md5-cache/mail-filter/bogofilter-1.2.3
  158. +0 −14 metadata/md5-cache/mail-filter/maildrop-2.5.5-r1
  159. +2 −2 metadata/md5-cache/media-gfx/pngcheck-2.3.0
  160. +1 −1  metadata/md5-cache/media-gfx/povray-3.7.0_rc6
  161. +2 −2 metadata/md5-cache/media-gfx/xli-1.17.0-r4
  162. +3 −3 metadata/md5-cache/media-libs/libmikmod-3.2.0
  163. +2 −2 metadata/md5-cache/media-libs/opengl-apple-3
  164. +2 −2 metadata/md5-cache/media-libs/opengl-apple-4
  165. +2 −2 metadata/md5-cache/media-libs/opengtl-0.9.17
  166. +2 −2 metadata/md5-cache/media-libs/sdl-terminal-1.1.3-r1
  167. +3 −3 metadata/md5-cache/media-plugins/gst-plugins-jpeg-0.10.31
  168. +3 −3 metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.0.3
  169. +2 −2 metadata/md5-cache/media-plugins/gst-plugins-vorbis-0.10.36
  170. +2 −2 metadata/md5-cache/media-sound/baudline-1.08-r1
  171. +2 −2 metadata/md5-cache/media-sound/fluidsynth-1.1.6
  172. +2 −2 metadata/md5-cache/media-sound/mangler-1.2.4
  173. +2 −2 metadata/md5-cache/media-sound/podracer-1.4
  174. +2 −2 metadata/md5-cache/media-video/vcdimager-0.7.23-r1
  175. +1 −1  metadata/timestamp
  176. +1 −1  metadata/timestamp.chk
  177. +1 −1  metadata/timestamp.x
View
2  .gitignore
@@ -1,2 +0,0 @@
-distfiles/*
-packages/*
View
4 app-admin/durep/durep-0.9-r4.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-admin/durep/durep-0.9-r4.ebuild,v 1.2 2012/12/01 21:30:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/durep/durep-0.9-r4.ebuild,v 1.3 2012/12/04 10:43:58 blueness Exp $
EAPI=4
inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="http://www.hibernaculum.net/download/${P}.tar.gz"
LICENSE="Artistic"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
IUSE=""
DEPEND="dev-lang/perl"
View
4 app-arch/libpar2/libpar2-0.2.1.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-arch/libpar2/libpar2-0.2.1.ebuild,v 1.4 2012/11/29 20:33:50 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/libpar2/libpar2-0.2.1.ebuild,v 1.5 2012/12/04 11:24:38 ago Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV:0:3}/${PV}/+download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE="static-libs"
RDEPEND="dev-libs/libsigc++:2"
View
6 app-emulation/qemu/qemu-9999.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/qemu/qemu-9999.ebuild,v 1.34 2012/11/21 22:22:35 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.35 2012/12/04 10:20:45 slyfox Exp $
EAPI="4"
@@ -68,7 +68,7 @@ LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
seccomp? ( >=sys-libs/libseccomp-1.0.0[static-libs(+)] )
- spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] )
+ spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
tls? ( net-libs/gnutls[static-libs(+)] )
uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
vde? ( net-misc/vde[static-libs(+)] )
@@ -88,7 +88,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
python? ( =dev-lang/python-2*[ncurses] )
sdl? ( media-libs/libsdl[X] )
smartcard? ( dev-libs/nss )
- spice? ( >=app-emulation/spice-protocol-0.8.1 )
+ spice? ( >=app-emulation/spice-protocol-0.12.2 )
systemtap? ( dev-util/systemtap )
usbredir? ( >=sys-apps/usbredir-0.3.4 )
virtfs? ( sys-libs/libcap )
View
8 app-emulation/virtualbox-bin/files/10-virtualbox.rules
@@ -1,7 +1,7 @@
# create second tree of USB devices according to
# http://www.virtualbox.org/ticket/7759#comment:5
-SUBSYSTEM=="usb_device", ACTION!="remove", RUN="/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM=="usb", ACTION!="remove", ENV{DEVTYPE}=="usb_device", RUN="/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/lib/udev/VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/lib/udev/VBoxCreateUSBNode.sh --remove $major $minor"
+SUBSYSTEM=="usb_device", ACTION!="remove", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+SUBSYSTEM=="usb", ACTION!="remove", ENV{DEVTYPE}=="usb_device", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+SUBSYSTEM=="usb_device", ACTION=="remove", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh --remove $major $minor"
+SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh --remove $major $minor"
View
15 app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild,v 1.1 2012/10/24 04:41:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild,v 1.2 2012/12/04 09:40:13 polynomial-c Exp $
EAPI=2
-inherit eutils unpacker fdo-mime gnome2 pax-utils
+inherit eutils unpacker fdo-mime gnome2 pax-utils udev
MY_PV=${PV/beta/BETA}
MY_PV=${MY_PV/rc/RC}
@@ -307,11 +307,14 @@ src_install() {
echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
doenvd "${T}/90virtualbox"
- insinto /lib/udev/rules.d
+ local udevdir="$(udev_get_udevdir)"
+ insinto ${udevdir}/rules.d
doins "${FILESDIR}"/10-virtualbox.rules
- # move udev scripts into /lib/udev (bug #372491)
- mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev
- fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
+ sed "s@%UDEVDIR%@${udevdir}@" \
+ -i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+ # move udev scripts into ${udevdir} (bug #372491)
+ mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
+ fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
}
pkg_postinst() {
View
15 app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild,v 1.1 2012/11/10 21:08:38 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild,v 1.2 2012/12/04 09:40:13 polynomial-c Exp $
EAPI=2
-inherit eutils unpacker fdo-mime gnome2 pax-utils
+inherit eutils unpacker fdo-mime gnome2 pax-utils udev
MY_PV=${PV/beta/BETA}
MY_PV=${MY_PV/rc/RC}
@@ -307,11 +307,14 @@ src_install() {
echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
doenvd "${T}/90virtualbox"
- insinto /lib/udev/rules.d
+ local udevdir="$(udev_get_udevdir)"
+ insinto ${udevdir}/rules.d
doins "${FILESDIR}"/10-virtualbox.rules
- # move udev scripts into /lib/udev (bug #372491)
- mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev
- fperms 0750 /lib/udev/VBoxCreateUSBNode.sh
+ sed "s@%UDEVDIR%@${udevdir}@" \
+ -i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+ # move udev scripts into ${udevdir} (bug #372491)
+ mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die
+ fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
}
pkg_postinst() {
View
1  app-emulation/xen-pvgrub/Manifest
@@ -5,4 +5,5 @@ 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
View
149 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. */
+
View
37 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
View
112 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"
+
View
12 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'
+
View
10 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() {
View
6 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):' \
View
110 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/"
+}
View
1  app-emulation/xen/Manifest
@@ -1,2 +1,3 @@
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
View
21 app-emulation/xen/files/xen-3.3.0-unexported-target-fix.patch
@@ -1,21 +0,0 @@
-diff -Nru a/tools/ioemu-qemu-xen/xen-setup b/tools/ioemu-qemu-xen/xen-setup
---- a/tools/ioemu-qemu-xen/xen-setup 2008-08-22 17:56:41.000000000 +0800
-+++ b/tools/ioemu-qemu-xen/xen-setup 2009-02-20 10:55:37.000000000 +0800
-@@ -3,6 +3,8 @@
-
- # git-clean -x -d && ./xen-setup && make prefix=/usr CMDLINE_CFLAGS='-O0 -g' -j4 && make install DESTDIR=`pwd`/dist/ prefix=/usr && rsync -a --stats --delete . thule:shadow/qemu-iwj.git/ && rsync -a --stats dist/. root@thule:/
-
-+target=i386-dm
-+
- rm -f $target/Makefile
- rm -f $target/config.mak
- rm -f config-host.mak
-@@ -11,8 +13,6 @@
-
- ./configure --disable-gfx-check --disable-gcc-check --disable-curses --disable-slirp "$@" --prefix=/usr
-
--target=i386-dm
--
- if [ "x$XEN_ROOT" != x ]; then
- echo "XEN_ROOT=$XEN_ROOT" >>config-host.mak
- fi
View
87 app-emulation/xen/files/xen-3.4.2-CVE-2011-1583.patch
@@ -1,87 +0,0 @@
---- tools/libxc/xc_dom_bzimageloader.c 2009-11-10 23:12:56.000000000 +0800
-+++ tools/libxc/xc_dom_bzimageloader.c 2011-10-09 20:10:08.972815311 +0800
-@@ -308,19 +308,19 @@
-
- extern struct xc_dom_loader elf_loader;
-
--static unsigned int payload_offset(struct setup_header *hdr)
-+static int check_magic(struct xc_dom_image *dom, const void *magic, size_t len)
- {
-- unsigned int off;
-+ if (len > dom->kernel_size)
-+ return 0;
-+
-+ return (memcmp(dom->kernel_blob, magic, len) == 0);
-+ }
-
-- off = (hdr->setup_sects + 1) * 512;
-- off += hdr->payload_offset;
-- return off;
--}
--
--static int xc_dom_probe_bzimage_kernel(struct xc_dom_image *dom)
-+static int check_bzimage_kernel(struct xc_dom_image *dom, int verbose)
- {
- struct setup_header *hdr;
-- int ret;
-+ uint64_t payload_offset, payload_length;
-+ /* int ret; */
-
- if ( dom->kernel_blob == NULL )
- {
-@@ -352,20 +352,47 @@
- return -EINVAL;
- }
-
-- dom->kernel_blob = dom->kernel_blob + payload_offset(hdr);
-- dom->kernel_size = hdr->payload_length;
-+ /* upcast to 64 bits to avoid overflow */
-+ /* setup_sects is u8 and so cannot overflow */
-+ payload_offset = (hdr->setup_sects + 1) * 512;
-+ payload_offset += hdr->payload_offset;
-+ payload_length = hdr->payload_length;
-
-- if ( memcmp(dom->kernel_blob, "\037\213", 2) == 0 )
-- {
-+/* if ( memcmp(dom->kernel_blob, "\037\213", 2) == 0 )
-+ {
- ret = xc_dom_try_gunzip(dom, &dom->kernel_blob, &dom->kernel_size);
-- if ( ret == -1 )
-+ if ( ret == -1 ) */
-+ if ( payload_offset >= dom->kernel_size )
-+ {
-+ xc_dom_panic(XC_INVALID_KERNEL, "%s: payload offset overflow",
-+ __FUNCTION__);
-+ return -EINVAL;
-+ }
-+ if ( (payload_offset + payload_length) > dom->kernel_size )
-+ {
-+ xc_dom_panic(XC_INVALID_KERNEL, "%s: payload length overflow",
-+ __FUNCTION__);
-+ }
-+
-+ dom->kernel_blob = dom->kernel_blob + payload_offset;
-+ dom->kernel_size = payload_length;
-+
-+ if ( check_magic(dom, "\037\213", 2) )
-+ {
-+ if ( xc_dom_try_gunzip(dom, &dom->kernel_blob, &dom->kernel_size) == -1 )
- {
-- xc_dom_panic(XC_INVALID_KERNEL,
-- "%s: unable to gzip decompress kernel\n",
-- __FUNCTION__);
-+ if ( verbose )
-+ xc_dom_panic(XC_INVALID_KERNEL, "%s: unable to decompress kernel\$n",
-+ __FUNCTION__);
- return -EINVAL;
- }
- }
-+ else
-+ {
-+ xc_dom_panic(XC_INVALID_KERNEL, "%s: unknown compression format\n",
-+ __FUNCTION__);
-+ return -EINVAL;
-+ }
- else if ( memcmp(dom->kernel_blob, "\102\132\150", 3) == 0 )
- {
- ret = xc_try_bzip2_decode(dom, &dom->kernel_blob, &dom->kernel_size);
View
19 app-emulation/xen/files/xen-3.4.2-dump_registers-watchdog-fix.patch
@@ -1,19 +0,0 @@
-diff -r 784caad93325 xen/common/keyhandler.c
---- a/xen/common/keyhandler.c Tue Nov 10 15:03:52 2009 +0000
-+++ b/xen/common/keyhandler.c Tue Jan 05 10:47:49 2010 +0000
-@@ -106,6 +106,7 @@
- unsigned int cpu;
-
- /* We want to get everything out that we possibly can. */
-+ watchdog_disable();
- console_start_sync();
-
- printk("'%c' pressed -> dumping registers\n", key);
-@@ -125,6 +126,7 @@
- printk("\n");
-
- console_end_sync();
-+ watchdog_enable();
- }
-
- static void dump_dom0_registers(unsigned char key)
View
101 app-emulation/xen/files/xen-3.4.2-fix-__addr_ok-limit.patch
@@ -1,101 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
- Xen Security Advisory CVE-2011-2901 / XSA-4
- revision no.2
- Xen <= 3.3 DoS due to incorrect virtual address validation
-
-ISSUE DESCRIPTION
-=================
-
-The x86_64 __addr_ok() macro intends to ensure that the checked
-address is either in the positive half of the 48-bit virtual address
-space, or above the Xen-reserved area. However, the current shift
-count is off-by-one, allowing full access to the "negative half" too,
-via certain hypercalls which ignore virtual-address bits [63:48].
-Vulnerable hypercalls exist only in very old versions of the
-hypervisor.
-
-VULNERABLE SYSTEMS
-==================
-
-All systems running a Xen 3.3 or earlier hypervisor with 64-bit PV
-guests with untrusted administrators are vulnerable.
-
-IMPACT
-======
-
-A malicious guest administrator on a vulnerable system is able to
-crash the host.
-
-There are no known further exploits but these have not been ruled out.
-
-RESOLUTION
-==========
-
-The attached patch resolves the issue.
-
-Alternatively, users may choose to upgrade to a more recent hypervisor
-
-PATCHES
-=======
-
-The following patch resolves this issue.
-
-Filename: fix-__addr_ok-limit.patch
-SHA1: f18bde8d276110451c608a16f577865aa1226b4f
-SHA256: 2da5aac72e1ac4849c34d38374ae456795905fd9512eef94b48fc31383c21636
-
-This patch should apply cleanly, and fix the problem, for all affected
-versions of Xen.
-
-It is harmless when applied to later hypervisors and will be included
-in the Xen unstable branch in due course.
-
-VERSION HISTORY
-===============
-
-Analysis following version 1 of this advisory (sent out to the
-predisclosure list during the embargo period) indicates that the
-actual DoS vulnerability only exists in very old hypervisors, Xen 3.3
-and earlier, contrary to previous reports.
-
-This advisory is no longer embargoed.
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iQEcBAEBAgAGBQJOYLq2AAoJEIP+FMlX6CvZLegH/26/oJBkd/WM/yYhXkzlbnIP
-MxF6Fgy96Omu8poQTanD7g1vEcM0TOLY+Kk3GGsfj4aDdEJ5Nq4ZOW8ooI0VnVcD
-7VXQqFsXPxre+eZ6g+G0AsmzdsG45C3qujUTRfGKqzYwXqjWjt9nNsdIy1Mrz8/4
-zG1uLDkN0LXnBG2Te4q8ZckYwMq8gFXHHnH35RfQ5Besu6pvJmtK3rFXETdlP12A
-JjBh7t5jsCfzvYWFQehVp8mJupuftiOBPClmVh4vrvN9gYd5rzEgB4Q9Ioiqz2qT
-2bE1zegR8NeOKBOi9xriTU8F530OdFzeWAbo7D5gyEbYdc60eNwbadcgNGLbzMg=
-=09T8
------END PGP SIGNATURE-----
-
-Subject: XSA-4: xen: correct limit checking in x86_64 version of __addr_ok
-
-The x86_64 __addr_ok() macro intends to ensure that the checked
-address is either in the positive half of the 48-bit virtual address
-space, or above the Xen-reserved area. However, the current shift
-count is off-by-one, allowing full access to the "negative half"
-too. Guests may exploit this to gain access to off-limits ranges.
-
-This issue has been assigned CVE-2011-2901.
-
-Signed-off-by: Laszlo Ersek <lersek@...hat.com>
-Signed-off-by: Ian Campbell <ian.campbell@...rix.com>
-
-diff --git a/xen/include/asm-x86/x86_64/uaccess.h
-b/xen/include/asm-x86/x86_64/uaccess.h
---- a/xen/include/asm-x86/x86_64/uaccess.h
-+++ b/xen/include/asm-x86/x86_64/uaccess.h
-@@ -34,7 +34,7 @@
- * non-canonical address (and thus fault) before ever reaching VIRT_START.
- */
- #define __addr_ok(addr) \
-- (((unsigned long)(addr) < (1UL<<48)) || \
-+ (((unsigned long)(addr) < (1UL<<47)) || \
- ((unsigned long)(addr) >= HYPERVISOR_VIRT_END))
-
- #define access_ok(addr, size) \
View
71 app-emulation/xen/files/xen-3.4.2-no-DMA.patch
@@ -1,71 +0,0 @@
-# HG changeset patch
-# User Tim Deegan <Tim.Deegan@citrix.com>
-# Date 1313145221 -3600
-# Node ID 84e3706df07a1963e23cd3875d8603917657d462
-# Parent cb22fa57ff252893b6adb1481e09b1287eacd990
-Passthrough: disable bus-mastering on any card that causes an IOMMU fault.
-
-This stops the card from raising back-to-back faults and live-locking
-the CPU that handles them.
-
-Signed-off-by: Tim Deegan <tim@xen.org>
-Acked-by: Wei Wang2 <wei.wang2@amd.com>
-Acked-by: Allen M Kay <allen.m.kay@intel.com>
-
---- a/xen/drivers/passthrough/vtd/iommu.c.orig Mon Jul 25 16:48:39 2011 +0100
-+++ b/xen/drivers/passthrough/vtd/iommu.c Fri Aug 12 11:33:41 2011 +0100
-@@ -733,7 +733,7 @@
- while (1)
- {
- u8 fault_reason;
-- u16 source_id;
-+ u16 source_id, cword;
- u32 data;
- u64 guest_addr;
- int type;
-@@ -766,6 +766,14 @@
- iommu_page_fault_do_one(iommu, type, fault_reason,
- source_id, guest_addr);
-
-+ /* Tell the device to stop DMAing; we can't rely on the guest to
-+ * control it for us. */
-+ cword = pci_conf_read16(PCI_BUS(source_id), PCI_SLOT(source_id),
-+ PCI_FUNC(source_id), PCI_COMMAND);
-+ pci_conf_write16(PCI_BUS(source_id), PCI_SLOT(source_id),
-+ PCI_FUNC(source_id), PCI_COMMAND,
-+ cword & ~PCI_COMMAND_MASTER);
-+
- fault_index++;
- if ( fault_index > cap_num_fault_regs(iommu->cap) )
- fault_index = 0;
-
---- a/xen/drivers/passthrough/amd/iommu_init.c.orig Mon Jul 25 16:48:39 2011 +0100
-+++ b/xen/drivers/passthrough/amd/iommu_init.c Fri Aug 12 11:33:41 2011 +0100
-@@ -415,7 +415,7 @@
-
- static void parse_event_log_entry(u32 entry[])
- {
-- u16 domain_id, device_id;
-+ u16 domain_id, device_id, bdf, cword;
- u32 code;
- u64 *addr;
- char * event_str[] = {"ILLEGAL_DEV_TABLE_ENTRY",
-@@ -449,6 +449,18 @@
- printk(XENLOG_ERR "AMD-Vi: "
- "%s: domain = %d, device id = 0x%04x, fault address = 0x%"PRIx64"\n",
- event_str[code-1], domain_id, device_id, *addr);
-+
-+ /* Tell the device to stop DMAing; we can't rely on the guest to
-+ * control it for us. */
-+ for ( bdf = 0; bdf < ivrs_bdf_entries; bdf++ )
-+ if ( get_dma_requestor_id(bdf) == device_id )
-+ {
-+ cword = pci_conf_read16(PCI_BUS(bdf), PCI_SLOT(bdf),
-+ PCI_FUNC(bdf), PCI_COMMAND);
-+ pci_conf_write16(PCI_BUS(bdf), PCI_SLOT(bdf),
-+ PCI_FUNC(bdf), PCI_COMMAND,
-+ cword & ~PCI_COMMAND_MASTER);
-+ }
- }
- }
-
View
429 app-emulation/xen/files/xen-3.4.2-werror-idiocy.patch
@@ -1,429 +0,0 @@
-diff -ur xen-3.4.2.orig//Config.mk xen-3.4.2//Config.mk
---- xen-3.4.2.orig//Config.mk 2009-11-10 23:16:03.000000000 +0800
-+++ xen-3.4.2//Config.mk 2011-09-25 02:34:11.605793042 +0800
-@@ -14,7 +14,7 @@
-
- # Tools to run on system hosting the build
- HOSTCC = gcc
--HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
-+HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
- HOSTCFLAGS += -fno-strict-aliasing
-
- DISTDIR ?= $(XEN_ROOT)/dist
-diff -ur xen-3.4.2.orig//extras/mini-os/minios.mk xen-3.4.2//extras/mini-os/minios.mk
---- xen-3.4.2.orig//extras/mini-os/minios.mk 2009-11-10 23:12:55.000000000 +0800
-+++ xen-3.4.2//extras/mini-os/minios.mk 2011-09-25 02:34:11.855793042 +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-3.4.2.orig//tools/blktap/drivers/Makefile xen-3.4.2//tools/blktap/drivers/Makefile
---- xen-3.4.2.orig//tools/blktap/drivers/Makefile 2009-11-10 23:12:55.000000000 +0800
-+++ xen-3.4.2//tools/blktap/drivers/Makefile 2011-09-25 02:34:11.750793042 +0800
-@@ -5,7 +5,7 @@
- QCOW_UTIL = img2qcow qcow2raw qcow-create
- LIBAIO_DIR = ../../libaio/src
-
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += -Wno-unused
- CFLAGS += -I../lib
- CFLAGS += $(CFLAGS_libxenctrl)
-diff -ur xen-3.4.2.orig//tools/blktap/lib/Makefile xen-3.4.2//tools/blktap/lib/Makefile
---- xen-3.4.2.orig//tools/blktap/lib/Makefile 2009-11-10 23:12:55.000000000 +0800
-+++ xen-3.4.2//tools/blktap/lib/Makefile 2011-09-25 02:34:11.748793042 +0800
-@@ -13,7 +13,7 @@
- SRCS :=
- SRCS += xenbus.c blkif.c xs_api.c
-
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += -Wno-unused
- CFLAGS += -fPIC
- # get asprintf():
-diff -ur xen-3.4.2.orig//tools/console/Makefile xen-3.4.2//tools/console/Makefile
---- xen-3.4.2.orig//tools/console/Makefile 2009-11-10 23:12:55.000000000 +0800
-+++ xen-3.4.2//tools/console/Makefile 2011-09-25 02:34:11.704793042 +0800
-@@ -2,7 +2,7 @@
- XEN_ROOT=../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -Werror
-+CFLAGS +=
-
- CFLAGS += $(CFLAGS_libxenctrl)
- CFLAGS += $(CFLAGS_libxenstore)
-diff -ur xen-3.4.2.orig//tools/debugger/xenitp/Makefile xen-3.4.2//tools/debugger/xenitp/Makefile
---- xen-3.4.2.orig//tools/debugger/xenitp/Makefile 2009-11-10 23:12:55.000000000 +0800
-+++ xen-3.4.2//tools/debugger/xenitp/Makefile 2011-09-25 02:34:11.744793042 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=../../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--#CFLAGS += -Werror -g -O0
-+#CFLAGS += -g -O0
-
- CFLAGS += $(CFLAGS_libxenctrl)
-
-diff -ur xen-3.4.2.orig//tools/firmware/Rules.mk xen-3.4.2//tools/firmware/Rules.mk
---- xen-3.4.2.orig//tools/firmware/Rules.mk 2009-11-10 23:12:55.000000000 +0800
-+++ xen-3.4.2//tools/firmware/Rules.mk 2011-09-25 02:34:11.565793045 +0800
-@@ -10,7 +10,7 @@
- CFLAGS += -DNDEBUG
- endif
-
--CFLAGS += -Werror
-+CFLAGS +=
-
- # Disable PIE/SSP if GCC supports them. They can break us.
- $(call cc-option-add,CFLAGS,CC,-nopie)
-diff -ur xen-3.4.2.orig//tools/flask/libflask/Makefile xen-3.4.2//tools/flask/libflask/Makefile
---- xen-3.4.2.orig//tools/flask/libflask/Makefile 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/flask/libflask/Makefile 2011-09-25 02:34:11.657793042 +0800
-@@ -9,7 +9,7 @@
- SRCS :=
- SRCS += flask_op.c
-
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += -fno-strict-aliasing
- CFLAGS += $(INCLUDES) -I./include -I$(XEN_LIBXC) -I$(XEN_INCLUDE)
-
-diff -ur xen-3.4.2.orig//tools/flask/loadpolicy/Makefile xen-3.4.2//tools/flask/loadpolicy/Makefile
---- xen-3.4.2.orig//tools/flask/loadpolicy/Makefile 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/flask/loadpolicy/Makefile 2011-09-25 02:34:11.660793042 +0800
-@@ -6,7 +6,7 @@
- LIBFLASK_ROOT = $(XEN_ROOT)/tools/flask/libflask
-
- PROFILE=#-pg
--BASECFLAGS=-Wall -g -Werror
-+BASECFLAGS=-Wall -g
- BASECFLAGS+= $(PROFILE)
- #BASECFLAGS+= -I$(XEN_ROOT)/tools
- BASECFLAGS+= $(CFLAGS_libxenctrl)
-diff -ur xen-3.4.2.orig//tools/fs-back/Makefile xen-3.4.2//tools/fs-back/Makefile
---- xen-3.4.2.orig//tools/fs-back/Makefile 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/fs-back/Makefile 2011-09-25 02:34:11.637793042 +0800
-@@ -5,7 +5,7 @@
-
- IBIN = fs-backend
-
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += -Wno-unused
- CFLAGS += -fno-strict-aliasing
- CFLAGS += $(CFLAGS_libxenctrl)
-diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/configure xen-3.4.2//tools/ioemu-qemu-xen/configure
---- xen-3.4.2.orig//tools/ioemu-qemu-xen/configure 2009-11-05 19:44:56.000000000 +0800
-+++ xen-3.4.2//tools/ioemu-qemu-xen/configure 2011-09-25 02:34:11.888793042 +0800
-@@ -468,7 +468,7 @@
- CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls"
- LDFLAGS="$LDFLAGS -g"
- if test "$werror" = "yes" ; then
--CFLAGS="$CFLAGS -Werror"
-+CFLAGS="$CFLAGS"
- fi
-
- if test "$solaris" = "no" ; then
-@@ -1150,7 +1150,7 @@
- echo "sparse enabled $sparse"
- echo "profiler $profiler"
- echo "static build $static"
--echo "-Werror enabled $werror"
-+
- if test "$darwin" = "yes" ; then
- echo "Cocoa support $cocoa"
- fi
-diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/Makefile.target xen-3.4.2//tools/ioemu-qemu-xen/Makefile.target
---- xen-3.4.2.orig//tools/ioemu-qemu-xen/Makefile.target 2011-09-25 02:33:23.946793064 +0800
-+++ xen-3.4.2//tools/ioemu-qemu-xen/Makefile.target 2011-09-25 02:34:11.584793042 +0800
-@@ -26,7 +26,7 @@
- TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH)
- VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw
- CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H
--#CFLAGS+=-Werror
-+#CFLAGS+=
- LIBS=
- # user emulator name
- ifndef TARGET_ARCH2
-diff -ur xen-3.4.2.orig//tools/libaio/harness/Makefile xen-3.4.2//tools/libaio/harness/Makefile
---- xen-3.4.2.orig//tools/libaio/harness/Makefile 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/libaio/harness/Makefile 2011-09-25 02:34:11.674793042 +0800
-@@ -4,7 +4,7 @@
- HARNESS_SRCS:=main.c
- # io_queue.c
-
--CFLAGS=-Wall -Werror -g -O -laio
-+CFLAGS=-Wall -g -O -laio
- #-lpthread -lrt
-
- all: $(PROGS)
-diff -ur xen-3.4.2.orig//tools/libfsimage/Rules.mk xen-3.4.2//tools/libfsimage/Rules.mk
---- xen-3.4.2.orig//tools/libfsimage/Rules.mk 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/libfsimage/Rules.mk 2011-09-25 02:34:11.566793044 +0800
-@@ -1,6 +1,6 @@
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror
-+CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/
- LDFLAGS += -L../common/
-
- PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
-diff -ur xen-3.4.2.orig//tools/libxc/Makefile xen-3.4.2//tools/libxc/Makefile
---- xen-3.4.2.orig//tools/libxc/Makefile 2011-09-25 02:33:23.987793064 +0800
-+++ xen-3.4.2//tools/libxc/Makefile 2011-09-25 02:34:11.687793042 +0800
-@@ -52,7 +52,7 @@
-
- -include $(XEN_TARGET_ARCH)/Makefile
-
--CFLAGS += -Werror -Wmissing-prototypes
-+CFLAGS += -Wmissing-prototypes
- CFLAGS += $(INCLUDES) -I. -I../xenstore -I../include
-
- # Needed for posix_fadvise64() in xc_linux.c
-diff -ur xen-3.4.2.orig//tools/libxen/Makefile.dist xen-3.4.2//tools/libxen/Makefile.dist
---- xen-3.4.2.orig//tools/libxen/Makefile.dist 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/libxen/Makefile.dist 2011-09-25 02:34:11.593793042 +0800
-@@ -22,7 +22,7 @@
- CFLAGS = -Iinclude \
- $(shell xml2-config --cflags) \
- $(shell curl-config --cflags) \
-- -W -Wall -Wmissing-prototypes -Werror -std=c99 -O2 -fPIC
-+ -W -Wall -Wmissing-prototypes -std=c99 -O2 -fPIC
-
- LDFLAGS = $(shell xml2-config --libs) \
- $(shell curl-config --libs)
-diff -ur xen-3.4.2.orig//tools/misc/lomount/Makefile xen-3.4.2//tools/misc/lomount/Makefile
---- xen-3.4.2.orig//tools/misc/lomount/Makefile 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/misc/lomount/Makefile 2011-09-25 02:34:11.666793042 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=../../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -Werror
-+CFLAGS +=
-
- HDRS = $(wildcard *.h)
- OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
-diff -ur xen-3.4.2.orig//tools/misc/Makefile xen-3.4.2//tools/misc/Makefile
---- xen-3.4.2.orig//tools/misc/Makefile 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/misc/Makefile 2011-09-25 02:34:11.669793042 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -Werror
-+CFLAGS +=
-
- INCLUDES += -I $(XEN_XC)
- INCLUDES += -I $(XEN_LIBXC)
-diff -ur xen-3.4.2.orig//tools/pygrub/setup.py xen-3.4.2//tools/pygrub/setup.py
---- xen-3.4.2.orig//tools/pygrub/setup.py 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/pygrub/setup.py 2011-09-25 02:34:11.901793042 +0800
-@@ -3,7 +3,7 @@
- import os
- import sys
-
--extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
-+extra_compile_args = [ "-fno-strict-aliasing" ]
-
- XEN_ROOT = "../.."
-
-diff -ur xen-3.4.2.orig//tools/python/setup.py xen-3.4.2//tools/python/setup.py
---- xen-3.4.2.orig//tools/python/setup.py 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/python/setup.py 2011-09-25 02:34:11.897793042 +0800
-@@ -4,7 +4,7 @@
-
- XEN_ROOT = "../.."
-
--extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
-+extra_compile_args = [ "-fno-strict-aliasing" ]
-
- include_dirs = [ XEN_ROOT + "/tools/libxc",
- XEN_ROOT + "/tools/xenstore",
-diff -ur xen-3.4.2.orig//tools/security/Makefile xen-3.4.2//tools/security/Makefile
---- xen-3.4.2.orig//tools/security/Makefile 2009-11-10 23:12:56.000000000 +0800
-+++ xen-3.4.2//tools/security/Makefile 2011-09-25 02:34:11.701793042 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT = ../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += -fno-strict-aliasing
- CFLAGS += -I. $(CFLAGS_libxenctrl)
-
-diff -ur xen-3.4.2.orig//tools/vnet/libxutil/Makefile xen-3.4.2//tools/vnet/libxutil/Makefile
---- xen-3.4.2.orig//tools/vnet/libxutil/Makefile 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/vnet/libxutil/Makefile 2011-09-25 02:34:11.694793042 +0800
-@@ -25,7 +25,7 @@
- PIC_OBJS := $(LIB_SRCS:.c=.opic)
-
- $(call cc-option-add,CFLAGS,CC,-fgnu89-inline)
--CFLAGS += -Werror -fno-strict-aliasing
-+CFLAGS += -fno-strict-aliasing
- CFLAGS += -O3
- #CFLAGS += -g
-
-diff -ur xen-3.4.2.orig//tools/vtpm/Rules.mk xen-3.4.2//tools/vtpm/Rules.mk
---- xen-3.4.2.orig//tools/vtpm/Rules.mk 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/vtpm/Rules.mk 2011-09-25 02:34:11.563793044 +0800
-@@ -9,7 +9,7 @@
- TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
-
- # General compiler flags
--CFLAGS = -Werror -g3 -I.
-+CFLAGS = -g3 -I.
-
- # Generic project files
- HDRS = $(wildcard *.h)
-diff -ur xen-3.4.2.orig//tools/vtpm_manager/Rules.mk xen-3.4.2//tools/vtpm_manager/Rules.mk
---- xen-3.4.2.orig//tools/vtpm_manager/Rules.mk 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/vtpm_manager/Rules.mk 2011-09-25 02:34:11.562793042 +0800
-@@ -9,7 +9,7 @@
- TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
-
- # General compiler flags
--CFLAGS = -Werror -g3 -I.
-+CFLAGS = -g3 -I.
-
- # Generic project files
- HDRS = $(wildcard *.h)
-diff -ur xen-3.4.2.orig//tools/xcutils/Makefile xen-3.4.2//tools/xcutils/Makefile
---- xen-3.4.2.orig//tools/xcutils/Makefile 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/xcutils/Makefile 2011-09-25 02:34:11.636793042 +0800
-@@ -11,7 +11,7 @@
- XEN_ROOT = ../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
-
- PROGRAMS = xc_restore xc_save readnotes lsevtchn
-diff -ur xen-3.4.2.orig//tools/xenmon/Makefile xen-3.4.2//tools/xenmon/Makefile
---- xen-3.4.2.orig//tools/xenmon/Makefile 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/xenmon/Makefile 2011-09-25 02:34:11.641793042 +0800
-@@ -13,7 +13,7 @@
- XEN_ROOT=../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += -I $(XEN_XC)
- CFLAGS += $(CFLAGS_libxenctrl)
- LDFLAGS += $(LDFLAGS_libxenctrl)
-diff -ur xen-3.4.2.orig//tools/xenpmd/Makefile xen-3.4.2//tools/xenpmd/Makefile
---- xen-3.4.2.orig//tools/xenpmd/Makefile 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/xenpmd/Makefile 2011-09-25 02:34:11.656793042 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += $(CFLAGS_libxenstore)
- LDFLAGS += $(LDFLAGS_libxenstore)
-
-diff -ur xen-3.4.2.orig//tools/xenstat/libxenstat/Makefile xen-3.4.2//tools/xenstat/libxenstat/Makefile
---- xen-3.4.2.orig//tools/xenstat/libxenstat/Makefile 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/xenstat/libxenstat/Makefile 2011-09-25 02:34:11.681793042 +0800
-@@ -34,7 +34,7 @@
- OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o
- SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR)
-
--WARN_FLAGS=-Wall -Werror
-+WARN_FLAGS=-Wall
-
- CFLAGS+=-Isrc -I$(XEN_LIBXC) -I$(XEN_XENSTORE) -I$(XEN_INCLUDE)
- LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/
-diff -ur xen-3.4.2.orig//tools/xenstat/xentop/Makefile xen-3.4.2//tools/xenstat/xentop/Makefile
---- xen-3.4.2.orig//tools/xenstat/xentop/Makefile 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/xenstat/xentop/Makefile 2011-09-25 02:34:11.684793042 +0800
-@@ -18,7 +18,7 @@
- all install xentop:
- else
-
--CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
-+CFLAGS += -DGCC_PRINTF -Wall -I$(XEN_LIBXENSTAT)
- LDFLAGS += -L$(XEN_LIBXENSTAT)
- LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS)
- CFLAGS += -DHOST_$(XEN_OS)
-diff -ur xen-3.4.2.orig//tools/xenstore/Makefile xen-3.4.2//tools/xenstore/Makefile
---- xen-3.4.2.orig//tools/xenstore/Makefile 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/xenstore/Makefile 2011-09-25 02:34:11.640793042 +0800
-@@ -4,7 +4,7 @@
- MAJOR = 3.0
- MINOR = 0
-
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += -I.
- CFLAGS += $(CFLAGS_libxenctrl)
-
-diff -ur xen-3.4.2.orig//tools/xenstore/xenstored_core.c xen-3.4.2//tools/xenstore/xenstored_core.c
---- xen-3.4.2.orig//tools/xenstore/xenstored_core.c 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/xenstore/xenstored_core.c 2011-09-25 02:34:11.845793042 +0800
-@@ -865,7 +865,7 @@
- {
- unsigned int offset, datalen;
- struct node *node;
-- char *vec[1] = { NULL }; /* gcc4 + -W + -Werror fucks code. */
-+ char *vec[1] = { NULL }; /* gcc4 + -W + fucks code. */
- char *name;
-
- /* Extra "strings" can be created by binary data. */
-diff -ur xen-3.4.2.orig//tools/xentrace/Makefile xen-3.4.2//tools/xentrace/Makefile
---- xen-3.4.2.orig//tools/xentrace/Makefile 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//tools/xentrace/Makefile 2011-09-25 02:34:11.745793042 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=../..
- include $(XEN_ROOT)/tools/Rules.mk
-
--CFLAGS += -Werror
-+CFLAGS +=
-
- CFLAGS += $(CFLAGS_libxenctrl)
- LDFLAGS += $(LDFLAGS_libxenctrl)
-Only in xen-3.4.2/: Werror.sh
-diff -ur xen-3.4.2.orig//xen/arch/ia64/Rules.mk xen-3.4.2//xen/arch/ia64/Rules.mk
---- xen-3.4.2.orig//xen/arch/ia64/Rules.mk 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//xen/arch/ia64/Rules.mk 2011-09-25 02:34:11.570793042 +0800
-@@ -68,7 +68,7 @@
- CFLAGS += -DCONFIG_XEN_IA64_TLBFLUSH_CLOCK
- endif
- ifeq ($(no_warns),y)
--CFLAGS += -Wa,--fatal-warnings -Werror -Wno-uninitialized
-+CFLAGS += -Wa,--fatal-warnings -Wno-uninitialized
- endif
- ifneq ($(vhpt_disable),y)
- CFLAGS += -DVHPT_ENABLED=1
-diff -ur xen-3.4.2.orig//xen/arch/x86/boot/build32.mk xen-3.4.2//xen/arch/x86/boot/build32.mk
---- xen-3.4.2.orig//xen/arch/x86/boot/build32.mk 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//xen/arch/x86/boot/build32.mk 2011-09-25 02:34:11.914793042 +0800
-@@ -8,7 +8,7 @@
- $(call cc-option-add,CFLAGS,CC,-fno-stack-protector)
- $(call cc-option-add,CFLAGS,CC,-fno-stack-protector-all)
-
--CFLAGS += -Werror -fno-builtin -msoft-float
-+CFLAGS += -fno-builtin -msoft-float
-
- # NB. awk invocation is a portable alternative to 'head -n -1'
- %.S: %.bin
-diff -ur xen-3.4.2.orig//xen/arch/x86/Rules.mk xen-3.4.2//xen/arch/x86/Rules.mk
---- xen-3.4.2.orig//xen/arch/x86/Rules.mk 2009-11-10 23:12:57.000000000 +0800
-+++ xen-3.4.2//xen/arch/x86/Rules.mk 2011-09-25 02:34:11.572793042 +0800
-@@ -17,7 +17,7 @@
- endif
-
- CFLAGS += -fno-builtin -fno-common
--CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
-+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe
- CFLAGS += -I$(BASEDIR)/include
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default
View
4 app-emulation/xen/xen-4.1.1-r2.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/xen-4.1.1-r2.ebuild,v 1.8 2012/06/01 00:12:36 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.1.1-r2.ebuild,v 1.9 2012/12/04 12:35:44 idella4 Exp $
EAPI="4"
@@ -13,7 +13,7 @@ if [[ $PV == *9999 ]]; then
S="${WORKDIR}/${REPO}"
inherit mercurial
else
- KEYWORDS="amd64 x86"
+ KEYWORDS="~amd64 ~x86"
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
fi
View
120 app-emulation/xen/xen-4.2.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.0.ebuild,v 1.1 2012/12/04 12:35:44 idella4 Exp $
+
+EAPI="4"
+
+if [[ $PV == *9999 ]]; then
+ KEYWORDS=""
+ REPO="xen-unstable.hg"
+ EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+ S="${WORKDIR}/${REPO}"
+ live_eclass="mercurial"
+else
+ KEYWORDS="~amd64 ~x86"
+ SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
+fi
+
+inherit mount-boot flag-o-matic toolchain-funcs ${live_eclass}
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug flask pae xsm"
+
+RDEPEND="|| ( sys-boot/grub
+ sys-boot/grub-static )"
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+RESTRICT="test"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="
+ flask? ( xsm )
+ "
+
+pkg_setup() {
+ if [[ -z ${XEN_TARGET_ARCH} ]]; then
+ if use x86 && use amd64; then
+ die "Confusion! Both x86 and amd64 are set in your use flags!"
+ elif use x86; then
+ export XEN_TARGET_ARCH="x86_32"
+ elif use amd64; then
+ export XEN_TARGET_ARCH="x86_64"
+ else
+ die "Unsupported architecture!"
+ fi
+ fi
+
+ if use flask ; then
+ export "XSM_ENABLE=y"
+ export "FLASK_ENABLE=y"
+ elif use xsm ; then
+ export "XSM_ENABLE=y"
+ fi
+}
+
+src_prepare() {
+
+ # Drop .config
+ sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
+
+ # 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 {} \; || die "failed to re-set custom-cflags"
+ fi
+
+ # remove -Werror for gcc-4.6's sake
+ find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
+ xargs sed -i 's/ *-Werror */ /'
+ # not strictly necessary to fix this
+ sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
+}
+
+src_configure() {
+ use debug && myopt="${myopt} debug=y"
+ use pae && myopt="${myopt} pae=y"
+
+ if use custom-cflags; then
+ filter-flags -fPIE -fstack-protector
+ replace-flags -O3 -O2
+ else
+ unset CFLAGS
+ fi
+}
+
+src_compile() {
+ # Send raw LDFLAGS so that --as-needed works
+ emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+ local myopt
+ use debug && myopt="${myopt} debug=y"
+ use pae && myopt="${myopt} pae=y"
+
+ emake LDFLAGS="$(raw-ldflags)" DESTDIR="${ED}" -C xen ${myopt} install
+}
+
+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/"
+
+ if use pae; then
+ echo
+ ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
+ fi
+}
View
4 app-misc/reptyr/reptyr-0.4.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-misc/reptyr/reptyr-0.4.ebuild,v 1.2 2012/11/25 09:39:23 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/reptyr/reptyr-0.4.ebuild,v 1.3 2012/12/04 11:30:29 ago Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nelhage/${PN}/tarball/${P} -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
IUSE=""
src_compile() {
View
3  app-office/libreoffice/Manifest
@@ -8,10 +8,13 @@ DIST ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 2732347 SHA256 64f8d
DIST ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 12735186 SHA256 dc6445d2c0445e5536010b80bd811adda6741ed82b288fe831d5be9902457941 SHA512 a8c39d205051a8f8abaecb7a6fdc0c2c37baf5eee2a082af8819555f442dab525649b86cae569048357eb1e6e651deff4b62183de417e15b403e1ac09c40ba7b WHIRLPOOL fd9b6bbd214113334d3d5e542bbc9b70d5a9505281454e7f4447c6c73af733e10b007a2d4225acb39db0fc17401c2ae36b6628c59d31f09bec485f4cfc009eb5
DIST libreoffice-binfilter-3.5.7.2.tar.xz 6061416 SHA256 ba07bc9b488d0c5f0c207ac7ab04e1d86b47018bf3fa77ef7562e28937485374 SHA512 3824d3ec845a2f0fdd4dcff3db8c7981f46f3b5ef541fc43d7ad0843f6093dcfda92ddbb406b4c314ea980335d74c2ee76c4f491ae38506689486481fc1d6196 WHIRLPOOL 9a637f35233c5a297f3209ca6d4c9bb2654fca5f8f171f689048de79fd3537bd8071c252c6943b284a71876d0deace76e35e28fb27d89d39e333dd3993a357ef
DIST libreoffice-binfilter-3.6.3.2.tar.xz 5979916 SHA256 65c27499468866ae06851f2686f904e991b0ae93abca3972e6a0202f624893b0 SHA512 4ae53b9aa61db7b741de47640c6d545e21b16021ffab2396c2593806c41909a0b8669cd37d13de03dd6e6858afee3f4835ec5846f7241561666f6e3608c6f5a5 WHIRLPOOL f3f905932b816f5ce849e97311f8fe50577e9487f06424fda281ec7b808740e8b01c8df5c6e127c6f2ac66c8c01b1adb370e21e92d52e679d8d118feb22c50dc
+DIST libreoffice-binfilter-3.6.4.3.tar.xz 5979564 SHA256 309c6e59693a60622a4fc02e5408a81dd3f422b0721340767f7ff8271c32c788 SHA512 83ca29b8ce813b9a87e20afdac160f51b67b7849ecc4dfc6868c7a4eb2146757d4f65f2e568d12f7ab9ee2eefcf7bd076860dd8466564683511e73d694d8f3b7 WHIRLPOOL 4d1f916448a4707142a821a1821054c489ab52d0e1f85fa8fe2d2ac4c99fd21ead35be21c1bc09206d834e11e9cecd6a5c3e98f46e2aa9e48b896d989053df27
DIST libreoffice-branding-gentoo-0.5.tar.xz 150616 SHA256 91beaf63fca297914cb4390b760ffef52b03450ecb52affab0f124a2dbd63a63 SHA512 a915973e1566414fd8fdae67ccaf426a9543cfa4f2549b39e7da0146c975d568d2e222835a259f4bbe6d36979b956cf65a7d28c7a5b3a7b8858e8f731acf33d9 WHIRLPOOL c2beb6b4220a99820eade85784638b883ea3b9293f6714bcce65dcb91fd617a1712a19327377d5fa1c33ac7b402749e8a29daa72f9ea9672d24607ce27cb82fc
DIST libreoffice-branding-gentoo-0.6.tar.xz 49756 SHA256 d5c2d12031a807d18e981a6df7e945e1787b96c7ee65fa3d9bb9eac17cf8ade9 SHA512 1126d92b6b8722fc8b7865ed42c98876922ce26c71ebff61faf03e07b338d5278ff41ba29ff296d281cbdee6a9a0965ccf8e2101fc0f4846eaddcf511ac74eed WHIRLPOOL 40f18619246ca0b6f91ff248d65e4a36639c6faee719a842fb57c6bd8fc871686156e1c991776877d5df0811088ca8f3f4390b60f10565deefa2739c99242c91
DIST libreoffice-branding-gentoo-0.7.tar.xz 72556 SHA256 57912157fe8874f9d628dd971cb68941ad605f2d8beba05327e7ce7a721080be SHA512 fdfd8190c1155e95a8874f07d6893d94e28dd7482b195e22f704f4b1621ef76ee99e5ae1fcdb41c392d2e37e05da32830c42d47b4e62e14a9526d67ffd2d279f WHIRLPOOL 6c1886dfc31b918180b78797a41c0dff042ef4ddab50f284d9f9ee7aca7733dc73795dcad35262cf6c5608a5f99cf8d85a3a0d23316e15bb6650bdc437a4226b
DIST libreoffice-core-3.5.7.2.tar.xz 105115768 SHA256 de03ffe76e3b7c636755f8e08730f606cab62e95df6a17e6b2804e5233cc8fb1 SHA512 cfb5990117c210a4a85d4f127dba09037e7cc184ef80d4545be962ea67a245c6c07550a6c3f59866919c98145227669bc5ba3fcc2034a45cd2dc87bfecee5ba6 WHIRLPOOL ccece4e1ed5854fcf226b31504141120b4c38eb2bd8e8fccee02f82ef6d65e5c197033dcd94a6815b331c8c5b1ce9200713faef0ae98386007cae27c2e64df89
DIST libreoffice-core-3.6.3.2.tar.xz 107194308 SHA256 260d4cac0ea18a88af201ec8b2e39dfb950b9c06d378876118cff0f7f0ed6d78 SHA512 f91322a2dc548b6e898619457650c6df13e622f1cac823020eac722d50c434b3729e3727441264d5d7382dc9586f779c0aadb0f4a2e4fc79b2f9321535df9657 WHIRLPOOL d42aff70aba5194c0ef3be07a9d34af8f6b0a01b49269bc2f6a499e6793390e1d01c20deb55f54498c9072c6db925f4f76de21b349a78a66c5e0313b0e15f569
+DIST libreoffice-core-3.6.4.3.tar.xz 107228036 SHA256 8f72530cf153707ce29a8db578c64609678375f86930b640c472c7bb9ef699cc SHA512 ff80fd960ea07911969e99993fb530d37a194e3381bd398aad0bd64c7849132d5a5ff7b81a93eaab0e772f5ef4f776dc88d4ef7375dee546e5a537a7e4a9865b WHIRLPOOL 1a15e5012a20b3d701d20e89dffac560cf28667c2678cd21fc1a617c02b5e0b16ef55464b6fd6590974043b5b8c9be184050d15f920de394004868925ced67ec
DIST libreoffice-help-3.5.7.2.tar.xz 1905872 SHA256 b8a645053eaf05195beaa9118f4ae59512d6dc7e76fbfaacd2c70dbce7965857 SHA512 000718aebad278bd1209130b873b16089c791db3ffabe95333dc4ba9d519f05d25950006417337d23d9ff7f983a4859d921b7e618598a4f0f4f9e13dbe8bc84b WHIRLPOOL 1eefaf8f4947659d39a3fbc4aa9e6d1e14b0b839ddf5a3e8589f125f127425bffc5cada82674a28f23598765ccf40d19008f311470c97871c1b42bef2315072a
DIST libreoffice-help-3.6.3.2.tar.xz 1864084 SHA256 954edba6f6109037a001af97ecd3d755a17fb3d68e5cba688313bbbdf8a500d2 SHA512 d9747a34d36fc5eb806c9cd294fef927b802185301f7f1a98b50ebae8411d3f9b2abe4b8d16514e14d3e8fe748e53a111c783120944161d24ca662da0b05de51 WHIRLPOOL 14ed04624657a095b8cbaa2cd07fa9f96faac1a3d2af45081b12beeb66948efa3868f9729095b57c3a55cc19cdc4bb4dc492df4e57dacacd70fc41d9230bda91
+DIST libreoffice-help-3.6.4.3.tar.xz 1863976 SHA256 ed4395f9264a27411050b0be4a953f67f754a9b7f913aad576ceef236db6686f SHA512 123009eef4d1ed342a4c23acf5ec52002cbe5f8083d1fc5d485e86f67f461765ebb34ff1edfcc0ff6d321de7f8a2bc40d87f757c66b3c2ac22785549f4098f27 WHIRLPOOL b275bded52e998e5a12111260123c7b3456d2dc7fba4e6b13ffda787b1712df4af4838ab426760f7abdb9824aced163a470255d83afb7daf46a83845bff900b8
View
580 app-office/libreoffice/libreoffice-3.6.4.3.ebuild
@@ -0,0 +1,580 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.4.3.ebuild,v 1.1 2012/12/04 17:34:45 scarabeus Exp $
+
+EAPI=4
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ http://dev-builds.libreoffice.org/pre-releases/src
+ http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.6.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
+inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="LibreOffice, a full office productivity suite."
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core binfilter help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ if [[ ${mod} == binfilter ]]; then
+ SRC_URI+=" binfilter? ( ${i}/${PN}-${mod}-${PV}.tar.xz )"
+ else
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ fi
+ done
+ unset mod
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )"
+ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
+ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
+SRC_URI+=" ${ADDONS_SRC}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome gstreamer +gtk
+jemalloc kde mysql odk opengl postgres test +vba +webdav"
+
+LO_EXTS="nlpsolver pdfimport presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+# report-builder: missing java packages
+for lo_xt in ${LO_EXTS}; do
+ IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+ app-arch/zip
+ app-arch/unzip
+ >=app-text/hunspell-1.3.2-r3
+ app-text/mythes
+ >=app-text/libexttextcat-3.2
+ app-text/libwpd:0.9[tools]
+ app-text/libwpg:0.2
+ >=app-text/libwps-0.2.2
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.2:0.2
+ dev-db/unixODBC
+ dev-libs/expat
+ >=dev-libs/glib-2.28
+ >=dev-libs/hyphen-2.7.1
+ >=dev-libs/icu-4.8.1.1
+ >=dev-libs/nspr-4.8.8
+ >=dev-libs/nss-3.12.9
+ >=dev-lang/perl-5.0
+ >=dev-libs/openssl-1.0.0d
+ >=dev-libs/redland-1.0.14[ssl]
+ gnome-base/librsvg
+ media-gfx/graphite2
+ >=media-libs/fontconfig-2.8.0
+ media-libs/freetype:2
+ media-libs/lcms:2
+ >=media-libs/libpng-1.4
+ >=media-libs/libcdr-0.0.5
+ media-libs/libvisio
+ >=net-misc/curl-7.21.4
+ sci-mathematics/lpsolve
+ >=sys-libs/db-4.8
+ virtual/jpeg
+ >=x11-libs/cairo-1.10.0[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ cups? ( net-print/cups )
+ dbus? ( >=dev-libs/dbus-glib-0.92 )
+ eds? ( gnome-extra/evolution-data-server )
+ gnome? ( gnome-base/gconf:2 )
+ gtk? (
+ x11-libs/gdk-pixbuf[X]
+ >=x11-libs/gtk+-2.24:2
+ )
+ gstreamer? (
+ >=media-libs/gstreamer-0.10:0.10
+ >=media-libs/gst-plugins-base-0.10:0.10
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
+ libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ libreoffice_extensions_wiki-publisher? (
+ dev-java/commons-codec:0
+ dev-java/commons-httpclient:3
+ dev-java/commons-lang:2.1
+ dev-java/commons-logging:0
+ dev-java/tomcat-servlet-api:3.0
+ )
+ mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
+ webdav? ( net-libs/neon )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !<app-office/openoffice-bin-3.4.0-r1
+ !app-office/openoffice
+ media-fonts/libertine-ttf
+ media-fonts/liberation-fonts
+ media-fonts/urw-fonts
+ java? ( >=virtual/jre-1.6 )
+"
+
+PDEPEND="
+ =app-office/libreoffice-l10n-3.6*
+"
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.46
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ dev-util/cppunit
+ >=dev-util/gperf-3
+ dev-util/intltool
+ dev-util/mdds
+ virtual/pkgconfig
+ net-misc/npapi-sdk
+ >=sys-apps/findutils-4.4.2
+ sys-devel/bison
+ sys-apps/coreutils
+ sys-devel/flex
+ sys-devel/gettext
+ >=sys-devel/make-3.82
+ sys-libs/zlib
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ >=virtual/jdk-1.6
+ >=dev-java/ant-core-1.7
+ )
+ odk? ( app-doc/doxygen )
+ test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-3.6-system-pyuno.patch"
+ "${FILESDIR}/${PN}-3.6-separate-checks.patch"
+)
+
+REQUIRED_USE="
+ gnome? ( gtk )
+ eds? ( gnome )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+S="${WORKDIR}/${PN}-core-${PV}"
+
+CHECKREQS_MEMORY="512M"
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+ local pgslot
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ check-reqs_pkg_pretend
+
+ if [[ $(gcc-major-version) -lt 4 ]] || \
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 5 ]] ) \
+ ; then
+ eerror "Compilation with gcc older than 4.5 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
+
+ # ensure pg version
+ if use postgres; then
+ pgslot=$(postgresql-config show)
+ if [[ ${pgslot//.} < 90 ]] ; then
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror " postgresql-config set 9.0"
+ die "PostgreSQL slot is not set to 9.0 or higher."
+ fi
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ kde4-base_pkg_setup
+
+ python_set_active_version 2
+ python_pkg_setup
+
+ [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+ local mod dest tmplfile tmplname mypv
+
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ if use branding; then
+ unpack "${BRANDING}"
+ fi
+
+ if [[ ${PV} != *9999* ]]; then
+ for mod in ${MODULES}; do
+ if [[ ${mod} == binfilter ]] && ! use binfilter; then
+ continue
+ fi
+ unpack "${PN}-${mod}-${PV}.tar.xz"
+ if [[ ${mod} != core ]]; then
+ mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
+ rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+ fi
+ done
+ else
+ for mod in ${MODULES}; do
+ if [[ ${mod} == binfilter ]] && ! use binfilter; then
+ continue
+ fi
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
+ EGIT_PROJECT="${PN}/${mod}"
+ EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
+ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
+ EGIT_NOUNPACK="true"
+ git-2_src_unpack
+ if [[ ${mod} != core ]]; then
+ mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
+ rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+ fi
+ done
+ unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
+ fi
+}
+
+src_prepare() {
+ # optimization flags
+ export ARCH_FLAGS="${CXXFLAGS}"
+ export LINKFLAGSOPTIMIZE="${LDFLAGS}"
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+
+ # patchset
+ if [[ -n ${PATCHSET} ]]; then
+ EPATCH_FORCE="yes" \
+ EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+ EPATCH_SUFFIX="patch" \
+ epatch
+ fi
+
+ base_src_prepare
+
+ # please no debug in binfilter, it blows up things insanely
+ if use binfilter && ! use binfilterdebug ; then
+ for name in $(find "${S}/binfilter" -name makefile.mk) ; do
+ sed -i -e '1i\CFLAGS+= -g0' $name || die
+ done
+ fi
+
+ AT_M4DIR="m4"
+ eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ -i pyuno/source/module/uno.py \
+ -i scripting/source/pyprov/officehelper.py || die
+}
+
+src_configure() {
+ local java_opts
+ local internal_libs
+ local lo_ext
+ local ext_opts
+ local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
+
+ # Workaround the boost header include issue for older gccs
+ if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; then
+ append-cppflags -DBOOST_NO_0X_HDR_TYPEINDEX
+ append-cppflags -DBOOST_NO_CXX11_HDR_TYPEINDEX
+ fi
+
+ # recheck that there is some value in jobs
+ [[ -z ${jbs} ]] && jbs="1"
+
+ # sane: just sane.h header that is used for scan in writer, not
+ # linked or anything else, worthless to depend on
+ # vigra: just uses templates from there
+ # it is serious pain in the ass for packaging
+ # should be replaced by boost::gil if someone interested
+ internal_libs+="
+ --without-system-sane
+ --without-system-vigra
+ "
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ # saxon: system one does not work properly
+ java_opts="
+ --without-junit
+ --without-system-hsqldb
+ --without-system-saxon
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-java-target-version=$(java-pkg_get-target)
+ --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
+ "
+
+ use libreoffice_extensions_scripting-beanshell && \
+ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+ use libreoffice_extensions_scripting-javascript && \
+ java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+
+ if use libreoffice_extensions_wiki-publisher; then
+ java_opts+="
+ --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
+ --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
+ --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
+ --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
+ --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
+ "
+ fi
+ fi
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --enable-unix-qstart-libpng: use libpng splashscreen that is faster
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --disable-gnome-vfs: old gnome virtual fs support
+ # --disable-kdeab: kde3 adressbook
+ # --disable-kde: kde3 support
+ # --disable-ldap: ldap requires internal mozilla stuff, same like mozab
+ # --disable-mozilla: disable mozilla build that is used for adresbook, not
+ # affecting the nsplugin that is always ON
+ # --disable-pch: precompiled headers cause build crashes
+ # --disable-rpath: relative runtime path is not desired
+ # --disable-systray: quickstarter does not actually work at all so do not
+ # promote it
+ # --disable-zenity: disable build icon
+ # --enable-extension-integration: enable any extension integration support
+ # --with-{max-jobs,num-cpus}: ensuring parallel building
+ # --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --without-stlport: disable deprecated extensions framework
+ # --disable-ext-report-builder: too much java packages pulled in
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-headers \
+ --with-system-libs \
+ --with-system-jars \
+ --with-system-dicts \
+ --enable-graphite \
+ --enable-cairo-canvas \
+ --enable-largefile \
+ --enable-mergelibs \
+ --enable-python=system \
+ --enable-librsvg=system \
+ --enable-randr \
+ --enable-randr-link \
+ --enable-release-build \
+ --enable-unix-qstart-libpng \
+ --enable-xmlsec \
+ --disable-ccache \
+ --disable-crashdump \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-gnome-vfs \
+ --disable-ext-report-builder \
+ --disable-kdeab \
+ --disable-kde \
+ --disable-ldap \
+ --disable-mozilla \
+ --disable-nsplugin \
+ --disable-online-update \
+ --disable-pch \
+ --disable-rpath \
+ --disable-systray \
+ --disable-zenity \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --enable-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-max-jobs=${jbs} \
+ --with-num-cpus=${jbs} \
+ --with-unix-wrapper=libreoffice \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-afms \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-stlport \
+ --without-system-mozilla \
+ --without-help \
+ --with-helppack-integration \
+ --without-sun-templates \
+ --disable-gtk3 \
+ $(use_enable binfilter) \
+ $(use_enable cups) \
+ $(use_enable dbus) \
+ $(use_enable eds evolution2) \
+ $(use_enable gnome gconf) \
+ $(use_enable gnome gio) \
+ $(use_enable gnome lockdown