don't use deprecated ? : use syntax

8 files changed, 34 insertions, 18 deletions

diff --git a/dev-ruby/ruby-libglade2/ChangeLog b/dev-ruby/ruby-libglade2/ChangeLog
index 7b143ee72b44..5694f1fed686 100644
--- a/dev-ruby/ruby-libglade2/ChangeLog
+++ b/dev-ruby/ruby-libglade2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/ruby-libglade2
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-libglade2/ChangeLog,v 1.5 2004/03/18 23:38:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-libglade2/ChangeLog,v 1.6 2004/03/25 07:16:10 mr_bones_ Exp $
+
+  24 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  ruby-libglade2-0.5.0.ebuild, ruby-libglade2-0.7.0.ebuild,
+  ruby-libglade2-0.8.0.ebuild, ruby-libglade2-0.8.1.ebuild,
+  ruby-libglade2-0.9.1.ebuild:
+  don't use deprecated ? : use syntax
 
 *ruby-libglade2-0.9.1 (18 Mar 2004)
 
diff --git a/dev-ruby/ruby-libglade2/ruby-libglade2-0.5.0.ebuild b/dev-ruby/ruby-libglade2/ruby-libglade2-0.5.0.ebuild
index 4d4711905e8d..304b217eccee 100644
--- a/dev-ruby/ruby-libglade2/ruby-libglade2-0.5.0.ebuild
+++ b/dev-ruby/ruby-libglade2/ruby-libglade2-0.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-libglade2/ruby-libglade2-0.5.0.ebuild,v 1.1 2003/08/06 13:38:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-libglade2/ruby-libglade2-0.5.0.ebuild,v 1.2 2004/03/25 07:16:10 mr_bones_ Exp $
 
 inherit ruby-gnome2
 
@@ -8,4 +8,5 @@ DESCRIPTION="Ruby Libglade2 bindings"
 KEYWORDS="~alpha ~x86"
 DEPEND="${DEPEND} >=gnome-base/libglade-2"
 RDEPEND="${RDEPEND} >=gnome-base/libglade-2
-	gnome? ( >=dev-ruby/ruby-gnome2-${PV} ) : ( >=dev-ruby/ruby-gtk2-${PV} )"
+	gnome? ( >=dev-ruby/ruby-gnome2-${PV} )
+	!gnome? ( >=dev-ruby/ruby-gtk2-${PV} )"
diff --git a/dev-ruby/ruby-libglade2/ruby-libglade2-0.7.0.ebuild b/dev-ruby/ruby-libglade2/ruby-libglade2-0.7.0.ebuild
index c749ee0cf6de..140129271915 100644
--- a/dev-ruby/ruby-libglade2/ruby-libglade2-0.7.0.ebuild
+++ b/dev-ruby/ruby-libglade2/ruby-libglade2-0.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-libglade2/ruby-libglade2-0.7.0.ebuild,v 1.1 2003/10/31 03:23:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-libglade2/ruby-libglade2-0.7.0.ebuild,v 1.2 2004/03/25 07:16:10 mr_bones_ Exp $
 
 inherit ruby-gnome2
 
@@ -8,4 +8,5 @@ DESCRIPTION="Ruby Libglade2 bindings"
 KEYWORDS="~alpha ~x86"
 DEPEND="${DEPEND} >=gnome-base/libglade-2"
 RDEPEND="${RDEPEND} >=gnome-base/libglade-2
-	gnome? ( >=dev-ruby/ruby-gnome2-${PV} ) : ( >=dev-ruby/ruby-gtk2-${PV} )"
+	gnome? ( >=dev-ruby/ruby-gnome2-${PV} )
+	!gnome? ( >=dev-ruby/ruby-gtk2-${PV} )"
diff --git a/dev-ruby/ruby-libglade2/ruby-libglade2-0.8.0.ebuild b/dev-ruby/ruby-libglade2/ruby-libglade2-0.8.0.ebuild
index ee2d018505a3..5da8eeb44dbe 100644
--- a/dev-ruby/ruby-libglade2/ruby-libglade2-0.8.0.ebuild
+++ b/dev-ruby/ruby-libglade2/ruby-libglade2-0.8.0.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/dev-ruby/ruby-libglade2/ruby-libglade2-0.8.0.ebuild,v 1.2 2004/03/18 23:38:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-libglade2/ruby-libglade2-0.8.0.ebuild,v 1.3 2004/03/25 07:16:10 mr_bones_ Exp $
 
 inherit ruby-gnome2
 
@@ -8,4 +8,5 @@ DESCRIPTION="Ruby Libglade2 bindings"
 KEYWORDS="alpha x86 ia64"
 DEPEND="${DEPEND} >=gnome-base/libglade-2"
 RDEPEND="${RDEPEND} >=gnome-base/libglade-2
-	gnome? ( >=dev-ruby/ruby-gnome2-${PV} ) : ( >=dev-ruby/ruby-gtk2-${PV} )"
+	gnome? ( >=dev-ruby/ruby-gnome2-${PV} )
+	!gnome? ( >=dev-ruby/ruby-gtk2-${PV} )"
diff --git a/dev-ruby/ruby-libglade2/ruby-libglade2-0.8.1.ebuild b/dev-ruby/ruby-libglade2/ruby-libglade2-0.8.1.ebuild
index ef76974820ba..b289bcd1c80d 100644
--- a/dev-ruby/ruby-libglade2/ruby-libglade2-0.8.1.ebuild
+++ b/dev-ruby/ruby-libglade2/ruby-libglade2-0.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-libglade2/ruby-libglade2-0.8.1.ebuild,v 1.1 2003/11/24 19:02:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-libglade2/ruby-libglade2-0.8.1.ebuild,v 1.2 2004/03/25 07:16:10 mr_bones_ Exp $
 
 inherit ruby-gnome2
 
@@ -8,4 +8,5 @@ DESCRIPTION="Ruby Libglade2 bindings"
 KEYWORDS="~alpha ~x86"
 DEPEND="${DEPEND} >=gnome-base/libglade-2"
 RDEPEND="${RDEPEND} >=gnome-base/libglade-2
-	gnome? ( >=dev-ruby/ruby-gnome2-${PV} ) : ( >=dev-ruby/ruby-gtk2-${PV} )"
+	gnome? ( >=dev-ruby/ruby-gnome2-${PV} )
+	!gnome? ( >=dev-ruby/ruby-gtk2-${PV} )"
diff --git a/dev-ruby/ruby-libglade2/ruby-libglade2-0.9.1.ebuild b/dev-ruby/ruby-libglade2/ruby-libglade2-0.9.1.ebuild
index bb25682268f5..3d3ff7b51e15 100644
--- a/dev-ruby/ruby-libglade2/ruby-libglade2-0.9.1.ebuild
+++ b/dev-ruby/ruby-libglade2/ruby-libglade2-0.9.1.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/dev-ruby/ruby-libglade2/ruby-libglade2-0.9.1.ebuild,v 1.1 2004/03/18 23:38:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-libglade2/ruby-libglade2-0.9.1.ebuild,v 1.2 2004/03/25 07:16:10 mr_bones_ Exp $
 
 inherit ruby-gnome2
 
@@ -8,4 +8,5 @@ DESCRIPTION="Ruby Libglade2 bindings"
 KEYWORDS="~alpha ~x86 ~ia64"
 DEPEND="${DEPEND} >=gnome-base/libglade-2"
 RDEPEND="${RDEPEND} >=gnome-base/libglade-2
-	gnome? ( >=dev-ruby/ruby-gnome2-${PV} ) : ( >=dev-ruby/ruby-gtk2-${PV} )"
+	gnome? ( >=dev-ruby/ruby-gnome2-${PV} )
+	!gnome? ( >=dev-ruby/ruby-gtk2-${PV} )"
diff --git a/media-libs/libgd/ChangeLog b/media-libs/libgd/ChangeLog
index a42cb55756d4..748800046f08 100644
--- a/media-libs/libgd/ChangeLog
+++ b/media-libs/libgd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libgd
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/ChangeLog,v 1.42 2004/03/04 15:56:40 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/ChangeLog,v 1.43 2004/03/25 07:11:48 mr_bones_ Exp $
+
+  24 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> libgd-1.8.4-r2.ebuild:
+  don't use deprecated ? : use syntax
 
   04 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> libgd-2.0.22.ebuild:
   stable on sparc
diff --git a/media-libs/libgd/libgd-1.8.4-r2.ebuild b/media-libs/libgd/libgd-1.8.4-r2.ebuild
index 49f15341c44e..d320ae66bb9a 100644
--- a/media-libs/libgd/libgd-1.8.4-r2.ebuild
+++ b/media-libs/libgd/libgd-1.8.4-r2.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/media-libs/libgd/libgd-1.8.4-r2.ebuild,v 1.8 2004/01/11 03:14:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/libgd-1.8.4-r2.ebuild,v 1.9 2004/03/25 07:11:48 mr_bones_ Exp $
 
 MY_P=${P/lib/}
 S=${WORKDIR}/${MY_P}
@@ -16,8 +16,10 @@ IUSE="X truetype freetype-version-1 jpeg"
 DEPEND="media-libs/libpng
 	jpeg? ( media-libs/jpeg )
 	X? ( virtual/x11 )
-	freetype-version-1? ( =media-libs/freetype-1* ) :
-		( truetype? ( =media-libs/freetype-2* ) )"
+	freetype-version-1? ( =media-libs/freetype-1* )
+	!freetype-version-1?  (
+		truetype? ( =media-libs/freetype-2* )
+	)"
 
 src_unpack() {
 	unpack ${A}