summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Delaney <idell5@iinet.com.au>2011-11-29 02:08:55 +0800
committerIan Delaney <idell5@iinet.com.au>2011-11-29 02:08:55 +0800
commitd6e73198410451ad57c0227af185c4049b75f4eb (patch)
tree08251a49e992d7156518d0442366f43f5bf16008 /app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
parentRevork ebuilds (diff)
downloadvirtualization-d6e73198410451ad57c0227af185c4049b75f4eb.tar.gz
virtualization-d6e73198410451ad57c0227af185c4049b75f4eb.tar.bz2
virtualization-d6e73198410451ad57c0227af185c4049b75f4eb.zip
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/virtualization
Conflicts: app-emulation/xen-tools/Manifest
Diffstat (limited to 'app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild')
-rw-r--r--app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild12
1 files changed, 6 insertions, 6 deletions
diff --git a/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
index 2a305e5..b32b668 100644
--- a/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
@@ -3,7 +3,6 @@
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2-r1.ebuild,v 1.1 2011/11/11 17:50:59 neurogeek Exp $
EAPI="4"
-
PYTHON_DEPEND="2"
PYTHON_USE_WITH="xml threads"
@@ -68,8 +67,7 @@ DEPEND="${CDEPEND}
hvm? (
x11-proto/xproto
sys-devel/dev86
- )
- pygrub? ( dev-lang/python[ncurses] )
+ ) pygrub? ( dev-lang/python[ncurses] )
"
RDEPEND="${CDEPEND}
@@ -139,6 +137,7 @@ src_prepare() {
# if the user *really* wants to use their own custom-cflags, let them
if use custom-cflags; then
einfo "User wants their own CFLAGS - removing defaults"
+
# try and remove all the default custom-cflags
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
@@ -237,11 +236,11 @@ src_install() {
-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
-i tools/examples/xl.conf || die
- dodoc README docs/README.xen-bugtool docs/ChangeLog
+# dodoc README docs/README.xen-bugtool docs/ChangeLog
if use doc; then
emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-docs
- dohtml -r docs/api/
+ dohtml -r docs/api/
docinto pdf
dodoc ${DOCS[@]}
#docs/api/tools/python/latex/refman.pdf
@@ -266,6 +265,7 @@ src_install() {
keepdir /var/log/xen-consoles
fi
+ python_convert_shebangs -r 2 "${ED}"
# xend expects these to exist
keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
@@ -321,4 +321,4 @@ pkg_postinst() {
pkg_postrm() {
python_mod_cleanup $(use pygrub && echo grub) xen
-}
+} \ No newline at end of file