Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

glorious funtoo updates

merged:

  gentoo: 1fb2810
  funtoo-overlay: 9efc7d6
  foo-overlay: 8298ae4
  bar-overlay: 6c956f1
  flora: 4c988e0
  • Loading branch information...
commit 2d4b696e2131df6ef24222f305a2ce8ed3e99abc 1 parent 7f00ae9
Daniel Robbins danielrobbins authored

Showing 86 changed files with 1,144 additions and 1,011 deletions. Show diff stats Hide diff stats

  1. +65 0 app-emulation/libvirt/files/libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch
  2. +7 4 app-emulation/libvirt/libvirt-0.9.13.ebuild
  3. +3 0  app-emulation/libvirt/metadata.xml
  4. +12 0 app-emulation/qemu-kvm/files/qemu-kvm-1.0.1-freebsd-sysctl-header.patch
  5. +25 14 app-emulation/qemu-kvm/qemu-kvm-1.0.1-r1.ebuild
  6. +2 11 app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild
  7. +3 2 app-emulation/spice-protocol/Manifest
  8. +17 0 app-emulation/spice-protocol/spice-protocol-0.10.3.ebuild
  9. +1 1  app-emulation/spice-vdagent/Manifest
  10. +11 0 app-emulation/spice-vdagent/files/spice-vdagent.confd-2
  11. +61 0 app-emulation/spice-vdagent/files/spice-vdagent.initd-2
  12. +1 0  app-emulation/spice-vdagent/metadata.xml
  13. +7 11 app-emulation/spice-vdagent/{spice-vdagent-0.8.0.ebuild → spice-vdagent-0.10.1.ebuild}
  14. +0 50 app-emulation/spice-vdagent/spice-vdagent-0.8.1.ebuild
  15. +6 6 dev-lang/python/Manifest
  16. +1 1  dev-lang/python/{python-2.7.4_pre20120610.ebuild → python-2.7.4_pre20120708.ebuild}
  17. +1 1  dev-lang/python/{python-3.2.4_pre20120610.ebuild → python-3.2.4_pre20120708.ebuild}
  18. +4 23 dev-lang/python/{python-3.3_pre20120610.ebuild → python-3.3_pre20120708.ebuild}
  19. +613 0 dev-libs/boost/boost-1.50.0.ebuild
  20. +1 0  dev-perl/crypt-dh/Manifest
  21. +24 0 dev-perl/crypt-dh/crypt-dh-0.70.0.ebuild
  22. +1 1  dev-python/pyyaml/Manifest
  23. +7 0 dev-python/pyyaml/pyyaml-3.10.ebuild
  24. +2 2 games-arcade/amphetamine/Manifest
  25. +10 15 games-arcade/amphetamine/amphetamine-0.8.10.ebuild
  26. +33 0 games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch
  27. +1 1  games-board/hexxagon/Manifest
  28. +43 0 games-board/hexxagon/files/hexxagon-1.0.1-gcc47.patch
  29. +6 4 games-board/hexxagon/hexxagon-1.0.1.ebuild
  30. +2 2 media-sound/leechcraft-lastfmscrobble/leechcraft-lastfmscrobble-9999.ebuild
  31. +1 1  metadata/dtd/timestamp.chk
  32. +1 1  metadata/glsa/timestamp.chk
  33. +4 4 metadata/md5-cache/app-emulation/libvirt-0.9.13
  34. +5 5 metadata/md5-cache/app-emulation/qemu-kvm-1.0.1-r1
  35. +4 4 metadata/md5-cache/app-emulation/qemu-kvm-1.1.0
  36. +9 0 metadata/md5-cache/app-emulation/spice-protocol-0.10.3
  37. +5 5 metadata/md5-cache/app-emulation/{spice-vdagent-0.8.0 → spice-vdagent-0.10.1}
  38. +0 13 metadata/md5-cache/app-emulation/spice-vdagent-0.8.1
  39. +1 1  metadata/md5-cache/dev-lang/{python-2.7.4_pre20120610 → python-2.7.4_pre20120708}
  40. +1 1  metadata/md5-cache/dev-lang/{python-3.2.4_pre20120610 → python-3.2.4_pre20120708}
  41. +1 1  metadata/md5-cache/dev-lang/{python-3.3_pre20120610 → python-3.3_pre20120708}
  42. +13 0 metadata/md5-cache/dev-libs/boost-1.50.0
  43. +12 0 metadata/md5-cache/dev-perl/crypt-dh-0.70.0
  44. +1 1  metadata/md5-cache/dev-python/pyyaml-3.10
  45. +1 1  metadata/md5-cache/games-arcade/amphetamine-0.8.10
  46. +4 4 metadata/md5-cache/games-board/hexxagon-1.0.1
  47. +3 3 metadata/md5-cache/media-sound/leechcraft-lastfmscrobble-9999
  48. +0 13 metadata/md5-cache/net-misc/freerdp-0.8.2
  49. +0 11 metadata/md5-cache/net-misc/freerdp-0.9999
  50. +0 14 metadata/md5-cache/net-misc/freerdp-1.0.0
  51. +0 14 metadata/md5-cache/net-misc/freerdp-1.0.1
  52. +2 1  metadata/md5-cache/net-misc/freerdp-9999.1
  53. +0 13 metadata/md5-cache/net-misc/remmina-0.7.5
  54. +0 13 metadata/md5-cache/net-misc/remmina-0.9.3
  55. +0 13 metadata/md5-cache/net-misc/remmina-1.0.0-r1
  56. +3 3 metadata/md5-cache/net-misc/remmina-9999
  57. +0 13 metadata/md5-cache/net-p2p/qbittorrent-3.0.0_rc2
  58. +0 13 metadata/md5-cache/sci-libs/cfitsio-3.270
  59. +3 3 metadata/md5-cache/sci-libs/{cfitsio-3.280 → cfitsio-3.300}
  60. +1 1  metadata/md5-cache/www-apache/anyterm-1.1.29
  61. +1 1  metadata/news/timestamp.chk
  62. +1 1  metadata/timestamp
  63. +1 1  metadata/timestamp.chk
  64. +1 1  metadata/timestamp.x
  65. +1 4 net-misc/freerdp/Manifest
  66. +0 90 net-misc/freerdp/freerdp-0.8.2.ebuild
  67. +0 89 net-misc/freerdp/freerdp-0.9999.ebuild
  68. +0 79 net-misc/freerdp/freerdp-1.0.0.ebuild
  69. +0 79 net-misc/freerdp/freerdp-1.0.1.ebuild
  70. +3 1 net-misc/freerdp/freerdp-9999.1.ebuild
  71. +1 4 net-misc/remmina/Manifest
  72. +0 60 net-misc/remmina/remmina-0.7.5.ebuild
  73. +0 62 net-misc/remmina/remmina-0.9.3.ebuild
  74. +0 80 net-misc/remmina/remmina-1.0.0-r1.ebuild
  75. +2 2 net-misc/remmina/remmina-9999.ebuild
  76. +0 1  net-p2p/qbittorrent/Manifest
  77. +0 62 net-p2p/qbittorrent/qbittorrent-3.0.0_rc2.ebuild
  78. +3 3 profiles/package.mask/funtoo-python
  79. +5 5 profiles/package.mask/gentoo
  80. +1 0  profiles/use.local.desc
  81. +1 2  sci-libs/cfitsio/Manifest
  82. +0 49 sci-libs/cfitsio/cfitsio-3.270.ebuild
  83. +15 12 sci-libs/cfitsio/{cfitsio-3.280.ebuild → cfitsio-3.300.ebuild}
  84. +1 1  www-apache/anyterm/Manifest
  85. +4 3 www-apache/anyterm/anyterm-1.1.29.ebuild
  86. +58 0 www-apache/anyterm/files/anyterm-1.1.29-boost-1.50.patch
65 app-emulation/libvirt/files/libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch
... ... @@ -0,0 +1,65 @@
  1 +From 78290b1641e95304c862062ee0aca95395c5926c Mon Sep 17 00:00:00 2001
  2 +From: Josh Durgin <josh.durgin@inktank.com>
  3 +Date: Mon, 2 Jul 2012 11:55:26 -0700
  4 +Subject: [PATCH 01/24] qemu: add rbd to whitelist of migration-safe formats
  5 +
  6 +QEMU (and librbd) flush the cache on the source before the
  7 +destination starts, and the destination does not read any
  8 +changeable data before that, so live migration with rbd caching
  9 +is safe.
  10 +
  11 +This makes 'virsh migrate' work with rbd and caching without the
  12 +--unsafe flag.
  13 +
  14 +Reported-by: Vladimir Bashkirtsev <vladimir@bashkirtsev.com>
  15 +Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
  16 +---
  17 + .mailmap | 3 ++-
  18 + AUTHORS | 2 +-
  19 + src/qemu/qemu_migration.c | 3 +++
  20 + 3 files changed, 6 insertions(+), 2 deletions(-)
  21 +
  22 +diff --git a/.mailmap b/.mailmap
  23 +index 65e2c10..a6744ac 100644
  24 +--- a/.mailmap
  25 ++++ b/.mailmap
  26 +@@ -28,7 +28,8 @@
  27 + <supriyak@linux.vnet.ibm.com> <supriyak@in.ibm.com>
  28 + <neil@aldur.co.uk> <neil@brightbox.co.uk>
  29 + <stefanb@us.ibm.com> <stefanb@linux.vnet.ibm.com>
  30 +-<josh.durgin@dreamhost.com> <joshd@hq.newdream.net>
  31 ++<josh.durgin@inktank.com> <joshd@hq.newdream.net>
  32 ++<josh.durgin@inktank.com> <josh.durgin@dreamhost.com>
  33 +
  34 + # Name consolidation:
  35 + # Preferred author spelling <preferred email>
  36 +diff --git a/AUTHORS b/AUTHORS
  37 +index 375db24..0e179a9 100644
  38 +--- a/AUTHORS
  39 ++++ b/AUTHORS
  40 +@@ -144,7 +144,7 @@ Patches have also been contributed by:
  41 + Hu Tao <hutao@cn.fujitsu.com>
  42 + Laurent Léonard <laurent@open-minds.org>
  43 + MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
  44 +- Josh Durgin <josh.durgin@dreamhost.com>
  45 ++ Josh Durgin <josh.durgin@inktank.com>
  46 + Roopa Prabhu <roprabhu@cisco.com>
  47 + Paweł Krześniak <pawel.krzesniak@gmail.com>
  48 + Kay Schubert <kayegypt@web.de>
  49 +diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
  50 +index 48369d6..f51c99a 100644
  51 +--- a/src/qemu/qemu_migration.c
  52 ++++ b/src/qemu/qemu_migration.c
  53 +@@ -847,6 +847,9 @@ qemuMigrationIsSafe(virDomainDefPtr def)
  54 + continue;
  55 + else if (cfs < 0)
  56 + return false;
  57 ++ } else if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK &&
  58 ++ disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD) {
  59 ++ continue;
  60 + }
  61 +
  62 + qemuReportError(VIR_ERR_MIGRATE_UNSAFE, "%s",
  63 +--
  64 +1.7.8.6
  65 +
11 app-emulation/libvirt/libvirt-0.9.13.ebuild
... ... @@ -1,6 +1,6 @@
1 1 # Copyright 1999-2012 Gentoo Foundation
2 2 # Distributed under the terms of the GNU General Public License v2
3   -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.13.ebuild,v 1.2 2012/07/04 16:54:31 cardoe Exp $
  3 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.13.ebuild,v 1.4 2012/07/08 04:23:26 cardoe Exp $
4 4
5 5 EAPI=4
6 6
@@ -35,8 +35,8 @@ HOMEPAGE="http://www.libvirt.org/"
35 35 LICENSE="LGPL-2.1"
36 36 SLOT="0"
37 37 IUSE="audit avahi +caps debug iscsi +libvirtd lvm +lxc +macvtap nfs \
38   - nls numa openvz parted pcap phyp policykit python qemu sasl selinux +udev \
39   - uml +vepa virtualbox virt-network xen elibc_glibc"
  38 + nls numa openvz parted pcap phyp policykit python qemu rbd sasl \
  39 + selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc"
40 40 REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
41 41 lxc? ( caps libvirtd )
42 42 openvz? ( libvirtd )
@@ -87,6 +87,7 @@ RDEPEND="sys-libs/readline
87 87 dev-libs/yajl
88 88 sys-power/pm-utils
89 89 )
  90 + rbd? ( sys-cluster/ceph )
90 91 sasl? ( dev-libs/cyrus-sasl )
91 92 selinux? ( >=sys-libs/libselinux-2.0.85 )
92 93 virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
@@ -159,6 +160,8 @@ src_prepare() {
159 160 EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
160 161 epatch
161 162
  163 + epatch "${FILESDIR}/${P}-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch"
  164 +
162 165 if [[ ${PV} = *9999* ]]; then
163 166
164 167 # git checkouts require bootstrapping to create the configure script.
@@ -213,7 +216,7 @@ src_configure() {
213 216 myconf="${myconf} $(use_with iscsi storage-iscsi)"
214 217 myconf="${myconf} $(use_with parted storage-disk)"
215 218 myconf="${myconf} $(use_with lvm storage-mpath)"
216   - myconf="${myconf} --without-storage-rbd"
  219 + myconf="${myconf} $(use_with rbd storage-rbd)"
217 220 myconf="${myconf} $(use_with numa numactl)"
218 221 myconf="${myconf} $(use_with numa numad)"
219 222 myconf="${myconf} $(use_with selinux)"
3  app-emulation/libvirt/metadata.xml
@@ -22,6 +22,9 @@
22 22 Allow using real disk partitions as pool for disk image storage, using
23 23 <pkg>sys-block/parted</pkg> to create, resize and delete them.
24 24 </flag>
  25 + <flag name='rbd'>
  26 + Enable rados block device support via <pkg>sys-cluster/ceph</pkg>
  27 + </flag>
25 28
26 29 <!-- Virtualisation backends -->
27 30 <flag name='lxc'>
12 app-emulation/qemu-kvm/files/qemu-kvm-1.0.1-freebsd-sysctl-header.patch
... ... @@ -0,0 +1,12 @@
  1 +--- a/os-posix.c
  2 ++++ b/os-posix.c
  3 +@@ -27,6 +27,9 @@
  4 + #include <fcntl.h>
  5 + #include <signal.h>
  6 + #include <sys/types.h>
  7 ++#ifdef __FreeBSD__
  8 ++#include <sys/sysctl.h>
  9 ++#endif
  10 + #include <sys/wait.h>
  11 + /*needed for MAP_POPULATE before including qemu-options.h */
  12 + #include <sys/mman.h>
39 app-emulation/qemu-kvm/qemu-kvm-1.0.1-r1.ebuild
... ... @@ -1,6 +1,6 @@
1 1 # Copyright 1999-2012 Gentoo Foundation
2 2 # Distributed under the terms of the GNU General Public License v2
3   -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.0.1-r1.ebuild,v 1.2 2012/05/31 23:35:44 zmedico Exp $
  3 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.0.1-r1.ebuild,v 1.3 2012/07/08 04:00:09 cardoe Exp $
4 4
5 5 #BACKPORTS=1
6 6
@@ -21,7 +21,7 @@ else
21 21 ${BACKPORTS:+
22 22 http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2
23 23 http://dev.gentoo.org/~cardoe/distfiles/${P}-backports-${BACKPORTS}.tar.bz2}"
24   - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
  24 + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
25 25 fi
26 26
27 27 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@@ -30,9 +30,9 @@ HOMEPAGE="http://www.linux-kvm.org"
30 30 LICENSE="GPL-2"
31 31 SLOT="0"
32 32 # xen is disabled until the deps are fixed
33   -IUSE="+aio alsa bluetooth brltty +curl debug fdt ncurses \
34   -opengl pulseaudio qemu-ifup rbd sasl sdl smartcard spice static test
35   -+threads tls usbredir vde +vhost-net xattr xen"
  33 +IUSE="+aio alsa bluetooth brltty +curl debug fdt kernel_linux \
  34 +kernel_FreeBSD ncurses opengl pulseaudio qemu-ifup rbd sasl sdl \
  35 +smartcard spice static test +threads tls usbredir vde +vhost-net xattr xen"
36 36
37 37 COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
38 38 IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
@@ -61,7 +61,6 @@ RDEPEND="
61 61 >=dev-libs/glib-2.0
62 62 media-libs/libpng
63 63 sys-apps/pciutils
64   - >=sys-apps/util-linux-2.16.0
65 64 virtual/jpeg
66 65 amd64? ( sys-apps/seabios
67 66 sys-apps/vgabios )
@@ -73,6 +72,7 @@ RDEPEND="
73 72 brltty? ( app-accessibility/brltty )
74 73 curl? ( >=net-misc/curl-7.15.4 )
75 74 fdt? ( >=sys-apps/dtc-1.2.0 )
  75 + kernel_linux? ( >=sys-apps/util-linux-2.16.0 )
76 76 ncurses? ( sys-libs/ncurses )
77 77 opengl? ( virtual/opengl )
78 78 pulseaudio? ( media-sound/pulseaudio )
@@ -96,7 +96,7 @@ RDEPEND="
96 96 DEPEND="${RDEPEND}
97 97 app-text/texi2html
98 98 virtual/pkgconfig
99   - >=sys-kernel/linux-headers-2.6.35
  99 + kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
100 100 test? ( dev-libs/check )"
101 101
102 102 STRIP_MASK="/usr/share/qemu/palcode-clipper"
@@ -136,10 +136,10 @@ pkg_pretend() {
136 136 eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
137 137 fi
138 138
139   - if kernel_is lt 2 6 25; then
  139 + if use kernel_linux && kernel_is lt 2 6 25; then
140 140 eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
141 141 eerror "Either upgrade your kernel"
142   - else
  142 + elif use kernel_linux; then
143 143 if ! linux_config_exists; then
144 144 eerror "Unable to check your kernel for KVM support"
145 145 else
@@ -201,6 +201,9 @@ src_prepare() {
201 201 # Quick fix for the bad version number
202 202 epatch "${FILESDIR}"/${P}-VERSION.patch
203 203
  204 + # Patch the use of sys/sysctl.h on FreeBSD
  205 + epatch "${FILESDIR}"/${P}-freebsd-sysctl-header.patch
  206 +
204 207 [[ -n ${BACKPORTS} ]] && \
205 208 EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
206 209 epatch
@@ -250,6 +253,9 @@ src_configure() {
250 253 use pulseaudio && audio_opts="pa ${audio_opts}"
251 254 use sdl && audio_opts="sdl ${audio_opts}"
252 255
  256 + # conditionally making UUID work on Linux only is wrong
  257 + # but the Gentoo/FreeBSD guys need to figure out what
  258 + # provides libuuid on their platform
253 259 ./configure --prefix=/usr \
254 260 --sysconfdir=/etc \
255 261 --disable-darwin-user \
@@ -257,13 +263,8 @@ src_configure() {
257 263 --disable-libiscsi \
258 264 --disable-strip \
259 265 --disable-werror \
260   - --enable-kvm \
261   - --enable-kvm-device-assignment \
262   - --enable-kvm-pit \
263 266 --enable-pie \
264   - --enable-nptl \
265 267 --enable-tcg-interpreter \
266   - --enable-uuid \
267 268 --enable-vnc-jpeg \
268 269 --enable-vnc-png \
269 270 --python=python2 \
@@ -272,6 +273,11 @@ src_configure() {
272 273 $(use_enable brltty brlapi) \
273 274 $(use_enable curl) \
274 275 $(use_enable fdt) \
  276 + $(use_enable kernel_linux kvm) \
  277 + $(use_enable kernel_linux kvm-device-assignment) \
  278 + $(use_enable kernel_linux kvm-pit) \
  279 + $(use_enable kernel_linux nptl) \
  280 + $(use_enable kernel_linux uuid) \
275 281 $(use_enable ncurses curses) \
276 282 $(use_enable opengl) \
277 283 $(use_enable rbd) \
@@ -299,6 +305,11 @@ src_configure() {
299 305 # the kvm project has its own support for threaded IO
300 306 # which is always on and works
301 307 # --enable-io-thread \
  308 +
  309 + # FreeBSD's kernel does not support QEMU assigning/grabbing
  310 + # host USB devices yet
  311 + use kernel_FreeBSD && \
  312 + sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
302 313 }
303 314
304 315 src_install() {
13 app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild
... ... @@ -1,6 +1,6 @@
1 1 # Copyright 1999-2012 Gentoo Foundation
2 2 # Distributed under the terms of the GNU General Public License v2
3   -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild,v 1.2 2012/07/03 14:41:36 mr_bones_ Exp $
  3 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild,v 1.3 2012/07/08 03:25:54 cardoe Exp $
4 4
5 5 EAPI="4"
6 6
@@ -30,7 +30,7 @@ LICENSE="GPL-2"
30 30 SLOT="0"
31 31 # xen is disabled until the deps are fixed
32 32 IUSE="+aio alsa bluetooth brltty +curl debug fdt ncurses \
33   -opengl pulseaudio qemu-ifup rbd sasl sdl smartcard spice static test
  33 +opengl pulseaudio rbd sasl sdl smartcard spice static test
34 34 +threads tls usbredir vde +vhost-net xattr xen"
35 35
36 36 COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
@@ -75,7 +75,6 @@ RDEPEND="
75 75 ncurses? ( sys-libs/ncurses )
76 76 opengl? ( virtual/opengl )
77 77 pulseaudio? ( media-sound/pulseaudio )
78   - qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
79 78 rbd? ( sys-cluster/ceph )
80 79 sasl? ( dev-libs/cyrus-sasl )
81 80 sdl? ( static? ( >=media-libs/libsdl-1.2.11[static-libs,X] )
@@ -307,12 +306,6 @@ src_install() {
307 306 insinto /lib/udev/rules.d/
308 307 doins kvm/scripts/65-kvm.rules || die
309 308
310   - if use qemu-ifup; then
311   - insinto /etc/qemu/
312   - insopts -m0755
313   - doins kvm/scripts/qemu-ifup || die
314   - fi
315   -
316 309 if use qemu_softmmu_targets_x86_64 ; then
317 310 dobin "${FILESDIR}"/qemu-kvm
318 311 ewarn "The depreciated '/usr/bin/kvm' symlink is no longer installed"
@@ -365,6 +358,4 @@ pkg_postinst() {
365 358 elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
366 359 fi
367 360
368   - use qemu-ifup && \
369   - ewarn "qemu-ifup is deprecated, be prepared for it to disappear next release"
370 361 }
5 app-emulation/spice-protocol/Manifest
... ... @@ -1,2 +1,3 @@
1   -DIST spice-protocol-0.10.0.tar.bz2 65811 SHA256 05fa0e3133d288289282741a58975daf6d340a2bc9af2e72602a91801afa5899 SHA512 6e984550392d6cb67d965e18ebc28b13ad406788da27839be94a05845f4c94e444f1737925320a9a69883c8d970ca112d2226bb1754a125f8a1c778be0c4367c WHIRLPOOL 198b143ffd86d5dd6df4a830942df0250351a9577e8c7b11ad0a73a3403216529652f721a16e083d02d305263008e31afe090e2d3fcca2256cdfcd2a54c1b666
2   -DIST spice-protocol-0.10.1.tar.bz2 66014 SHA256 e5f6cbb679febc840eb530a5195d2625f900f7d21a5aefbadc95e3a3b9f03537 SHA512 0088648e7d7132facbaace5342f84c9acb93306d660a9e1d03266e6f98b1d387f11330e0db8066cf407876a0a89d1fa006bf559fb9437cb7a4a79e811f06182b WHIRLPOOL beed83f94027e2f62032d953baacb59e69c53bf35a112dbface6d90f4ba1a4eb5d999953ce6fa49d84fec4b96d4d229b570256accd988d7d36262a623e2a6b5a
  1 +DIST spice-protocol-0.10.0.tar.bz2 65811 RMD160 82f4e9e6847947be139de02bd1ede745cdb0e8fc SHA1 6ca37bc05521feccdb624c8d7f42fbc19b1d08a9 SHA256 05fa0e3133d288289282741a58975daf6d340a2bc9af2e72602a91801afa5899
  2 +DIST spice-protocol-0.10.1.tar.bz2 66014 RMD160 abdef903bb5c075e1ddb68bd63d9172bd72029d7 SHA1 9f6ed3a6ab4c830a4c65b857a48f6b579e8b994d SHA256 e5f6cbb679febc840eb530a5195d2625f900f7d21a5aefbadc95e3a3b9f03537
  3 +DIST spice-protocol-0.10.3.tar.bz2 67377 RMD160 ea90791480709de2c37a8aab9ec5874f0596215a SHA1 875286fa19f6ac5c227c7495676cea87d2dc80cd SHA256 b89eeeef21a79958e9de8dfc9a4ebbb6ae3eea17c0c498fd0f89a0ad1949ebe1
17 app-emulation/spice-protocol/spice-protocol-0.10.3.ebuild
... ... @@ -0,0 +1,17 @@
  1 +# Copyright 1999-2012 Gentoo Foundation
  2 +# Distributed under the terms of the GNU General Public License v2
  3 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-protocol/spice-protocol-0.10.3.ebuild,v 1.1 2012/07/08 02:33:17 cardoe Exp $
  4 +
  5 +EAPI=4
  6 +
  7 +DESCRIPTION="Headers defining the SPICE protocol."
  8 +HOMEPAGE="http://spice-space.org/"
  9 +SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
  10 +
  11 +LICENSE="BSD"
  12 +SLOT="0"
  13 +KEYWORDS="~amd64 ~x86"
  14 +IUSE=""
  15 +
  16 +DEPEND=""
  17 +RDEPEND=""
2  app-emulation/spice-vdagent/Manifest
... ... @@ -1,2 +1,2 @@
1   -DIST spice-vdagent-0.8.0.tar.bz2 97797 SHA256 3e0e33e8c0416520303a3d99cd14215956022bb2bddb6bc909c7bf2c854ee510 SHA512 444c5d8e02977793e0c1fcf9598c72d1bfffd05f9bbabdd7f6d309552692b2d76d8f45369a1537fe435d757cb20ee016f0cba6dda147d31f8023bf50718f3cd1 WHIRLPOOL fd72f8fd6e3579615fb70f215a7f37e9e0d796524a4b2d78dfdfc1be244d994df84101169fa91479475ca3efc966639ffe07c091408cd28a08543bd8a28216e4
  1 +DIST spice-vdagent-0.10.1.tar.bz2 107250 RMD160 818b923c5f61aa1e0d0d5875dd33d3398dbea76b SHA1 237ecdd441ca8a977c88cf4b54942b5b9f5cfcf3 SHA256 cea0db6f2def79a96876d0921f2a6234875797c68a8143d24cf9af8cc01361db
2 2 DIST spice-vdagent-0.8.1.tar.bz2 98437 SHA256 99ec232805a6201da78d409e6f874ff0aa6bb25e7ffe623aa77752539ae7d7ff SHA512 45c2b94dc66dd2061b57cfe90d7b900fd095fa067c6bca560ecc300979953e8c37b63e8cbdb4683275a1cc084512aa97e1125bbb17e39a6966387e4f1be2c178 WHIRLPOOL 1cfeabc97f4c1fd9e42a9ad849916f04d9f4f640a586158c3d8b2ab3b9449f6e1cf8acba196a9e684a1499404747971fa82ad922bd50e87c257526d67468a85f
11 app-emulation/spice-vdagent/files/spice-vdagent.confd-2
... ... @@ -0,0 +1,11 @@
  1 +# The virtual communication port provided by the hypervisor/vm
  2 +# Default: /dev/virtio-ports/com.redhat.spice.0
  3 +#PORT="/dev/virtio-ports/com.redhat.spice.0"
  4 +
  5 +# Userspace Input Device
  6 +# Default: /dev/uinput or /dev/input/uinput
  7 +#DEVICE=""
  8 +
  9 +# Extra arguments for spice-vdagentd
  10 +# Default: none
  11 +#SPICE_VDAGENT_ARGS=""
61 app-emulation/spice-vdagent/files/spice-vdagent.initd-2
... ... @@ -0,0 +1,61 @@
  1 +#!/sbin/runscript
  2 +# Copyright 1999-2012 Gentoo Foundation
  3 +# Distributed under the terms of the GNU General Public License v2
  4 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-vdagent/files/spice-vdagent.initd-2,v 1.1 2012/07/08 03:20:31 cardoe Exp $
  5 +
  6 +depend() {
  7 + after dbus
  8 +}
  9 +
  10 +PIDFILE="/var/run/spice-vdagentd/spice-vdagentd.pid"
  11 +
  12 +start() {
  13 + PORT="${PORT:-/dev/virtio-ports/com.redhat.spice.0}"
  14 + DEVICE="${DEVICE:-/dev/uinput}"
  15 +
  16 + ebegin "Checking for required modules and devices"
  17 +
  18 + if [[ ! -d /sys/module/uinput ]]; then
  19 + modprobe -q uinput
  20 + fi
  21 +
  22 + if [[ ! -d /sys/module/uinput ]]; then
  23 + eerror "Module 'uinput' not loaded or not enabled in the kernel"
  24 + eend 1
  25 + return 1
  26 + fi
  27 +
  28 + if [[ ! -c "${PORT}" ]] ; then
  29 + eerror "Required virtio port does not exist. Make sure you"
  30 + eerror "started the virtual machine with appropriate parameters."
  31 + eend 1
  32 + return 1
  33 + fi
  34 + eend 0
  35 +
  36 + if [[ ! -c ${DEVICE} && -c /dev/input/uinput ]]; then
  37 + DEVICE=/dev/input/uinput
  38 + fi
  39 +
  40 + # recreate the directory since /var/run may reside on a ramdisk
  41 + mkdir -p /var/run/spice-vdagentd
  42 +
  43 + # cleanup stalled socket
  44 + rm -f /var/run/spice-vdagentd/spice-vdagent-sock
  45 +
  46 + ebegin "Starting spice VD agent daemon"
  47 + start-stop-daemon \
  48 + --start \
  49 + --pidfile "${PIDFILE}" \
  50 + --exec /usr/sbin/spice-vdagentd \
  51 + -- -u "${DEVICE}" ${SPICE_VDAGENT_ARGS}
  52 + eend $?
  53 +}
  54 +
  55 +stop() {
  56 + ebegin "Stopping spice VD agent daemon"
  57 + start-stop-daemon \
  58 + --stop \
  59 + --pidfile "${PIDFILE}"
  60 + eend $?
  61 +}
1  app-emulation/spice-vdagent/metadata.xml
... ... @@ -1,6 +1,7 @@
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3 3 <pkgmetadata>
  4 + <herd>virtualization</herd>
4 5 <maintainer>
5 6 <email>dev-zero@gentoo.org</email>
6 7 <name>Tiziano Müller</name>
18 ...mulation/spice-vdagent/spice-vdagent-0.8.0.ebuild → ...ulation/spice-vdagent/spice-vdagent-0.10.1.ebuild
... ... @@ -1,6 +1,6 @@
1 1 # Copyright 1999-2012 Gentoo Foundation
2 2 # Distributed under the terms of the GNU General Public License v2
3   -# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-vdagent/spice-vdagent-0.8.0.ebuild,v 1.3 2012/05/03 18:49:05 jdhore Exp $
  3 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-vdagent/spice-vdagent-0.10.1.ebuild,v 1.1 2012/07/08 03:20:31 cardoe Exp $
4 4
5 5 EAPI=4
6 6
@@ -18,13 +18,14 @@ IUSE="+consolekit"
18 18 RDEPEND="x11-libs/libXfixes
19 19 x11-libs/libXrandr
20 20 x11-libs/libX11
21   - >=app-emulation/spice-protocol-0.8.0
  21 + >=app-emulation/spice-protocol-0.10.1
22 22 consolekit? ( sys-auth/consolekit sys-apps/dbus )"
23 23 DEPEND="virtual/pkgconfig
24 24 ${RDEPEND}"
25 25
26   -CONFIG_CHECK="~INPUT_UINPUT"
27   -ERROR_INPUT_UINPUT="User level driver support is required to run the spice-vdagent daemon"
  26 +CONFIG_CHECK="~INPUT_UINPUT ~VIRTIO_CONSOLE"
  27 +ERROR_INPUT_UINPUT="User level input support is required"
  28 +ERROR_VIRTIO_CONSOLE="VirtIO console/serial device support is required"
28 29
29 30 src_configure() {
30 31 econf \
@@ -40,11 +41,6 @@ src_install() {
40 41 keepdir /var/run/spice-vdagentd
41 42 keepdir /var/log/spice-vdagentd
42 43
43   - newinitd "${FILESDIR}/${PN}.initd" "${PN}"
44   - newconfd "${FILESDIR}/${PN}.confd" "${PN}"
45   -}
46   -
47   -pkg_postinst() {
48   - elog "Make sure that the User level driver support kernel module 'uinput' is loaded"
49   - elog "if built as a module before starting the vdagent daemon."
  44 + newinitd "${FILESDIR}/${PN}.initd-2" "${PN}"
  45 + newconfd "${FILESDIR}/${PN}.confd-2" "${PN}"
50 46 }
50 app-emulation/spice-vdagent/spice-vdagent-0.8.1.ebuild
... ... @@ -1,50 +0,0 @@
1   -# Copyright 1999-2012 Gentoo Foundation
2   -# Distributed under the terms of the GNU General Public License v2
3   -# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-vdagent/spice-vdagent-0.8.1.ebuild,v 1.3 2012/05/03 18:49:05 jdhore Exp $
4   -
5   -EAPI=4
6   -
7   -inherit linux-info
8   -
9   -DESCRIPTION="SPICE VD Linux Guest Agent."
10   -HOMEPAGE="http://spice-space.org/"
11   -SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
12   -
13   -LICENSE="LGPL-2.1"
14   -SLOT="0"
15   -KEYWORDS="~amd64"
16   -IUSE="+consolekit"
17   -
18   -RDEPEND="x11-libs/libXfixes
19   - x11-libs/libXrandr
20   - x11-libs/libX11
21   - >=app-emulation/spice-protocol-0.8.1
22   - consolekit? ( sys-auth/consolekit sys-apps/dbus )"
23   -DEPEND="virtual/pkgconfig
24   - ${RDEPEND}"
25   -
26   -CONFIG_CHECK="~INPUT_UINPUT"
27   -ERROR_INPUT_UINPUT="User level driver support is required to run the spice-vdagent daemon"
28   -
29   -src_configure() {
30   - econf \
31   - --localstatedir=/var \
32   - $(use_enable consolekit console-kit)
33   -}
34   -
35   -src_install() {
36   - default
37   -
38   - rm -rf "${D}"/etc/{rc,tmpfiles}.d
39   -
40   - keepdir /var/run/spice-vdagentd
41   - keepdir /var/log/spice-vdagentd
42   -
43   - newinitd "${FILESDIR}/${PN}.initd" "${PN}"
44   - newconfd "${FILESDIR}/${PN}.confd" "${PN}"
45   -}
46   -
47   -pkg_postinst() {
48   - elog "Make sure that the User level driver support kernel module 'uinput' is loaded"
49   - elog "if built as a module before starting the vdagent daemon."
50   -}
12 dev-lang/python/Manifest
... ... @@ -1,16 +1,16 @@
1 1 DIST Python-2.6.6.tar.bz2 11080872 RMD160 2d63f4f0ad3c124a8e62215ca94bd0231350e912 SHA1 a1daf2c2c7cffe0939c015260447572fe75c7e50 SHA256 134c5e0736bae2e5570d0b915693374f11108ded63c35a23a35d282737d2ce83
2   -DIST Python-2.6.8.tar.bz2 11127915 RMD160 fcfa3554af415cbddd3e8d68aead46f1e7b8e616 SHA1 348b727a9818146a57aa43203f37d8c6b462fe79 SHA256 c34036718ee1f091736677f543bc7960861cf9fcbea77d49572b59f7f1ab3c3f
  2 +DIST Python-2.6.8.tar.bz2 11127915 SHA256 c34036718ee1f091736677f543bc7960861cf9fcbea77d49572b59f7f1ab3c3f SHA512 91aa96574328d7165b7ff799cc4f33e021c18865bb0b08a4bc2d1361633c3290964cc54beb817fe42ab0a569b57652c990e2c6aa6d4d8aefe0063fcefcff7642 WHIRLPOOL 03403bcd7fd47fd670d3176e12e6778519487da168cf08c46ce663c89caa65f1f792f1b1611516d0b099c4746f17a1a595ad22caa550fefa658e8b982efb6ea2
3 3 DIST Python-2.7.1.tar.bz2 11722546 RMD160 3ce59305f6cd3fb320a53771d0ea01ec0687005f SHA1 fbe1894322ff91b80726e269c97454f4129fc2a3 SHA256 80e387bcf57eae8ce26726753584fd63e060ec11682d1145af921e85fd612292
4   -DIST Python-2.7.3.tar.bz2 11793433 RMD160 bfc511d54080898d7008d4b84d49f957859d66c3 SHA1 842c4e2aff3f016feea3c6e992c7fa96e49c9aa0 SHA256 726457e11cb153adc3f428aaf1901fc561a374c30e5e7da6742c0742a338663c
5   -DIST Python-3.0.1.tar.bz2 9495088 RMD160 78c918abba4cc85bd111a49ad17bed36f5d0b6b5 SHA1 6206059f0c04336e8d6550d2cdd88ab91f2657ff SHA256 91afb6ac16d3d22bc6bfbc80726dc85ede32bf838f660cc67016c7d0a7079add
  4 +DIST Python-2.7.3.tar.bz2 11793433 SHA256 726457e11cb153adc3f428aaf1901fc561a374c30e5e7da6742c0742a338663c SHA512 1fc5866b7bdbd3d6b89d92797ea4ad612a3dd6b77c4b9dde9feae64ce6c70013ea1b4d2086dd8e8be426689b4465b1a15d22b048d2f5335de629f5e8b0cb3820 WHIRLPOOL c980f465066ef0881d8b1141c6d8d4c54991c765fc258ddcd37ed2ec483f0686b8cc4cd076c56e0c8fa8891852905bed74d70b3f5071210cef7a9713542ab1a8
  5 +DIST Python-3.0.1.tar.bz2 9495088 SHA256 91afb6ac16d3d22bc6bfbc80726dc85ede32bf838f660cc67016c7d0a7079add SHA512 1895fe55b1c821e3bc7e53b51d65977c006f5ee5a67fd8073c5363e6bb28a2c3194c9d247fe9b66e55a7a365c71daac3c81a7b13d62bae212cb93e14d98d52ba WHIRLPOOL 2856862621f401359f5386a35add546c37cd54e87d9696a38cfee86a1d4970f09ba0c9b465a901a35aa43e1b088b9adb3bfff0cfee56e443ed89b454a11ee4cf
6 6 DIST Python-3.1.3.tar.bz2 9875464 RMD160 730f3b8eb1a41f1b7c469fc81be734bb802cb9f9 SHA1 aeadf1eb7f450aab77a8972c042bc5f49bcf2288 SHA256 77f6f41a51be4ca85d83670405c8281dd1237bb00d8be8a7560cb3ccdf5558cb
7   -DIST Python-3.1.5.tar.xz 8189536 RMD160 021362658310f9ea5f6825bf0919f160304f4833 SHA1 3fa78edeefd892a50b5f41bab018b51ecad0b56f SHA256 035c4370354d901924ce0fd8df65c5452839f590ec1b9c17fae2ada3e5f3b4d7
  7 +DIST Python-3.1.5.tar.xz 8189536 SHA256 035c4370354d901924ce0fd8df65c5452839f590ec1b9c17fae2ada3e5f3b4d7 SHA512 68581803b9d8276912503869d80494a135cc77aed204e1df3c83eb88c9fc06c8774402b885d80be38dfbc8229432b4ba53d6227f562504c4338464da7ed4bcb1 WHIRLPOOL c9b492d37e3220f9dda3f06f58569b2bd831de5f65fa92e644f016e21231a188a7310058e37081a2038769e65bc281ce4f5a464abfc4571e7337cfd9f17d7d9e
8 8 DIST Python-3.2.2.tar.xz 8923224 RMD160 f28dc7a6b8a6ed1cc359791b1c70367d36ae0af3 SHA1 5e654dbd48476193ccdef4d604ed4f45b48c6769 SHA256 1072d13d846373e7eaa4f94c21f0985d2965e916ff1096abe72d1af67c5f55f9
9   -DIST Python-3.2.3.tar.xz 8970368 RMD160 8e34a4dd2544a9b6a691557a0ab0e69b21e5ee0e SHA1 3d607dbcfdf100dd659978195ccf3ade9d221823 SHA256 23c16f621f21e54987079765c060196cbe50235c7867147c6126d433054b1754
  9 +DIST Python-3.2.3.tar.xz 8970368 SHA256 23c16f621f21e54987079765c060196cbe50235c7867147c6126d433054b1754 SHA512 80a84cc0818b28e0d52828cf23e3618dc25bde5d40dad3d76f1f66d36bdbe14845d6a8582659b304320564ba53cbd5e917f7d435998bbb4c4e2004474d1e7154 WHIRLPOOL 2bdf34a09b12d7b0d7c2df921b74d355eb2ac5dd9d9d979e493f1dba5bbc11034a5b8dfaf11c4210952a56165f8e1d7c0b9badad374fb7ac2236851f93035d0f
10 10 DIST Python-3.2.tar.xz 8877208 RMD160 25e958dbb17223d6c2060520e0921e6d9c9f7906 SHA1 55a3a9d39f31563370d0c494373bb6d38e4d1a00 SHA256 38a3de4ed38e92e1c3dd81e230caf6569d41bf8df6537d099541a6d3dca1b132
11 11 DIST python-gentoo-patches-2.6.6-r1.tar.bz2 15729 RMD160 9f0e1f5ead8b1ff1a3a3aedf2fb70d10fe4c6c3b SHA1 2a1fd29501c0f5a424e670e5d6a60c67007f23e7 SHA256 17d7fd6c4de686d41403322bc26bd306607f03843c4f9ab6365a985ded4f4ebb
12 12 DIST python-gentoo-patches-2.7.1-r2.tar.bz2 13610 RMD160 13163307b7bebae8eff27ef47859ce449d50aa4b SHA1 54a1d1d1412cd231d039134dfff179f60a7bcda6 SHA256 f56bca3ef0dca20bfd43a130ba8ecc06f062d1457092070a3e97ee2d3315b29b
13   -DIST python-gentoo-patches-3.0.1-r1.tar.bz2 9237 RMD160 aaa2a66609e2669350bd96852037ffddd29cf700 SHA1 1e58cdcb201cf83386b6e2d64d66e5e00afab75a SHA256 2a8ad6df5f6a5bc27d0b9a9ac98768b1107626217bfcd3af5a3ea11272e74a21
  13 +DIST python-gentoo-patches-3.0.1-r1.tar.bz2 9237 SHA256 2a8ad6df5f6a5bc27d0b9a9ac98768b1107626217bfcd3af5a3ea11272e74a21 SHA512 827ab13dacaf37c9b0a51597a2a686ca063571c750cc0af5b3c0d4ac3f6182d9ea5e84d1a1224a8c6b06b5b0b558246b24e47c90bf298fd6a0ffd054c70b7bf8 WHIRLPOOL b09cd5d41d491dd67c7c783b4ed25ba7f977d11417f82cdf2c7119c90e72826c3134165092db4149ce4d2a4dbf63d6415f41b0ee6d95ea43bef2bfb27ce20c03
14 14 DIST python-gentoo-patches-3.1.3-r1.tar.bz2 13730 RMD160 73f922d850e464e589c7a3cfb8f755d36167d156 SHA1 9228b63c980b80dd7e8dd9e0276c29af18692e33 SHA256 f23056436b298ed0ff9823b52902aaaa63eae0c4585a4a19e47571685127631e
15 15 DIST python-gentoo-patches-3.2.2.tar.bz2 10834 RMD160 f1ca3bec5705b72ee488a37ea71dc7110b4495f1 SHA1 c5daaea3c52a564228c84be741da6cf039b10e19 SHA256 521c1bd7c360fb66788e7c5e191497e014bb104f2ef2272d99a40b764082d7cb
16 16 DIST python-gentoo-patches-3.2.tar.bz2 11826 RMD160 8d450939f3f2f7f5c779b8701097fcf92909c36b SHA1 bdc922a4b94bbb616dbf702e913f74984ad8bda5 SHA256 43799206ed8c81936e3b3e68e8c562334b346652d30383c5b7b93fe9741ad0db
2  dev-lang/python/python-2.7.4_pre20120610.ebuild → dev-lang/python/python-2.7.4_pre20120708.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == *_pre* ]]; then
11 11 inherit mercurial
12 12
13 13 EHG_REPO_URI="http://hg.python.org/cpython"
14   - EHG_REVISION="b15d5b2c9051"
  14 + EHG_REVISION="b90968d584c3"
15 15 else
16 16 MY_PV="${PV%_p*}"
17 17 MY_P="Python-${MY_PV}"
2  dev-lang/python/python-3.2.4_pre20120610.ebuild → dev-lang/python/python-3.2.4_pre20120708.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == *_pre* ]]; then
11 11 inherit mercurial
12 12
13 13 EHG_REPO_URI="http://hg.python.org/cpython"
14   - EHG_REVISION="02b4c62ce393"
  14 + EHG_REVISION="5020afc0b7c9"
15 15 else
16 16 MY_PV="${PV%_p*}"
17 17 MY_P="Python-${MY_PV}"
27 dev-lang/python/python-3.3_pre20120610.ebuild → dev-lang/python/python-3.3_pre20120708.ebuild
@@ -11,13 +11,13 @@ if [[ "${PV}" == *_pre* ]]; then
11 11 inherit mercurial
12 12
13 13 EHG_REPO_URI="http://hg.python.org/cpython"
14   - EHG_REVISION="2059910e7d76"
  14 + EHG_REVISION="34e705fa4da4"
15 15 else
16 16 MY_PV="${PV%_p*}"
17 17 MY_P="Python-${MY_PV}"
18 18 fi
19 19
20   -PATCHSET_REVISION="20120527"
  20 +PATCHSET_REVISION="20120701"
21 21
22 22 DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
23 23 HOMEPAGE="http://www.python.org/"
@@ -101,11 +101,6 @@ src_prepare() {
101 101 fi
102 102 fi
103 103
104   - local excluded_patches
105   - if ! tc-is-cross-compiler; then
106   - excluded_patches="*_all_crosscompile.patch"
107   - fi
108   -
109 104 local patchset_dir
110 105 if [[ "${PV}" == *_pre* ]]; then
111 106 patchset_dir="${FILESDIR}/${SLOT}-${PATCHSET_REVISION}"
@@ -115,14 +110,13 @@ src_prepare() {
115 110 patchset_dir="${WORKDIR}/${MY_PV}"
116 111 fi
117 112
118   - EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" epatch "${patchset_dir}"
  113 + EPATCH_SUFFIX="patch" epatch "${patchset_dir}"
119 114
120 115 sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
121 116 Lib/distutils/command/install.py \
122 117 Lib/distutils/sysconfig.py \
123   - Lib/packaging/tests/test_command_install_dist.py \
124 118 Lib/site.py \
125   - Lib/sysconfig.cfg \
  119 + Lib/sysconfig.py \
126 120 Lib/test/test_site.py \
127 121 Makefile.pre.in \
128 122 Modules/Setup.dist \
@@ -177,19 +171,6 @@ src_configure() {
177 171 use hardened && replace-flags -O3 -O2
178 172 fi
179 173
180   - if tc-is-cross-compiler; then
181   - OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
182   - ./configure --{build,host}=${CBUILD} || die "cross-configure failed"
183   - emake python Parser/pgen || die "cross-make failed"
184   - mv python hostpython
185   - mv Parser/pgen Parser/hostpgen
186   - make distclean
187   - sed -i \
188   - -e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
189   - -e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
190   - Makefile.pre.in || die "sed failed"
191   - fi
192   -
193 174 # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
194 175 tc-export CXX
195 176
613 dev-libs/boost/boost-1.50.0.ebuild
... ... @@ -0,0 +1,613 @@
  1 +# Copyright 1999-2012 Gentoo Foundation
  2 +# Distributed under the terms of the GNU General Public License v2
  3 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.50.0.ebuild,v 1.1 2012/07/07 18:56:41 floppym Exp $
  4 +
  5 +EAPI="4"
  6 +PYTHON_DEPEND="python? *"
  7 +SUPPORT_PYTHON_ABIS="1"
  8 +RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
  9 +
  10 +inherit check-reqs flag-o-matic multilib python toolchain-funcs versionator
  11 +
  12 +MY_P=${PN}_$(replace_all_version_separators _)
  13 +
  14 +DESCRIPTION="Boost Libraries for C++"
  15 +HOMEPAGE="http://www.boost.org/"
  16 +SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
  17 +
  18 +LICENSE="Boost-1.0"
  19 +SLOT="$(get_version_component_range 1-2)"
  20 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
  21 +IUSE="debug doc +eselect icu mpi python static-libs test tools"
  22 +
  23 +RDEPEND="icu? ( >=dev-libs/icu-3.3 )
  24 + mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) )
  25 + sys-libs/zlib
  26 + !!<=dev-libs/boost-1.35.0-r2
  27 + >=app-admin/eselect-boost-0.4"
  28 +DEPEND="${RDEPEND}
  29 + dev-util/boost-build:${SLOT}"
  30 +
  31 +S=${WORKDIR}/${MY_P}
  32 +
  33 +MAJOR_PV=$(replace_all_version_separators _ ${SLOT})
  34 +BJAM="b2-${MAJOR_PV}"
  35 +
  36 +# Usage:
  37 +# _add_line <line-to-add> <profile>
  38 +# ... to add to specific profile
  39 +# or
  40 +# _add_line <line-to-add>
  41 +# ... to add to all profiles for which the use flag set
  42 +
  43 +_add_line() {
  44 + if [[ -z "$2" ]]; then
  45 + echo "${1}" >> "${D}usr/share/boost-eselect/profiles/${SLOT}/default"
  46 + if use debug; then
  47 + echo "${1}" >> "${D}usr/share/boost-eselect/profiles/${SLOT}/debug"
  48 + fi
  49 + else
  50 + echo "${1}" >> "${D}usr/share/boost-eselect/profiles/${SLOT}/${2}"
  51 + fi
  52 +}
  53 +
  54 +create_user-config.jam() {
  55 + local compiler compiler_version compiler_executable
  56 +
  57 + if [[ ${CHOST} == *-darwin* ]]; then
  58 + compiler="darwin"
  59 + compiler_version="$(gcc-fullversion)"
  60 + compiler_executable="$(tc-getCXX)"
  61 + else
  62 + compiler="gcc"
  63 + compiler_version="$(gcc-version)"
  64 + compiler_executable="$(tc-getCXX)"
  65 + fi
  66 + local mpi_configuration python_configuration
  67 +
  68 + if use mpi; then
  69 + mpi_configuration="using mpi ;"
  70 + fi
  71 +
  72 + if use python; then
  73 + python_configuration="using python : $(python_get_version) : /usr : $(python_get_includedir) : /usr/$(get_libdir) ;"
  74 + fi
  75 +
  76 + # The debug-symbols=none and optimization=none are not official upstream flags but a Gentoo
  77 + # specific patch to make sure that all our CFLAGS/CXXFLAGS/LDFLAGS are being respected.
  78 + # Using optimization=off would for example add "-O0" and override "-O2" set by the user.
  79 + # Please take a look at the boost-build ebuild for more information.
  80 + cat > user-config.jam << __EOF__
  81 +variant gentoorelease : release : <optimization>none <debug-symbols>none ;
  82 +variant gentoodebug : debug : <optimization>none ;
  83 +
  84 +using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
  85 +${mpi_configuration}
  86 +${python_configuration}
  87 +__EOF__
  88 +}
  89 +
  90 +pkg_pretend() {
  91 + if use test; then
  92 + CHECKREQS_DISK_BUILD="15G" check-reqs_pkg_pretend
  93 +
  94 + ewarn "The tests may take several hours on a recent machine"
  95 + ewarn "but they will not fail (unless something weird happens ;-)"
  96 + ewarn "This is because the tests depend on the used compiler version"
  97 + ewarn "and the platform and upstream says that this is normal."
  98 + ewarn "If you are interested in the results, please take a look at the"
  99 + ewarn "generated results page:"
  100 + ewarn " ${ROOT}usr/share/doc/${PF}/status/cs-$(uname).html"
  101 + fi
  102 +}
  103 +
  104 +pkg_setup() {
  105 + if use python; then
  106 + python_pkg_setup
  107 + fi
  108 +
  109 + if use debug; then
  110 + ewarn "The debug USE flag means that a second set of the boost libraries"
  111 + ewarn "will be built containing debug symbols. You'll be able to select them"
  112 + ewarn "using the boost-eselect module. But even though the optimization flags"
  113 + ewarn "you might have set are not stripped, there will be a performance"
  114 + ewarn "penalty and linking other packages against the debug version"
  115 + ewarn "of boost is _not_ recommended."
  116 + fi
  117 +}
  118 +
  119 +src_prepare() {
  120 + epatch "${FILESDIR}/${PN}-1.48.0-mpi_python3.patch"
  121 + epatch "${FILESDIR}/${PN}-1.48.0-respect_python-buildid.patch"
  122 + epatch "${FILESDIR}/${PN}-1.48.0-support_dots_in_python-buildid.patch"
  123 + epatch "${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch"
  124 + epatch "${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch"
  125 + epatch "${FILESDIR}/${PN}-1.48.0-python_linking.patch"
  126 + epatch "${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch"
  127 + epatch "${FILESDIR}/remove-toolset-1.48.0.patch"
  128 +}
  129 +
  130 +src_configure() {
  131 + OPTIONS=""
  132 +
  133 + if [[ ${CHOST} == *-darwin* ]]; then
  134 + # We need to add the prefix, and in two cases this exceeds, so prepare
  135 + # for the largest possible space allocation.
  136 + append-ldflags -Wl,-headerpad_max_install_names
  137 + fi
  138 +
  139 + # bug 298489
  140 + if use ppc || use ppc64; then
  141 + [[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
  142 + fi
  143 +
  144 + use icu && OPTIONS+=" -sICU_PATH=/usr"
  145 + use icu || OPTIONS+=" --disable-icu boost.locale.icu=off"
  146 + use mpi || OPTIONS+=" --without-mpi"
  147 + use python || OPTIONS+=" --without-python"
  148 +
  149 + # https://svn.boost.org/trac/boost/attachment/ticket/2597/add-disable-long-double.patch
  150 + if use sparc || { use mips && [[ ${ABI} = "o32" ]]; } || use hppa || use arm || use x86-fbsd || use sh; then
  151 + OPTIONS+=" --disable-long-double"
  152 + fi
  153 +
  154 + OPTIONS+=" pch=off --boost-build=/usr/share/boost-build-${MAJOR_PV} --prefix=\"${D}usr\" --layout=versioned"
  155 +
  156 + if use static-libs; then
  157 + LINK_OPTS="link=shared,static"
  158 + LIBRARY_TARGETS="*.a *$(get_libname)"
  159 + else
  160 + LINK_OPTS="link=shared"
  161 + # There is no dynamically linked version of libboost_test_exec_monitor and libboost_exception.
  162 + LIBRARY_TARGETS="libboost_test_exec_monitor*.a libboost_exception*.a *$(get_libname)"
  163 + fi
  164 +}
  165 +
  166 +src_compile() {
  167 + local jobs
  168 + jobs=$( echo " ${MAKEOPTS} " | \
  169 + sed -e 's/ --jobs[= ]/ -j /g' \
  170 + -e 's/ -j \([1-9][0-9]*\)/ -j\1/g' \
  171 + -e 's/ -j\>/ -j1/g' | \
  172 + ( while read -d ' ' j; do if [[ "${j#-j}" = "$j" ]]; then continue; fi; jobs="${j#-j}"; done; echo ${jobs} ) )
  173 + if [[ "${jobs}" != "" ]]; then NUMJOBS="-j"${jobs}; fi
  174 +
  175 + export BOOST_ROOT="${S}"
  176 + PYTHON_DIRS=""
  177 + MPI_PYTHON_MODULE=""
  178 +
  179 + building() {
  180 + create_user-config.jam
  181 +
  182 + einfo "Using the following command to build:"
  183 + einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared $(use python && echo --python-buildid=${PYTHON_ABI})"
  184 +
  185 + ${BJAM} ${NUMJOBS} -q -d+2 \
  186 + gentoorelease \
  187 + --user-config=user-config.jam \
  188 + ${OPTIONS} \
  189 + threading=single,multi ${LINK_OPTS} runtime-link=shared \
  190 + $(use python && echo --python-buildid=${PYTHON_ABI}) \
  191 + || die "Building of Boost libraries failed"
  192 +
  193 + # ... and do the whole thing one more time to get the debug libs
  194 + if use debug; then
  195 + einfo "Using the following command to build:"
  196 + einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoodebug --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --buildid=debug $(use python && echo --python-buildid=${PYTHON_ABI})"
  197 +
  198 + ${BJAM} ${NUMJOBS} -q -d+2 \
  199 + gentoodebug \
  200 + --user-config=user-config.jam \
  201 + ${OPTIONS} \
  202 + threading=single,multi ${LINK_OPTS} runtime-link=shared \
  203 + --buildid=debug \
  204 + $(use python && echo --python-buildid=${PYTHON_ABI}) \
  205 + || die "Building of Boost debug libraries failed"
  206 + fi
  207 +
  208 + if use python; then
  209 + if [[ -z "${PYTHON_DIRS}" ]]; then
  210 + PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
  211 + else
  212 + if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then
  213 + die "Inconsistent structure of build directories"
  214 + fi
  215 + fi
  216 +
  217 + local dir
  218 + for dir in ${PYTHON_DIRS}; do
  219 + mv ${dir} ${dir}-${PYTHON_ABI} || die "Renaming of '${dir}' to '${dir}-${PYTHON_ABI}' failed"
  220 + done
  221 +
  222 + if use mpi; then
  223 + if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
  224 + MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoorelease -name mpi.so)"
  225 + if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
  226 + die "Multiple mpi.so files found"
  227 + fi
  228 + else
  229 + if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoorelease -name mpi.so)" ]]; then
  230 + die "Inconsistent structure of build directories"
  231 + fi
  232 + fi
  233 +
  234 + mv stage/lib/mpi.so stage/lib/mpi.so-${PYTHON_ABI} || die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${PYTHON_ABI}' failed"
  235 + fi
  236 + fi
  237 + }
  238 + if use python; then
  239 + python_execute_function building
  240 + else
  241 + building
  242 + fi
  243 +
  244 + if use tools; then
  245 + pushd tools > /dev/null || die
  246 + einfo "Using the following command to build the tools:"
  247 + einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease --user-config=../user-config.jam ${OPTIONS}"
  248 +
  249 + ${BJAM} ${NUMJOBS} -q -d+2\
  250 + gentoorelease \
  251 + --user-config=../user-config.jam \
  252 + ${OPTIONS} \
  253 + || die "Building of Boost tools failed"
  254 + popd > /dev/null || die
  255 + fi
  256 +}
  257 +
  258 +src_install () {
  259 + dodir /usr/share/boost-eselect/profiles/${SLOT}
  260 + touch "${D}usr/share/boost-eselect/profiles/${SLOT}/default" || die
  261 + if use debug; then
  262 + touch "${D}usr/share/boost-eselect/profiles/${SLOT}/debug" || die
  263 + fi
  264 +
  265 + if use mpi && use python; then
  266 + _add_line "python_modules=\""
  267 + fi
  268 +
  269 + installation() {
  270 + create_user-config.jam
  271 +
  272 + if use python; then
  273 + local dir
  274 + for dir in ${PYTHON_DIRS}; do
  275 + cp -pr ${dir}-${PYTHON_ABI} ${dir} || die "Copying of '${dir}-${PYTHON_ABI}' to '${dir}' failed"
  276 + done
  277 +
  278 + if use mpi; then
  279 + cp -p stage/lib/mpi.so-${PYTHON_ABI} "${MPI_PYTHON_MODULE}" || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to '${MPI_PYTHON_MODULE}' failed"
  280 + cp -p stage/lib/mpi.so-${PYTHON_ABI} stage/lib/mpi.so || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to 'stage/lib/mpi.so' failed"
  281 + fi
  282 + fi
  283 +
  284 + einfo "Using the following command to install:"
  285 + einfo "${BJAM} -q -d+2 gentoorelease --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}usr/include\" --libdir=\"${D}usr/$(get_libdir)\" $(use python && echo --python-buildid=${PYTHON_ABI}) install"
  286 +
  287 + ${BJAM} -q -d+2 \
  288 + gentoorelease \
  289 + --user-config=user-config.jam \
  290 + ${OPTIONS} \
  291 + threading=single,multi ${LINK_OPTS} runtime-link=shared \
  292 + --includedir="${D}usr/include" \
  293 + --libdir="${D}usr/$(get_libdir)" \
  294 + $(use python && echo --python-buildid=${PYTHON_ABI}) \
  295 + install || die "Installation of Boost libraries failed"
  296 +
  297 + if use debug; then
  298 + einfo "Using the following command to install:"
  299 + einfo "${BJAM} -q -d+2 gentoodebug --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}usr/include\" --libdir=\"${D}usr/$(get_libdir)\" --buildid=debug $(use python && echo --python-buildid=${PYTHON_ABI})"
  300 +
  301 + ${BJAM} -q -d+2 \
  302 + gentoodebug \
  303 + --user-config=user-config.jam \
  304 + ${OPTIONS} \
  305 + threading=single,multi ${LINK_OPTS} runtime-link=shared \
  306 + --includedir="${D}usr/include" \
  307 + --libdir="${D}usr/$(get_libdir)" \
  308 + --buildid=debug \
  309 + $(use python && echo --python-buildid=${PYTHON_ABI}) \
  310 + install || die "Installation of Boost debug libraries failed"
  311 + fi
  312 +
  313 + if use python; then
  314 + rm -r ${PYTHON_DIRS} || die
  315 +
  316 + # Move mpi.so Python module to Python site-packages directory and make sure it is slotted.
  317 + if use mpi; then
  318 + mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die
  319 + mv "${D}usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die
  320 + cat << EOF > "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py" || die
  321 +import sys
  322 +if sys.platform.startswith('linux'):
  323 + import DLFCN
  324 + flags = sys.getdlopenflags()
  325 + sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
  326 + from . import mpi
  327 + sys.setdlopenflags(flags)
  328 + del DLFCN, flags
  329 +else:
  330 + from . import mpi
  331 +del sys
  332 +EOF
  333 + _add_line "$(python_get_sitedir)/mpi.py:boost_${MAJOR_PV}.mpi"
  334 + fi
  335 + fi
  336 + }
  337 + if use python; then
  338 + python_execute_function installation
  339 + else
  340 + installation
  341 + fi
  342 +
  343 + if use mpi && use python; then
  344 + _add_line "\""
  345 + fi
  346 +
  347 + use python || rm -rf "${D}usr/include/boost-${MAJOR_PV}/boost"/python* || die
  348 +
  349 + if use doc; then
  350 + find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf
  351 + dohtml \
  352 + -A pdf,txt,cpp,hpp \
  353 + *.{htm,html,png,css} \
  354 + -r doc
  355 + dohtml \
  356 + -A pdf,txt \
  357 + -r tools
  358 + insinto /usr/share/doc/${PF}/html
  359 + doins -r libs
  360 + doins -r more
  361 +
  362 + # To avoid broken links
  363 + insinto /usr/share/doc/${PF}/html
  364 + doins LICENSE_1_0.txt
  365 +
  366 + dosym /usr/include/boost-${MAJOR_PV}/boost /usr/share/doc/${PF}/html/boost
  367 + fi
  368 +
  369 + pushd "${D}usr/$(get_libdir)" > /dev/null || die
  370 +
  371 + # Remove (unversioned) symlinks
  372 + # And check for what we remove to catch bugs
  373 + # got a better idea how to do it? tell me!
  374 + local f
  375 + for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v "${MAJOR_PV}"); do
  376 + if [[ ! -h "${f}" ]]; then
  377 + eerror "Tried to remove '${f}' which is a regular file instead of a symlink"
  378 + die "Slotting/naming of the libraries broken!"
  379 + fi
  380 + rm "${f}" || die
  381 + done
  382 +
  383 + # The threading libs obviously always gets the "-mt" (multithreading) tag
  384 + # some packages seem to have a problem with it. Creating symlinks...
  385 +
  386 + if use static-libs; then
  387 + THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}.a libboost_thread-mt-${MAJOR_PV}$(get_libname)"
  388 + else
  389 + THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}$(get_libname)"
  390 + fi
  391 + local lib