[gentoo-commits] gentoo-x86 commit in dev-util/xdelta: ChangeLog xdelta-3.0v.ebuild xdelta-3.0t.ebuild

[gentoo-commits] gentoo-x86 commit in dev-util/xdelta: ChangeLog xdelta-3.0v.ebuild xdelta-3.0t.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    09/07/06 23:26:50

  Modified:             ChangeLog xdelta-3.0v.ebuild
  Removed:              xdelta-3.0t.ebuild
  Log:
  Respect CC and LDFLAGS wrt #244046
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.42                 dev-util/xdelta/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/xdelta/ChangeLog?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/xdelta/ChangeLog?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/xdelta/ChangeLog?r1=1.41&r2=1.42

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/xdelta/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ChangeLog	29 Jun 2009 19:41:36 -0000	1.41
+++ ChangeLog	6 Jul 2009 23:26:50 -0000	1.42
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/xdelta
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xdelta/ChangeLog,v 1.41 2009/06/29 19:41:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xdelta/ChangeLog,v 1.42 2009/07/06 23:26:50 ssuominen Exp $
+
+  06 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> xdelta-3.0v.ebuild:
+  Respect CC and LDFLAGS wrt #244046
 
   29 Jun 2009; Jeroen Roovers <jer@gentoo.org> xdelta-3.0t.ebuild,
   xdelta-3.0v.ebuild:



1.3                  dev-util/xdelta/xdelta-3.0v.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/xdelta/xdelta-3.0v.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/xdelta/xdelta-3.0v.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/xdelta/xdelta-3.0v.ebuild?r1=1.2&r2=1.3

Index: xdelta-3.0v.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/xdelta/xdelta-3.0v.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xdelta-3.0v.ebuild	29 Jun 2009 19:41:36 -0000	1.2
+++ xdelta-3.0v.ebuild	6 Jul 2009 23:26:50 -0000	1.3
@@ -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
 }