support user specified cflags (must be forced to override defaults with 'cflags' USE flag

(Portage version: 2.0.51.22-r3)

5 files changed, 124 insertions, 6 deletions

diff --git a/app-emulation/xen/ChangeLog b/app-emulation/xen/ChangeLog
index 85c6f82d77d1..bbf92ceb201d 100644
--- a/app-emulation/xen/ChangeLog
+++ b/app-emulation/xen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/xen
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.14 2005/11/28 11:40:56 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/ChangeLog,v 1.15 2005/11/30 22:23:24 chrb Exp $
+
+*xen-3.0.0_pre20051128-r1 (30 Nov 2005)
+
+  30 Nov 2005; <chrb@gentoo.org> xen-3.0.0_pre20051128.ebuild,
+  +xen-3.0.0_pre20051128-r1.ebuild:
+  support user specified cflags (must be forced to override defaults with
+  'cflags' USE flag
 
 *xen-3.0.0_pre20051128 (28 Nov 2005)
 
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 93df510473b1..a836014a11d4 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,9 +1,10 @@
-MD5 ef85685977b7f559a520879291d31065 ChangeLog 2533
+MD5 81ef563f9f76bc32ce65a50b5dd4e17e ChangeLog 2768
 MD5 23ec60d5040f966fda250a47d8903428 metadata.xml 252
 MD5 b25e5ad259e28bab5d8d3b4c0a62d278 xen-2.0.7.ebuild 2853
 MD5 3d185e164d3d5963aa0a4e4aea9ec626 xen-3.0.0_pre20051027.ebuild 2029
 MD5 3e8f1dfa962c8806582268ef861d9879 xen-3.0.0_pre20051122.ebuild 2029
-MD5 a8c9b21e7f3f7af2685a534e2ed0337f xen-3.0.0_pre20051128.ebuild 2029
+MD5 9d49c379f9e04756ec172c4027391a51 xen-3.0.0_pre20051128.ebuild 2079
+MD5 f2a52ca9d9a5955764699cfb5a6b4bf3 xen-3.0.0_pre20051128-r1.ebuild 2829
 MD5 16d372298e94a8eef72c1943b1ed5561 files/xend-conf 347
 MD5 b659e1e802207d647698236ddbc2e7a3 files/xend-init 838
 MD5 11ef318e35fcfed12931f182fc01955a files/xendomains-conf 180
@@ -11,4 +12,5 @@ MD5 f13640a07af78a60cfb562fa1d2088f3 files/xendomains-init 1659
 MD5 2e39cb335339f213e3daac1e0ff12598 files/digest-xen-3.0.0_pre20051027 75
 MD5 6bda4cc8b2c6066f4d83b2fd65b4dc53 files/digest-xen-3.0.0_pre20051122 75
 MD5 c6a23b0fa912b8b937f2baf019263a2d files/digest-xen-3.0.0_pre20051128 75
+MD5 c6a23b0fa912b8b937f2baf019263a2d files/digest-xen-3.0.0_pre20051128-r1 75
 MD5 6eaea330ed78459069eb5ba608e654dd files/digest-xen-2.0.7 63
diff --git a/app-emulation/xen/files/digest-xen-3.0.0_pre20051128-r1 b/app-emulation/xen/files/digest-xen-3.0.0_pre20051128-r1
new file mode 100644
index 000000000000..5adcf721f079
--- /dev/null
+++ b/app-emulation/xen/files/digest-xen-3.0.0_pre20051128-r1
@@ -0,0 +1 @@
+MD5 f50b604a5dad515cad4e8eef24659771 xen-unstable-20051128.tar.bz2 3507331
diff --git a/app-emulation/xen/xen-3.0.0_pre20051128-r1.ebuild b/app-emulation/xen/xen-3.0.0_pre20051128-r1.ebuild
new file mode 100644
index 000000000000..ed997f1d77b8
--- /dev/null
+++ b/app-emulation/xen/xen-3.0.0_pre20051128-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.0.0_pre20051128-r1.ebuild,v 1.1 2005/11/30 22:23:24 chrb Exp $
+
+inherit mount-boot flag-o-matic
+
+DESCRIPTION="The Xen virtual machine monitor and Xend daemon"
+HOMEPAGE="http://xen.sourceforge.net"
+DATE="20051128"
+SRC_URI="mirror://gentoo/xen-unstable-${DATE}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc debug screen cflags"
+
+DEPEND="sys-apps/iproute2
+	net-misc/bridge-utils
+	dev-lang/python
+	net-misc/curl
+	sys-libs/zlib
+	doc? (
+		dev-tex/latex2html
+		media-gfx/transfig
+	)
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	sys-devel/dev86"
+
+S="${WORKDIR}/xen-unstable-${DATE}"
+
+src_unpack() {
+	unpack ${A}
+	# if the user *really* wants to use their own cflags, let them
+	if use cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		for f in Makefile Rules.mk Config.mk; do
+			# try and remove all the default cflags
+			find ${S} -name ${f} -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 {} \;
+		done
+		# odd fixes
+		sed -e "s/int mode/int mode=-1/" -i ${S}/tools/misc/xc_shadow.c
+	fi
+}
+
+src_compile() {
+	local myopt
+	if use debug; then
+		myopt="${myopt} debug=y"
+	fi
+
+	filter-flags -fPIE -fstack-protector
+	if ! use cflags; then
+		unset CFLAGS
+	fi
+
+	make ${myopt} -C xen || die "compiling xen failed"
+	make ${myopt} -C tools || die "compiling tools failed"
+
+	if use doc; then
+		sh ./docs/check_pkgs || die "package check failed"
+		make ${myopt} -C docs || die "compiling docs failed"
+	fi
+}
+
+src_install() {
+	make DESTDIR=${D} -C xen install || die "installing xen failed"
+
+	make DESTDIR=${D} XEN_PYTHON_NATIVE_INSTALL=1 -C tools install \
+	    || die "installing tools failed"
+
+	if use doc; then
+		make DESTDIR=${D} -C docs install \
+			|| die "installing docs failed"
+		# Rename doc/xen to the Gentoo-style doc/xen-x.y
+		mv ${D}/usr/share/doc/{${PN},${PF}}
+	fi
+
+	# bind xend to localhost per default
+	sed -i -e "s/\((xend-address  *\)'')/\1\'localhost\')/" \
+		${D}/etc/xen/xend-config.sxp
+
+	newinitd ${FILESDIR}/xend-init xend
+	newconfd ${FILESDIR}/xend-conf xend
+	newconfd ${FILESDIR}/xendomains-conf xendomains
+	newinitd ${FILESDIR}/xendomains-init xendomains
+
+	# for upstream change tracking
+	dodoc ${S}/XEN-VERSION
+
+	if use screen; then
+		sed -i -e 's/SCREEN="no"/SCREEN="yes"/' ${D}/etc/init.d/xendomains
+	fi
+}
+
+pkg_postinst() {
+	einfo "Please visit the Xen and Gentoo wiki:"
+	einfo "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo"
+}
diff --git a/app-emulation/xen/xen-3.0.0_pre20051128.ebuild b/app-emulation/xen/xen-3.0.0_pre20051128.ebuild
index 054797f5aeb3..469d30708567 100644
--- a/app-emulation/xen/xen-3.0.0_pre20051128.ebuild
+++ b/app-emulation/xen/xen-3.0.0_pre20051128.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.0.0_pre20051128.ebuild,v 1.1 2005/11/28 11:40:56 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.0.0_pre20051128.ebuild,v 1.2 2005/11/30 22:23:24 chrb Exp $
 
-inherit mount-boot
+inherit mount-boot flag-o-matic
 
 DESCRIPTION="The Xen virtual machine monitor and Xend daemon"
 HOMEPAGE="http://xen.sourceforge.net"
@@ -37,7 +37,8 @@ src_compile() {
 		myopt="${myopt} debug=y"
 	fi
 
-	unset CFLAGS
+	strip-flags
+	filter-flags -fPIE -fstack-protector
 	make ${myopt} -C xen || die "compiling xen failed"
 	make ${myopt} -C tools || die "compiling tools failed"