Switch default ordering of gcc-config and eselect-compiler to work around portage bug.

(Portage version: 2.1.1_pre5-r1)

6 files changed, 20 insertions, 13 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index ba9cb439837d..3591f6984423 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libffi
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.42 2006/08/13 15:45:27 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.43 2006/08/14 16:51:18 phreak Exp $
+
+  14 Aug 2006; Christian Heim <phreak@gentoo.org> libffi-3.3.5.ebuild,
+  libffi-3.4.1.ebuild, libffi-3.4.1-r1.ebuild, libffi-3.4.3.ebuild:
+  Switch default ordering of gcc-config and eselect-compiler to work around
+  portage bug.
 
   13 Aug 2006; Markus Rothe <corsair@gentoo.org> libffi-3.4.1-r1.ebuild,
   libffi-3.4.3.ebuild:
diff --git a/dev-libs/libffi/files/digest-libffi-1.20 b/dev-libs/libffi/files/digest-libffi-1.20
index 5983bd3f6022..a7c91c0d916f 100644
--- a/dev-libs/libffi/files/digest-libffi-1.20
+++ b/dev-libs/libffi/files/digest-libffi-1.20
@@ -1 +1,3 @@
 MD5 e4c9c435ebdfcba6fa493fb1abce2ddc libffi-1.20.tar.gz 109484
+RMD160 19960e3faf7a95042b4e82155c58e12c679e15a3 libffi-1.20.tar.gz 109484
+SHA256 794a23a3feacc11ef431fae9ad79c33b98043cefd6b001707596ca93085dedaa libffi-1.20.tar.gz 109484
diff --git a/dev-libs/libffi/libffi-3.3.5.ebuild b/dev-libs/libffi/libffi-3.3.5.ebuild
index 671b87376d51..b4c517509495 100644
--- a/dev-libs/libffi/libffi-3.3.5.ebuild
+++ b/dev-libs/libffi/libffi-3.3.5.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/dev-libs/libffi/libffi-3.3.5.ebuild,v 1.8 2006/07/27 17:16:09 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.3.5.ebuild,v 1.9 2006/08/14 16:51:18 phreak Exp $
 
 inherit eutils flag-o-matic libtool gnuconfig versionator
 
@@ -95,13 +95,13 @@ DEPEND="virtual/libc
 	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	>=sys-devel/bison-1.875
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+	|| ( >=sys-devel/gcc-config-1.3.1 app-admin/eselect-compiler )
 	=sys-devel/gcc-3.3.5*
 	nls? ( sys-devel/gettext )"
 
 RDEPEND="virtual/libc
 	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+	|| ( >=sys-devel/gcc-config-1.3.1 app-admin/eselect-compiler )
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4"
 
diff --git a/dev-libs/libffi/libffi-3.4.1-r1.ebuild b/dev-libs/libffi/libffi-3.4.1-r1.ebuild
index 374a6578d8a5..26e4c4b154d2 100644
--- a/dev-libs/libffi/libffi-3.4.1-r1.ebuild
+++ b/dev-libs/libffi/libffi-3.4.1-r1.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/dev-libs/libffi/libffi-3.4.1-r1.ebuild,v 1.13 2006/08/13 15:45:27 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.4.1-r1.ebuild,v 1.14 2006/08/14 16:51:18 phreak Exp $
 
 inherit eutils flag-o-matic libtool gnuconfig versionator
 
@@ -73,13 +73,13 @@ DEPEND="virtual/libc
 	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	>=sys-devel/bison-1.875
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+	|| ( >=sys-devel/gcc-config-1.3.1 app-admin/eselect-compiler )
 	>=sys-devel/gcc-3.4.1
 	nls? ( sys-devel/gettext )"
 
 RDEPEND="virtual/libc
 	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+	|| ( >=sys-devel/gcc-config-1.3.1 app-admin/eselect-compiler )
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4"
 
diff --git a/dev-libs/libffi/libffi-3.4.1.ebuild b/dev-libs/libffi/libffi-3.4.1.ebuild
index 1de16ae18d1c..4be5e8238fd4 100644
--- a/dev-libs/libffi/libffi-3.4.1.ebuild
+++ b/dev-libs/libffi/libffi-3.4.1.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/dev-libs/libffi/libffi-3.4.1.ebuild,v 1.13 2006/07/27 17:16:09 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.4.1.ebuild,v 1.14 2006/08/14 16:51:18 phreak Exp $
 
 IUSE="nls nptl"
 SLOT="0"
@@ -92,12 +92,12 @@ DEPEND="virtual/libc
 	!nptl? ( >=sys-libs/glibc-2.3.2-r3 )
 	>=sys-devel/binutils-2.14.90.0.8-r1
 	>=sys-devel/bison-1.875
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+	|| ( >=sys-devel/gcc-config-1.3.1 app-admin/eselect-compiler )
 	nls? ( sys-devel/gettext )"
 
 RDEPEND="virtual/libc
 	!nptl? ( >=sys-libs/glibc-2.3.2-r3 )
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+	|| ( >=sys-devel/gcc-config-1.3.1 app-admin/eselect-compiler )
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4"
 
diff --git a/dev-libs/libffi/libffi-3.4.3.ebuild b/dev-libs/libffi/libffi-3.4.3.ebuild
index 5a612a1f8859..1d1e583619d3 100644
--- a/dev-libs/libffi/libffi-3.4.3.ebuild
+++ b/dev-libs/libffi/libffi-3.4.3.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/dev-libs/libffi/libffi-3.4.3.ebuild,v 1.14 2006/08/13 15:45:27 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.4.3.ebuild,v 1.15 2006/08/14 16:51:18 phreak Exp $
 
 inherit eutils flag-o-matic libtool gnuconfig versionator
 
@@ -70,13 +70,13 @@ DEPEND="virtual/libc
 	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
 	>=sys-devel/binutils-2.14.90.0.6-r1
 	>=sys-devel/bison-1.875
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+	|| ( >=sys-devel/gcc-config-1.3.1 app-admin/eselect-compiler )
 	>=sys-devel/gcc-3.4.3
 	nls? ( sys-devel/gettext )"
 
 RDEPEND="virtual/libc
 	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
-	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
+	|| ( >=sys-devel/gcc-config-1.3.1 app-admin/eselect-compiler )
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4"