moved library to versioned directory with an env.d entry that tries to be as far after the 3.4 libstdc++ as possible. hopefully this will fix the problems people see with arts and similar ebuilds when the compat package is installed.

4 files changed, 19 insertions, 7 deletions

diff --git a/sys-libs/libstdc++-v3/ChangeLog b/sys-libs/libstdc++-v3/ChangeLog
index 7a707338ad94..953d2dd16bbe 100644
--- a/sys-libs/libstdc++-v3/ChangeLog
+++ b/sys-libs/libstdc++-v3/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/libstdc++-v3
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/ChangeLog,v 1.1 2004/05/23 09:14:24 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/ChangeLog,v 1.2 2004/05/24 21:17:43 lv Exp $
+
+*libstdc++-v3-3.3.3-r1 (24 May 2004)
+
+  24 May 2004; Travis Tilley <lv@gentoo.org> +libstdc++-v3-3.3.3-r1.ebuild,
+  -libstdc++-v3-3.3.3.ebuild:
+  moved library to versioned directory with an env.d entry that tries to be as
+  far after the 3.4 libstdc++ as possible. hopefully this will fix the problems
+  people see with arts and similar ebuilds when the compat package is installed.
 
 *libstdc++-v3-3.3.3 (23 May 2004)
 
diff --git a/sys-libs/libstdc++-v3/Manifest b/sys-libs/libstdc++-v3/Manifest
index 95be4691c019..f2e172002bf7 100644
--- a/sys-libs/libstdc++-v3/Manifest
+++ b/sys-libs/libstdc++-v3/Manifest
@@ -1,5 +1,5 @@
-MD5 d350de0f970974e14e11ef9ea2396680 ChangeLog 404
-MD5 921a6959ea093c61e485262694c797af libstdc++-v3-3.3.3.ebuild 5665
+MD5 79f41a90231d46c5a5dc22e92cd11641 ChangeLog 789
+MD5 08a4605b6a9cb6a41a4a6762e3171dff libstdc++-v3-3.3.3-r1.ebuild 5792
 MD5 b6c1db1060c4e856b248a22adec1ff53 metadata.xml 220
-MD5 14f4d6619c938dbb907e2420c0eeefd9 files/digest-libstdc++-v3-3.3.3 64
+MD5 14f4d6619c938dbb907e2420c0eeefd9 files/digest-libstdc++-v3-3.3.3-r1 64
 MD5 b2a96584f4cee72362695ba44c911c40 files/libstdc++_amd64_multilib_hack.patch 350
diff --git a/sys-libs/libstdc++-v3/files/digest-libstdc++-v3-3.3.3 b/sys-libs/libstdc++-v3/files/digest-libstdc++-v3-3.3.3-r1
index e87695155cb0..e87695155cb0 100644
--- a/sys-libs/libstdc++-v3/files/digest-libstdc++-v3-3.3.3
+++ b/sys-libs/libstdc++-v3/files/digest-libstdc++-v3-3.3.3-r1
diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild
index 4af3e59302a6..e35914d1eafc 100644
--- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3.ebuild
+++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3.ebuild,v 1.1 2004/05/23 09:14:24 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.3-r1.ebuild,v 1.1 2004/05/24 21:17:43 lv Exp $
 
 IUSE="nls"
 
@@ -66,7 +66,7 @@ HOMEPAGE="http://gcc.gnu.org/libstdc++/"
 
 LICENSE="GPL-2 LGPL-2.1"
 
-KEYWORDS="~amd64"
+KEYWORDS="-*"
 
 if [ "${CHOST}" == "${CCHOST}" ]
 then
@@ -147,6 +147,7 @@ src_compile() {
 		--disable-checking \
 		--enable-cstdio=stdio \
 		--enable-__cxa_atexit \
+		--enable-version-specific-runtime-libs \
 		--with-gxx-include-dir=${STDCXX_INCDIR} \
 		--with-local-prefix=${LOC}/local \
 		${myconf} || die
@@ -201,10 +202,13 @@ src_install() {
 		install-target-libstdc++-v3 || die
 
 	# we dont want the headers...
-	rm -rf ${D}/${LOC}/lib/gcc-lib
+	rm -rf ${D}/${STDCXX_INCDIR}
 	# or locales...
 	rm -rf ${D}/${LOC}/share
 	# or anything other than the .so files, really.
 	find ${D} | grep -e c++.la$ -e c++.a$ | xargs rm -f
+
+	mkdir -p ${D}/etc/env.d/
+	echo "LDPATH=\"${LIBPATH}\"" >> ${D}/etc/env.d/99libstdc++
 }