Fix gcc-3.3 compiling, bug 126358, remove old ebuilds

(Portage version: 2.1_pre6-r4)

16 files changed, 55 insertions, 282 deletions

diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog
index a33aeac448bd..424adc221de3 100644
--- a/app-portage/eix/ChangeLog
+++ b/app-portage/eix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/eix
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.72 2006/03/20 12:22:40 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.73 2006/03/21 21:10:44 genstef Exp $
+
+  21 Mar 2006; Stefan Schweizer <genstef@gentoo.org>
+  -files/eix-0.5.0-redir-fix.patch,
+  +files/eix-0.5.4-proper-template-usage.patch, -eix-0.3.0-r1.ebuild,
+  -eix-0.5.0.ebuild, -eix-0.5.0-r1.ebuild, -eix-0.5.1.ebuild,
+  -eix-0.5.1-r1.ebuild, -eix-0.5.3.ebuild, eix-0.5.4.ebuild:
+  Fix gcc-3.3 compiling, bug 126358, remove old ebuilds
 
 *eix-0.5.4 (20 Mar 2006)
 
diff --git a/app-portage/eix/eix-0.3.0-r1.ebuild b/app-portage/eix/eix-0.3.0-r1.ebuild
deleted file mode 100644
index c903891f7f9b..000000000000
--- a/app-portage/eix/eix-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.3.0-r1.ebuild,v 1.7 2005/09/19 13:26:05 hollow Exp $
-
-inherit eutils flag-o-matic bash-completion
-
-DESCRIPTION="Small utility for searching ebuilds with indexing for fast results"
-HOMEPAGE="http://eixwiki.unfoog.de"
-SRC_URI="mirror://sourceforge/eix/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
-IUSE=""
-
-DEPEND="sys-apps/portage"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/0.3.0-if-else-fi.patch
-	epatch ${FILESDIR}/0.3.0-datatype-mix.patch
-	epatch ${FILESDIR}/0.3.0-dbmatchcriteria-fix.patch
-	epatch ${FILESDIR}/0.3.0-getParentProfile.patch
-}
-
-src_compile() {
-	econf
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dobashcompletion contrib/eix.bash-completion "${PN}"
-}
-
-pkg_postinst() {
-	einfo "Please run 'update-eix' to setup the portage search database."
-	einfo "The database file will be located at /var/cache/eix"
-	echo
-	einfo "If you want to use the cdb-support, you need to add"
-	einfo "    PORTDIR_CACHE_METHOD=\"cdb\""
-	einfo "to you /etc/eixrc or ~/.eixrc"
-
-	bash-completion_pkg_postinst
-}
diff --git a/app-portage/eix/eix-0.5.0-r1.ebuild b/app-portage/eix/eix-0.5.0-r1.ebuild
deleted file mode 100644
index dfa6fbb5efaa..000000000000
--- a/app-portage/eix/eix-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.5.0-r1.ebuild,v 1.3 2006/02/06 07:48:07 corsair Exp $
-
-inherit eutils bash-completion
-
-DESCRIPTION="Small utility for searching ebuilds with indexing for fast results"
-HOMEPAGE="http://dev.croup.de/proj/eix"
-SRC_URI="http://dev.gentoo.org/~hollow/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="sys-apps/portage"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch ${FILESDIR}/eix-0.5.0-redir-fix.patch
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dobashcompletion contrib/eix.bash-completion "${PN}"
-}
-
-pkg_postinst() {
-	einfo "Please run 'update-eix' to setup the portage search database."
-	einfo "The database file will be located at /var/cache/eix"
-	echo
-	einfo "If you want to use cdb support, you need to add"
-	einfo "    PORTDIR_CACHE_METHOD=\"cdb\""
-	einfo "to /etc/eixrc or ~/.eixrc"
-	echo
-	einfo "If you want to use the backported cache patch of portage-2.1"
-	einfo "you need to add"
-	einfo "    PORTDIR_CACHE_METHOD=\"backport\""
-	einfo "to /etc/eixrc or ~/.eixrc"
-
-	bash-completion_pkg_postinst
-}
diff --git a/app-portage/eix/eix-0.5.0.ebuild b/app-portage/eix/eix-0.5.0.ebuild
deleted file mode 100644
index 008a817aa2b3..000000000000
--- a/app-portage/eix/eix-0.5.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.5.0.ebuild,v 1.4 2006/02/06 07:48:07 corsair Exp $
-
-inherit eutils flag-o-matic bash-completion
-
-DESCRIPTION="Small utility for searching ebuilds with indexing for fast results"
-HOMEPAGE="http://dev.croup.de/proj/eix"
-SRC_URI="http://dev.gentoo.org/~hollow/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="sys-apps/portage"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch ${FILESDIR}/eix-0.5.0-redir-fix.patch
-}
-
-src_compile() {
-	econf
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dobashcompletion contrib/eix.bash-completion "${PN}"
-}
-
-pkg_postinst() {
-	einfo "Please run 'update-eix' to setup the portage search database."
-	einfo "The database file will be located at /var/cache/eix"
-	echo
-	einfo "If you want to use cdb support, you need to add"
-	einfo "    PORTDIR_CACHE_METHOD=\"cdb\""
-	einfo "to /etc/eixrc or ~/.eixrc"
-	echo
-	einfo "If you want to use the backported cache patch of portage-2.1"
-	einfo "you need to add"
-	einfo "    PORTDIR_CACHE_METHOD=\"backport\""
-	einfo "to /etc/eixrc or ~/.eixrc"
-
-	bash-completion_pkg_postinst
-}
diff --git a/app-portage/eix/eix-0.5.1-r1.ebuild b/app-portage/eix/eix-0.5.1-r1.ebuild
deleted file mode 100644
index e9c70eec78ab..000000000000
--- a/app-portage/eix/eix-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.5.1-r1.ebuild,v 1.2 2006/02/06 07:48:07 corsair Exp $
-
-inherit eutils
-
-DESCRIPTION="Small utility for searching ebuilds with indexing for fast results"
-HOMEPAGE="http://dev.croup.de/proj/eix"
-SRC_URI="http://stovokor.unfoog.de/pub/eix/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="sys-apps/portage"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/eix-0.5.1-bug121360.patch
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-}
-
-pkg_postinst() {
-	einfo "Please run 'update-eix' to setup the portage search database."
-	einfo "The database file will be located at /var/cache/eix"
-	echo
-	einfo "If you want to use cdb support, you need to add"
-	einfo "    PORTDIR_CACHE_METHOD=\"cdb\""
-	einfo "to /etc/eixrc or ~/.eixrc"
-	echo
-	einfo "If you want to use the backported cache patch of portage-2.1"
-	einfo "you need to add"
-	einfo "    PORTDIR_CACHE_METHOD=\"backport\""
-	einfo "to /etc/eixrc or ~/.eixrc"
-}
diff --git a/app-portage/eix/eix-0.5.1.ebuild b/app-portage/eix/eix-0.5.1.ebuild
deleted file mode 100644
index 49484c9aaeb0..000000000000
--- a/app-portage/eix/eix-0.5.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.5.1.ebuild,v 1.2 2006/02/06 07:48:07 corsair Exp $
-
-inherit eutils
-
-DESCRIPTION="Small utility for searching ebuilds with indexing for fast results"
-HOMEPAGE="http://dev.croup.de/proj/eix"
-SRC_URI="http://stovokor.unfoog.de/pub/eix/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="sys-apps/portage"
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-}
-
-pkg_postinst() {
-	einfo "Please run 'update-eix' to setup the portage search database."
-	einfo "The database file will be located at /var/cache/eix"
-	echo
-	einfo "If you want to use cdb support, you need to add"
-	einfo "    PORTDIR_CACHE_METHOD=\"cdb\""
-	einfo "to /etc/eixrc or ~/.eixrc"
-	echo
-	einfo "If you want to use the backported cache patch of portage-2.1"
-	einfo "you need to add"
-	einfo "    PORTDIR_CACHE_METHOD=\"backport\""
-	einfo "to /etc/eixrc or ~/.eixrc"
-}
diff --git a/app-portage/eix/eix-0.5.3.ebuild b/app-portage/eix/eix-0.5.3.ebuild
deleted file mode 100644
index 5020ba5d452c..000000000000
--- a/app-portage/eix/eix-0.5.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.5.3.ebuild,v 1.1 2006/03/15 17:57:45 genstef Exp $
-
-inherit eutils
-
-DESCRIPTION="Small utility for searching ebuilds with indexing for fast results"
-HOMEPAGE="http://dev.croup.de/proj/eix"
-SRC_URI="mirror://sourceforge/eix/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="sys-apps/portage"
-
-src_compile() {
-	local myconf
-	has_version =sys-apps/portage-2.1* && \
-		myconf="--with-portdir-cache-method=backport"
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-}
-
-pkg_postinst() {
-	einfo "Please run 'update-eix' to setup the portage search database."
-	einfo "The database file will be located at /var/cache/eix"
-	echo
-	einfo "If you want to use cdb support, you need to add"
-	einfo "    PORTDIR_CACHE_METHOD=\"cdb\""
-	einfo "to /etc/eixrc or ~/.eixrc"
-	echo
-	einfo "If you want to use the backported cache patch of portage-2.1"
-	einfo "you need to add"
-	einfo "    PORTDIR_CACHE_METHOD=\"backport\""
-	einfo "to /etc/eixrc or ~/.eixrc"
-	einfo "backport is default when merging with portage-2.1"
-}
diff --git a/app-portage/eix/eix-0.5.4.ebuild b/app-portage/eix/eix-0.5.4.ebuild
index 00583c1e0f71..2f6f31a64cb4 100644
--- a/app-portage/eix/eix-0.5.4.ebuild
+++ b/app-portage/eix/eix-0.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.5.4.ebuild,v 1.1 2006/03/20 12:22:40 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.5.4.ebuild,v 1.2 2006/03/21 21:10:44 genstef Exp $
 
 inherit eutils
 
@@ -15,6 +15,12 @@ IUSE=""
 
 DEPEND="sys-apps/portage"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-proper-template-usage.patch
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 }
diff --git a/app-portage/eix/files/digest-eix-0.3.0-r1 b/app-portage/eix/files/digest-eix-0.3.0-r1
deleted file mode 100644
index f710b5a177cd..000000000000
--- a/app-portage/eix/files/digest-eix-0.3.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3fc734b6e01dcae577092a513e5d68e5 eix-0.3.0.tar.bz2 288210
diff --git a/app-portage/eix/files/digest-eix-0.5.0 b/app-portage/eix/files/digest-eix-0.5.0
deleted file mode 100644
index 9686bbaa7b87..000000000000
--- a/app-portage/eix/files/digest-eix-0.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6bada4a5604fae160708ae4a9c7251cc eix-0.5.0.tar.bz2 306476
diff --git a/app-portage/eix/files/digest-eix-0.5.0-r1 b/app-portage/eix/files/digest-eix-0.5.0-r1
deleted file mode 100644
index 9686bbaa7b87..000000000000
--- a/app-portage/eix/files/digest-eix-0.5.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6bada4a5604fae160708ae4a9c7251cc eix-0.5.0.tar.bz2 306476
diff --git a/app-portage/eix/files/digest-eix-0.5.1 b/app-portage/eix/files/digest-eix-0.5.1
deleted file mode 100644
index ebf294164fe6..000000000000
--- a/app-portage/eix/files/digest-eix-0.5.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 317d7cf3f77313fdf9de1e4b5d23a02e eix-0.5.1.tar.bz2 310073
-RMD160 b9812a714a163c769c08486240a6650618d48881 eix-0.5.1.tar.bz2 310073
-SHA256 cd183e3c392797571a483518f798355d60c3c57b40f0b4696623e7c8d4465f68 eix-0.5.1.tar.bz2 310073
diff --git a/app-portage/eix/files/digest-eix-0.5.1-r1 b/app-portage/eix/files/digest-eix-0.5.1-r1
deleted file mode 100644
index ebf294164fe6..000000000000
--- a/app-portage/eix/files/digest-eix-0.5.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 317d7cf3f77313fdf9de1e4b5d23a02e eix-0.5.1.tar.bz2 310073
-RMD160 b9812a714a163c769c08486240a6650618d48881 eix-0.5.1.tar.bz2 310073
-SHA256 cd183e3c392797571a483518f798355d60c3c57b40f0b4696623e7c8d4465f68 eix-0.5.1.tar.bz2 310073
diff --git a/app-portage/eix/files/digest-eix-0.5.3 b/app-portage/eix/files/digest-eix-0.5.3
deleted file mode 100644
index 44b4f9cbed6f..000000000000
--- a/app-portage/eix/files/digest-eix-0.5.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6e9f6b534880e824982da9db417e43c1 eix-0.5.3.tar.bz2 291138
-RMD160 917537aec040224637757d4b9d5476bbb56d4035 eix-0.5.3.tar.bz2 291138
-SHA256 d11df6bfb40d20c9032ac1dc4703573047d950109d4c74a2106bbbee34f1a2cd eix-0.5.3.tar.bz2 291138
diff --git a/app-portage/eix/files/eix-0.5.0-redir-fix.patch b/app-portage/eix/files/eix-0.5.0-redir-fix.patch
deleted file mode 100644
index 23fe4fe1f13e..000000000000
--- a/app-portage/eix/files/eix-0.5.0-redir-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/eix-sync.in.or	2006-01-06 08:35:47.000000000 -0600
-+++ src/eix-sync.in	2006-01-06 08:38:27.000000000 -0600
-@@ -46,7 +46,7 @@
-   else
-     ebegin "${1}"
-     shift 1
--    eval "${@}" &>1 >> /var/log/eix-sync.log
-+    eval "${@}" 2>&1 >> /var/log/eix-sync.log
-     ret=${?}
-     eend ${ret} "Problems running ${@}"
-     return "${ret}"
diff --git a/app-portage/eix/files/eix-0.5.4-proper-template-usage.patch b/app-portage/eix/files/eix-0.5.4-proper-template-usage.patch
new file mode 100644
index 000000000000..f5bca8f6506a
--- /dev/null
+++ b/app-portage/eix/files/eix-0.5.4-proper-template-usage.patch
@@ -0,0 +1,40 @@
+diff -Nau eix-0.5.4/src/eixTk/ptr_list.h.orig eix-0.5.4/src/eixTk/ptr_list.h
+--- eix-0.5.4/src/eixTk/ptr_list.h.orig	2006-03-21 01:58:05.000000000 +0100
++++ eix-0.5.4/src/eixTk/ptr_list.h	2006-03-21 01:58:18.000000000 +0100
+@@ -81,32 +81,28 @@
+ 			typedef ptr_iterator<
+ 				type,
+ 				std::list<type*>,
+-				std::_List_iterator<type*>
++				typename std::list<type*>::iterator
+ 			> iterator;
+ 
+ 			/// Constant access iterator.
+ 			typedef ptr_iterator<
+ 				type,
+ 				std::list<type*>,
+-				std::_List_const_iterator<type*>
++				typename std::list<type*>::const_iterator
+ 			> const_iterator;
+ 
+ 			/// Reverse access iterator.
+ 			typedef ptr_iterator<
+ 				type,
+ 				std::list<type*>,
+-				std::reverse_iterator<
+-					std::_List_iterator<type*>
+-				>
++				typename std::list<type*>::reverse_iterator
+ 			> reverse_iterator;
+ 
+ 			/// Constant reverse access iterator.
+ 			typedef ptr_iterator<
+ 				type,
+ 				std::list<type*>,
+-				std::reverse_iterator<
+-					std::_List_const_iterator<type*> 
+-				>
++				typename std::list<type*>::const_reverse_iterator
+ 			> const_reverse_iterator;
+ 
+ 			void delete_and_clear()