gentoo resync : 14.07.2018

10 files changed, 484 insertions, 0 deletions

diff --git a/app-emulation/xe-guest-utilities/Manifest b/app-emulation/xe-guest-utilities/Manifest
new file mode 100644
index 000000000000..ad2e041283e6
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/Manifest
@@ -0,0 +1,12 @@
+AUX xe-daemon.initd 628 BLAKE2B 2307505518a79ff929dd8559ceea7e25df88f8b32e589228b64a50e1117c0cfa7da6d43fe5f4b32add62dbc24f5da02d959a06602b973546777bc36558547e99 SHA512 0278202ff6ce4d8537fd56293844039cee438d5487bb5bd843634f7ca91a0ade2afe5d5b5e5fbc3715e5ef3966ff58772a3540ae9e3cbc19b19eac4266b953b6
+AUX xe-guest-utilities-5.6.100_p651-gentoo.patch 1004 BLAKE2B 03762683b5f0d8fa7ade58ff0269d082e452e94219e70e79e946225189885e3a2db03d77d67140ef14d0736b317c406de64d43d610bb0ad82e29144e48fbb037 SHA512 c420d4304f749ef4c52a56ba8fb08b4979dc1334d32cc22793afe39f3494bda66dc291970474c1aa1345179e60399f37dcf82b09e7e408ad772bfd214bf9e0ed
+AUX xe-guest-utilities-5.6.100_p651-update-guest-attrs.patch 558 BLAKE2B 672698b5408aa6f07f0216afdd58aa6421fa3dad46d11e9d1699f90c0a9adceb36fd692ec55fa730bf4bc574850fcb74b73b713335719d7b5f9bda1855c1fb95 SHA512 84fb3d8f231e9597616770960e6c0bae8a4bed2d165dd185cccbd6b64d72836f2271d17574f8cbf524e39c0090a7d5a6f646959d214c38d3074e930fde2e9852
+AUX xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch 4599 BLAKE2B 6bcbd37c9386ed91635d23cbe43ea07ea321063d4c859688735303f14734b08b7895886f49791c000d64eff0e9b458f266a2c921e7c4fd202cd6d10fafcf1b76 SHA512 c9147d9a93b45d7300441b6c398c27bf3c38d39c0a6908f80a2708b8c26329c9b138522ca3b7ae7b4af2ace3b43ededda03dd39b9c8cafd31dbe32beae739690
+AUX xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch 2146 BLAKE2B 6875bf6ff48acd48cee2e590402cc546dd53df8a0861a6941b2de0d8c8caeb509f107d2b24c4e5c5d665890c15972c84c80c299eab718ec81131dc0594b6a5ec SHA512 93f5c1445b7ee449fedaed3c73a3f21b6adc0fad67d90e3bb35213749ae659ffae85dec3ddf43d4b5df21500e8b651651dd7496a2ffb8fa2d9091dd246c839de
+DIST xe-guest-utilities-5.6.0-595.src.rpm 454569 BLAKE2B ded5b93d74f268d069ddeebbf36aad7c098a8009e7f19e538343d71a5fe07e6a25e1089aba90540ae82511c2807dd792d3c3e59a40c1a55c9ef02ba1fe160154 SHA512 967f7708f074f4382c95a823e24dcf07c677e44d75a97e57078d63284584c85d2acf24e0a4b58ec2f26ba034ccaa1baad5793391f736fa4d72c04f7511bd78aa
+DIST xe-guest-utilities-6.1.0-1033.src.rpm 554621 BLAKE2B c76db0e9ab163f18c59687f33af3a91a75c602b3ff90a5e2a4405dd4797c31be215b599e01829d874c4f69e2bb1a675d8d017c09cdfa8818add167d886c3fbf1 SHA512 65ab85974fb5e73619aa3bac22c861cf989d6256e4f856da3c14767a0e8fe8f1c34713db32166c6f901c589e61f2fcc3c285bd8eded4925daa829e4adb07e9e2
+DIST xe-guest-utilities-6.2.0-1120.src.rpm 566881 BLAKE2B b2c727c551996f218c021d509ba1841baa07c70cbaf7660c0ec9cbeae696c4e77921d8ca12e8dfdf934a6894058c62ee6bf4e86bd1918e304cc76ee28d396fad SHA512 b945b3bf8175816b41b3a07a7dd8f0d9d2fdb1a7144448a5bb7fb4b6729736c67cea88fd45031df41abdd99416addb17fa1ee9cfe1fc76acf610cde3b3213880
+EBUILD xe-guest-utilities-5.6.0_p595.ebuild 1490 BLAKE2B 807f9be5ceac0345e4f7e92732537a12231cb6f9dbd22a2116c47738b7e130df8bfb69412ef2c512ecb1038d8f778a9f9499bf98ba2fcdc885c726bb8d37ff9b SHA512 1a95d5c3ba95b6006b8198442570b10673d47ea87073593ab79b096f9b8d89328bc9aee80d2e16ce595b01c571d12aad723d4b0d85a8003d128995a456dab952
+EBUILD xe-guest-utilities-6.1.0_p1033.ebuild 1498 BLAKE2B ed8304c90962627d9c078d9d00a7b5b6f08c17efb4a8da9f3fa12d70985fb1e8807ae59c310d616347fac7be6bfeb8c105a3996ac1d9d7f3f9454ce2eab7e62f SHA512 7445f259f022a37e8a44989f51a4c78214f6909ffb2eb70cbf0b35cc0ccab363227c10736915c0d56884d5ec4b22201cc824f8de7dd8877c914e7b5f1d68cddd
+EBUILD xe-guest-utilities-6.2.0_p1120.ebuild 1503 BLAKE2B ad1bfc862229957baa6f3253cc534bfcea7e98b84c11af707445691d59070ecec3ed64323ef198353f21cb30065a7b471844537f04e65b63e0e61387aeca1489 SHA512 dfeffca4ae4c29234163d461efd1c1d20c20f9ff1545283e6966878f2a4edeaffabde845b7f040be0b535f200bfab05fadd51a89115a6dfdb72d77aa4201ca59
+MISC metadata.xml 843 BLAKE2B 472593a2f2cd850c1b65cf77ed0c81ccc8ed0ff0eed767ca4d28c6127559f7fb1cdb094cfd0a1b15c00b50b2ea3dbde88af3dc1d4eef8ed83463785f42ca4c24 SHA512 81830766353ca324bee53374fa0c4a61f9d177233fd0a69067a29cb6b6742290babac528b971ecec0e7efe6ec7d8a8fce1a5e01ef8be34be2f375206886521c9
diff --git a/app-emulation/xe-guest-utilities/files/xe-daemon.initd b/app-emulation/xe-guest-utilities/files/xe-daemon.initd
new file mode 100644
index 000000000000..d2c6e51fb5bf
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/files/xe-daemon.initd
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+  need localmount
+  after bootmisc
+}
+
+start() {
+  einfo "Detecting Linux distribution version"
+  /usr/sbin/xe-linux-distribution /var/cache/xe-linux-distribution
+
+  ebegin "Starting xe daemon"
+  start-stop-daemon --start --exec /usr/sbin/xe-daemon \
+  --pidfile /var/run/xe-daemon.pid \
+  --background \
+  -- -p /var/run/xe-daemon.pid
+  eend $?
+}
+
+stop() {
+  ebegin "Stopping xe daemon"
+  start-stop-daemon --stop --exec /usr/sbin/xe-daemon \
+  --pidfile /var/run/xe-daemon.pid
+  eend $?
+}
diff --git a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-gentoo.patch b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-gentoo.patch
new file mode 100644
index 000000000000..ee9b86e91396
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-gentoo.patch
@@ -0,0 +1,35 @@
+--- usr/sbin/xe-linux-distribution.orig	2011-04-18 10:56:30.000000000 -0500
++++ usr/sbin/xe-linux-distribution	2013-12-31 01:35:51.995831278 -0600
+@@ -249,6 +249,24 @@
+     write_to_output "${distro}" "${major}" "${minor}" "${description}"
+ }
+ 
++identify_gentoo()
++{
++	gentoo_release="$1"
++	if [ ! -e "${gentoo_release}" ] ; then
++		return 1
++	fi
++	distro="gentoo"
++	eval $(cat ${gentoo_release} | awk '{ print "release=" $5 }' )
++	if [ -z "${release}" ] ; then
++		return 1
++	fi
++	eval $(echo $release | awk -F. -- '{ print "major=" $1 ; print "minor=" $2 }' )
++	if [ -z "${major}" -o -z "$minor" ] ; then
++		return 1
++	fi
++	write_to_output "${distro}" "${major}" "${minor}" "${distro}"
++}
++
+ if [ $# -eq 1 ] ; then
+     exec 1>"$1"
+ fi
+@@ -258,6 +276,7 @@
+     identify_sles   /etc/SuSE-release   && exit 0
+     identify_lsb    lsb_release         && exit 0
+     identify_debian /etc/debian_version && exit 0
++    identify_gentoo /etc/gentoo-release && exit 0
+ 
+     if [ $# -eq 1 ] ; then
+ 	rm -f "$1"
diff --git a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-update-guest-attrs.patch b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-update-guest-attrs.patch
new file mode 100644
index 000000000000..c60994effa65
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-5.6.100_p651-update-guest-attrs.patch
@@ -0,0 +1,11 @@
+--- usr/sbin/xe-update-guest-attrs.orig	2011-04-18 10:56:30.000000000 -0500
++++ usr/sbin/xe-update-guest-attrs	2013-12-31 04:34:57.750083257 -0600
+@@ -172,7 +172,7 @@
+ #           collisions:0 txqueuelen:0 
+ #           RX bytes:3604609 (3.4 MiB)  TX bytes:3604609 (3.4 MiB)
+ 
+-eval $(/sbin/ifconfig | \
++eval $(/bin/ifconfig | \
+         sed -n -e '/^[0-9a-z][0-9a-z]*\:/,/^$/d' \
+                -e 's/^\([0-9a-z][0-9a-z]*\) .*/ifs="\$ifs \1"; current="\1"; /gp;' \
+                -e 's/  *inet addr:\('$IPADDR_RE'\) .*/eval inet_\${current}="\1"; /gp;')
diff --git a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch
new file mode 100644
index 000000000000..d431cdfcf999
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch
@@ -0,0 +1,127 @@
+--- usr/sbin/xe-update-guest-attrs.orig	2013-06-14 07:57:18.000000000 -0500
++++ usr/sbin/xe-update-guest-attrs	2014-04-19 13:38:14.627477193 -0500
+@@ -1,6 +1,7 @@
+ #!/bin/sh
+ 
+ # Copyright (C) 2009  Citrix Systems Inc.
++# Copyright (C) 2014  Christopher J. Camisa
+ #
+ # This program is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License
+@@ -51,10 +52,10 @@
+ 
+ # parse command line opts
+ 
+-MEMORY_MODE=0 # do not update memory stats 
+-while [ $# -ge 1 ] ; do 
++MEMORY_MODE=0 # do not update memory stats
++while [ $# -ge 1 ] ; do
+     if [ "$1" = "--memory" ] ; then
+-	MEMORY_MODE=1	# update only memory stats 
++	MEMORY_MODE=1	# update only memory stats
+     fi
+     shift
+ done
+@@ -71,12 +72,12 @@
+ 	fi
+     else
+ 	# cache does not exist
+-	if [ -e $cache ] ; then 
++	if [ -e $cache ] ; then
+ 	    # something (directory?) in its way
+ 	    rm -rf $cache
+ 	fi
+     fi
+-    
++
+     # try to write and update cache if successful
+     if $XENSTORE write "$key" "$newval" ; then
+ 	mkdir -p $(dirname "$cache")
+@@ -119,8 +120,8 @@
+ xenstore_list_interfaces_cached() {
+     topdir=$XS_CACHE/attr
+     if [ -d $topdir ] ; then
+-	cd $topdir 
+-	for dir in * ; do 
++	cd $topdir
++	for dir in * ; do
+ 	    [ -f $dir/ip ] && echo $dir
+ 	done
+     fi
+@@ -131,7 +132,7 @@
+     eval $(cat /proc/meminfo | \
+ 	sed -n -e 's/MemTotal\: *\([0-9]*\)[^$]*/memtotal=\1/gp;' \
+         -e 's/MemFree\: *\([0-9]*\)[^$]*/memfree=\1/gp;')
+-    
++
+     xenstore_write_cached "data/meminfo_total" "${memtotal}"
+     xenstore_write_cached "data/meminfo_free" "${memfree}"
+ fi
+@@ -140,17 +141,17 @@
+ 
+ # e.g.
+ # $ ip addr show
+-# 1: lo: <LOOPBACK,UP,LOWER_UP> mtu 16436 qdisc noqueue 
++# 1: lo: <LOOPBACK,UP,LOWER_UP> mtu 16436 qdisc noqueue
+ #     link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
+ #     inet 127.0.0.1/8 scope host lo
+-#     inet6 ::1/128 scope host 
++#     inet6 ::1/128 scope host
+ #        valid_lft forever preferred_lft forever
+ # 2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast qlen 1000
+ #     link/ether 00:13:20:95:e8:74 brd ff:ff:ff:ff:ff:ff
+ #     inet 172.31.0.57/20 brd 172.31.15.255 scope global eth0
+-#     inet6 fe80::213:20ff:fe95:e874/64 scope link 
++#     inet6 fe80::213:20ff:fe95:e874/64 scope link
+ #        valid_lft forever preferred_lft forever
+-# 3: sit0: <NOARP> mtu 1480 qdisc noop 
++# 3: sit0: <NOARP> mtu 1480 qdisc noop
+ #     link/sit 0.0.0.0 brd 0.0.0.0
+ 
+ #eval $(ip addr show | \
+@@ -158,26 +159,26 @@
+ #	      -e 's/^[[:space:]]\{4\}inet \('${IPADDR_RE}'\)\/.*/eval inet_\${current}="\1"; /gp;')
+ 
+ # e.g.
+-# eth0      Link encap:Ethernet  HWaddr 00:13:20:95:E8:74  
++# eth0      Link encap:Ethernet  HWaddr 00:13:20:95:E8:74
+ #           inet addr:172.31.0.57  Bcast:172.31.15.255  Mask:255.255.240.0
+ #           inet6 addr: fe80::213:20ff:fe95:e874/64 Scope:Link
+ #           UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
+ #           RX packets:98001128 errors:0 dropped:0 overruns:0 frame:0
+ #           TX packets:87728920 errors:0 dropped:0 overruns:0 carrier:0
+-#           collisions:0 txqueuelen:1000 
++#           collisions:0 txqueuelen:1000
+ #           RX bytes:35864034092 (33.4 GiB)  TX bytes:27544025180 (25.6 GiB)
+-#           Interrupt:177 
+-# 
+-# lo        Link encap:Local Loopback  
++#           Interrupt:177
++#
++# lo        Link encap:Local Loopback
+ #           inet addr:127.0.0.1  Mask:255.0.0.0
+ #           inet6 addr: ::1/128 Scope:Host
+ #           UP LOOPBACK RUNNING  MTU:16436  Metric:1
+ #           RX packets:32928 errors:0 dropped:0 overruns:0 frame:0
+ #           TX packets:32928 errors:0 dropped:0 overruns:0 carrier:0
+-#           collisions:0 txqueuelen:0 
++#           collisions:0 txqueuelen:0
+ #           RX bytes:3604609 (3.4 MiB)  TX bytes:3604609 (3.4 MiB)
+ 
+-ifs=`/sbin/ifconfig | sed -n -e 's/^\([a-z0-9]\+\).*/name \1/p' \
++ifs=`/bin/ifconfig | sed -n -e 's/^\([a-z0-9]\+\).*/name \1/p' \
+     -e 's/.*inet addr:\('$IPADDR_RE'\) .*/ipv4 \1/p' \
+     -e 's+.*inet6 addr: \('$IPADDR6_RE'\)/.*+ipv6 \1+p' | \
+ while read tag value; do
+@@ -225,9 +226,9 @@
+ # build time addons
+ xenstore_write_cached "attr/PVAddons/MajorVersion" "6"
+ xenstore_write_cached "attr/PVAddons/MinorVersion" "2"
+-xenstore_write_cached "attr/PVAddons/MicroVersion" "0" 
++xenstore_write_cached "attr/PVAddons/MicroVersion" "0"
+ xenstore_write_cached "attr/PVAddons/BuildVersion" "70442"
+-xenstore_write_cached "attr/PVAddons/Installed" "1" 
++xenstore_write_cached "attr/PVAddons/Installed" "1"
+ 
+ # update xenstore if necessary
+ if [ $XENSTORE_UPDATED -eq 1 ] ; then
diff --git a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch
new file mode 100644
index 000000000000..45b0bbc56c69
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch
@@ -0,0 +1,77 @@
+--- usr/sbin/xe-linux-distribution.orig	2013-06-14 07:57:18.000000000 -0500
++++ usr/sbin/xe-linux-distribution	2014-04-19 13:54:13.270477193 -0500
+@@ -1,6 +1,7 @@
+ #! /bin/sh
+ 
+ # Copyright (C) 2009  Citrix Systems Inc.
++# Copyright (C) 2014  Christopher J. Camisa
+ #
+ # This program is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License
+@@ -68,7 +69,7 @@
+     eval $(awk -F. '/^[0-9]*\.[0-9]*/ \
+                         { print "major="$1 ; print "minor="$2 ; exit 0 }' \
+                    "${debian_version}")
+-    
++
+     if [ -z "${major}" ] && [ -z "${minor}" ] && ! grep -q /sid "${debian_version}" ; then
+ 	return 1
+     fi
+@@ -118,7 +119,7 @@
+     # Enterprise Linux Enterprise Linux Server release 5 (Carthage)
+     # Enterprise Linux Enterprise Linux Server release 5.5 (Carthage)
+     # Oracle Linux Server release 5.6
+-    
++
+     if [ ! -f "${redhat_release}" ] ; then
+ 	return 1
+     fi
+@@ -236,7 +237,7 @@
+     if [ ! -x "${lsb_release}" ] ; then
+ 	return 1
+     fi
+-    
++
+     distro=$(${lsb_release} --short --id | tr 'A-Z' 'a-z')
+     description=$(${lsb_release} --short --description | sed -e 's/^"\(.*\)"$/\1/g')
+     release=$(${lsb_release} --short --release)
+@@ -254,6 +255,31 @@
+     write_to_output "${distro}" "${major}" "${minor}" "${description}"
+ }
+ 
++identify_gentoo()
++{
++    gentoo_release="$1"
++
++    if [ ! -e "${gentoo_release}" ] ; then
++	return 1
++    fi
++
++    distro="gentoo"
++
++    eval $(cat ${gentoo_release} | awk '{ print "release=" $5 }' )
++
++    if [ -z "${release}" ] ; then
++	return 1
++    fi
++
++    eval $(echo $release | awk -F. -- '{ print "major=" $1 ; print "minor=" $2 }' )
++
++    if [ -z "${major}" -o -z "$minor" ] ; then
++	return 1
++    fi
++
++    write_to_output "${distro}" "${major}" "${minor}" "${distro}"
++}
++
+ if [ $# -eq 1 ] ; then
+     exec 1>"$1"
+ fi
+@@ -265,6 +291,7 @@
+     identify_sles   /etc/SuSE-release   && exit 0
+     identify_lsb    lsb_release         && exit 0
+     identify_debian /etc/debian_version && exit 0
++    identify_gentoo /etc/gentoo-release && exit 0
+ 
+     if [ $# -eq 1 ] ; then
+ 	rm -f "$1"
diff --git a/app-emulation/xe-guest-utilities/metadata.xml b/app-emulation/xe-guest-utilities/metadata.xml
new file mode 100644
index 000000000000..b680abcf6169
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>chicago@blkid.net</email>
+	<name>Chicago</name>
+</maintainer>
+<maintainer type="person">
+	<email>robbat2@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+	<email>openstack@gentoo.org</email>
+	<name>Openstack</name>
+</maintainer>
+<maintainer type="project">
+	<email>virtualization@gentoo.org</email>
+	<name>Gentoo Virtualization Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>xen@gentoo.org</email>
+	<name>Gentoo Xen Project</name>
+</maintainer>
+<longdescription>XenServer Virtual Machine Tools</longdescription>
+<use>
+	<flag name="xenstore">Use xenstore binaries bundled by Citrix instead of building app-emulation/xen-tools</flag>
+</use>
+</pkgmetadata>
diff --git a/app-emulation/xe-guest-utilities/xe-guest-utilities-5.6.0_p595.ebuild b/app-emulation/xe-guest-utilities/xe-guest-utilities-5.6.0_p595.ebuild
new file mode 100644
index 000000000000..9a057370c6ba
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/xe-guest-utilities-5.6.0_p595.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils rpm linux-info
+DESCRIPTION="XenServer Virtual Machine Tools"
+HOMEPAGE="https://www.citrix.com/"
+PV_BASE=${PV/_*}
+PV_FULL=${PV/_p/-}
+SRC_URI="http://updates.vmd.citrix.com/XenServer/${PV_BASE}/rhel4x/SRPMS/xe-guest-utilities-${PV_FULL}.src.rpm"
+LICENSE="LGPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="xenstore"
+DEPEND="app-arch/rpm2targz"
+RDEPEND="
+	!xenstore? ( app-emulation/xen-tools )
+	xenstore? ( !app-emulation/xen-tools )"
+S=${WORKDIR}
+CONFIG_CHECK="~XEN_COMPAT_XENFS ~XENFS"
+QA_PREBUILT="usr/bin/xenstore* usr/bin/xeninfo"
+
+src_unpack() {
+	rpm_src_unpack ${A}
+	# Upstream includes xenstore-sources.tar.bz2
+	# but it is NOT the complete source :-(
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.6.100_p651-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-5.6.100_p651-update-guest-attrs.patch
+}
+
+src_install() {
+	newinitd "${FILESDIR}/xe-daemon.initd" xe-daemon
+	dosbin xe-daemon
+	dosbin xe-linux-distribution
+	dosbin xe-update-guest-attrs
+	insinto /lib/udev/rules.d
+	newins xen-vcpu-hotplug.rules 10-xen-vcpu-hotplug.rules
+
+	if use xenstore; then
+		dobin usr/bin/xeninfo
+		dobin usr/bin/xenstore
+		dobin usr/bin/xenstore-*
+	fi
+}
+
+pkg_postinst() {
+	if [ ! -e /etc/runlevels/boot/xe-daemon ]; then
+		elog "To start the xe-daemon automatically by default"
+		elog "you should add it to the boot runlevel :"
+		elog "'rc-update add xe-daemon boot'"
+		elog
+	fi
+}
diff --git a/app-emulation/xe-guest-utilities/xe-guest-utilities-6.1.0_p1033.ebuild b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.1.0_p1033.ebuild
new file mode 100644
index 000000000000..c8993996dc9b
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.1.0_p1033.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils rpm linux-info
+DESCRIPTION="XenServer Virtual Machine Tools"
+HOMEPAGE="https://www.citrix.com/"
+PV_BASE=${PV/_*}
+PV_FULL=${PV/_p/-}
+SRC_URI="http://updates.vmd.citrix.com/XenServer/${PV_BASE}/rhel4x/SRPMS/xe-guest-utilities-${PV_FULL}.src.rpm"
+LICENSE="LGPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="xenstore"
+DEPEND="app-arch/rpm2targz"
+RDEPEND="
+	!xenstore? ( app-emulation/xen-tools )
+	xenstore? ( !app-emulation/xen-tools )"
+S=${WORKDIR}
+CONFIG_CHECK="~XEN_COMPAT_XENFS ~XENFS"
+QA_PREBUILT="usr/bin/xenstore* usr/bin/xeninfo"
+
+src_unpack() {
+	rpm_src_unpack ${A}
+	# Upstream includes xenstore-sources.tar.bz2
+	# but it is NOT the complete source :-(
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.2.0_p1120-Guest-Attributes.patch
+	epatch "${FILESDIR}"/${PN}-6.2.0_p1120-Linux-Distribution.patch
+}
+
+src_install() {
+	newinitd "${FILESDIR}/xe-daemon.initd" xe-daemon
+	dosbin xe-daemon
+	dosbin xe-linux-distribution
+	dosbin xe-update-guest-attrs
+	insinto /lib/udev/rules.d
+	newins xen-vcpu-hotplug.rules 10-xen-vcpu-hotplug.rules
+
+	if use xenstore; then
+		dobin usr/bin/xeninfo
+		dobin usr/bin/xenstore
+		dobin usr/bin/xenstore-*
+	fi
+}
+
+pkg_postinst() {
+	if [ ! -e /etc/runlevels/boot/xe-daemon ]; then
+		elog "To start the xe-daemon automatically by default"
+		elog "you should add it to the boot runlevel :"
+		elog "'rc-update add xe-daemon boot'"
+		elog
+	fi
+}
diff --git a/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild
new file mode 100644
index 000000000000..d3211b5fdcf1
--- /dev/null
+++ b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils rpm linux-info
+DESCRIPTION="XenServer Virtual Machine Tools"
+HOMEPAGE="https://www.citrix.com/"
+PV_BASE=${PV/_*}
+PV_FULL=${PV/_p/-}
+SRC_URI="http://updates.vmd.citrix.com/XenServer/${PV_BASE}/rhel4x/SRPMS/xe-guest-utilities-${PV_FULL}.src.rpm"
+LICENSE="LGPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="xenstore"
+DEPEND="app-arch/rpm2targz"
+RDEPEND="
+	!xenstore? ( app-emulation/xen-tools )
+	xenstore? ( !app-emulation/xen-tools )"
+S=${WORKDIR}
+CONFIG_CHECK="~XEN_COMPAT_XENFS ~XENFS"
+QA_PREBUILT="usr/bin/xenstore* usr/bin/xeninfo"
+
+src_unpack() {
+	rpm_src_unpack ${A}
+	# Upstream includes xenstore-sources.tar.bz2
+	# but it is NOT the complete source :-(
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.2.0_p1120-Guest-Attributes.patch
+	epatch "${FILESDIR}"/${PN}-6.2.0_p1120-Linux-Distribution.patch
+}
+
+src_install() {
+	newinitd "${FILESDIR}/xe-daemon.initd" xe-daemon
+	dosbin xe-daemon
+	dosbin xe-linux-distribution
+	dosbin xe-update-guest-attrs
+	insinto /lib/udev/rules.d
+	newins xen-vcpu-hotplug.rules 10-xen-vcpu-hotplug.rules
+
+	if use xenstore; then
+		dobin usr/bin/xeninfo
+		dobin usr/bin/xenstore
+		dobin usr/bin/xenstore-*
+	fi
+}
+
+pkg_postinst() {
+	if [ ! -e /etc/runlevels/boot/xe-daemon ]; then
+		elog "To start the xe-daemon automatically by default"
+		elog "you should add it to the boot runlevel :"
+		elog "'rc-update add xe-daemon boot'"
+		elog
+	fi
+}