Set RDEPEND so it is not set implicitly (bug #221331). Respect CC (bug #244048),...

Package-Manager: portage-2.2_rc67/cvs/Linux i686

diff --git a/dev-util/xmlindent/ChangeLog b/dev-util/xmlindent/ChangeLog
index 629c39e718937a48a6a88e2473ce4be5ae072f2a..7fbb3b9415b51413b2b517d41a0d35ef389da362 100644 (file)
--- a/dev-util/xmlindent/ChangeLog
+++ b/dev-util/xmlindent/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/xmlindent
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xmlindent/ChangeLog,v 1.3 2008/03/31 12:47:10 eva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xmlindent/ChangeLog,v 1.4 2010/05/07 00:38:42 jer Exp $
+
+*xmlindent-0.2.17-r1 (07 May 2010)
+
+  07 May 2010; Jeroen Roovers <jer@gentoo.org> -xmlindent-0.2.17.ebuild,
+  +xmlindent-0.2.17-r1.ebuild:
+  Set RDEPEND so it is not set implicitly (bug #221331). Respect CC (bug
+  #244048), CFLAGS and LDFLAGS.
 
   24 Jun 2006; Andrej Kacian <ticho@gentoo.org> xmlindent-0.2.17.ebuild:
   Added ~x86 keyword. Bug #137456, by Gilles Dartiguelongue <dartigug at

diff --git a/dev-util/xmlindent/Manifest b/dev-util/xmlindent/Manifest
index 7783e8acb7ceaf1a7ed0e0cea417407ea0fcd074..1d5935637f7415252b3681d26de464d68f914bc5 100644 (file)
--- a/dev-util/xmlindent/Manifest
+++ b/dev-util/xmlindent/Manifest
@@ -1,4 +1,4 @@
 DIST xmlindent-0.2.17.tar.gz 18333 RMD160 f0b6e51ed24c16026d551c495d4c5bbb1d892b5d SHA1 024d5c27ae7fd63b012e663c437b3ec46f12b789 SHA256 3a0f6887b696087b8dad4901d3994954214dbbd78499eaf622b9a85060cf254c
-EBUILD xmlindent-0.2.17.ebuild 622 RMD160 136ff47838f5f16b1c23612451b52e87e9e8f297 SHA1 6e0db69eae63bd75f41725e88d9f7046ded94c5b SHA256 61258c5e1eee6d1a89406e937073958a1f0cc43a091ccb61e70f9824d91e2f71
-MISC ChangeLog 552 RMD160 8b458f6f2a40bdcbb37f07752e8aa4bf9d1fe5d4 SHA1 5f3ecd9449da6aa330c67d5164899477b7370b6b SHA256 85423d82f53af2bac7b766023081fe34f9efd77beacd784d9abf6cd5cffe9624
+EBUILD xmlindent-0.2.17-r1.ebuild 807 RMD160 d4031be64fa7b5f49bfd2f34f7ff91be5e82d69c SHA1 011e190bbe083641770b38b4963774f0336043ee SHA256 588bf44f3f73912439defd06fdc8fb91fb2a223ad9c1da57cdfd187f820d38ee
+MISC ChangeLog 798 RMD160 7f80d941ff5190584eacd9d75b0cae68a9a73c0f SHA1 5a252b180e62d778f132061b93d1bd087d73d994 SHA256 828d0152a5703d2b0f2e9f1fffd44e882096de2d487a5647052e413eaaed9a37
 MISC metadata.xml 213 RMD160 520c51f455b178f5def1ad023df6c73a289dce61 SHA1 552589ae128c8b94dd93759827fca583712db674 SHA256 535acb93c6116e8aec4d89bfe98206b77539e95a3daee22a6cea2273eeda9f46

diff --git a/dev-util/xmlindent/xmlindent-0.2.17.ebuild b/dev-util/xmlindent/xmlindent-0.2.17-r1.ebuild
similarity index 61%
rename from dev-util/xmlindent/xmlindent-0.2.17.ebuild
rename to dev-util/xmlindent/xmlindent-0.2.17-r1.ebuild
index 0948d0c81a3090f8537540b1c510f9e4987a629c..7bada54bebddd8206cb48dd81b93a7d59699f1cb 100644 (file)
--- a/dev-util/xmlindent/xmlindent-0.2.17.ebuild
+++ b/dev-util/xmlindent/xmlindent-0.2.17-r1.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xmlindent/xmlindent-0.2.17.ebuild,v 1.4 2009/10/12 20:08:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xmlindent/xmlindent-0.2.17-r1.ebuild,v 1.1 2010/05/07 00:38:42 jer Exp $
+
+EAPI="2"
+
+inherit toolchain-funcs
 
-inherit eutils
 DESCRIPTION="XML Indent is an XML stream reformatter written in ANSI C, analogous to GNU indent."
 HOMEPAGE="http://xmlindent.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xmlindent/${P}.tar.gz"
@@ -12,12 +15,21 @@ KEYWORDS="~amd64 ~sparc ~x86"
 
 IUSE=""
 DEPEND="sys-devel/flex"
+RDEPEND=""
+
+src_prepare() {
+       sed -i Makefile \
+               -e 's|gcc|$(CC)|g' \
+               -e 's|-g|$(CFLAGS) $(LDFLAGS) |g' \
+               || die "sed failed"
+}
 
 src_compile() {
+       tc-export CC
        emake || die "emake failed"
 }
 
 src_install() {
-       dobin xmlindent
+       dobin xmlindent || die "dobin failed"
        doman *.1
 }