Fix QA issues as reported in bug #168179, with thanks to Ciaran McCreesh <ciaranm [at) ciaranm.org>

(Portage version: 2.1.2.2)

5 files changed, 25 insertions, 27 deletions

diff --git a/gnustep-base/gnustep-base/ChangeLog b/gnustep-base/gnustep-base/ChangeLog
index 459a0df2a059..52b630f721d0 100644
--- a/gnustep-base/gnustep-base/ChangeLog
+++ b/gnustep-base/gnustep-base/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnustep-base/gnustep-base
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.41 2006/12/05 19:51:34 grobian Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.42 2007/03/15 17:33:32 grobian Exp $
+
+  15 Mar 2007; Fabian Groffen <grobian@gentoo.org>
+  gnustep-base-1.10.3.ebuild, gnustep-base-1.10.3-r1.ebuild,
+  gnustep-base-1.12.0.ebuild, gnustep-base-1.13.0-r1.ebuild:
+  Fix QA issues as reported in bug #168179, with thanks to Ciaran McCreesh
+  <ciaranm [at) ciaranm.org>
 
 *gnustep-base-1.13.0-r1 (05 Dec 2006)
 
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.10.3-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.3-r1.ebuild
index ea41dc2f8ba0..9ee616dbb7a8 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.10.3-r1.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.10.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.10.3-r1.ebuild,v 1.3 2007/02/28 22:11:12 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.10.3-r1.ebuild,v 1.4 2007/03/15 17:33:32 grobian Exp $
 
 inherit gnustep
 
@@ -15,11 +15,9 @@ LICENSE="GPL-2 LGPL-2.1"
 IUSE="doc ffcall gcc-libffi"
 DEPEND="${GNUSTEP_CORE_DEPEND}
 	~gnustep-base/gnustep-make-1.10.0
-	|| (
-		ffcall? ( dev-libs/ffcall )
-		gcc-libffi? ( >=sys-devel/gcc-3.3.5 )
-		>=dev-libs/libffi-3.3.5
-	)
+	ffcall? ( dev-libs/ffcall )
+	gcc-libffi? ( >=sys-devel/gcc-3.3.5 )
+	!ffcall? ( !gcc-libffi? ( >=dev-libs/libffi-3.3.5 ) )
 	>=dev-libs/libxml2-2.6
 	>=dev-libs/libxslt-1.1
 	>=dev-libs/gmp-4.1
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.10.3.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.3.ebuild
index 675aee18a15c..891aadbed034 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.10.3.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.10.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.10.3.ebuild,v 1.8 2006/03/19 14:37:51 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.10.3.ebuild,v 1.9 2007/03/15 17:33:32 grobian Exp $
 
 inherit gnustep
 
@@ -15,10 +15,8 @@ LICENSE="GPL-2 LGPL-2.1"
 IUSE="doc gcc-libffi"
 DEPEND="${GNUSTEP_CORE_DEPEND}
 	~gnustep-base/gnustep-make-1.10.0
-	|| (
-		gcc-libffi? ( >=sys-devel/gcc-3.3.5 )
-		>=dev-libs/libffi-3.3.5
-	)
+	gcc-libffi? ( >=sys-devel/gcc-3.3.5 )
+	!gcc-libffi? ( >=dev-libs/libffi-3.3.5 )
 	>=dev-libs/libxml2-2.6
 	>=dev-libs/libxslt-1.1
 	>=dev-libs/gmp-4.1
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.12.0.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.12.0.ebuild
index 41d606ac7187..0864eddaf5a1 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.12.0.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.12.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.12.0.ebuild,v 1.9 2007/02/28 22:11:12 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.12.0.ebuild,v 1.10 2007/03/15 17:33:32 grobian Exp $
 
 inherit gnustep
 
@@ -16,10 +16,8 @@ LICENSE="GPL-2 LGPL-2.1"
 IUSE="gcc-libffi"
 DEPEND="${GNUSTEP_CORE_DEPEND}
 	~gnustep-base/gnustep-make-1.12.0
-	|| (
-		dev-libs/ffcall
-		gcc-libffi? ( >=sys-devel/gcc-3.3.5 )
-	)
+	gcc-libffi? ( >=sys-devel/gcc-3.3.5 )
+	!gcc-libffi? ( dev-libs/ffcall )
 	>=dev-libs/libxml2-2.6
 	>=dev-libs/libxslt-1.1
 	>=dev-libs/gmp-4.1
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.13.0-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.13.0-r1.ebuild
index 50bbcdc51352..783b287b2ab4 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.13.0-r1.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.13.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.13.0-r1.ebuild,v 1.1 2006/12/05 19:51:34 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.13.0-r1.ebuild,v 1.2 2007/03/15 17:33:32 grobian Exp $
 
 inherit gnustep autotools
 
@@ -16,10 +16,8 @@ IUSE="${IUSE} doc gcc-libffi"
 
 DEPEND="${GNUSTEP_CORE_DEPEND}
 	~gnustep-base/gnustep-make-1.13.0
-	|| (
-		dev-libs/ffcall
-		gcc-libffi? ( >=sys-devel/gcc-3.3.5 )
-	)
+	gcc-libffi? ( >=sys-devel/gcc-3.3.5 )
+	!gcc-libffi? ( dev-libs/ffcall )
 	>=dev-libs/libxml2-2.6
 	>=dev-libs/libxslt-1.1
 	>=dev-libs/gmp-4.1