From 587330a248a0478b33f9a2de2ad281200d638226 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 1 Mar 2012 21:37:11 +0000
Subject: Drop old upgrade logic that is only there for systems 4.5+ years old
 as it is causing issues with newer ones, and 4.5+ upgrade time is plenty
 #381633 by Tim Harder.

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
---
 sys-devel/binutils-config/ChangeLog                   | 12 ++++++++++--
 sys-devel/binutils-config/binutils-config-3-r1.ebuild | 19 -------------------
 sys-devel/binutils-config/binutils-config-3-r2.ebuild | 19 +++++++++++++++++++
 sys-devel/binutils-config/files/binutils-config-3     |  9 +++------
 4 files changed, 32 insertions(+), 27 deletions(-)
 delete mode 100644 sys-devel/binutils-config/binutils-config-3-r1.ebuild
 create mode 100644 sys-devel/binutils-config/binutils-config-3-r2.ebuild

(limited to 'sys-devel/binutils-config')

diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index af8487468932..627855c5558c 100644
--- a/sys-devel/binutils-config/ChangeLog
+++ b/sys-devel/binutils-config/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/binutils-config
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.51 2011/12/05 19:50:48 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.52 2012/03/01 21:37:11 vapier Exp $
+
+*binutils-config-3-r2 (01 Mar 2012)
+
+  01 Mar 2012; Mike Frysinger <vapier@gentoo.org> files/binutils-config-3,
+  -binutils-config-3-r1.ebuild, +binutils-config-3-r2.ebuild:
+  Drop old upgrade logic that is only there for systems 4.5+ years old as it is
+  causing issues with newer ones, and 4.5+ upgrade time is plenty #381633 by
+  Tim Harder.
 
   05 Dec 2011; Mike Frysinger <vapier@gentoo.org> binutils-config-3-r1.ebuild:
   Use a blocker dep to avoid pulling in packages we do not need.
diff --git a/sys-devel/binutils-config/binutils-config-3-r1.ebuild b/sys-devel/binutils-config/binutils-config-3-r1.ebuild
deleted file mode 100644
index 9a9317fa9a14..000000000000
--- a/sys-devel/binutils-config/binutils-config-3-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-3-r1.ebuild,v 1.2 2011/12/05 19:50:48 vapier Exp $
-
-DESCRIPTION="Utility to change the binutils version being used"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="userland_GNU? ( !<sys-apps/findutils-4.2 )"
-
-src_install() {
-	newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die
-	doman "${FILESDIR}"/${PN}.8
-}
diff --git a/sys-devel/binutils-config/binutils-config-3-r2.ebuild b/sys-devel/binutils-config/binutils-config-3-r2.ebuild
new file mode 100644
index 000000000000..b126a0f0b3a1
--- /dev/null
+++ b/sys-devel/binutils-config/binutils-config-3-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-3-r2.ebuild,v 1.1 2012/03/01 21:37:11 vapier Exp $
+
+DESCRIPTION="Utility to change the binutils version being used"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="userland_GNU? ( !<sys-apps/findutils-4.2 )"
+
+src_install() {
+	newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die
+	doman "${FILESDIR}"/${PN}.8
+}
diff --git a/sys-devel/binutils-config/files/binutils-config-3 b/sys-devel/binutils-config/files/binutils-config-3
index 3705371ef711..a402ef2ab8e6 100755
--- a/sys-devel/binutils-config/files/binutils-config-3
+++ b/sys-devel/binutils-config/files/binutils-config-3
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.6 2011/09/29 20:26:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.7 2012/03/01 21:37:11 vapier Exp $
 
 # Format of /etc/env.d/binutils/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -162,9 +162,6 @@ switch_profile() {
 		dstlib=${ROOT}/usr/${HOST}/lib
 	else
 		dstlib=${ROOT}/usr/${HOST}/${TARGET}/lib
-		# Clean out old path
-		rm -rf "${ROOT}"/usr/${TARGET}/lib/ldscripts
-		rmdir "${ROOT}"/usr/${TARGET}/lib >& /dev/null
 	fi
 	# When upgrading, we need to clean up ldscripts and libs
 	mkdir -p "${dstlib}"
@@ -408,7 +405,7 @@ while [[ $# -gt 0 ]] ; do
 		-h|--help)                 usage 0 ;;
 		-V|--version)
 			unset Header
-			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.6 2011/09/29 20:26:56 vapier Exp $"
+			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.7 2012/03/01 21:37:11 vapier Exp $"
 			cvsver=${cvsver##*binutils-config-}
 			bver=${cvsver%%,v *}
 			cvsver=${cvsver#* }
-- 
cgit v1.2.3-65-gdbad