Fix direct AR calls, wrt bug #444042, drop old versions

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 11 insertions, 61 deletions

diff --git a/app-text/rnv/ChangeLog b/app-text/rnv/ChangeLog
index 19e0162b3442..e4a11cdc7ed6 100644
--- a/app-text/rnv/ChangeLog
+++ b/app-text/rnv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/rnv
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/rnv/ChangeLog,v 1.18 2012/11/20 20:46:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/rnv/ChangeLog,v 1.19 2012/11/27 11:08:45 pinkbyte Exp $
+
+  27 Nov 2012; Sergey Popov <pinkbyte@gentoo.org> -rnv-1.7.8-r2.ebuild,
+  -rnv-1.7.10-r1.ebuild, rnv-1.7.11.ebuild:
+  Fix direct AR calls, wrt bug #444042, drop old versions
 
   20 Nov 2012; Agostino Sarubbo <ago@gentoo.org> rnv-1.7.11.ebuild:
   Stable for x86, wrt bug #441118
diff --git a/app-text/rnv/rnv-1.7.10-r1.ebuild b/app-text/rnv/rnv-1.7.10-r1.ebuild
deleted file mode 100644
index 251ddbfd7dd0..000000000000
--- a/app-text/rnv/rnv-1.7.10-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/rnv/rnv-1.7.10-r1.ebuild,v 1.3 2012/04/04 23:09:21 jdhore Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A lightweight Relax NG Compact Syntax validator"
-HOMEPAGE="http://www.davidashen.net/rnv.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="dev-libs/expat"
-DEPEND="${RDEPEND}
-		app-arch/unzip"
-
-src_install() {
-	dobin rnv rvp arx
-	dodoc readme.txt
-}
diff --git a/app-text/rnv/rnv-1.7.11.ebuild b/app-text/rnv/rnv-1.7.11.ebuild
index e4c6efa2ace4..5f60f3b01d82 100644
--- a/app-text/rnv/rnv-1.7.11.ebuild
+++ b/app-text/rnv/rnv-1.7.11.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/rnv/rnv-1.7.11.ebuild,v 1.3 2012/11/20 20:46:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/rnv/rnv-1.7.11.ebuild,v 1.4 2012/11/27 11:08:45 pinkbyte Exp $
 
 EAPI="4"
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A lightweight Relax NG Compact Syntax validator"
 HOMEPAGE="http://www.davidashen.net/rnv.html"
@@ -19,6 +19,10 @@ RDEPEND="dev-libs/expat"
 DEPEND="${RDEPEND}
 		app-arch/unzip"
 
+src_prepare() {
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/" Makefile.in || die 'sed on Makefile.in failed'
+}
+
 src_install() {
 	dobin rnv rvp arx
 	dodoc readme.txt
diff --git a/app-text/rnv/rnv-1.7.8-r2.ebuild b/app-text/rnv/rnv-1.7.8-r2.ebuild
deleted file mode 100644
index 1cfc4651b445..000000000000
--- a/app-text/rnv/rnv-1.7.8-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/rnv/rnv-1.7.8-r2.ebuild,v 1.4 2010/04/09 08:09:18 hwoarang Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A lightweight Relax NG Compact Syntax validator"
-HOMEPAGE="http://www.davidashen.net/rnv.html"
-SRC_URI="http://ftp.davidashen.net/PreTI/RNV/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="dev-libs/expat"
-DEPEND="${RDEPEND}
-		app-arch/unzip"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-respect-CFLAGS_and_CC.patch"
-}
-
-src_compile() {
-	CC=$(tc-getCC) emake -j1 -f Makefile.gnu || die
-}
-
-src_install() {
-	dobin rnv rvp arx
-	dodoc readme.txt
-}