Respect CC and LDFLAGS wrt #244046

(Portage version: 2.2_rc33/cvs/Linux x86_64)

1 files changed, 31 insertions, 22 deletions

diff --git a/dev-util/xdelta/xdelta-3.0v.ebuild b/dev-util/xdelta/xdelta-3.0v.ebuild
index cc0ea8600d4a..128059a67ed6 100644
--- a/dev-util/xdelta/xdelta-3.0v.ebuild
+++ b/dev-util/xdelta/xdelta-3.0v.ebuild
@@ -1,44 +1,53 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xdelta/xdelta-3.0v.ebuild,v 1.2 2009/06/29 19:41:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xdelta/xdelta-3.0v.ebuild,v 1.3 2009/07/06 23:26:50 ssuominen Exp $
 
-inherit distutils
-
-# there was a 3.0v2 release
-MY_P=${PN}${PV}2
+EAPI=2
+inherit distutils toolchain-funcs
 
 DESCRIPTION="a binary diff and differential compression tools. VCDIFF (RFC 3284) delta compression."
 HOMEPAGE="http://xdelta.org"
-SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
+SRC_URI="http://${PN}.googlecode.com/files/${P/-}2.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/python"
-DEPEND="${RDEPEND}"
+IUSE="test"
 
-# but the v2 doesn't show in the tarball. sigh!
-S=${WORKDIR}/${PN}${PV}
+RDEPEND=">=dev-lang/python-2.5"
+DEPEND="${RDEPEND}
+	sys-apps/sed"
 
+S=${WORKDIR}/${P/-}
 DOCS="draft-korn-vcdiff.txt"
 
-# made redundant
-#pkg_setup() {
-#	if use alpha || use amd64 || use ia64 || use ppc64 || use sparc; then
-#		xdelta="xdelta3-64"
-#	else
-#		xdelta="xdelta3"
-#	fi
-#}
+src_prepare() {
+	sed -i -e 's:-O3:-Wall:' setup.py || die "sed failed"
+	sed \
+		-e 's:-O3::g' \
+		-e 's:$(CC):$(CC) $(LDFLAGS):g' \
+		-e 's:CFLAGS=:CFLAGS+=:' \
+		-i Makefile || die "sed failed"
+}
+
+src_test() {
+	if [ $UID != 0 ]; then
+		emake test || die "emake test failed"
+	else
+		ewarn "Tests can't be run as root, skipping."
+	fi
+}
 
 src_compile() {
+	tc-export CC CXX
 	distutils_src_compile
-	emake all || die "emake all failed."
+	emake xdelta3 || die "emake failed"
+	if use test; then
+		emake xdelta3-debug || die "emake failed"
+	fi
 }
 
 src_install() {
-	dobin xdelta3 || die "dobin xdelta failed."
+	dobin xdelta3 || die "dobin xdelta failed"
 	distutils_src_install
 }