summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2004-07-23 23:41:38 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2004-07-23 23:41:38 +0000
commitc93ca7949f83b8f5cb84e16919584cf9305db790 (patch)
tree4f7c30907c4c7b425e95f4aa29ffa69970cd3f17
parentStable on alpha. (Manifest recommit) (diff)
downloadgentoo-2-c93ca7949f83b8f5cb84e16919584cf9305db790.tar.gz
gentoo-2-c93ca7949f83b8f5cb84e16919584cf9305db790.tar.bz2
gentoo-2-c93ca7949f83b8f5cb84e16919584cf9305db790.zip
don't use deprecated ? : syntax
-rw-r--r--media-video/motiontrack/ChangeLog6
-rw-r--r--media-video/motiontrack/motiontrack-0.1.0.ebuild29
-rw-r--r--net-p2p/amule/ChangeLog5
-rw-r--r--net-p2p/amule/amule-2.0.0_rc5.ebuild5
4 files changed, 28 insertions, 17 deletions
diff --git a/media-video/motiontrack/ChangeLog b/media-video/motiontrack/ChangeLog
index f5177352d394..9df35fb05825 100644
--- a/media-video/motiontrack/ChangeLog
+++ b/media-video/motiontrack/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/motiontrack
# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motiontrack/ChangeLog,v 1.2 2004/07/23 16:09:38 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motiontrack/ChangeLog,v 1.3 2004/07/23 23:39:21 mr_bones_ Exp $
+
+ 23 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+ motiontrack-0.1.0.ebuild:
+ don't use deprecated ? : syntax
*motiontrack-0.1.0 (23 Jul 2004)
diff --git a/media-video/motiontrack/motiontrack-0.1.0.ebuild b/media-video/motiontrack/motiontrack-0.1.0.ebuild
index 0f07584ee47f..2e7529e8db1c 100644
--- a/media-video/motiontrack/motiontrack-0.1.0.ebuild
+++ b/media-video/motiontrack/motiontrack-0.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motiontrack/motiontrack-0.1.0.ebuild,v 1.2 2004/07/23 16:09:38 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motiontrack/motiontrack-0.1.0.ebuild,v 1.3 2004/07/23 23:39:21 mr_bones_ Exp $
DESCRIPTION="A set of tools that detect motion between two images"
@@ -16,12 +16,17 @@ IUSE="libgd imagemagick debug"
DEPEND="virtual/libc
debug? (
libgd? (
- imagemagick? ( >=media-gfx/imagemagick-5.5.7 ) : ( media-libs/gd )
- ) : ( >=media-gfx/imagemagick-5.5.7 )
- ) : (
+ imagemagick? ( >=media-gfx/imagemagick-5.5.7 )
+ !imagemagick? ( media-libs/gd )
+ )
+ !libgd? ( >=media-gfx/imagemagick-5.5.7 )
+ )
+ !debug? (
imagemagick? (
- gd? ( media-libs/gd ) : ( >=media-gfx/imagemagick-5.5.7 )
- ) : ( media-libs/gd )
+ gd? ( media-libs/gd )
+ !gd? ( >=media-gfx/imagemagick-5.5.7 )
+ )
+ !imagemagick? ( media-libs/gd )
)"
src_compile() {
@@ -29,11 +34,11 @@ src_compile() {
local myconf
if use libgd; then
- if use imagemagick; then
- einfo "motiontrack can only use one of libgd or imagemagick, not both."
- einfo "default is libgd when debug is unset, imagemagick otherwise."
- einfo "please unset one of these use flags if you have other intentions."
- fi
+ if use imagemagick; then
+ einfo "motiontrack can only use one of libgd or imagemagick, not both."
+ einfo "default is libgd when debug is unset, imagemagick otherwise."
+ einfo "please unset one of these use flags if you have other intentions."
+ fi
fi
if use debug; then
#default to imagemagick for providing better features
@@ -71,5 +76,3 @@ src_install() {
make DESTDIR=${D} install || die "install failed"
dodoc README src/TheCode.txt
}
-
-
diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index 19f9ffa5ea21..634e6695d622 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-p2p/amule
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.27 2004/07/19 22:21:01 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.28 2004/07/23 23:41:38 mr_bones_ Exp $
+
+ 23 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> amule-2.0.0_rc5.ebuild:
+ don't use deprecated ? : syntax
*amule-2.0.0_rc5 (19 Jul 2004)
diff --git a/net-p2p/amule/amule-2.0.0_rc5.ebuild b/net-p2p/amule/amule-2.0.0_rc5.ebuild
index 3606bf1676e9..e61024e7cf7f 100644
--- a/net-p2p/amule/amule-2.0.0_rc5.ebuild
+++ b/net-p2p/amule/amule-2.0.0_rc5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.0_rc5.ebuild,v 1.2 2004/07/19 22:21:01 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.0_rc5.ebuild,v 1.3 2004/07/23 23:41:38 mr_bones_ Exp $
MY_P=${P/m/M}
MY_P=${MY_P/_/}
@@ -20,7 +20,8 @@ EXTRA_ECONF="--disable-optimise"
# USE "stats" enables external utilities (statistics and other)
# USE "remote" enables remote controlling utilities (webserver, text client)
-DEPEND="remote? ( =x11-libs/wxGTK-2.4* ) : ( >=x11-libs/wxGTK-2.4.2-r1 )
+DEPEND="remote? ( =x11-libs/wxGTK-2.4* )
+ !remote? ( >=x11-libs/wxGTK-2.4.2-r1 )
>=net-misc/curl-7.11.0
>=dev-libs/crypto++-5.1-r1
>=sys-libs/zlib-1.2.1