don't use deprecated ? : use syntax

6 files changed, 25 insertions, 17 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index 8984faaef67b..4147b1f13276 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/abiword
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.68 2004/03/13 00:32:03 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.69 2004/03/25 08:21:27 mr_bones_ Exp $
+
+  25 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> abiword-2.0.1.ebuild,
+  abiword-2.0.2.ebuild, abiword-2.0.3-r1.ebuild, abiword-2.0.5.ebuild:
+  don't use deprecated ? : use syntax
 
 *abiword-2.0.5 (13 Mar 2004)
 
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 7c9b9be24bf9..df585b9082b4 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,15 +1,15 @@
-MD5 58f4f455b57d36a428740f743220f425 abiword-2.0.3-r1.ebuild 2530
-MD5 d446566c92d0412e767fbd0841c42edf abiword-2.0.5.ebuild 2528
+MD5 332605c9a065c5fb995fd7bfacf3b319 ChangeLog 10519
 MD5 7921df3134ed60f1eb9c3d1c920bde16 abiword-1.0.6-r1.ebuild 1927
-MD5 2cea2a3dd4030bc2ad09765a5f083ef4 abiword-2.0.2.ebuild 2255
-MD5 32730f5ef95f89d3f059ae26a72f7cbf abiword-2.0.1.ebuild 2171
-MD5 ac51357d3a1b592d6e9c1a4ee575ff09 ChangeLog 10328
+MD5 f8ed2f89b5cd1abf83ecd4a6f5344821 abiword-2.0.1.ebuild 2179
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 cd037c182094f6ba10b7dd9e15035efd files/abiword-2.0.3-amd64.patch 8632
+MD5 abfb2e2e507d908d06169c5a8d4378d5 abiword-2.0.2.ebuild 2266
+MD5 cf9dcca5745cda8078a0386993cc0d8a abiword-2.0.5.ebuild 2542
+MD5 232c5a4ec65a706f4b1436df697891df abiword-2.0.3-r1.ebuild 2541
+MD5 31616e14907aefda2489036cc3d1db3d files/AbiWord.desktop 901
+MD5 1ebcd22c6249c06e631c13491113d8ef files/AbiWord2.desktop 166
 MD5 28dcae4a10f58c12a4a73346a7ab1ed0 files/digest-abiword-2.0.1 142
 MD5 20b01c6c3348c63e1b088cf107398e0c files/digest-abiword-2.0.2 68
 MD5 de17339aaab5c0b950381a7f36cf4c58 files/digest-abiword-2.0.5 68
-MD5 31616e14907aefda2489036cc3d1db3d files/AbiWord.desktop 901
 MD5 ddf70a53b4fc5671c7ed5cb4acb4a6e8 files/digest-abiword-2.0.3-r1 68
-MD5 1ebcd22c6249c06e631c13491113d8ef files/AbiWord2.desktop 166
+MD5 cd037c182094f6ba10b7dd9e15035efd files/abiword-2.0.3-amd64.patch 8632
 MD5 55d85bca7cd645ef338336da3d6e6a7e files/digest-abiword-1.0.6-r1 67
diff --git a/app-office/abiword/abiword-2.0.1.ebuild b/app-office/abiword/abiword-2.0.1.ebuild
index 6e3cd984533e..06ebffa9eff5 100644
--- a/app-office/abiword/abiword-2.0.1.ebuild
+++ b/app-office/abiword/abiword-2.0.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/app-office/abiword/abiword-2.0.1.ebuild,v 1.5 2004/01/16 21:01:33 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.1.ebuild,v 1.6 2004/03/25 08:21:27 mr_bones_ Exp $
 
 inherit eutils
 
@@ -28,7 +28,8 @@ RDEPEND="virtual/x11
 	>=app-text/wv-1
 	>=dev-libs/fribidi-0.10.4
 	jpeg?  ( >=media-libs/jpeg-6b-r2 )
-	( xml2? >=dev-libs/libxml2-2.4.10 : dev-libs/expat )
+	xml2? ( >=dev-libs/libxml2-2.4.10 )
+	!xml2? ( dev-libs/expat )
 	spell? ( >=app-text/enchant-1 )
 	gnome? ( >=gnome-base/libgnomeui-2.2
 		>=gnome-base/libgnomeprintui-2.2.1 )"
diff --git a/app-office/abiword/abiword-2.0.2.ebuild b/app-office/abiword/abiword-2.0.2.ebuild
index 8767bb87f949..0a33def39cf6 100644
--- a/app-office/abiword/abiword-2.0.2.ebuild
+++ b/app-office/abiword/abiword-2.0.2.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/app-office/abiword/abiword-2.0.2.ebuild,v 1.3 2004/02/09 18:52:23 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.2.ebuild,v 1.4 2004/03/25 08:21:27 mr_bones_ Exp $
 
 inherit eutils
 
@@ -27,7 +27,8 @@ RDEPEND="virtual/x11
 	>=app-text/wv-1
 	>=dev-libs/fribidi-0.10.4
 	jpeg?  ( >=media-libs/jpeg-6b-r2 )
-	( xml2? >=dev-libs/libxml2-2.4.10 : dev-libs/expat )
+	xml2? ( >=dev-libs/libxml2-2.4.10 )
+	!xml2? ( dev-libs/expat )
 	spell? ( >=app-text/enchant-1 )
 	gnome? ( >=gnome-base/libgnomeui-2.2
 		>=gnome-base/libgnomeprint-2.2.1
diff --git a/app-office/abiword/abiword-2.0.3-r1.ebuild b/app-office/abiword/abiword-2.0.3-r1.ebuild
index d66fb13c7482..51033064238c 100644
--- a/app-office/abiword/abiword-2.0.3-r1.ebuild
+++ b/app-office/abiword/abiword-2.0.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/app-office/abiword/abiword-2.0.3-r1.ebuild,v 1.2 2004/03/02 16:47:14 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.3-r1.ebuild,v 1.3 2004/03/25 08:21:27 mr_bones_ Exp $
 
 inherit eutils
 
@@ -28,7 +28,8 @@ RDEPEND="virtual/x11
 	>=app-text/wv-1
 	>=dev-libs/fribidi-0.10.4
 	jpeg?  ( >=media-libs/jpeg-6b-r2 )
-	( xml2? >=dev-libs/libxml2-2.4.10 : dev-libs/expat )
+	xml2? ( >=dev-libs/libxml2-2.4.10 )
+	!xml2? ( dev-libs/expat )
 	spell? ( >=app-text/enchant-1 )
 	gnome? ( >=gnome-base/libgnomeui-2.2
 		>=gnome-base/libgnomeprint-2.2.1
diff --git a/app-office/abiword/abiword-2.0.5.ebuild b/app-office/abiword/abiword-2.0.5.ebuild
index b0d75d51cdfe..653b785f2b2e 100644
--- a/app-office/abiword/abiword-2.0.5.ebuild
+++ b/app-office/abiword/abiword-2.0.5.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/app-office/abiword/abiword-2.0.5.ebuild,v 1.1 2004/03/13 00:32:03 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.5.ebuild,v 1.2 2004/03/25 08:21:27 mr_bones_ Exp $
 
 inherit eutils
 
@@ -28,7 +28,8 @@ RDEPEND="virtual/x11
 	>=app-text/wv-1
 	>=dev-libs/fribidi-0.10.4
 	jpeg?  ( >=media-libs/jpeg-6b-r2 )
-	( xml2? >=dev-libs/libxml2-2.4.10 : dev-libs/expat )
+	xml2? ( >=dev-libs/libxml2-2.4.10 )
+	!xml2? ( dev-libs/expat )
 	spell? ( >=app-text/enchant-1 )
 	gnome? ( >=gnome-base/libgnomeui-2.2
 		>=gnome-base/libgnomeprint-2.2.1