[app-emulation/xen-tools] Sabayon Tinderbox build failuire, fixes bug #377557. patch...

Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 75206bfa217d025454e40da941b38d7b1d4f9734..f430dae41fbbdcc564d59ef48fe8246621d0bcf9 100644 (file)
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.98 2011/10/05 18:59:29 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.99 2011/10/13 19:30:37 alexxy Exp $
+
+  13 Oct 2011; Alexey Shvetsov <alexxy@gentoo.org> -xen-tools-3.4.2.ebuild,
+  xen-tools-4.1.1-r5.ebuild, files/xendomains.initd-r1:
+  Sabayon Tinderbox build failuire, fixes bug #377557. patch by Tobias Heinlein
+  aka keytoaster, full diff prepared by Ian Delaney. Use toolchain function
+  instead of calling LD directly, copy fix from bug #384359, fix to invoke
+  correct compiler, copy from bug #383973, patches by Ian Delaney aka idella4
 
   05 Oct 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-tools-3.4.2-r5.ebuild,
   xen-tools-4.1.1-r5.ebuild, metadata.xml:

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index babb295a86c0fa34680253619e5d8cc53c2e0927..815a49c85c501aea3551fb24e7a260fa958edd46 100644 (file)
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -19,7 +19,7 @@ AUX xend.initd-r1 1664 RMD160 8d7ea19e96c49631a8f432dd93ae91ca4f37d26b SHA1 bd3a
 AUX xend.initd-r2 1064 RMD160 07b94d60a9c93577864086945389ef9821913522 SHA1 60f246da00f829776f1bb9a16ec07a6f91cbd24e SHA256 b9dcd925856eb5213b9052169492492d686b5d1ccae65b1c94a8ac944708d155
 AUX xendomains-screen.confd 594 RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 SHA1 7f9ed2986495d5fa4a6f8b050cd632fde6a19994 SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a
 AUX xendomains.confd 291 RMD160 75d55db5360da12fc3d721c37001ccbfbb844e52 SHA1 e7be8973a4bcbfc7680258e369b07e2ed097ef49 SHA256 2fac318bb96b357dd185f7729d83c0a0b941799cdb89c24ed83051bb085735dc
-AUX xendomains.initd-r1 2921 RMD160 dd45bbc63a2c497990e193eb80b24b47226a8da2 SHA1 ea3c35c3829371b10ad023f222cf9c360adf0871 SHA256 4c63f354ac076c30ae4cd414224561f50252e9141e3bda95703bd3fb14ea7a59
+AUX xendomains.initd-r1 2930 RMD160 9a1c467d63043ce04c5f3c268745a30e4db1d006 SHA1 e649a34fae4cfc25f9f904008a79603c47df9836 SHA256 cf03eb7d8eb6d79bce02e857a4a6bcff68a6a63c55ff283f18ebb8d013a27111
 AUX xendomains.initd-r2 2933 RMD160 31d35c58d0286a34bebd636e85a9368054b8f6c0 SHA1 5e9cbdb5f2b1770bf30ba99ca7c67dbf38b78e84 SHA256 da69c146e5213df5376bd9b2758d9d5957c802e5513c6ea510e604d00f1d9e40
 AUX xenstored.confd 42 RMD160 3407e1ff0958d5797e257da284798a21fe31a5db SHA1 c18f64d2a41de25695b7dfb924478e3fa64ed0c3 SHA256 afcc14f014fe4ec478f85d230efefba9ffad024bf8c83b30074e8a3712cc7831
 AUX xenstored.initd 812 RMD160 57a880e0024f3733bb3ebe945389eed6474b96f5 SHA1 9837c052afac31ee623ef02280a43114866869c8 SHA256 8f9df8ad835e45f9c995244e9e80d1a9ee630787bf2da88b7c4a73354d056fd8
@@ -28,25 +28,24 @@ DIST xen-3.4.2.tar.gz 11187726 RMD160 2ef81df1f44356d60e04e21df2173ce5357d8509 S
 DIST xen-4.1.1.tar.gz 10355625 RMD160 4b3c0641b0f098889f627662aa6b8fea00c5b636 SHA1 f1b5ef4b663c339faf9c77fc895327cfbcc9776c SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b
 EBUILD xen-tools-3.4.2-r3.ebuild 7049 RMD160 05ffd0fdba6761df2d59f3bd7421599e1f20f4a1 SHA1 e36b7900c84de2ca1f861af081678ff3c7eb943a SHA256 d1513d443231dd27cb0267acac47c00c9bf95c25aa296e90ee6bb21a134e1e51
 EBUILD xen-tools-3.4.2-r5.ebuild 7398 RMD160 08e9b12c23c9d853f5b59ee2613a5e07a9623038 SHA1 0859af01b9dace9451e24f509c4b436a76b9da39 SHA256 92682159a7961a7ebebf523541f793e59e7b4807755e32e8787e70658bc3ff54
-EBUILD xen-tools-3.4.2.ebuild 7086 RMD160 ce6037714a2bef2aa117157f200ddbcb4bd88484 SHA1 30f5ffe1852ba3c3676a12e1983898d1a89fa852 SHA256 23547d91a41cfe46579310004cb8edcd9119a1b8e5672ba3489f7b845f178b14
-EBUILD xen-tools-4.1.1-r5.ebuild 10128 RMD160 f47f5f5a377970493c042a27fef4c37f74a5a81a SHA1 56679821ebe590f7eb67620f5e6b23d25f4e32d5 SHA256 6404ec9d05e45eac9d734905c54ef2602128f68f8f446359f837f0e8e1b21525
+EBUILD xen-tools-4.1.1-r5.ebuild 10316 RMD160 92450a0dba081cda3e23e94072953b858538d31e SHA1 f1af2fba3958c0813b37adc16c82d69d720f2458 SHA256 80485abdbcaf256d21289f0cf260de671d72bbcc023bf49df3bd99db99b23720
 EBUILD xen-tools-9999.ebuild 9682 RMD160 2f60aa64bb720767cee6b7a88a421613f92dcf02 SHA1 69a5487f75dd757d5da96bb2339c38819fe6d4d6 SHA256 20770f7c8a02ea141be8a8772624e6dcf8266dbee477b31e87f265695b939a69
-MISC ChangeLog 24185 RMD160 0164f7d18ed05863b0168df15f7b5489708f78ef SHA1 25ae2f615f7a3ad153afd93d96d16ea6d3897205 SHA256 d0077829fe17c76f0322eea65457512eddcf0a9056acbcb776db362bc94b2e11
+MISC ChangeLog 24627 RMD160 264f09aa2e84c48f0e60f80256798b78d8248017 SHA1 b638c1547d1ec25a56af72036a845a1456194d31 SHA256 16d9a3c42ae49dc72137fe16e52c8c21182cc5e68aca0ce80b833dd00599fcf6
 MISC metadata.xml 947 RMD160 96890462f83ee4a47c9c77993ba76ef82a732af5 SHA1 7ff424eead47cb6ce81930c10d3b22b0d8f73d61 SHA256 74f0e5bea356989a42fd4086d87271ed7c25331306acb333707476f53cac4d60
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOjKkoAAoJEOf+E+/4L5LmRyYP/RLuNlbswnwTG4aOc1g0EcqD
-5rYpNlpDNfsvoAnQ31FxSR0MtNt/rcGxjFvzWndGA/qL70AluT7H1Ak2qy4Q1p+J
-0Fejiw+yivKh6fkzxthJKxY3cy9fpMhgqs4FgQaBvv+Z1rBh7k2phzNRw6nZo7Ex
-4oreIx3d/QU7a+vC6FtfxKghbdNwjeKVaUJ4U/rSxjrr0T8akMcZSgaPnh3HLbbQ
-ZqqW3EuMqsOaPDLsUVvkmSgZIyZNlwEWMPYR/yyTcOefsxI0EhwMWx4Kr//6qsJF
-P79wFTcDIXzcBvFnaPgdSb8myMWVqFHGXX6/wxlWk6ugUypHJ+Q9jBB5aBA4C53S
-NqNlO7P9BCD+a+ptjprKcbXDUXsbwAae0340jh7N8nIOyx+I5Y3LWke43jSb6r4B
-6Bw9ZA4UHKVCqWNmtaNmBgMjQH5ALGLAfYuHjeUsZu18WQIGe8BL6IfphxN9Wk+6
-B6gSHkNmiD0/SHPkg2dg/KwXyLrUJ71iKFjCIX/DX6NkqZBNA6qwzFSpm4T2jZ0p
-C5Y1mKUuiL3AAL05+JCUQ+pgaipw4enm8clK1jVc6WlJCWm6dHMkx5tlx1Hl4PL4
-nYCw7GBSMUph5KG9XLju2BYRrgu9N+5AfOyMP0LagCRpP+GpDFrDAl5Mnye5syW+
-TZXp5YN5b9aRrp4usQ+g
-=NBOC
+iQIcBAEBCAAGBQJOlzv9AAoJEOf+E+/4L5LmYPYP/2Ehv9W8g4V6fYzXn1X2lmnq
+U/VgQlpZ1ueM5egJU6KrDBjVeZ9ALTp6iXFlpBb990oJCipv0BNkACN2fFDlRiWU
++slwjhdpWaT+8YO5/R7xzSQ9julOkN9UBumWl5Nswijc1Whs9GAXXEKLH2R10SgB
+65SQ9Z8VEtfU+WPt//tfRoJQrH4p6Y+WTHLiGrgZiAlDVmD3dgRmOqnHogIskw6e
+V0Oh1V1L5vatlmRkPKYz1+fAhOmVrpWXeDsRO0VR6JsM32B9appg753zsA386Bm4
+sTv2ZcBX1IEvFPwVoMkQd8+xeqfRAaQqYndHY2qONYcSwSOLxUmneg7vfzuUJRdb
+3X7s7VVtYhMxLLleSJ+n7pB/Cb33r7lkYRAanHcMXiiTXnUdB2tr57WNBVbsdXeu
+TkNGnAeAd+qFV7ge4tu91u2FjnosOJkqZf9AW2pRm2EIRlQxtuRaTFcGz6tIJbtQ
+J4dZbbokIXaaDqs+Sdgd2y2yaVMS1EjkhqvbvWusWBpxdI5Sq31NZTPSWZewRoac
+rfQ0+UvvyWEpGU9anBd2sdWuxXf3wkLelB5uX5xUscRMOgSrdmTeWMcuaZQU+PQ3
+CSHAfRqT6n26x7gCTIJv9qJIFiguhUgw8ugu85knR5x0upNi7n7Hjx57BaMyGKKg
+hv8Cl0yd5LqNWD39U14L
+=sPz0
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/xen-tools/files/xendomains.initd-r1 b/app-emulation/xen-tools/files/xendomains.initd-r1
index 79ceac5a94b19b046df6b0218aa7dd9b125a871c..c7f6f88ee27d4d7910130709dbf6349610f3f174 100755 (executable)
--- a/app-emulation/xen-tools/files/xendomains.initd-r1
+++ b/app-emulation/xen-tools/files/xendomains.initd-r1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r1,v 1.1 2009/09/01 09:56:36 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r1,v 1.2 2011/10/13 19:30:37 alexxy Exp $
 
 opts="start stop status restart"
 
@@ -38,7 +38,7 @@ start() {
        einfo "Starting Xen domains from ${AUTODIR:=/etc/xen/auto}"
        if using_screen ; then
                ebegin "Creating screen session to hold domain consoles"
-               (  screen -c ${SCREENRC:-/dev/null} -d -m -S ${SCREEN_NAME} -t dom0 \
+               (  screen -c ${SCREENRC:-/dev/null} -d -m -S ${SCREEN_NAME} -t dom0 && sleep 3 \
                && ${screen_cmd} zombie dr \
                && logrotate -f /etc/xen/xen-consoles.logrotate \
                && ${screen_cmd} logfile  /var/log/xen-consoles/%t.log \

diff --git a/app-emulation/xen-tools/xen-tools-3.4.2.ebuild b/app-emulation/xen-tools/xen-tools-3.4.2.ebuild
deleted file mode 100644 (file)
index 7917bcd..0000000
--- a/app-emulation/xen-tools/xen-tools-3.4.2.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2.ebuild,v 1.6 2011/03/26 00:26:15 alexxy Exp $
-
-EAPI="3"
-
-inherit flag-o-matic eutils multilib python
-
-# TPMEMUFILE=tpm_emulator-0.4.tar.gz
-
-DESCRIPTION="Xend daemon and tools"
-HOMEPAGE="http://xen.org/"
-SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
-#      vtpm? ( mirror://berlios/tpm-emulator/${TPMEMUFILE} )"
-S="${WORKDIR}/xen-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc debug screen custom-cflags pygrub hvm api acm flask"
-
-CDEPEND="dev-lang/python[ncurses,threads]
-       sys-libs/zlib
-       hvm? ( media-libs/libsdl )
-       acm? ( dev-libs/libxml2 )
-       api? ( dev-libs/libxml2 net-misc/curl )"
-#      vtpm? ( dev-libs/gmp dev-libs/openssl )
-
-DEPEND="${CDEPEND}
-       sys-devel/gettext
-       sys-devel/gcc
-       dev-lang/perl
-       dev-lang/python[ssl]
-       app-misc/pax-utils
-       doc? (
-               app-doc/doxygen
-               dev-tex/latex2html[png,gif]
-               dev-texlive/texlive-latexextra
-               media-gfx/transfig
-               media-gfx/graphviz
-       )
-       hvm? (
-               x11-proto/xproto
-               sys-devel/dev86
-       )"
-
-RDEPEND="${CDEPEND}
-       sys-apps/iproute2
-       net-misc/bridge-utils
-       dev-python/pyxml
-       screen? (
-               app-misc/screen
-               app-admin/logrotate
-       )
-       || ( sys-fs/udev sys-apps/hotplug )"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
-QA_EXECSTACK="usr/share/xen/qemu/openbios-sparc32
-       usr/share/xen/qemu/openbios-sparc64"
-
-pkg_setup() {
-       export "CONFIG_LOMOUNT=y"
-
-       if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
-               eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
-               eerror "an amd64 multilib profile is required. Remove the hvm use flag"
-               eerror "to build xen-tools on your current profile."
-               die "USE=hvm is unsupported on this system."
-       fi
-
-       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
-
-#      use vtpm    && export "VTPM_TOOLS=y"
-       use api     && export "LIBXENAPI_BINDINGS=y"
-       use acm     && export "ACM_SECURITY=y"
-       use flask   && export "FLASK_ENABLE=y"
-}
-
-src_prepare() {
-#      use vtpm && cp "${DISTDIR}"/${TPMEMUFILE}  tools/vtpm
-
-       # 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
-
-       # Disable hvm support on systems that don't support x86_32 binaries.
-       if ! use hvm; then
-               chmod 644 tools/check/check_x11_devel
-               sed -i -e '/^CONFIG_IOEMU := y$/d' "${S}"/config/*.mk
-               sed -i -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' "${S}"/tools/Makefile
-       fi
-
-       if ! use pygrub; then
-               sed -i -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' "${S}"/tools/Makefile
-       fi
-
-       # Fix network broadcast on bridged networks
-       epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
-
-       # Do not strip binaries
-       epatch "${FILESDIR}/${PN}-3.3.0-nostrip.patch"
-
-       # fix variable declaration to avoid sandbox issue, #253134
-       epatch "${FILESDIR}/${PN}-3.3.1-sandbox-fix.patch"
-
-       # Fix --as-needed issues, bug 296631
-       epatch "${FILESDIR}/${P}-as-needed.patch"
-}
-
-src_compile() {
-       export VARTEXFONTS="${T}/fonts"
-       local myopt
-       use debug && myopt="${myopt} debug=y"
-
-       use custom-cflags || unset CFLAGS
-       if test-flag-CC -fno-strict-overflow; then
-               append-flags -fno-strict-overflow
-       fi
-
-       emake -C tools ${myopt} || die "compile failed"
-
-       if use doc; then
-               sh ./docs/check_pkgs || die "package check failed"
-               emake docs || die "compiling docs failed"
-               emake dev-docs || die "make dev-docs failed"
-       fi
-
-       emake -C docs man-pages || die "make man-pages failed"
-}
-
-src_install() {
-       make DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools  \
-               || die "install failed"
-
-       # Remove RedHat-specific stuff
-       rm -rf "${D}"/etc/sysconfig
-
-       dodoc README docs/README.xen-bugtool docs/ChangeLog
-       if use doc; then
-               emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs \
-                       || die "install docs failed"
-
-               dohtml -r docs/api/
-               docinto pdf
-               dodoc docs/api/tools/python/latex/refman.pdf
-
-               [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
-       fi
-       rm -rf "${D}"/usr/share/doc/xen/
-
-       doman docs/man?/*
-
-       newinitd "${FILESDIR}"/xend.initd-r1 xend \
-               || die "Couldn't install xen.initd"
-       newconfd "${FILESDIR}"/xendomains.confd xendomains \
-               || die "Couldn't install xendomains.confd"
-       newinitd "${FILESDIR}"/xendomains.initd-r1 xendomains \
-               || die "Couldn't install xendomains.initd"
-
-       if use screen; then
-               cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains
-               cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/
-               keepdir /var/log/xen-consoles
-       fi
-
-       # xend expects these to exist
-       keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
-
-       # for xendomains
-       keepdir /etc/xen/auto
-}
-
-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 [[ "$(scanelf -s __guard -q $(type -P python))" ]] ; then
-               echo
-               ewarn "xend may not work when python is built with stack smashing protection (ssp)."
-               ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
-               ewarn "This probablem may be resolved as of Xen 3.0.4, if not post in the bug."
-       fi
-
-       if ! has_version "dev-lang/python[ncurses]"; then
-               echo
-               ewarn "NB: Your dev-lang/python is built without USE=ncurses."
-               ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
-       fi
-
-       if has_version "sys-apps/iproute2[minimal]"; then
-               echo
-               ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
-               ewarn "will not work until you rebuild iproute2 without USE=minimal."
-       fi
-
-       if ! use hvm; then
-               echo
-               elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-               elog "support enable the hvm use flag."
-               elog "An x86 or amd64 multilib system is required to build HVM support."
-               echo
-               elog "The ioemu use flag has been removed and replaced with hvm."
-       fi
-
-       if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
-               echo
-               elog "xensv is broken upstream (Gentoo bug #142011)."
-               elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
-       fi
-
-       python_mod_optimize $(use pygrub && echo grub) xen
-}
-
-pkg_postrm() {
-       python_mod_cleanup $(use pygrub && echo grub) xen
-}

diff --git a/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild
index 9cb12442c55af9c5f1f1548b2f804bfd78e606b7..7fe45567b7e950e2d2dbdf3113d5310c04486d80 100644 (file)
--- a/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild,v 1.4 2011/10/05 18:59:29 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild,v 1.5 2011/10/13 19:30:37 alexxy Exp $
 
 EAPI="3"
 
@@ -18,7 +18,7 @@ else
        S="${WORKDIR}/xen-${PV}"
 fi
 
-inherit flag-o-matic eutils multilib python ${live_eclass}
+inherit flag-o-matic eutils multilib python toolchain-funcs ${live_eclass}
 
 DESCRIPTION="Xend daemon and tools"
 HOMEPAGE="http://xen.org/"
@@ -205,7 +205,7 @@ src_compile() {
        fi
 
        unset LDFLAGS
-       emake -C tools ${myopt} || die "compile failed"
+       emake CC=$(tc-getCC) LD=$(tc-getLD) -C tools ${myopt} || die "compile failed"
 
        if use doc; then
                sh ./docs/check_pkgs || die "package check failed"
@@ -217,11 +217,15 @@ src_compile() {
 }
 
 src_install() {
+       # Override auto-detection in the build system, bug #382573
+       export INITD_DIR=/etc/init.d
+       export CONFIG_LEAF_DIR=default
+
        make DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools  \
                || die "install failed"
 
        # Remove RedHat-specific stuff
-       rm -r "${D}"/etc/init.d/xen* || die
+       rm -r "${D}"/etc/init.d/xen* "${D}"/etc/default || die
 
        # uncomment lines in xl.conf
        sed -e 's:^#autoballoon=1:autoballoon=1:' \