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

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64

5 files changed, 13 insertions, 67 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/Manifest b/app-text/rnv/Manifest
index 27738ae62bef..d7fdfc701b82 100644
--- a/app-text/rnv/Manifest
+++ b/app-text/rnv/Manifest
@@ -1,9 +1,5 @@
 AUX rnv-1.7.8-respect-CFLAGS_and_CC.patch 658 SHA256 d50f67c1dd6445a5f7ed0a7650e976358057190292e95dbf902f8ca532768629 SHA512 87bf638605e30d6bc57fab0ace8f4bd473a4f62309f5a297d92279e73176a7f6ac53190a6697389c955961687ce65d16125cd03f8b1d551cfd9c47a14670c19b WHIRLPOOL c4242c9a4246d7ae571cb3ff19bf6db453a50b795ee6c331c5d228c62e6d5fcded4784f66db4756c62524c15db5718af3c1bc7147aeceff1e2b180f503932ff5
-DIST rnv-1.7.10.zip 203490 SHA256 0840ce00ebd2a2ce72f92dd7d5abcd9695204c6b21b0668502cedc84695b6b8b SHA512 52be7ad2f7edb9050164e7b74a58918240f9779ef1802be3cafafe64448bf5da6d446763fbc48e3d1f86f4dfe6a9a913027ab520906b537e660b88a84ab97111 WHIRLPOOL 9fd7ff530854d5b5c505e826d3b7048be5ef5ceafa7a4cc509e4d3a0fbc0342ecb6d073503c8c0977b116ca852272bfa95e490883f6a924b94f1b4221cca20bf
 DIST rnv-1.7.11.zip 211316 SHA256 39ed53271f20517a55aa74ad5e393dca407e14512a31ecac4c223378bdd4a6ac SHA512 0d9457015e35177144eb88f6d6234e8d94c3a5a45f26f961b4aaba892bf92c0ddcaf0e037cf3fbbeecf110399760e182c20973e6ba32d1223d2f82600582a28e WHIRLPOOL fe82f65b68e55a7f607d7fb0cc200e83e6882c71226095894615822e68d06e20aebb85e80028edd3c5d4881f47779e42a26947d03757c1391ff8a1dc1a5ab175
-DIST rnv-1.7.8.zip 138609 SHA256 0afd120e79322556cbe9fff725523b68907bdcfe354b68e3080715eaaad00f72 SHA512 43fb8733c6558c78b65acec8461171554c11238aa15081f59aeeaac71a3e896fddac332189d2932ef19197c2ae43f571eeb9a62b140e99bb16a8f949c87fcca4 WHIRLPOOL a2f5b89baf34c6e1104e9f1e37a338dc8236abe31eef180752a0d5e5e9678de9238b01924b07fd60f7311475151000d2442128946e77442c3739534bb7fbfccc
-EBUILD rnv-1.7.10-r1.ebuild 589 SHA256 e702754cb2feac814512d3ff34e1fe0dad5a8d9dec2bc6784ae4b6de38dbead2 SHA512 6810520f6ca5db6bbca7f91bd651c2ef9c65ff207628911d5752428c52bd25cad2289dc43317fcdad14b9caadf9cc91a851c492ed36ce75e8416e82892c71a3f WHIRLPOOL fc2267335e7d4f4e331b1dc8e8187aa350feb5cc16dec7c7d4b94df70c77be9a5f3c8614b3932959d44f0b19e277d82c9df8d6b1dd0bc217cade7255b2005c23
-EBUILD rnv-1.7.11.ebuild 583 SHA256 bd9b8ff6857533885086db1930dc67481f360ce26ca015ed968f29354e6a42b6 SHA512 69a5c875c1b2a3ee6e1c4ed11ff2f87141f7b41ffdf811f86c79ebf51b68dad37b98526e3ade6be353516b437aa55bc5a75a5623ea2c7a7eaf3a2e758c8990a7 WHIRLPOOL c4a982442129bbf000e49b24f5bd965ad3c0091befc44bba90fdd3c6e271a1f92221e59dbf92e60e4e2ed70dfbc2c9667a38f8106c1b6c586d43bfaebf32dd3b
-EBUILD rnv-1.7.8-r2.ebuild 754 SHA256 2a20dd3ce08f7bde50a5bc56a330fb2e50ce5dc2cb413440786a16920a55b3d0 SHA512 3e504c607d4bf5efe6196347b580a29b24a3e188b105e469615a30f3b8e3ec231a334ae9738e172d8355e26bf54830cd4f245a0a0f9057bf83e0b95175f54b8a WHIRLPOOL b912a7b04e3c2fe54ade88054b8a514e8d341122440c2132f17470890cffb6404cf5570a23551b9db608bb7459646999b160a63df15f2bd657ed718cfcf49d26
-MISC ChangeLog 2568 SHA256 d58a7ef31a5d683059c0cbc7c8aed16b37c05a723bdaddf0a4faf6a6693c6385 SHA512 7936ef452ccb0a5c0ceb1f0de1d41cd1ede12e863790de23587f6a805d3893fb2e364cc1d37b7da05e0ff62ea584d560990dc48d711ba968d23e31592637b57e WHIRLPOOL 8a99993ab1e1ad384db057b2ed50d967406ba9dc6171b7cb7ee4a36e2229ffb0249894d247e06e170b506183d628407f8454fe721a8f08159d4f1e56daa3f480
+EBUILD rnv-1.7.11.ebuild 683 SHA256 648a99ccd064499ec3a4cc35f114700535828298f138ec16c48217add1d8523c SHA512 412b045b2cb229d569ea03c1a3dc5113622cc71d4d4410d7dde91f03f48755ef34d1652d970db30490df42f3445a8b6bfd56d1a9ae28f08c2ef46cda75e727ba WHIRLPOOL 9f49f72a6555a64e688b3942cdd18bcbd0f0d28e2cd7bd72f14745b2da809ae98a2da872a15a3a97547b8857f0dad6ae9246017db2695709e6f05cc45ae7480a
+MISC ChangeLog 2748 SHA256 3c1f81d22934c7c70bc146216bdb7cc3b5155f0bf533974dbe3299132180675e SHA512 6d44df5c0da4266a838e5439ba47d446c3fac84733c75b4b11305aa76768597c39fbf6f8d7f3891e5dd8e5148711217e9892cec61c37ff3a6e000074f8195fc0 WHIRLPOOL e563a515c24ab8a64c7957d7c5607036cca8676697454222cf7640cbedf4bc43a90596104ce5e78bd6bf68c3e04ad261208bc6c73440a5f2c19b60ae475fee2e
 MISC metadata.xml 310 SHA256 9c3ae9dfcb2289b33b7b77375d324ead045ec434739e148518e1e66e4b5b06f6 SHA512 58814cd174878b8d56a7b1a8f11858d12b0d6547aff0b873dac47ec26c5fce24a91ec0d411f0b348537dcc16048d9153484ad1a7d524a42936a43026e1c41694 WHIRLPOOL 07a188a801a173cca46acee1b985f49e0a9f100fd95f5abab83c7247f7757c7d931d6eb545e08fdad23f419ffcfa4240f04cfcd90e2f7df221ffe08c0657647d
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
-}