From 7bb3a357ea7c691ad32f7b68a214cd67a7ed2b73 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <eradicator@gentoo.org>
Date: Tue, 11 Jan 2005 12:07:43 +0000
Subject: [PATCH] Setting GCC_CONFIG_VER back to GCC_RELEASE_VER for now.

---
 eclass/toolchain.eclass | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 05d3dd6b83e9..394329b9118f 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.73 2005/01/11 08:50:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.74 2005/01/11 12:07:43 eradicator Exp $
 
 HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
 LICENSE="GPL-2 LGPL-2.1"
@@ -44,7 +44,7 @@ fi
 
 GCC_RELEASE_VER="$(get_version_component_range 1-3)"
 GCC_BRANCH_VER="$(get_version_component_range 1-2)"
-GCC_CONFIG_VER="${PV}"
+GCC_CONFIG_VER="${GCC_RELEASE_VER}"
 GCCMAJOR="$(get_version_component_range 1)"
 GCCMINOR="$(get_version_component_range 2)"
 GCCMICRO="$(get_version_component_range 3)"
@@ -1333,6 +1333,12 @@ gcc_movelibs() {
 	rm -f ${D}${LIBPATH}/libiberty.a
 	rm -f ${D}${LIBPATH}/*/libiberty.a
 
+	#local FROMDIR=${D}/${LIBPATH}/../${GCC_RELEASE_VER}
+	#[ -d "${FROMDIR}" ] && mv ${FROMDIR}/* ${LIBPATH}
+
+	#FROMDIR=${D}/${PREFIX}/libexec/gcc/${CTARGET}/${GCC_RELEASE_VER}
+	#[ -d "${FROMDIR}" ] && mv ${FROMDIR}/* ${FROMDIR}/../
+
 	if [ -n "${MULTILIB_ABIS}" ]; then
 		for abi in ${MULTILIB_ABIS}; do
 			local OS_MULTIDIR=$(${XGCC} $(get_abi_CFLAGS ${abi}) --print-multi-os-directory)
-- 
2.26.2