[Lunar-commits] <moonbase> moonbase: cleanup && from all DEPENDS
Paul Bredbury
brebs at lunar-linux.org
Sat Jan 15 10:36:18 CET 2011
commit 3a1fb3c3392d32fea7ed5162863bb2de2e641b10
Author: Paul Bredbury <brebs at lunar-linux.org>
Date: Sat Jan 15 16:36:18 2011 +0700
moonbase: cleanup && from all DEPENDS
Done basically by:
find -name DEPENDS | xargs grep -l '&&'
cat ~/temp/list | xargs sed -i -e "s: &&::"
etc. until "s:&&::", then:
cat ~/temp/list | xargs sed -i -e 's/[ \t]*$//'
---
app-themes/slim-theme-lunar/DEPENDS | 2 +-
app-themes/spheres-and-crystals/DEPENDS | 2 +-
app-themes/tango-icon-theme/DEPENDS | 2 +-
archive/flexbackup/DEPENDS | 20 +++++++-------
audio/amSynth/DEPENDS | 2 +-
audio/aqualung/DEPENDS | 32 ++++++++++++------------
audio/audiotag/DEPENDS | 6 ++--
audio/esound/DEPENDS | 2 +-
audio/grip/DEPENDS | 12 ++++----
audio/gtick/DEPENDS | 4 +-
audio/icecast/DEPENDS | 6 ++--
audio/jamin/DEPENDS | 12 ++++----
audio/lash/DEPENDS | 2 +-
audio/liblrdf/DEPENDS | 2 +-
audio/mhwaveedit/DEPENDS | 10 +++---
audio/paman/DEPENDS | 6 ++--
audio/pavucontrol/DEPENDS | 6 ++--
audio/pavumeter/DEPENDS | 6 ++--
audio/rakarrack/DEPENDS | 6 ++--
audio/seq24/DEPENDS | 2 +-
audio/swh-plugins/DEPENDS | 4 +-
audio/traverso/DEPENDS | 24 +++++++++---------
audio/zinf/DEPENDS | 14 +++++-----
cd/burgner/DEPENDS | 2 +-
cd/cdcd/DEPENDS | 4 +-
cd/dcd/DEPENDS | 2 +-
cd/graveman/DEPENDS | 20 +++++++-------
chat/centericq/DEPENDS | 4 +-
chat/gnomeicu/DEPENDS | 2 +-
chat/ickle/DEPENDS | 4 +-
chat/icqnd/DEPENDS | 2 +-
chat/ircd-hybrid/DEPENDS | 10 +++---
chat/irssi-otr/DEPENDS | 6 ++--
chat/meanwhile/DEPENDS | 2 +-
chat/micq/DEPENDS | 4 +-
chat/naim/DEPENDS | 2 +-
chat/silc-client/DEPENDS | 2 +-
crypto/mcrypt/DEPENDS | 2 +-
devel/GUIlib/DEPENDS | 4 +-
devel/arch/DEPENDS | 14 +++++-----
devel/autotoolset/DEPENDS | 4 +-
devel/bdb-ruby/DEPENDS | 2 +-
devel/cgdb/DEPENDS | 2 +-
devel/fam-ruby/DEPENDS | 4 +-
devel/ferite/DEPENDS | 2 +-
devel/g-wrap/DEPENDS | 2 +-
devel/glademm/DEPENDS | 4 +-
devel/gtranslator/DEPENDS | 10 +++---
devel/imlib2-ruby/DEPENDS | 2 +-
devel/libbonobomm/DEPENDS | 2 +-
devel/libbonobouimm/DEPENDS | 2 +-
devel/metakit/DEPENDS | 2 +-
devel/orbitcpp/DEPENDS | 2 +-
devel/paragui/DEPENDS | 6 ++--
devel/ruby-gnome2/DEPENDS | 10 +++---
devel/ruby-gtk2/DEPENDS | 2 +-
devel/ruby-postgres/DEPENDS | 2 +-
devel/stgit/DEPENDS | 2 +-
devel/tig/DEPENDS | 2 +-
devel/xfdiff/DEPENDS | 2 +-
distributed/distcc/DEPENDS | 6 ++--
distributed/nicotine/DEPENDS | 4 +-
doc-tools/docbook-dsssl/DEPENDS | 2 +-
doc-tools/jadetex/DEPENDS | 2 +-
doc-tools/linuxdoc-tools/DEPENDS | 2 +-
doc-tools/man/DEPENDS | 4 +-
doc-tools/openjade/DEPENDS | 2 +-
doc-tools/pinfo/DEPENDS | 2 +-
doc-tools/psgml/DEPENDS | 2 +-
doc-tools/scrollkeeper/DEPENDS | 4 +-
doc-tools/uTidylib/DEPENDS | 4 +-
editors/cooledit/DEPENDS | 2 +-
editors/elvis/DEPENDS | 2 +-
editors/gtkspell/DEPENDS | 4 +-
editors/jedit/DEPENDS | 4 +-
editors/nedit/DEPENDS | 2 +-
editors/scribes/DEPENDS | 10 +++---
filemanagers/filer/DEPENDS | 6 ++--
filemanagers/xffm-filemanager/DEPENDS | 2 +-
filesys/tagsfs/DEPENDS | 6 ++--
filesys/xfsdump/DEPENDS | 2 +-
ftp/d4x/DEPENDS | 6 ++--
ftp/dc_gui/DEPENDS | 4 +-
ftp/dctc/DEPENDS | 2 +-
ftp/giftui/DEPENDS | 2 +-
games/CriticalMass/DEPENDS | 2 +-
games/TORCS/DEPENDS | 4 +-
games/armagetron/DEPENDS | 2 +-
games/bzedit2/DEPENDS | 4 +-
games/castle-combat/DEPENDS | 4 +-
games/circuslinux/DEPENDS | 2 +-
games/crossfire-client/DEPENDS | 4 +-
games/csmash/DEPENDS | 8 +++---
games/epiar/DEPENDS | 8 +++---
games/exult/DEPENDS | 4 +-
games/falconseye/DEPENDS | 2 +-
games/freedroid/DEPENDS | 4 +-
games/frozen-bubble/DEPENDS | 8 +++---
games/glaxium/DEPENDS | 2 +-
games/gltron/DEPENDS | 2 +-
games/gnuchess/DEPENDS | 2 +-
games/jfduke3d/DEPENDS | 8 +++---
games/lgeneral/DEPENDS | 4 +-
games/luola/DEPENDS | 6 ++--
games/netwalk/DEPENDS | 2 +-
games/openmortal/DEPENDS | 6 ++--
games/penguin-command/DEPENDS | 2 +-
games/pysol-music/DEPENDS | 2 +-
games/pysol-sound-server/DEPENDS | 2 +-
games/pysol/DEPENDS | 4 +-
games/rockdodger/DEPENDS | 2 +-
games/toppler/DEPENDS | 4 +-
games/trackballs/DEPENDS | 6 ++--
games/tuxnes/DEPENDS | 2 +-
games/tuxpuck/DEPENDS | 4 +-
games/vectoroids/DEPENDS | 2 +-
games/xqf/DEPENDS | 4 +-
games/xtux/DEPENDS | 2 +-
gnome2/applets/contact-lookup-applet/DEPENDS | 4 +-
gnome2/applets/gnome-blog/DEPENDS | 2 +-
gnome2/applets/grandr_applet/DEPENDS | 2 +-
gnome2/applets/netspeed_applet/DEPENDS | 4 +-
gnome2/applets/quick-lounge-applet/DEPENDS | 2 +-
gnome2/applets/teatime/DEPENDS | 2 +-
gnome2/apps/conglomerate/DEPENDS | 2 +-
gnome2/apps/diacanvas2/DEPENDS | 4 +-
gnome2/apps/gnome-btdownload/DEPENDS | 2 +-
gnome2/apps/gnomesu/DEPENDS | 2 +-
gnome2/apps/gramps/DEPENDS | 6 ++--
gnome2/apps/katoob/DEPENDS | 4 +-
gnome2/core/gDesklets/DEPENDS | 2 +-
graphics/GUatu/DEPENDS | 4 +-
graphics/SDL_Pango/DEPENDS | 2 +-
graphics/SDL_ttf/DEPENDS | 2 +-
graphics/aewan/DEPENDS | 2 +-
graphics/autopano-sift/DEPENDS | 4 +-
graphics/gliv/DEPENDS | 2 +-
graphics/povray/DEPENDS | 6 ++--
graphics/skencil/DEPENDS | 4 +-
graphics/truevision/DEPENDS | 6 ++--
ham/xlog/DEPENDS | 4 +-
kde4/utils/qimageblitz/DEPENDS | 2 +-
libs/cdk/DEPENDS | 2 +-
libs/esdl/DEPENDS | 2 +-
libs/f2py/DEPENDS | 2 +-
libs/librep/DEPENDS | 2 +-
libs/libsexy/DEPENDS | 2 +-
libs/libxffm/DEPENDS | 8 +++---
libs/newt-perl/DEPENDS | 2 +-
libs/reportlab/DEPENDS | 4 +-
libs/roadrunner/DEPENDS | 2 +-
mail/drac/DEPENDS | 2 +-
mail/elm/DEPENDS | 2 +-
mail/embrace/DEPENDS | 2 +-
mail/gnu-pop3d/DEPENDS | 2 +-
mail/mailcrypt/DEPENDS | 2 +-
mail/mutt/DEPENDS | 4 +-
mail/pop-before-smtp/DEPENDS | 4 +-
mail/qpopper3/DEPENDS | 4 +-
mail/teapop/DEPENDS | 4 +-
mail/tkrat/DEPENDS | 2 +-
net/RCon/DEPENDS | 2 +-
net/SDL_net/DEPENDS | 6 ++--
net/adns-python/DEPENDS | 2 +-
net/bw-whois/DEPENDS | 2 +-
net/ettercap/DEPENDS | 6 ++--
net/fusesmb/DEPENDS | 4 +-
net/ifplugd/DEPENDS | 4 +-
net/net-tools/DEPENDS | 4 +-
net/pppconfig/DEPENDS | 2 +-
net/rarpd/DEPENDS | 2 +-
net/unison/DEPENDS | 2 +-
news/bbdb/DEPENDS | 2 +-
perl/App-CLI/DEPENDS | 2 +-
perl/Clipboard/DEPENDS | 4 +-
perl/Compress-Zlib/DEPENDS | 2 +-
perl/DBD-SQLite/DEPENDS | 4 +-
perl/ExtUtils-PkgConfig/DEPENDS | 2 +-
perl/GDGraph/DEPENDS | 2 +-
perl/Gtk2-Spell/DEPENDS | 2 +-
perl/IO-All/DEPENDS | 2 +-
perl/Mail-Audit/DEPENDS | 4 +-
perl/SVN-Mirror/DEPENDS | 14 +++++-----
perl/SVN-Simple/DEPENDS | 2 +-
perl/Stat-lsMode/DEPENDS | 2 +-
perl/Sys-Gamin/DEPENDS | 2 +-
perl/Tie-DBI/DEPENDS | 2 +-
perl/WWW-Search/DEPENDS | 8 +++---
perl/XML-Parser/DEPENDS | 2 +-
perl/YAML-Syck/DEPENDS | 2 +-
printer/a2ps/DEPENDS | 4 +-
printer/foo2zjs/DEPENDS | 4 +-
python/PyOpenGL/DEPENDS | 2 +-
python/bsddb3/DEPENDS | 2 +-
python/geoip-python/DEPENDS | 2 +-
python/lxml/DEPENDS | 2 +-
python/mod_python/DEPENDS | 2 +-
python/pyPgSQL/DEPENDS | 2 +-
python/pyao/DEPENDS | 2 +-
python/pylirc/DEPENDS | 2 +-
python/pyogg/DEPENDS | 2 +-
python/pyvorbis/DEPENDS | 2 +-
qt4-apps/qsynth/DEPENDS | 2 +-
qt4-apps/treeline/DEPENDS | 4 +-
science/celestia-gtk/DEPENDS | 6 ++--
science/dx/DEPENDS | 2 +-
science/gerbv/DEPENDS | 2 +-
science/gstat/DEPENDS | 4 +-
science/libticalcs/DEPENDS | 2 +-
science/maxima/DEPENDS | 4 +-
science/qalculate-gtk/DEPENDS | 8 +++---
science/tilp/DEPENDS | 4 +-
science/wxMaxima/DEPENDS | 4 +-
security/firestarter/DEPENDS | 2 +-
security/openvpn/DEPENDS | 4 +-
security/pam_mount/DEPENDS | 2 +-
security/setools/DEPENDS | 2 +-
sql/sybase-ase/DEPENDS | 2 +-
sql/xbsql/DEPENDS | 2 +-
terminal/multi-aterm/DEPENDS | 2 +-
terminal/qlogin/DEPENDS | 2 +-
terminal/screen/DEPENDS | 2 +-
terminal/tilda/DEPENDS | 4 +-
terminal/tsclient/DEPENDS | 2 +-
utils/bc/DEPENDS | 2 +-
utils/btmgr/DEPENDS | 4 +-
utils/dump/DEPENDS | 2 +-
utils/fam/DEPENDS | 6 ++--
utils/fdutils/DEPENDS | 4 +-
utils/figlet/DEPENDS | 2 +-
utils/free42/DEPENDS | 6 ++--
utils/gamin/DEPENDS | 2 +-
utils/libPropList/DEPENDS | 2 +-
utils/lunar-init/DEPENDS | 2 +-
utils/memdump/DEPENDS | 2 +-
utils/metalog/DEPENDS | 2 +-
utils/sdscsyslogd/DEPENDS | 14 +++++-----
utils/units/DEPENDS | 2 +-
utils/xmlclitools/DEPENDS | 4 +-
video/camE/DEPENDS | 2 +-
video/dvdauthor/DEPENDS | 4 +-
video/goggles/DEPENDS | 4 +-
video/libprojectM/DEPENDS | 2 +-
video/ogle/DEPENDS | 6 ++--
video/ogmtools/DEPENDS | 2 +-
video/piave/DEPENDS | 10 +++---
video/tvtime/DEPENDS | 6 ++--
virtual/uml/DEPENDS | 4 +-
web/PostNuke/DEPENDS | 4 +-
web/PyDS/DEPENDS | 20 +++++++-------
web/SOAPpy/DEPENDS | 2 +-
web/apache-mod_ssl/DEPENDS | 4 +-
web/cadaver/DEPENDS | 6 ++--
web/clearsilver/DEPENDS | 4 +-
web/dansguardian/DEPENDS | 2 +-
web/mod_perl-old/DEPENDS | 2 +-
web/mod_perl/DEPENDS | 2 +-
web/mod_ruby/DEPENDS | 2 +-
web/peacock/DEPENDS | 2 +-
web/scgi_rails/DEPENDS | 2 +-
web/screem/DEPENDS | 6 ++--
web/w3c-libwww/DEPENDS | 4 +-
x11-apps/gpa/DEPENDS | 2 +-
x11-apps/jpilot/DEPENDS | 2 +-
x11-utils/gipc/DEPENDS | 4 +-
x11-utils/gkrellm-speedfreq/DEPENDS | 2 +-
x11-utils/gkrellshoot/DEPENDS | 2 +-
x11-utils/lineak_xosdplugin/DEPENDS | 2 +-
x11-utils/obconf/DEPENDS | 8 +++---
x11-utils/type1inst/DEPENDS | 4 +-
x11-utils/wmweather/DEPENDS | 2 +-
x11-utils/xpad/DEPENDS | 2 +-
x11-wm/3ddesktop/DEPENDS | 4 +-
x11/xplanet/DEPENDS | 2 +-
xfce4/goodies/thunar-media-tags-plugin/DEPENDS | 2 +-
xfce4/goodies/xfce4-genmon-plugin/DEPENDS | 2 +-
xfce4/goodies/xfce4-sensors-plugin/DEPENDS | 2 +-
xfce4/goodies/xfce4-volstatus-icon/DEPENDS | 4 +-
zbeta/climm/DEPENDS | 8 +++---
zbeta/giftcurs-cvs/DEPENDS | 2 +-
zbeta/giftoxic-cvs/DEPENDS | 8 +++---
zbeta/giftui-cvs/DEPENDS | 2 +-
zbeta/gloox/DEPENDS | 6 ++--
zbeta/grub2/DEPENDS | 2 +-
zbeta/mailutils/DEPENDS | 2 +-
zbeta/mercurial-hg/DEPENDS | 8 +++---
zbeta/mutt-devel/DEPENDS | 4 +-
zbeta/nedit-cvs/DEPENDS | 2 +-
zbeta/njb-sharp/DEPENDS | 2 +-
zbeta/pan2-beta/DEPENDS | 4 +-
zbeta/pcb-cvs/DEPENDS | 20 +++++++-------
zbeta/pcb-git/DEPENDS | 20 +++++++-------
zbeta/smbnetfs/DEPENDS | 4 +-
zbeta/xemacs-beta/DEPENDS | 10 +++---
zdeprecated/E-xmms/DEPENDS | 4 +-
zdeprecated/audioscrobbler/DEPENDS | 2 +-
zdeprecated/gkrellmms/DEPENDS | 2 +-
zdeprecated/gnustep/gnustep-base/DEPENDS | 10 +++---
zdeprecated/gst-player/DEPENDS | 4 +-
zdeprecated/lirc-xmms-plugin/DEPENDS | 2 +-
zdeprecated/modplugxmms/DEPENDS | 10 +++---
zdeprecated/piave/DEPENDS | 10 +++---
zdeprecated/ximian-connector/DEPENDS | 4 +-
zdeprecated/xmms-mad/DEPENDS | 4 +-
304 files changed, 615 insertions(+), 615 deletions(-)
diff --git a/app-themes/slim-theme-lunar/DEPENDS b/app-themes/slim-theme-lunar/DEPENDS
index 04dafc4..c5606da 100644
--- a/app-themes/slim-theme-lunar/DEPENDS
+++ b/app-themes/slim-theme-lunar/DEPENDS
@@ -1,2 +1,2 @@
-depends slim &&
+depends slim
depends bitstream-vera
diff --git a/app-themes/spheres-and-crystals/DEPENDS b/app-themes/spheres-and-crystals/DEPENDS
index 588e2ee..082c607 100644
--- a/app-themes/spheres-and-crystals/DEPENDS
+++ b/app-themes/spheres-and-crystals/DEPENDS
@@ -1,2 +1,2 @@
-depends librsvg &&
+depends librsvg
depends gnome-session
diff --git a/app-themes/tango-icon-theme/DEPENDS b/app-themes/tango-icon-theme/DEPENDS
index 3955830..68bfd0d 100644
--- a/app-themes/tango-icon-theme/DEPENDS
+++ b/app-themes/tango-icon-theme/DEPENDS
@@ -1,2 +1,2 @@
-depends icon-naming-utils &&
+depends icon-naming-utils
depends ImageMagick
diff --git a/archive/flexbackup/DEPENDS b/archive/flexbackup/DEPENDS
index 477eba0..01f5419 100644
--- a/archive/flexbackup/DEPENDS
+++ b/archive/flexbackup/DEPENDS
@@ -1,12 +1,12 @@
-depends perl &&
-depends coreutils &&
-depends findutils &&
+depends perl
+depends coreutils
+depends findutils
-optional_depends "afio" "" "" "for afio format support" &&
-optional_depends "tar" "" "" "for tar format support" &&
-optional_depends "star" "" "" "for star format support" &&
-optional_depends "cpio" "" "" "for cpio format support" &&
-optional_depends "zip" "" "" "for zip format support" &&
-optional_depends "gzip" "" "" "for gzip compression support" &&
-optional_depends "bzip2" "" "" "for bzip2 compression support" &&
+optional_depends "afio" "" "" "for afio format support"
+optional_depends "tar" "" "" "for tar format support"
+optional_depends "star" "" "" "for star format support"
+optional_depends "cpio" "" "" "for cpio format support"
+optional_depends "zip" "" "" "for zip format support"
+optional_depends "gzip" "" "" "for gzip compression support"
+optional_depends "bzip2" "" "" "for bzip2 compression support"
optional_depends "buffer" "" "" "for I/O buffering"
diff --git a/audio/amSynth/DEPENDS b/audio/amSynth/DEPENDS
index 5217ed3..ad5b9ac 100644
--- a/audio/amSynth/DEPENDS
+++ b/audio/amSynth/DEPENDS
@@ -1,2 +1,2 @@
-depends gtkmm &&
+depends gtkmm
depends jack
diff --git a/audio/aqualung/DEPENDS b/audio/aqualung/DEPENDS
index acbcc6f..61fc7d8 100644
--- a/audio/aqualung/DEPENDS
+++ b/audio/aqualung/DEPENDS
@@ -1,18 +1,18 @@
-depends gtk+-2 &&
-depends libxml2 &&
+depends gtk+-2
+depends libxml2
-optional_depends "liblrdf" "" "--without-ladspa" "LADSPA plugin support" &&
-optional_depends "jack" "" "--without-jack" "jack output" &&
-optional_depends "libsamplerate" "" "--without-src" "sample rate conversion" &&
-optional_depends "flac" "" "--without-flac" "decode flac files" &&
-optional_depends "libvorbis" "" "--without-ogg --without-vorbisenc" "de-/encode ogg" &&
-optional_depends "speex" "" "--without-speex" "decode OGG Speex" &&
-optional_depends "libmad" "" "--without-mpeg" "decode MPEG Audio" &&
-optional_depends "lame" "" "--without-lame" "encode MP3" &&
-optional_depends "libmodplug" "" "--without-mod" "decode MOD files" &&
-optional_depends "libmpcdec" "" "--without-mpc" "decode Musepack files" &&
-optional_depends "ffmpeg" "" "--without-lavc" "AC3, AAC, WMA, WavPack and movie formats" &&
-optional_depends "taglib" "" "--without-metadata" "read metadata" &&
-optional_depends "libcddb" "" "--without-cddb" "access CDDB server" &&
-optional_depends "libcdio" "" "--without-cdda" "play Audio-CD" &&
+optional_depends "liblrdf" "" "--without-ladspa" "LADSPA plugin support"
+optional_depends "jack" "" "--without-jack" "jack output"
+optional_depends "libsamplerate" "" "--without-src" "sample rate conversion"
+optional_depends "flac" "" "--without-flac" "decode flac files"
+optional_depends "libvorbis" "" "--without-ogg --without-vorbisenc" "de-/encode ogg"
+optional_depends "speex" "" "--without-speex" "decode OGG Speex"
+optional_depends "libmad" "" "--without-mpeg" "decode MPEG Audio"
+optional_depends "lame" "" "--without-lame" "encode MP3"
+optional_depends "libmodplug" "" "--without-mod" "decode MOD files"
+optional_depends "libmpcdec" "" "--without-mpc" "decode Musepack files"
+optional_depends "ffmpeg" "" "--without-lavc" "AC3, AAC, WMA, WavPack and movie formats"
+optional_depends "taglib" "" "--without-metadata" "read metadata"
+optional_depends "libcddb" "" "--without-cddb" "access CDDB server"
+optional_depends "libcdio" "" "--without-cdda" "play Audio-CD"
optional_depends "libifp" "" "--without-ifp" "iRiver support"
diff --git a/audio/audiotag/DEPENDS b/audio/audiotag/DEPENDS
index d3ebfc1..9d51bc8 100644
--- a/audio/audiotag/DEPENDS
+++ b/audio/audiotag/DEPENDS
@@ -1,5 +1,5 @@
-depends perl &&
-depends id3lib &&
+depends perl
+depends id3lib
-optional_depends "flac" "" "" "for flac file support" &&
+optional_depends "flac" "" "" "for flac file support"
optional_depends "vorbis-tools" "" "" "for ogg file support"
diff --git a/audio/esound/DEPENDS b/audio/esound/DEPENDS
index 98a7c78..461626a 100644
--- a/audio/esound/DEPENDS
+++ b/audio/esound/DEPENDS
@@ -1,3 +1,3 @@
-depends audiofile &&
+depends audiofile
optional_depends "tcp_wrappers" "--with-libwrap" "" "for TCP wrapper support"
diff --git a/audio/grip/DEPENDS b/audio/grip/DEPENDS
index 9b0bf11..355d150 100644
--- a/audio/grip/DEPENDS
+++ b/audio/grip/DEPENDS
@@ -1,9 +1,9 @@
-depends libgnomeui &&
-depends vte &&
+depends libgnomeui
+depends vte
-optional_depends "cdparanoia" "" "" "to rip CDs using cdparanoia" &&
-optional_depends "cdrtools" "" "" "to rip CDs using cdda2wav" &&
-optional_depends "lame" "" "" "to encode mp3 files using lame" &&
-optional_depends "bladeenc" "" "" "to encode mp3 files using bladeenc" &&
+optional_depends "cdparanoia" "" "" "to rip CDs using cdparanoia"
+optional_depends "cdrtools" "" "" "to rip CDs using cdda2wav"
+optional_depends "lame" "" "" "to encode mp3 files using lame"
+optional_depends "bladeenc" "" "" "to encode mp3 files using bladeenc"
optional_depends "vorbis-tools" "" "" "to encode ogg vorbis files with oggenc"
optional_depends "id3lib" "" "" "to encode mp3s with the id3 tags"
diff --git a/audio/gtick/DEPENDS b/audio/gtick/DEPENDS
index f499371..8e090d2 100644
--- a/audio/gtick/DEPENDS
+++ b/audio/gtick/DEPENDS
@@ -1,4 +1,4 @@
-depends gtk+-2 &&
+depends gtk+-2
-optional_depends "libsndfile" "--with-sndfile" "" "for custom ticking sound" &&
+optional_depends "libsndfile" "--with-sndfile" "" "for custom ticking sound"
optional_depends "gettext" "" "--disable-nls" "for NLS support"
diff --git a/audio/icecast/DEPENDS b/audio/icecast/DEPENDS
index 8399b97..cfc7b5e 100644
--- a/audio/icecast/DEPENDS
+++ b/audio/icecast/DEPENDS
@@ -1,10 +1,10 @@
-depends libxslt &&
-depends vorbis-tools &&
+depends libxslt
+depends vorbis-tools
optional_depends "tcp_wrappers" \
"--with-libwrap" \
"" \
- "for tcp_wrappers support" &&
+ "for tcp_wrappers support"
optional_depends "readline" \
"" \
diff --git a/audio/jamin/DEPENDS b/audio/jamin/DEPENDS
index 76ec05b..7d9e07b 100644
--- a/audio/jamin/DEPENDS
+++ b/audio/jamin/DEPENDS
@@ -1,7 +1,7 @@
-depends jack &&
-depends fftw3 &&
-depends ladspa_sdk &&
-depends libsndfile &&
-depends swh-plugins &&
-depends liblo &&
+depends jack
+depends fftw3
+depends ladspa_sdk
+depends libsndfile
+depends swh-plugins
+depends liblo
depends gtk+-2
diff --git a/audio/lash/DEPENDS b/audio/lash/DEPENDS
index 1a64aa9..818ea74 100644
--- a/audio/lash/DEPENDS
+++ b/audio/lash/DEPENDS
@@ -1,2 +1,2 @@
-depends alsa-utils &&
+depends alsa-utils
depends jack
diff --git a/audio/liblrdf/DEPENDS b/audio/liblrdf/DEPENDS
index a1f5298..a839387 100644
--- a/audio/liblrdf/DEPENDS
+++ b/audio/liblrdf/DEPENDS
@@ -1,2 +1,2 @@
-depends raptor &&
+depends raptor
depends ladspa_sdk
diff --git a/audio/mhwaveedit/DEPENDS b/audio/mhwaveedit/DEPENDS
index c17a0f4..cbc003c 100644
--- a/audio/mhwaveedit/DEPENDS
+++ b/audio/mhwaveedit/DEPENDS
@@ -1,7 +1,7 @@
-depends gtk+-2 &&
-depends libsamplerate &&
-depends libsndfile &&
+depends gtk+-2
+depends libsamplerate
+depends libsndfile
-optional_depends pulseaudio "" "--without-pulse" "for PulseAudio support" &&
-optional_depends jack "" "--without-jack" "for JACK support" &&
+optional_depends pulseaudio "" "--without-pulse" "for PulseAudio support"
+optional_depends jack "" "--without-jack" "for JACK support"
optional_depends esound "" "--without-esound" "for EsounD support"
diff --git a/audio/paman/DEPENDS b/audio/paman/DEPENDS
index bf63360..dce89a5 100644
--- a/audio/paman/DEPENDS
+++ b/audio/paman/DEPENDS
@@ -1,10 +1,10 @@
-depends libglademm &&
-depends pulseaudio &&
+depends libglademm
+depends pulseaudio
optional_depends "lynx" \
"--enable-lynx" \
"--disable-lynx" \
- "for documenation generation" &&
+ "for documenation generation"
optional_depends "pavumeter" \
"" "" "for volume meters"
diff --git a/audio/pavucontrol/DEPENDS b/audio/pavucontrol/DEPENDS
index 1534890..832e32d 100644
--- a/audio/pavucontrol/DEPENDS
+++ b/audio/pavucontrol/DEPENDS
@@ -1,7 +1,7 @@
-depends libglademm &&
-depends pulseaudio &&
+depends libglademm
+depends pulseaudio
optional_depends "lynx" \
"--enable-lynx" \
"--disable-lynx" \
- "for documenation generation"
+ "for documenation generation"
diff --git a/audio/pavumeter/DEPENDS b/audio/pavumeter/DEPENDS
index 1534890..832e32d 100644
--- a/audio/pavumeter/DEPENDS
+++ b/audio/pavumeter/DEPENDS
@@ -1,7 +1,7 @@
-depends libglademm &&
-depends pulseaudio &&
+depends libglademm
+depends pulseaudio
optional_depends "lynx" \
"--enable-lynx" \
"--disable-lynx" \
- "for documenation generation"
+ "for documenation generation"
diff --git a/audio/rakarrack/DEPENDS b/audio/rakarrack/DEPENDS
index 456fe3f..aa875be 100644
--- a/audio/rakarrack/DEPENDS
+++ b/audio/rakarrack/DEPENDS
@@ -1,4 +1,4 @@
-depends fltk &&
-depends jack &&
-depends libsamplerate &&
+depends fltk
+depends jack
+depends libsamplerate
depends libsndfile
diff --git a/audio/seq24/DEPENDS b/audio/seq24/DEPENDS
index 5217ed3..ad5b9ac 100644
--- a/audio/seq24/DEPENDS
+++ b/audio/seq24/DEPENDS
@@ -1,2 +1,2 @@
-depends gtkmm &&
+depends gtkmm
depends jack
diff --git a/audio/swh-plugins/DEPENDS b/audio/swh-plugins/DEPENDS
index f09217a..fbe933f 100644
--- a/audio/swh-plugins/DEPENDS
+++ b/audio/swh-plugins/DEPENDS
@@ -1,4 +1,4 @@
-depends autoconf &&
-depends ladspa_sdk &&
+depends autoconf
+depends ladspa_sdk
depends fftw
diff --git a/audio/traverso/DEPENDS b/audio/traverso/DEPENDS
index 4b4869a..f67866c 100644
--- a/audio/traverso/DEPENDS
+++ b/audio/traverso/DEPENDS
@@ -1,15 +1,15 @@
-depends cmake &&
-depends libsamplerate &&
-depends libsndfile &&
-depends jack &&
-depends fftw3 &&
-depends rasqal &&
-depends redland &&
-depends wavpack &&
-depends libogg &&
-depends libvorbis &&
-depends flac &&
+depends cmake
+depends libsamplerate
+depends libsndfile
+depends jack
+depends fftw3
+depends rasqal
+depends redland
+depends wavpack
+depends libogg
+depends libvorbis
+depends flac
depends qt4
-optional_depends libmad "-DWANT_MP3_DECODE=ON" "-DWANT_MP3_DECODE=OFF" "for MP3 read support" &&
+optional_depends libmad "-DWANT_MP3_DECODE=ON" "-DWANT_MP3_DECODE=OFF" "for MP3 read support"
optional_depends lame "-DWANT_MP3_ENCODE=ON" "-DWANT_MP3_DECODE=OFF" "for MP3 write support"
diff --git a/audio/zinf/DEPENDS b/audio/zinf/DEPENDS
index 4b23e00..7c288d6 100644
--- a/audio/zinf/DEPENDS
+++ b/audio/zinf/DEPENDS
@@ -1,26 +1,26 @@
-depends libmusicbrainz &&
-depends id3lib &&
-depends gdbm &&
+depends libmusicbrainz
+depends id3lib
+depends gdbm
optional_depends "gtk+-2" \
"" \
"" \
- "to enable a graphical interface" &&
+ "to enable a graphical interface"
optional_depends "libvorbis" \
"" \
"" \
- "to play oggvorbis files" &&
+ "to play oggvorbis files"
optional_depends "esound" \
"" \
"--disable-esd --disable-esdtest" \
- "to enable ESD output support" &&
+ "to enable ESD output support"
optional_depends "arts" \
"" \
"--disable-arts" \
- "to enable aRTS output support" &&
+ "to enable aRTS output support"
optional_depends "alsa-lib" \
"" \
diff --git a/cd/burgner/DEPENDS b/cd/burgner/DEPENDS
index 33a8778..85aae51 100644
--- a/cd/burgner/DEPENDS
+++ b/cd/burgner/DEPENDS
@@ -1,2 +1,2 @@
-depends popt &&
+depends popt
depends gnome-vfs
diff --git a/cd/cdcd/DEPENDS b/cd/cdcd/DEPENDS
index b55ebbe..0d04059 100644
--- a/cd/cdcd/DEPENDS
+++ b/cd/cdcd/DEPENDS
@@ -1,3 +1,3 @@
-depends libcdaudio &&
-depends readline &&
+depends libcdaudio
+depends readline
depends ncurses
diff --git a/cd/dcd/DEPENDS b/cd/dcd/DEPENDS
index f7e95b9..d8592ee 100644
--- a/cd/dcd/DEPENDS
+++ b/cd/dcd/DEPENDS
@@ -1,2 +1,2 @@
-depends libstdc++5 &&
+depends libstdc++5
depends libmusicbrainz
diff --git a/cd/graveman/DEPENDS b/cd/graveman/DEPENDS
index 5a4d117..e6b5628 100644
--- a/cd/graveman/DEPENDS
+++ b/cd/graveman/DEPENDS
@@ -1,20 +1,20 @@
-depends libglade &&
-depends intltool &&
-depends cdrtools &&
-depends cdrdao &&
-depends libmng &&
+depends libglade
+depends intltool
+depends cdrtools
+depends cdrdao
+depends libmng
optional_depends "flac" "--enable-flac" "--disable-flac" \
- "for FLAC audio support" &&
+ "for FLAC audio support"
optional_depends "libmad" "--enable-mp3" "--disable-mp3" \
- "form MP3 audio support (must say 'y' to sox)" &&
+ "form MP3 audio support (must say 'y' to sox)"
optional_depends "libid3tag" "" "" \
- "for MP3 tag support" &&
+ "for MP3 tag support"
optional_depends "libvorbis" "--enable-ogg" "--disable-ogg" \
- "for OGG audio support (must say 'y' to sox)" &&
+ "for OGG audio support (must say 'y' to sox)"
-optional_depends "sox" "" "" "required for MP3 or OGG support" &&
+optional_depends "sox" "" "" "required for MP3 or OGG support"
optional_depends "dvd+rw-tools" "" "" "for DVD burning support"
diff --git a/chat/centericq/DEPENDS b/chat/centericq/DEPENDS
index e50d435..69a19cf 100644
--- a/chat/centericq/DEPENDS
+++ b/chat/centericq/DEPENDS
@@ -1,3 +1,3 @@
-depends ncurses &&
-depends openssl &&
+depends ncurses
+depends openssl
depends curl
diff --git a/chat/gnomeicu/DEPENDS b/chat/gnomeicu/DEPENDS
index a023485..84a8d15 100644
--- a/chat/gnomeicu/DEPENDS
+++ b/chat/gnomeicu/DEPENDS
@@ -1,2 +1,2 @@
-depends gnome-panel &&
+depends gnome-panel
depends gnet
diff --git a/chat/ickle/DEPENDS b/chat/ickle/DEPENDS
index 4ec2caf..a3fedf7 100644
--- a/chat/ickle/DEPENDS
+++ b/chat/ickle/DEPENDS
@@ -1,2 +1,2 @@
-depends gtkmm &&
-depends libicq2000
+depends gtkmm
+depends libicq2000
diff --git a/chat/icqnd/DEPENDS b/chat/icqnd/DEPENDS
index 61ae83d..1c6dc1c 100644
--- a/chat/icqnd/DEPENDS
+++ b/chat/icqnd/DEPENDS
@@ -1,2 +1,2 @@
-depends licq &&
+depends licq
depends gtk+-2
diff --git a/chat/ircd-hybrid/DEPENDS b/chat/ircd-hybrid/DEPENDS
index f527154..dfbb9ed 100644
--- a/chat/ircd-hybrid/DEPENDS
+++ b/chat/ircd-hybrid/DEPENDS
@@ -1,5 +1,5 @@
-depends flex &&
-depends bison &&
-optional_depends "openssl" "" "" "For SSL features" &&
-optional_depends "gettext" "" "" "For intl support" &&
-optional_depends "w3c-libwww" "" "" "For encrypted server passwords"
+depends flex
+depends bison
+optional_depends "openssl" "" "" "For SSL features"
+optional_depends "gettext" "" "" "For intl support"
+optional_depends "w3c-libwww" "" "" "For encrypted server passwords"
diff --git a/chat/irssi-otr/DEPENDS b/chat/irssi-otr/DEPENDS
index 5aa1650..8a05f6f 100644
--- a/chat/irssi-otr/DEPENDS
+++ b/chat/irssi-otr/DEPENDS
@@ -1,4 +1,4 @@
-depends irssi &&
-depends cmake &&
-depends libotr &&
+depends irssi
+depends cmake
+depends libotr
depends libgcrypt
diff --git a/chat/meanwhile/DEPENDS b/chat/meanwhile/DEPENDS
index bcfe26e..6c32f55 100644
--- a/chat/meanwhile/DEPENDS
+++ b/chat/meanwhile/DEPENDS
@@ -1,2 +1,2 @@
-depends gmp &&
+depends gmp
depends glib-2
diff --git a/chat/micq/DEPENDS b/chat/micq/DEPENDS
index d67e47e..4e6746d 100644
--- a/chat/micq/DEPENDS
+++ b/chat/micq/DEPENDS
@@ -1,3 +1,3 @@
-depends gnutls &&
-depends tcl &&
+depends gnutls
+depends tcl
depends openssl
diff --git a/chat/naim/DEPENDS b/chat/naim/DEPENDS
index ee25e54..d48fc66 100644
--- a/chat/naim/DEPENDS
+++ b/chat/naim/DEPENDS
@@ -1,2 +1,2 @@
-depends ncurses &&
+depends ncurses
depends automake
diff --git a/chat/silc-client/DEPENDS b/chat/silc-client/DEPENDS
index 58281b7..6f487dd 100644
--- a/chat/silc-client/DEPENDS
+++ b/chat/silc-client/DEPENDS
@@ -1,2 +1,2 @@
-depends perl &&
+depends perl
depends ncurses
diff --git a/crypto/mcrypt/DEPENDS b/crypto/mcrypt/DEPENDS
index 1e4a24c..2c67ad9 100644
--- a/crypto/mcrypt/DEPENDS
+++ b/crypto/mcrypt/DEPENDS
@@ -1,2 +1,2 @@
-depends mhash &&
+depends mhash
depends libmcrypt
diff --git a/devel/GUIlib/DEPENDS b/devel/GUIlib/DEPENDS
index 11d5462..deacd0c 100644
--- a/devel/GUIlib/DEPENDS
+++ b/devel/GUIlib/DEPENDS
@@ -1,3 +1,3 @@
-depends autoconf &&
-depends automake &&
+depends autoconf
+depends automake
depends SDL
diff --git a/devel/arch/DEPENDS b/devel/arch/DEPENDS
index ceda48e..d5126ad 100644
--- a/devel/arch/DEPENDS
+++ b/devel/arch/DEPENDS
@@ -1,8 +1,8 @@
-depends bash &&
-depends coreutils &&
-depends diffutils &&
-depends findutils &&
-depends grep &&
-depends make &&
-depends patch &&
+depends bash
+depends coreutils
+depends diffutils
+depends findutils
+depends grep
+depends make
+depends patch
depends tar
diff --git a/devel/autotoolset/DEPENDS b/devel/autotoolset/DEPENDS
index 8c6f23c..b12d2bd 100644
--- a/devel/autotoolset/DEPENDS
+++ b/devel/autotoolset/DEPENDS
@@ -1,4 +1,4 @@
-depends automake &&
-depends sharutils &&
+depends automake
+depends sharutils
optional_depends "emacs" "" "" "for gpl & gpl-copying commands in Emacs"
diff --git a/devel/bdb-ruby/DEPENDS b/devel/bdb-ruby/DEPENDS
index c7eb2f2..5f5513b 100644
--- a/devel/bdb-ruby/DEPENDS
+++ b/devel/bdb-ruby/DEPENDS
@@ -1,2 +1,2 @@
-depends ruby &&
+depends ruby
depends db
diff --git a/devel/cgdb/DEPENDS b/devel/cgdb/DEPENDS
index a093af3..72f7b32 100644
--- a/devel/cgdb/DEPENDS
+++ b/devel/cgdb/DEPENDS
@@ -1,2 +1,2 @@
-depends ncurses &&
+depends ncurses
depends gdb
diff --git a/devel/fam-ruby/DEPENDS b/devel/fam-ruby/DEPENDS
index 8c78f34..9819a5a 100644
--- a/devel/fam-ruby/DEPENDS
+++ b/devel/fam-ruby/DEPENDS
@@ -1,2 +1,2 @@
-depends ruby &&
-depends fam
+depends ruby
+depends fam
diff --git a/devel/ferite/DEPENDS b/devel/ferite/DEPENDS
index 39c0a66..68bba53 100644
--- a/devel/ferite/DEPENDS
+++ b/devel/ferite/DEPENDS
@@ -1,2 +1,2 @@
-depends libxml2 &&
+depends libxml2
depends pcre
diff --git a/devel/g-wrap/DEPENDS b/devel/g-wrap/DEPENDS
index bd1f037..1bc2908 100644
--- a/devel/g-wrap/DEPENDS
+++ b/devel/g-wrap/DEPENDS
@@ -1,2 +1,2 @@
-depends autoconf &&
+depends autoconf
depends slib
diff --git a/devel/glademm/DEPENDS b/devel/glademm/DEPENDS
index c42dbb7..b90d3f2 100644
--- a/devel/glademm/DEPENDS
+++ b/devel/glademm/DEPENDS
@@ -1,3 +1,3 @@
-depends gtkmm &&
-depends libgnomeuimm &&
+depends gtkmm
+depends libgnomeuimm
depends glade2
diff --git a/devel/gtranslator/DEPENDS b/devel/gtranslator/DEPENDS
index e523cae..d37511d 100644
--- a/devel/gtranslator/DEPENDS
+++ b/devel/gtranslator/DEPENDS
@@ -1,6 +1,6 @@
-depends gtkspell &&
-depends libxml2 &&
-depends libgnomeui &&
-depends gnome-vfs &&
-depends intltool &&
+depends gtkspell
+depends libxml2
+depends libgnomeui
+depends gnome-vfs
+depends intltool
depends scrollkeeper
diff --git a/devel/imlib2-ruby/DEPENDS b/devel/imlib2-ruby/DEPENDS
index abffb72..ea7c7f3 100644
--- a/devel/imlib2-ruby/DEPENDS
+++ b/devel/imlib2-ruby/DEPENDS
@@ -1,2 +1,2 @@
-depends ruby &&
+depends ruby
depends imlib2
diff --git a/devel/libbonobomm/DEPENDS b/devel/libbonobomm/DEPENDS
index 95a30f0..6e0b8b4 100644
--- a/devel/libbonobomm/DEPENDS
+++ b/devel/libbonobomm/DEPENDS
@@ -1,2 +1,2 @@
-depends libbonobo &&
+depends libbonobo
depends gconfmm
diff --git a/devel/libbonobouimm/DEPENDS b/devel/libbonobouimm/DEPENDS
index f2a9a86..44b91a0 100644
--- a/devel/libbonobouimm/DEPENDS
+++ b/devel/libbonobouimm/DEPENDS
@@ -1,2 +1,2 @@
-depends libbonoboui &&
+depends libbonoboui
depends libgnomemm
diff --git a/devel/metakit/DEPENDS b/devel/metakit/DEPENDS
index e9400a3..b4a3677 100644
--- a/devel/metakit/DEPENDS
+++ b/devel/metakit/DEPENDS
@@ -1,2 +1,2 @@
-optional_depends "Python" "--with-python=/usr" "" "for Mk4py extensions" &&
+optional_depends "Python" "--with-python=/usr" "" "for Mk4py extensions"
optional_depends "tcl" "--with-tcl=/usr/include/" "" "for Tcl support"
diff --git a/devel/orbitcpp/DEPENDS b/devel/orbitcpp/DEPENDS
index 2acfefe..2e37d0d 100644
--- a/devel/orbitcpp/DEPENDS
+++ b/devel/orbitcpp/DEPENDS
@@ -1,2 +1,2 @@
-depends ORBit2 &&
+depends ORBit2
depends gtkmm
diff --git a/devel/paragui/DEPENDS b/devel/paragui/DEPENDS
index 54fbae7..abdedfe 100644
--- a/devel/paragui/DEPENDS
+++ b/devel/paragui/DEPENDS
@@ -1,4 +1,4 @@
-depends freetype2 &&
-depends SDL_image &&
-depends expat &&
+depends freetype2
+depends SDL_image
+depends expat
depends physfs
diff --git a/devel/ruby-gnome2/DEPENDS b/devel/ruby-gnome2/DEPENDS
index 921187f..91e1b61 100644
--- a/devel/ruby-gnome2/DEPENDS
+++ b/devel/ruby-gnome2/DEPENDS
@@ -1,7 +1,7 @@
-depends ruby &&
-depends gtk+-2 &&
-depends libgnomeui &&
-depends libgnomeprintui &&
-depends gtksourceview &&
+depends ruby
+depends gtk+-2
+depends libgnomeui
+depends libgnomeprintui
+depends gtksourceview
depends gnome-panel
diff --git a/devel/ruby-gtk2/DEPENDS b/devel/ruby-gtk2/DEPENDS
index 19a6e8a..1c8e8d6 100644
--- a/devel/ruby-gtk2/DEPENDS
+++ b/devel/ruby-gtk2/DEPENDS
@@ -1,2 +1,2 @@
-depends ruby &&
+depends ruby
depends gtk+-2
diff --git a/devel/ruby-postgres/DEPENDS b/devel/ruby-postgres/DEPENDS
index c6eb021..2c84535 100644
--- a/devel/ruby-postgres/DEPENDS
+++ b/devel/ruby-postgres/DEPENDS
@@ -1,3 +1,3 @@
-depends ruby &&
+depends ruby
depends postgresql
diff --git a/devel/stgit/DEPENDS b/devel/stgit/DEPENDS
index dac99b2..3d20a0b 100644
--- a/devel/stgit/DEPENDS
+++ b/devel/stgit/DEPENDS
@@ -1,2 +1,2 @@
-depends git &&
+depends git
depends Python
diff --git a/devel/tig/DEPENDS b/devel/tig/DEPENDS
index f37ac88..28c40aa 100644
--- a/devel/tig/DEPENDS
+++ b/devel/tig/DEPENDS
@@ -1,2 +1,2 @@
-depends git &&
+depends git
depends ncurses
diff --git a/devel/xfdiff/DEPENDS b/devel/xfdiff/DEPENDS
index 0360037..3e84e60 100644
--- a/devel/xfdiff/DEPENDS
+++ b/devel/xfdiff/DEPENDS
@@ -1,2 +1,2 @@
-depends gtk+-2 &&
+depends gtk+-2
depends libtubo
diff --git a/distributed/distcc/DEPENDS b/distributed/distcc/DEPENDS
index 70c2675..44720a0 100644
--- a/distributed/distcc/DEPENDS
+++ b/distributed/distcc/DEPENDS
@@ -1,7 +1,7 @@
-depends popt &&
+depends popt
optional_depends gtk+-2 "--with-gtk" "" \
- "build the GTK+-2 based compile monitor" &&
+ "build the GTK+-2 based compile monitor"
optional_depends libgnomeui "--with-gnome" "" \
- "build the Gnome based compile monitor" &&
+ "build the Gnome based compile monitor"
optional_depends avahi "" "" "build zeroconf support"
diff --git a/distributed/nicotine/DEPENDS b/distributed/nicotine/DEPENDS
index a227235..5366cff 100644
--- a/distributed/nicotine/DEPENDS
+++ b/distributed/nicotine/DEPENDS
@@ -1,4 +1,4 @@
-depends pygtk &&
+depends pygtk
-optional_depends "pyvorbis" "" "" "for integrated OGG support" &&
+optional_depends "pyvorbis" "" "" "for integrated OGG support"
optional_depends "geoip-python" "" "" "for geographical user pin-pointing"
diff --git a/doc-tools/docbook-dsssl/DEPENDS b/doc-tools/docbook-dsssl/DEPENDS
index ad4c54f..3621109 100644
--- a/doc-tools/docbook-dsssl/DEPENDS
+++ b/doc-tools/docbook-dsssl/DEPENDS
@@ -1,2 +1,2 @@
-depends openjade &&
+depends openjade
depends docbook-sgml
diff --git a/doc-tools/jadetex/DEPENDS b/doc-tools/jadetex/DEPENDS
index 08de369..d6a5e31 100644
--- a/doc-tools/jadetex/DEPENDS
+++ b/doc-tools/jadetex/DEPENDS
@@ -1,2 +1,2 @@
-depends openjade &&
+depends openjade
depends teTeX
diff --git a/doc-tools/linuxdoc-tools/DEPENDS b/doc-tools/linuxdoc-tools/DEPENDS
index fe5c363..0337d5b 100644
--- a/doc-tools/linuxdoc-tools/DEPENDS
+++ b/doc-tools/linuxdoc-tools/DEPENDS
@@ -1,2 +1,2 @@
-depends opensp &&
+depends opensp
depends openjade
diff --git a/doc-tools/man/DEPENDS b/doc-tools/man/DEPENDS
index 7a125a7..cbd9e76 100644
--- a/doc-tools/man/DEPENDS
+++ b/doc-tools/man/DEPENDS
@@ -1,3 +1,3 @@
-depends groff &&
-depends gzip &&
+depends groff
+depends gzip
depends less
diff --git a/doc-tools/openjade/DEPENDS b/doc-tools/openjade/DEPENDS
index 5060f18..9a87438 100644
--- a/doc-tools/openjade/DEPENDS
+++ b/doc-tools/openjade/DEPENDS
@@ -1,2 +1,2 @@
-depends sgml-common &&
+depends sgml-common
depends opensp
diff --git a/doc-tools/pinfo/DEPENDS b/doc-tools/pinfo/DEPENDS
index 7401733..ffe1e16 100644
--- a/doc-tools/pinfo/DEPENDS
+++ b/doc-tools/pinfo/DEPENDS
@@ -1,2 +1,2 @@
-depends ncurses &&
+depends ncurses
depends bison
diff --git a/doc-tools/psgml/DEPENDS b/doc-tools/psgml/DEPENDS
index dcd0fc2..9856986 100644
--- a/doc-tools/psgml/DEPENDS
+++ b/doc-tools/psgml/DEPENDS
@@ -1,3 +1,3 @@
-depends sgml-common &&
+depends sgml-common
depends emacs
diff --git a/doc-tools/scrollkeeper/DEPENDS b/doc-tools/scrollkeeper/DEPENDS
index 3151b1d..aa0a2e2 100644
--- a/doc-tools/scrollkeeper/DEPENDS
+++ b/doc-tools/scrollkeeper/DEPENDS
@@ -1,3 +1,3 @@
-depends intltool &&
-depends xml-i18n-tools &&
+depends intltool
+depends xml-i18n-tools
depends docbook-xml
diff --git a/doc-tools/uTidylib/DEPENDS b/doc-tools/uTidylib/DEPENDS
index e9b2b47..2ea473b 100644
--- a/doc-tools/uTidylib/DEPENDS
+++ b/doc-tools/uTidylib/DEPENDS
@@ -1,3 +1,3 @@
-depends tidy &&
-depends Python &&
+depends tidy
+depends Python
depends unzip
diff --git a/editors/cooledit/DEPENDS b/editors/cooledit/DEPENDS
index 74e092e..096fa4c 100644
--- a/editors/cooledit/DEPENDS
+++ b/editors/cooledit/DEPENDS
@@ -1,3 +1,3 @@
-optional_depends "Python" "" "" "for writing extensions to Cooledit" &&
+optional_depends "Python" "" "" "for writing extensions to Cooledit"
optional_depends "aspell" "" "" "to enable spell checking feature"
diff --git a/editors/elvis/DEPENDS b/editors/elvis/DEPENDS
index 730d696..bf03c7c 100644
--- a/editors/elvis/DEPENDS
+++ b/editors/elvis/DEPENDS
@@ -1,2 +1,2 @@
-depends ncurses &&
+depends ncurses
optional_depends "%X" "" "" "Build elvis with x11 support"
diff --git a/editors/gtkspell/DEPENDS b/editors/gtkspell/DEPENDS
index dcdd103..aa12feb 100644
--- a/editors/gtkspell/DEPENDS
+++ b/editors/gtkspell/DEPENDS
@@ -1,3 +1,3 @@
-depends gtk+-2 &&
-depends aspell &&
+depends gtk+-2
+depends aspell
depends enchant
diff --git a/editors/jedit/DEPENDS b/editors/jedit/DEPENDS
index 4c14c04..7bb7942 100644
--- a/editors/jedit/DEPENDS
+++ b/editors/jedit/DEPENDS
@@ -1,3 +1,3 @@
-depends apache-ant &&
-depends docbook-xsl &&
+depends apache-ant
+depends docbook-xsl
depends docbook-xml
diff --git a/editors/nedit/DEPENDS b/editors/nedit/DEPENDS
index 6398c47..b62f301 100644
--- a/editors/nedit/DEPENDS
+++ b/editors/nedit/DEPENDS
@@ -1,5 +1,5 @@
# Don't add anymore lesstif apps in moonbase, openMotif is by FAR a more
# correct implementation. nedit works just fine with openMotif and lesstif conflicts
# with openMotif. lesstif is NOT as feature rich as openMotif.
-depends openMotif &&
+depends openMotif
depends bison
diff --git a/editors/scribes/DEPENDS b/editors/scribes/DEPENDS
index f0917c7..86ce281 100644
--- a/editors/scribes/DEPENDS
+++ b/editors/scribes/DEPENDS
@@ -1,6 +1,6 @@
-depends dbus &&
-depends yelp &&
-depends Python &&
-depends gnome-python &&
-depends gnome-python-extras &&
+depends dbus
+depends yelp
+depends Python
+depends gnome-python
+depends gnome-python-extras
depends gnome-python-desktop
diff --git a/filemanagers/filer/DEPENDS b/filemanagers/filer/DEPENDS
index f18aa09..910ad31 100644
--- a/filemanagers/filer/DEPENDS
+++ b/filemanagers/filer/DEPENDS
@@ -1,4 +1,4 @@
-depends File-DirWalk &&
-depends File-MimeInfo &&
-depends Stat-lsMode &&
+depends File-DirWalk
+depends File-MimeInfo
+depends Stat-lsMode
depends Gtk2-Perl
diff --git a/filemanagers/xffm-filemanager/DEPENDS b/filemanagers/xffm-filemanager/DEPENDS
index 99051ad..160875d 100644
--- a/filemanagers/xffm-filemanager/DEPENDS
+++ b/filemanagers/xffm-filemanager/DEPENDS
@@ -1,2 +1,2 @@
-depends xfce4-icon-theme &&
+depends xfce4-icon-theme
depends xffm-gui
diff --git a/filesys/tagsfs/DEPENDS b/filesys/tagsfs/DEPENDS
index 34b0bbe..6095c34 100644
--- a/filesys/tagsfs/DEPENDS
+++ b/filesys/tagsfs/DEPENDS
@@ -1,4 +1,4 @@
-depends MP3-Tag &&
-depends Ogg-Vorbis-Header &&
-depends DBD-SQLite &&
+depends MP3-Tag
+depends Ogg-Vorbis-Header
+depends DBD-SQLite
depends Fuse
diff --git a/filesys/xfsdump/DEPENDS b/filesys/xfsdump/DEPENDS
index 6d086ae..81c0561 100644
--- a/filesys/xfsdump/DEPENDS
+++ b/filesys/xfsdump/DEPENDS
@@ -1,2 +1,2 @@
-depends attr &&
+depends attr
depends dmapi
diff --git a/ftp/d4x/DEPENDS b/ftp/d4x/DEPENDS
index 89713f2..b30e16d 100644
--- a/ftp/d4x/DEPENDS
+++ b/ftp/d4x/DEPENDS
@@ -1,5 +1,5 @@
-depends gtk+-2 &&
-depends boost &&
+depends gtk+-2
+depends boost
-optional_depends "gettext" "" "--disable-nls" "for NLS support" &&
+optional_depends "gettext" "" "--disable-nls" "for NLS support"
optional_depends "esound" "" "--disable-esd" "for esound support"
diff --git a/ftp/dc_gui/DEPENDS b/ftp/dc_gui/DEPENDS
index 1c71aa3..d596eb2 100644
--- a/ftp/dc_gui/DEPENDS
+++ b/ftp/dc_gui/DEPENDS
@@ -1,3 +1,3 @@
-depends dctc &&
-depends gtk+-2 &&
+depends dctc
+depends gtk+-2
depends libgnomeui
diff --git a/ftp/dctc/DEPENDS b/ftp/dctc/DEPENDS
index 4332c2b..6f971b8 100644
--- a/ftp/dctc/DEPENDS
+++ b/ftp/dctc/DEPENDS
@@ -1,2 +1,2 @@
-depends glib-2 &&
+depends glib-2
depends db
diff --git a/ftp/giftui/DEPENDS b/ftp/giftui/DEPENDS
index 18e0aa0..93184b6 100644
--- a/ftp/giftui/DEPENDS
+++ b/ftp/giftui/DEPENDS
@@ -1,2 +1,2 @@
-depends gtk+-2 &&
+depends gtk+-2
depends gift
diff --git a/games/CriticalMass/DEPENDS b/games/CriticalMass/DEPENDS
index 6134e85..60e2f30 100644
--- a/games/CriticalMass/DEPENDS
+++ b/games/CriticalMass/DEPENDS
@@ -1,2 +1,2 @@
-depends SDL_image &&
+depends SDL_image
depends SDL_mixer
diff --git a/games/TORCS/DEPENDS b/games/TORCS/DEPENDS
index 18fab0e..538d1d5 100644
--- a/games/TORCS/DEPENDS
+++ b/games/TORCS/DEPENDS
@@ -1,3 +1,3 @@
-depends plib &&
-depends %GLUT &&
+depends plib
+depends %GLUT
depends libpng
diff --git a/games/armagetron/DEPENDS b/games/armagetron/DEPENDS
index ca2296e..0ad5c84 100644
--- a/games/armagetron/DEPENDS
+++ b/games/armagetron/DEPENDS
@@ -1,2 +1,2 @@
-depends SDL_mixer &&
+depends SDL_mixer
depends SDL_image
diff --git a/games/bzedit2/DEPENDS b/games/bzedit2/DEPENDS
index ec1185b..844dd97 100644
--- a/games/bzedit2/DEPENDS
+++ b/games/bzedit2/DEPENDS
@@ -1,3 +1,3 @@
-depends gtkglarea2 &&
-depends gtk+-2 &&
+depends gtkglarea2
+depends gtk+-2
depends libgnome
diff --git a/games/castle-combat/DEPENDS b/games/castle-combat/DEPENDS
index 7dec88d..47c12cc 100644
--- a/games/castle-combat/DEPENDS
+++ b/games/castle-combat/DEPENDS
@@ -1,3 +1,3 @@
-depends SDL_mixer &&
-depends SDL_net &&
+depends SDL_mixer
+depends SDL_net
depends libpng
diff --git a/games/circuslinux/DEPENDS b/games/circuslinux/DEPENDS
index 15289cc..0a918d1 100644
--- a/games/circuslinux/DEPENDS
+++ b/games/circuslinux/DEPENDS
@@ -1,3 +1,3 @@
-depends SDL_image &&
+depends SDL_image
depends SDL_mixer
diff --git a/games/crossfire-client/DEPENDS b/games/crossfire-client/DEPENDS
index 4659a31..381d07f 100644
--- a/games/crossfire-client/DEPENDS
+++ b/games/crossfire-client/DEPENDS
@@ -1,4 +1,4 @@
-depends libpng &&
+depends libpng
-optional_depends "SDL_image" "" "--disable-sdl" "for SDL support" &&
+optional_depends "SDL_image" "" "--disable-sdl" "for SDL support"
optional_depends "gtk+-2" "" "--disable-gtk" "for gtk client"
diff --git a/games/csmash/DEPENDS b/games/csmash/DEPENDS
index 34be057..82b4bd7 100644
--- a/games/csmash/DEPENDS
+++ b/games/csmash/DEPENDS
@@ -1,5 +1,5 @@
-depends gtk+-2 &&
-depends %GLUT &&
-depends SDL_image &&
-depends SDL_mixer &&
+depends gtk+-2
+depends %GLUT
+depends SDL_image
+depends SDL_mixer
depends libvorbis
diff --git a/games/epiar/DEPENDS b/games/epiar/DEPENDS
index 9f29af5..24436b8 100644
--- a/games/epiar/DEPENDS
+++ b/games/epiar/DEPENDS
@@ -1,5 +1,5 @@
-depends SDL_ttf &&
-depends SDL_image &&
-depends libvorbis &&
-depends openal &&
+depends SDL_ttf
+depends SDL_image
+depends libvorbis
+depends openal
depends unzip
diff --git a/games/exult/DEPENDS b/games/exult/DEPENDS
index 5c0ea76..f72d28e 100644
--- a/games/exult/DEPENDS
+++ b/games/exult/DEPENDS
@@ -1,3 +1,3 @@
-depends zlib &&
-depends SDL_mixer &&
+depends zlib
+depends SDL_mixer
depends unzip
diff --git a/games/falconseye/DEPENDS b/games/falconseye/DEPENDS
index fca3280..8f7d8f2 100644
--- a/games/falconseye/DEPENDS
+++ b/games/falconseye/DEPENDS
@@ -1,2 +1,2 @@
-depends SDL &&
+depends SDL
depends unzip
diff --git a/games/freedroid/DEPENDS b/games/freedroid/DEPENDS
index c2e92d0..88f8cc7 100644
--- a/games/freedroid/DEPENDS
+++ b/games/freedroid/DEPENDS
@@ -1,4 +1,4 @@
-depends SDL_image &&
-depends SDL_net &&
+depends SDL_image
+depends SDL_net
optional_depends "SDL_mixer" "" "" "for Audio support"
diff --git a/games/frozen-bubble/DEPENDS b/games/frozen-bubble/DEPENDS
index 2f516b6..63e2953 100644
--- a/games/frozen-bubble/DEPENDS
+++ b/games/frozen-bubble/DEPENDS
@@ -1,5 +1,5 @@
-depends SDL_image &&
-depends SDL_mixer &&
-depends SDL_perl &&
-depends SDL_Pango &&
+depends SDL_image
+depends SDL_mixer
+depends SDL_perl
+depends SDL_Pango
depends Locale-gettext
diff --git a/games/glaxium/DEPENDS b/games/glaxium/DEPENDS
index dc517fd..707a197 100644
--- a/games/glaxium/DEPENDS
+++ b/games/glaxium/DEPENDS
@@ -1,2 +1,2 @@
-depends %GLUT &&
+depends %GLUT
depends SDL_mixer
diff --git a/games/gltron/DEPENDS b/games/gltron/DEPENDS
index 8df9d34..b939d5f 100644
--- a/games/gltron/DEPENDS
+++ b/games/gltron/DEPENDS
@@ -1,2 +1,2 @@
-depends %GLUT &&
+depends %GLUT
depends SDL_sound
diff --git a/games/gnuchess/DEPENDS b/games/gnuchess/DEPENDS
index 809a12d..d9f9fbc 100644
--- a/games/gnuchess/DEPENDS
+++ b/games/gnuchess/DEPENDS
@@ -1,3 +1,3 @@
-depends ncurses &&
+depends ncurses
optional_depends "xboard" "" "" "to use with an X based board."
diff --git a/games/jfduke3d/DEPENDS b/games/jfduke3d/DEPENDS
index 66d68ab..24e32c8 100644
--- a/games/jfduke3d/DEPENDS
+++ b/games/jfduke3d/DEPENDS
@@ -1,5 +1,5 @@
-depends nasm &&
-depends atk &&
-depends pango &&
-depends SDL_mixer &&
+depends nasm
+depends atk
+depends pango
+depends SDL_mixer
depends fmodapi
diff --git a/games/lgeneral/DEPENDS b/games/lgeneral/DEPENDS
index b13b4f8..6d81207 100644
--- a/games/lgeneral/DEPENDS
+++ b/games/lgeneral/DEPENDS
@@ -1,4 +1,4 @@
-depends SDL &&
+depends SDL
-optional_depends "SDL_mixer" "" "" "for sound support." &&
+optional_depends "SDL_mixer" "" "" "for sound support."
optional_depends "lgeneral-data" "" "" "for preconverted game data."
\ No newline at end of file
diff --git a/games/luola/DEPENDS b/games/luola/DEPENDS
index 4a61798..71c0ab3 100644
--- a/games/luola/DEPENDS
+++ b/games/luola/DEPENDS
@@ -1,14 +1,14 @@
-depends SDL_image &&
+depends SDL_image
optional_depends SDL_ttf \
"" \
"--disable-truetype" \
- "for TrueType fonts" &&
+ "for TrueType fonts"
optional_depends SDL_mixer \
"--enable-sound" \
"--disable-sound" \
- "for sound support" &&
+ "for sound support"
optional_depends SDL_gfx \
"--enable-sdl-gfx" \
diff --git a/games/netwalk/DEPENDS b/games/netwalk/DEPENDS
index bdda5d4..2fa8636 100644
--- a/games/netwalk/DEPENDS
+++ b/games/netwalk/DEPENDS
@@ -1,2 +1,2 @@
-depends SDL &&
+depends SDL
depends SDL_ttf
diff --git a/games/openmortal/DEPENDS b/games/openmortal/DEPENDS
index 72d0ad4..336bea9 100644
--- a/games/openmortal/DEPENDS
+++ b/games/openmortal/DEPENDS
@@ -1,4 +1,4 @@
-depends perl &&
-depends SDL_image &&
-depends SDL_mixer &&
+depends perl
+depends SDL_image
+depends SDL_mixer
depends freetype2
diff --git a/games/penguin-command/DEPENDS b/games/penguin-command/DEPENDS
index c3fb0d1..8ca5396 100644
--- a/games/penguin-command/DEPENDS
+++ b/games/penguin-command/DEPENDS
@@ -1,2 +1,2 @@
-depends libpng &&
+depends libpng
depends SDL_mixer
diff --git a/games/pysol-music/DEPENDS b/games/pysol-music/DEPENDS
index 6ca8e40..ec9732c 100644
--- a/games/pysol-music/DEPENDS
+++ b/games/pysol-music/DEPENDS
@@ -1,2 +1,2 @@
-depends pysol &&
+depends pysol
depends pysol-sound-server
diff --git a/games/pysol-sound-server/DEPENDS b/games/pysol-sound-server/DEPENDS
index cd31f31..a2f6b3e 100644
--- a/games/pysol-sound-server/DEPENDS
+++ b/games/pysol-sound-server/DEPENDS
@@ -1,2 +1,2 @@
-depends Python &&
+depends Python
depends smpeg
diff --git a/games/pysol/DEPENDS b/games/pysol/DEPENDS
index 468eb61..fe36a2e 100644
--- a/games/pysol/DEPENDS
+++ b/games/pysol/DEPENDS
@@ -1,4 +1,4 @@
-depends tk &&
-depends Python &&
+depends tk
+depends Python
optional_depends "pysol-sound-server" "" "" "to enable sound"
diff --git a/games/rockdodger/DEPENDS b/games/rockdodger/DEPENDS
index 6134e85..60e2f30 100644
--- a/games/rockdodger/DEPENDS
+++ b/games/rockdodger/DEPENDS
@@ -1,2 +1,2 @@
-depends SDL_image &&
+depends SDL_image
depends SDL_mixer
diff --git a/games/toppler/DEPENDS b/games/toppler/DEPENDS
index d0f655c..135252e 100644
--- a/games/toppler/DEPENDS
+++ b/games/toppler/DEPENDS
@@ -1,4 +1,4 @@
-depends SDL_image &&
-depends SDL_mixer &&
+depends SDL_image
+depends SDL_mixer
optional_depends "gettext" "--enable-nls" "--disable-nls" "for NLS support"
diff --git a/games/trackballs/DEPENDS b/games/trackballs/DEPENDS
index 7f8405b..57addec 100644
--- a/games/trackballs/DEPENDS
+++ b/games/trackballs/DEPENDS
@@ -1,5 +1,5 @@
-depends guile &&
-depends SDL_ttf &&
-depends SDL_image &&
+depends guile
+depends SDL_ttf
+depends SDL_image
depends SDL_mixer
diff --git a/games/tuxnes/DEPENDS b/games/tuxnes/DEPENDS
index 0988e6e..6db1635 100644
--- a/games/tuxnes/DEPENDS
+++ b/games/tuxnes/DEPENDS
@@ -1,4 +1,4 @@
#the depends below are non-existent at the moment, 20020710, kongar
-#optional_depends "gtuxnes" "" "" "for an easy GUI fronted to tuxnes" &&
+#optional_depends "gtuxnes" "" "" "for an easy GUI fronted to tuxnes"
#optional_depends "nes_roms" "" "" "for hours of amazing gameplay in nes rom files"
diff --git a/games/tuxpuck/DEPENDS b/games/tuxpuck/DEPENDS
index b60b97f..fb21c60 100644
--- a/games/tuxpuck/DEPENDS
+++ b/games/tuxpuck/DEPENDS
@@ -1,3 +1,3 @@
-depends freetype2 &&
-depends libvorbis &&
+depends freetype2
+depends libvorbis
depends SDL
diff --git a/games/vectoroids/DEPENDS b/games/vectoroids/DEPENDS
index 6134e85..60e2f30 100644
--- a/games/vectoroids/DEPENDS
+++ b/games/vectoroids/DEPENDS
@@ -1,2 +1,2 @@
-depends SDL_image &&
+depends SDL_image
depends SDL_mixer
diff --git a/games/xqf/DEPENDS b/games/xqf/DEPENDS
index b1b6b82..63895f1 100644
--- a/games/xqf/DEPENDS
+++ b/games/xqf/DEPENDS
@@ -1,4 +1,4 @@
-depends qstat &&
-depends gtk+-2 &&
+depends qstat
+depends gtk+-2
optional_depends "geoip" "" "" "for IP-to-country association"
diff --git a/games/xtux/DEPENDS b/games/xtux/DEPENDS
index 28fc156..67db068 100644
--- a/games/xtux/DEPENDS
+++ b/games/xtux/DEPENDS
@@ -1,2 +1,2 @@
-optional_depends "libggz" "" "" "for ggz-client support" &&
+optional_depends "libggz" "" "" "for ggz-client support"
optional_depends "ggz-server" "" "" "for ggz-server support"
diff --git a/gnome2/applets/contact-lookup-applet/DEPENDS b/gnome2/applets/contact-lookup-applet/DEPENDS
index 65279ba..a5f46d0 100644
--- a/gnome2/applets/contact-lookup-applet/DEPENDS
+++ b/gnome2/applets/contact-lookup-applet/DEPENDS
@@ -1,2 +1,2 @@
-depends evolution-data-server &&
-depends gnome-panel
+depends evolution-data-server
+depends gnome-panel
diff --git a/gnome2/applets/gnome-blog/DEPENDS b/gnome2/applets/gnome-blog/DEPENDS
index c83ea78..2508305 100644
--- a/gnome2/applets/gnome-blog/DEPENDS
+++ b/gnome2/applets/gnome-blog/DEPENDS
@@ -1,2 +1,2 @@
-depends pygtk &&
+depends pygtk
depends gnome-panel
diff --git a/gnome2/applets/grandr_applet/DEPENDS b/gnome2/applets/grandr_applet/DEPENDS
index 08bf011..fbd1588 100644
--- a/gnome2/applets/grandr_applet/DEPENDS
+++ b/gnome2/applets/grandr_applet/DEPENDS
@@ -1,2 +1,2 @@
-depends gnome-panel &&
+depends gnome-panel
depends libglade
diff --git a/gnome2/applets/netspeed_applet/DEPENDS b/gnome2/applets/netspeed_applet/DEPENDS
index 749c504..26c6e80 100644
--- a/gnome2/applets/netspeed_applet/DEPENDS
+++ b/gnome2/applets/netspeed_applet/DEPENDS
@@ -1,3 +1,3 @@
-depends intltool &&
-depends gnome-panel &&
+depends intltool
+depends gnome-panel
depends libgtop
diff --git a/gnome2/applets/quick-lounge-applet/DEPENDS b/gnome2/applets/quick-lounge-applet/DEPENDS
index 08bf011..fbd1588 100644
--- a/gnome2/applets/quick-lounge-applet/DEPENDS
+++ b/gnome2/applets/quick-lounge-applet/DEPENDS
@@ -1,2 +1,2 @@
-depends gnome-panel &&
+depends gnome-panel
depends libglade
diff --git a/gnome2/applets/teatime/DEPENDS b/gnome2/applets/teatime/DEPENDS
index 231bf17..771e5c6 100644
--- a/gnome2/applets/teatime/DEPENDS
+++ b/gnome2/applets/teatime/DEPENDS
@@ -1,2 +1,2 @@
-depends gnome-panel &&
+depends gnome-panel
depends gstreamer-10
diff --git a/gnome2/apps/conglomerate/DEPENDS b/gnome2/apps/conglomerate/DEPENDS
index be5cc8b..c3119e5 100644
--- a/gnome2/apps/conglomerate/DEPENDS
+++ b/gnome2/apps/conglomerate/DEPENDS
@@ -1,2 +1,2 @@
-depends docbook-xsl &&
+depends docbook-xsl
depends libgnomeui
diff --git a/gnome2/apps/diacanvas2/DEPENDS b/gnome2/apps/diacanvas2/DEPENDS
index 959491a..90e3c24 100644
--- a/gnome2/apps/diacanvas2/DEPENDS
+++ b/gnome2/apps/diacanvas2/DEPENDS
@@ -1,2 +1,2 @@
-depends libgnomecanvas &&
-depends libgnomeprintui
+depends libgnomecanvas
+depends libgnomeprintui
diff --git a/gnome2/apps/gnome-btdownload/DEPENDS b/gnome2/apps/gnome-btdownload/DEPENDS
index cc550ae..59a88ee 100644
--- a/gnome2/apps/gnome-btdownload/DEPENDS
+++ b/gnome2/apps/gnome-btdownload/DEPENDS
@@ -1,2 +1,2 @@
-depends BitTorrent &&
+depends BitTorrent
depends gnome-python
diff --git a/gnome2/apps/gnomesu/DEPENDS b/gnome2/apps/gnomesu/DEPENDS
index 234a7ac..edf504d 100644
--- a/gnome2/apps/gnomesu/DEPENDS
+++ b/gnome2/apps/gnomesu/DEPENDS
@@ -1,2 +1,2 @@
-depends libzvt &&
+depends libzvt
depends libgnomeui
diff --git a/gnome2/apps/gramps/DEPENDS b/gnome2/apps/gramps/DEPENDS
index 1e8f285..ef2fc0c 100644
--- a/gnome2/apps/gramps/DEPENDS
+++ b/gnome2/apps/gramps/DEPENDS
@@ -1,3 +1,3 @@
-depends gnome-python &&
-depends pil &&
-depends reportlab
+depends gnome-python
+depends pil
+depends reportlab
diff --git a/gnome2/apps/katoob/DEPENDS b/gnome2/apps/katoob/DEPENDS
index 31ef844..3d2f5e9 100644
--- a/gnome2/apps/katoob/DEPENDS
+++ b/gnome2/apps/katoob/DEPENDS
@@ -1,9 +1,9 @@
-depends gtkmm &&
+depends gtkmm
optional_depends "gtkspell" \
"--enable-spell" \
"" \
- "for spell ckecking support" &&
+ "for spell ckecking support"
optional_depends "dbus" \
"--enable-dbus" \
diff --git a/gnome2/core/gDesklets/DEPENDS b/gnome2/core/gDesklets/DEPENDS
index 38dcaff..80f9f36 100644
--- a/gnome2/core/gDesklets/DEPENDS
+++ b/gnome2/core/gDesklets/DEPENDS
@@ -1,2 +1,2 @@
-depends gnome-python &&
+depends gnome-python
depends swig
diff --git a/graphics/GUatu/DEPENDS b/graphics/GUatu/DEPENDS
index 7682f7d..3705022 100644
--- a/graphics/GUatu/DEPENDS
+++ b/graphics/GUatu/DEPENDS
@@ -1,4 +1,4 @@
-depends gtkglext &&
-depends unrar &&
+depends gtkglext
+depends unrar
depends unzip
diff --git a/graphics/SDL_Pango/DEPENDS b/graphics/SDL_Pango/DEPENDS
index 4400a29..c5afd47 100644
--- a/graphics/SDL_Pango/DEPENDS
+++ b/graphics/SDL_Pango/DEPENDS
@@ -1,2 +1,2 @@
-depends SDL &&
+depends SDL
depends pango
diff --git a/graphics/SDL_ttf/DEPENDS b/graphics/SDL_ttf/DEPENDS
index 972d180..9894082 100644
--- a/graphics/SDL_ttf/DEPENDS
+++ b/graphics/SDL_ttf/DEPENDS
@@ -1,2 +1,2 @@
-depends SDL &&
+depends SDL
depends freetype2
diff --git a/graphics/aewan/DEPENDS b/graphics/aewan/DEPENDS
index a04d700..14ae9b0 100644
--- a/graphics/aewan/DEPENDS
+++ b/graphics/aewan/DEPENDS
@@ -1,2 +1,2 @@
-depends zlib &&
+depends zlib
depends ncurses
diff --git a/graphics/autopano-sift/DEPENDS b/graphics/autopano-sift/DEPENDS
index 9d52d8f..cb4017c 100644
--- a/graphics/autopano-sift/DEPENDS
+++ b/graphics/autopano-sift/DEPENDS
@@ -1,3 +1,3 @@
-depends mono &&
-depends gtk-sharp &&
+depends mono
+depends gtk-sharp
depends libgdiplus
diff --git a/graphics/gliv/DEPENDS b/graphics/gliv/DEPENDS
index 665b36d..c9456ee 100644
--- a/graphics/gliv/DEPENDS
+++ b/graphics/gliv/DEPENDS
@@ -1,2 +1,2 @@
-depends gtk+-2 &&
+depends gtk+-2
depends gtkglext
diff --git a/graphics/povray/DEPENDS b/graphics/povray/DEPENDS
index 4235301..d34c531 100644
--- a/graphics/povray/DEPENDS
+++ b/graphics/povray/DEPENDS
@@ -1,3 +1,3 @@
-optional_depends "libpng" "" "" "PNG support" &&
-optional_depends "%JPEG" "" "" "JPEG support" &&
-optional_depends "tiff" "" "" "TIFF support"
+optional_depends "libpng" "" "" "PNG support"
+optional_depends "%JPEG" "" "" "JPEG support"
+optional_depends "tiff" "" "" "TIFF support"
diff --git a/graphics/skencil/DEPENDS b/graphics/skencil/DEPENDS
index 4988265..77ecca4 100644
--- a/graphics/skencil/DEPENDS
+++ b/graphics/skencil/DEPENDS
@@ -1,3 +1,3 @@
-depends tk &&
-depends pil &&
+depends tk
+depends pil
optional_depends "PyXML" "" "" "Adds SVG Import filter"
diff --git a/graphics/truevision/DEPENDS b/graphics/truevision/DEPENDS
index cf0b208..957c042 100644
--- a/graphics/truevision/DEPENDS
+++ b/graphics/truevision/DEPENDS
@@ -1,4 +1,4 @@
-depends gtkglext &&
-depends gtk+-2 &&
-depends zlib &&
+depends gtkglext
+depends gtk+-2
+depends zlib
depends povray
diff --git a/ham/xlog/DEPENDS b/ham/xlog/DEPENDS
index 34eb087..a872576 100644
--- a/ham/xlog/DEPENDS
+++ b/ham/xlog/DEPENDS
@@ -1,3 +1,3 @@
-depends gtk+-2 &&
-depends libgnomeprint &&
+depends gtk+-2
+depends libgnomeprint
depends teTeX
diff --git a/kde4/utils/qimageblitz/DEPENDS b/kde4/utils/qimageblitz/DEPENDS
index fb97c4f..a67e7a8 100644
--- a/kde4/utils/qimageblitz/DEPENDS
+++ b/kde4/utils/qimageblitz/DEPENDS
@@ -1,2 +1,2 @@
-depends cmake &&
+depends cmake
depends qt4
diff --git a/libs/cdk/DEPENDS b/libs/cdk/DEPENDS
index f471472..d866f19 100644
--- a/libs/cdk/DEPENDS
+++ b/libs/cdk/DEPENDS
@@ -1,4 +1,4 @@
-depends ncurses &&
+depends ncurses
optional_depends "%X" "--with-x" "" "use the X Window System"
diff --git a/libs/esdl/DEPENDS b/libs/esdl/DEPENDS
index be4ccb7..a45b8c8 100644
--- a/libs/esdl/DEPENDS
+++ b/libs/esdl/DEPENDS
@@ -1,2 +1,2 @@
-depends SDL &&
+depends SDL
depends erlang
diff --git a/libs/f2py/DEPENDS b/libs/f2py/DEPENDS
index 8fd993e..763d7ef 100644
--- a/libs/f2py/DEPENDS
+++ b/libs/f2py/DEPENDS
@@ -1,2 +1,2 @@
-depends Python &&
+depends Python
depends numpy
diff --git a/libs/librep/DEPENDS b/libs/librep/DEPENDS
index 409cad5..039259f 100644
--- a/libs/librep/DEPENDS
+++ b/libs/librep/DEPENDS
@@ -1,2 +1,2 @@
-depends gmp &&
+depends gmp
depends gdbm
diff --git a/libs/libsexy/DEPENDS b/libs/libsexy/DEPENDS
index d2ba747..0770a58 100644
--- a/libs/libsexy/DEPENDS
+++ b/libs/libsexy/DEPENDS
@@ -1,3 +1,3 @@
-depends gtk+-2 &&
+depends gtk+-2
optional_depends "iso-codes" "" "" "for extra internationalization support"
diff --git a/libs/libxffm/DEPENDS b/libs/libxffm/DEPENDS
index b10cd40..b11e740 100644
--- a/libs/libxffm/DEPENDS
+++ b/libs/libxffm/DEPENDS
@@ -1,5 +1,5 @@
-depends gtk+-2 &&
-depends libxml2 &&
-depends dbh &&
-depends libtubo &&
+depends gtk+-2
+depends libxml2
+depends dbh
+depends libtubo
depends librsvg
diff --git a/libs/newt-perl/DEPENDS b/libs/newt-perl/DEPENDS
index f6395cc..2111340 100644
--- a/libs/newt-perl/DEPENDS
+++ b/libs/newt-perl/DEPENDS
@@ -1,2 +1,2 @@
-depends newt &&
+depends newt
depends perl
diff --git a/libs/reportlab/DEPENDS b/libs/reportlab/DEPENDS
index 6caa774..2a253c2 100644
--- a/libs/reportlab/DEPENDS
+++ b/libs/reportlab/DEPENDS
@@ -1,4 +1,4 @@
-depends Python &&
+depends Python
-optional_depends "pil" "" "" "work with bitmaps" &&
+optional_depends "pil" "" "" "work with bitmaps"
optional_depends "zlib" "" "" "to produce compressed PDFs"
diff --git a/libs/roadrunner/DEPENDS b/libs/roadrunner/DEPENDS
index 03909f3..a713c9f 100644
--- a/libs/roadrunner/DEPENDS
+++ b/libs/roadrunner/DEPENDS
@@ -1,2 +1,2 @@
-depends glib-2 &&
+depends glib-2
depends libxml2
diff --git a/mail/drac/DEPENDS b/mail/drac/DEPENDS
index a87d070..7eaa5d6 100644
--- a/mail/drac/DEPENDS
+++ b/mail/drac/DEPENDS
@@ -1,2 +1,2 @@
-depends portmap &&
+depends portmap
depends db
diff --git a/mail/elm/DEPENDS b/mail/elm/DEPENDS
index beb8a16..c6f90ed 100644
--- a/mail/elm/DEPENDS
+++ b/mail/elm/DEPENDS
@@ -1,2 +1,2 @@
-depends metamail &&
+depends metamail
depends mailx
diff --git a/mail/embrace/DEPENDS b/mail/embrace/DEPENDS
index 279cb96..ed4f9e7 100644
--- a/mail/embrace/DEPENDS
+++ b/mail/embrace/DEPENDS
@@ -1,2 +1,2 @@
-depends esmart-svn &&
+depends esmart-svn
depends libtool
diff --git a/mail/gnu-pop3d/DEPENDS b/mail/gnu-pop3d/DEPENDS
index 97fce89..16e8738 100644
--- a/mail/gnu-pop3d/DEPENDS
+++ b/mail/gnu-pop3d/DEPENDS
@@ -1,2 +1,2 @@
-depends procmail &&
+depends procmail
depends Linux-PAM
diff --git a/mail/mailcrypt/DEPENDS b/mail/mailcrypt/DEPENDS
index 9a37930..5969069 100644
--- a/mail/mailcrypt/DEPENDS
+++ b/mail/mailcrypt/DEPENDS
@@ -1,2 +1,2 @@
-depends emacs &&
+depends emacs
depends gnupg
diff --git a/mail/mutt/DEPENDS b/mail/mutt/DEPENDS
index 1953843..8a094ca 100644
--- a/mail/mutt/DEPENDS
+++ b/mail/mutt/DEPENDS
@@ -1,3 +1,3 @@
-depends ncurses &&
-optional_depends "ncursesw" "" "" "to enable multibyte character support" &&
+depends ncurses
+optional_depends "ncursesw" "" "" "to enable multibyte character support"
optional_depends "openssl" "--with-ssl" "" "to enable ssl support for pop/imap"
diff --git a/mail/pop-before-smtp/DEPENDS b/mail/pop-before-smtp/DEPENDS
index 933fc80..76140de 100644
--- a/mail/pop-before-smtp/DEPENDS
+++ b/mail/pop-before-smtp/DEPENDS
@@ -1,3 +1,3 @@
-depends File-Tail &&
-depends TimeDate &&
+depends File-Tail
+depends TimeDate
depends Net-Netmask
diff --git a/mail/qpopper3/DEPENDS b/mail/qpopper3/DEPENDS
index f764ac9..213b9ca 100644
--- a/mail/qpopper3/DEPENDS
+++ b/mail/qpopper3/DEPENDS
@@ -1,3 +1,3 @@
-depends exim &&
-depends Linux-PAM &&
+depends exim
+depends Linux-PAM
depends mysql
diff --git a/mail/teapop/DEPENDS b/mail/teapop/DEPENDS
index c5c8d2b..7f62a1d 100644
--- a/mail/teapop/DEPENDS
+++ b/mail/teapop/DEPENDS
@@ -1,12 +1,12 @@
optional_depends "postgresql" \
"--with-pgsql=/usr" \
"" \
- "for Postgres support" &&
+ "for Postgres support"
optional_depends "mysql" \
"--with-mysql=/usr" \
"" \
- "for mysql support" &&
+ "for mysql support"
optional_depends "drac" \
"--with-drac=/usr \
diff --git a/mail/tkrat/DEPENDS b/mail/tkrat/DEPENDS
index 2b026d1..de6a858 100644
--- a/mail/tkrat/DEPENDS
+++ b/mail/tkrat/DEPENDS
@@ -1,3 +1,3 @@
-depends tk &&
+depends tk
optional_depends "gnupg" "" "" "for encryption support"
diff --git a/net/RCon/DEPENDS b/net/RCon/DEPENDS
index 59df468..45dd4c5 100644
--- a/net/RCon/DEPENDS
+++ b/net/RCon/DEPENDS
@@ -1,2 +1,2 @@
-depends perl-tk &&
+depends perl-tk
depends rdesktop
diff --git a/net/SDL_net/DEPENDS b/net/SDL_net/DEPENDS
index 7c775de..a28ed96 100644
--- a/net/SDL_net/DEPENDS
+++ b/net/SDL_net/DEPENDS
@@ -1,6 +1,6 @@
-depends automake &&
-depends libtool &&
-depends SDL &&
+depends automake
+depends libtool
+depends SDL
optional_depends "GUIlib" \
"--enable-gui" \
diff --git a/net/adns-python/DEPENDS b/net/adns-python/DEPENDS
index 76b0848..66c79c3 100644
--- a/net/adns-python/DEPENDS
+++ b/net/adns-python/DEPENDS
@@ -1,2 +1,2 @@
-depends Python &&
+depends Python
depends adns
diff --git a/net/bw-whois/DEPENDS b/net/bw-whois/DEPENDS
index 3c997e7..43095c7 100644
--- a/net/bw-whois/DEPENDS
+++ b/net/bw-whois/DEPENDS
@@ -1,2 +1,2 @@
-depends perl &&
+depends perl
optional_depends "mysql" "" "" "if you want to use mysql with bw-whois"
diff --git a/net/ettercap/DEPENDS b/net/ettercap/DEPENDS
index b96a3ce..24f131d 100644
--- a/net/ettercap/DEPENDS
+++ b/net/ettercap/DEPENDS
@@ -1,4 +1,4 @@
-depends ncurses &&
-depends openssl &&
-depends libpcap &&
+depends ncurses
+depends openssl
+depends libpcap
depends libnet
diff --git a/net/fusesmb/DEPENDS b/net/fusesmb/DEPENDS
index 32735dd..881661d 100644
--- a/net/fusesmb/DEPENDS
+++ b/net/fusesmb/DEPENDS
@@ -1,2 +1,2 @@
-depends fuse &&
-depends samba
+depends fuse
+depends samba
diff --git a/net/ifplugd/DEPENDS b/net/ifplugd/DEPENDS
index 13aa569..38cfeaf 100644
--- a/net/ifplugd/DEPENDS
+++ b/net/ifplugd/DEPENDS
@@ -1,4 +1,4 @@
-depends net-tools &&
-depends libdaemon &&
+depends net-tools
+depends libdaemon
optional_depends "lynx" "--enable-lynx" "--disable-lynx" "for documentation generation"
diff --git a/net/net-tools/DEPENDS b/net/net-tools/DEPENDS
index 9171203..4b07a57 100644
--- a/net/net-tools/DEPENDS
+++ b/net/net-tools/DEPENDS
@@ -1,5 +1,5 @@
#for boot-strapping purposes:
-depends chkconfig &&
-depends coreutils &&
+depends chkconfig
+depends coreutils
optional_depends "gettext" "" "" "for i18n internationalization support"
diff --git a/net/pppconfig/DEPENDS b/net/pppconfig/DEPENDS
index 6f9581b..93f8a0d 100644
--- a/net/pppconfig/DEPENDS
+++ b/net/pppconfig/DEPENDS
@@ -1,2 +1,2 @@
-depends ppp &&
+depends ppp
depends dialog
diff --git a/net/rarpd/DEPENDS b/net/rarpd/DEPENDS
index 287d2d7..a0aa685 100644
--- a/net/rarpd/DEPENDS
+++ b/net/rarpd/DEPENDS
@@ -1,2 +1,2 @@
-depends libpcap &&
+depends libpcap
depends libnet
diff --git a/net/unison/DEPENDS b/net/unison/DEPENDS
index 077bb5f..78859e2 100644
--- a/net/unison/DEPENDS
+++ b/net/unison/DEPENDS
@@ -1,2 +1,2 @@
-depends ocaml &&
+depends ocaml
optional_depends lablgtk "" "" "For a gtk+-2 gui interface"
diff --git a/news/bbdb/DEPENDS b/news/bbdb/DEPENDS
index ed49256..5822510 100644
--- a/news/bbdb/DEPENDS
+++ b/news/bbdb/DEPENDS
@@ -1,2 +1,2 @@
-depends gnus &&
+depends gnus
depends teTeX
diff --git a/perl/App-CLI/DEPENDS b/perl/App-CLI/DEPENDS
index 75f0f89..05e16ff 100644
--- a/perl/App-CLI/DEPENDS
+++ b/perl/App-CLI/DEPENDS
@@ -1,2 +1,2 @@
-depends Locale-Maketext-Simple &&
+depends Locale-Maketext-Simple
depends Pod-Simple
diff --git a/perl/Clipboard/DEPENDS b/perl/Clipboard/DEPENDS
index d8ea53c..fbf2ab1 100644
--- a/perl/Clipboard/DEPENDS
+++ b/perl/Clipboard/DEPENDS
@@ -1,3 +1,3 @@
-depends perl &&
-depends Spiffy &&
+depends perl
+depends Spiffy
depends xclip
diff --git a/perl/Compress-Zlib/DEPENDS b/perl/Compress-Zlib/DEPENDS
index 7ef1126..d27e9ea 100644
--- a/perl/Compress-Zlib/DEPENDS
+++ b/perl/Compress-Zlib/DEPENDS
@@ -1,2 +1,2 @@
-depends perl &&
+depends perl
depends IO-Compress-Zlib
diff --git a/perl/DBD-SQLite/DEPENDS b/perl/DBD-SQLite/DEPENDS
index 282d1d4..8aa749b 100644
--- a/perl/DBD-SQLite/DEPENDS
+++ b/perl/DBD-SQLite/DEPENDS
@@ -1,3 +1,3 @@
-depends perl &&
-depends sqlite &&
+depends perl
+depends sqlite
depends DBI
diff --git a/perl/ExtUtils-PkgConfig/DEPENDS b/perl/ExtUtils-PkgConfig/DEPENDS
index cabccfa..bcc8b44 100644
--- a/perl/ExtUtils-PkgConfig/DEPENDS
+++ b/perl/ExtUtils-PkgConfig/DEPENDS
@@ -1,2 +1,2 @@
-depends pkgconfig &&
+depends pkgconfig
depends ExtUtils-Depends
diff --git a/perl/GDGraph/DEPENDS b/perl/GDGraph/DEPENDS
index f3be942..1e286ab 100644
--- a/perl/GDGraph/DEPENDS
+++ b/perl/GDGraph/DEPENDS
@@ -1,2 +1,2 @@
-depends gd &&
+depends gd
depends perl
diff --git a/perl/Gtk2-Spell/DEPENDS b/perl/Gtk2-Spell/DEPENDS
index e8cdbcc..32379f2 100644
--- a/perl/Gtk2-Spell/DEPENDS
+++ b/perl/Gtk2-Spell/DEPENDS
@@ -1,2 +1,2 @@
-depends Gtk2-Perl &&
+depends Gtk2-Perl
depends gtkspell
diff --git a/perl/IO-All/DEPENDS b/perl/IO-All/DEPENDS
index 1c72cf4..0509e17 100644
--- a/perl/IO-All/DEPENDS
+++ b/perl/IO-All/DEPENDS
@@ -1,2 +1,2 @@
-depends perl &&
+depends perl
depends Spiffy
diff --git a/perl/Mail-Audit/DEPENDS b/perl/Mail-Audit/DEPENDS
index 196d7cc..9a5703f 100644
--- a/perl/Mail-Audit/DEPENDS
+++ b/perl/Mail-Audit/DEPENDS
@@ -1,3 +1,3 @@
-depends perl &&
-depends MailTools &&
+depends perl
+depends MailTools
depends MIME-tools
diff --git a/perl/SVN-Mirror/DEPENDS b/perl/SVN-Mirror/DEPENDS
index e8b435b..65925d8 100644
--- a/perl/SVN-Mirror/DEPENDS
+++ b/perl/SVN-Mirror/DEPENDS
@@ -1,8 +1,8 @@
-depends URI &&
-depends TermReadKey &&
-depends SVN-Simple &&
-depends TimeDate &&
-depends File-chdir &&
-depends Class-Accessor &&
-depends Data-UUID &&
+depends URI
+depends TermReadKey
+depends SVN-Simple
+depends TimeDate
+depends File-chdir
+depends Class-Accessor
+depends Data-UUID
depends subversion
diff --git a/perl/SVN-Simple/DEPENDS b/perl/SVN-Simple/DEPENDS
index 7fbceb7..f26d121 100644
--- a/perl/SVN-Simple/DEPENDS
+++ b/perl/SVN-Simple/DEPENDS
@@ -1,2 +1,2 @@
-depends subversion &&
+depends subversion
depends perl
diff --git a/perl/Stat-lsMode/DEPENDS b/perl/Stat-lsMode/DEPENDS
index ef0c610..b7d9074 100644
--- a/perl/Stat-lsMode/DEPENDS
+++ b/perl/Stat-lsMode/DEPENDS
@@ -1,2 +1,2 @@
-depends shared-mime-info &&
+depends shared-mime-info
depends IO-stringy
diff --git a/perl/Sys-Gamin/DEPENDS b/perl/Sys-Gamin/DEPENDS
index 094362a..6cb8f5f 100644
--- a/perl/Sys-Gamin/DEPENDS
+++ b/perl/Sys-Gamin/DEPENDS
@@ -1,2 +1,2 @@
-depends perl &&
+depends perl
depends gamin
diff --git a/perl/Tie-DBI/DEPENDS b/perl/Tie-DBI/DEPENDS
index 12b138b..7b0bcf9 100644
--- a/perl/Tie-DBI/DEPENDS
+++ b/perl/Tie-DBI/DEPENDS
@@ -1,2 +1,2 @@
-depends perl &&
+depends perl
depends DBI
diff --git a/perl/WWW-Search/DEPENDS b/perl/WWW-Search/DEPENDS
index e0e4a12..ea96cd5 100644
--- a/perl/WWW-Search/DEPENDS
+++ b/perl/WWW-Search/DEPENDS
@@ -1,5 +1,5 @@
-depends perl &&
-depends HTML-Tree &&
-depends Test-File &&
-depends Test-Pod &&
+depends perl
+depends HTML-Tree
+depends Test-File
+depends Test-Pod
depends IO-Capture
diff --git a/perl/XML-Parser/DEPENDS b/perl/XML-Parser/DEPENDS
index 1e1834e..75b1a46 100644
--- a/perl/XML-Parser/DEPENDS
+++ b/perl/XML-Parser/DEPENDS
@@ -1,2 +1,2 @@
-depends perl &&
+depends perl
depends expat
diff --git a/perl/YAML-Syck/DEPENDS b/perl/YAML-Syck/DEPENDS
index 776fb90..d8f0cff 100644
--- a/perl/YAML-Syck/DEPENDS
+++ b/perl/YAML-Syck/DEPENDS
@@ -1,2 +1,2 @@
-depends perl &&
+depends perl
depends syck
diff --git a/printer/a2ps/DEPENDS b/printer/a2ps/DEPENDS
index f1d003b..2f8a33d 100644
--- a/printer/a2ps/DEPENDS
+++ b/printer/a2ps/DEPENDS
@@ -1,4 +1,4 @@
-depends psutils &&
-depends ImageMagick &&
+depends psutils
+depends ImageMagick
optional_depends "%TEX" "" "" "to convert TeX documents"
diff --git a/printer/foo2zjs/DEPENDS b/printer/foo2zjs/DEPENDS
index b76104b..59583f5 100644
--- a/printer/foo2zjs/DEPENDS
+++ b/printer/foo2zjs/DEPENDS
@@ -1,3 +1,3 @@
-depends udev &&
-depends foomatic-filters &&
+depends udev
+depends foomatic-filters
depends cups
diff --git a/python/PyOpenGL/DEPENDS b/python/PyOpenGL/DEPENDS
index cb2b5a4..5902cb1 100644
--- a/python/PyOpenGL/DEPENDS
+++ b/python/PyOpenGL/DEPENDS
@@ -1,2 +1,2 @@
-depends %GLUT &&
+depends %GLUT
depends numpy
diff --git a/python/bsddb3/DEPENDS b/python/bsddb3/DEPENDS
index a3c87bd..283aa8c 100644
--- a/python/bsddb3/DEPENDS
+++ b/python/bsddb3/DEPENDS
@@ -1,2 +1,2 @@
-depends Python &&
+depends Python
depends db
diff --git a/python/geoip-python/DEPENDS b/python/geoip-python/DEPENDS
index 47ed88b..513fe0a 100644
--- a/python/geoip-python/DEPENDS
+++ b/python/geoip-python/DEPENDS
@@ -1,2 +1,2 @@
-depends Python &&
+depends Python
depends geoip
diff --git a/python/lxml/DEPENDS b/python/lxml/DEPENDS
index a3c87bd..283aa8c 100644
--- a/python/lxml/DEPENDS
+++ b/python/lxml/DEPENDS
@@ -1,2 +1,2 @@
-depends Python &&
+depends Python
depends db
diff --git a/python/mod_python/DEPENDS b/python/mod_python/DEPENDS
index e7530aa..f0c3d3a 100644
--- a/python/mod_python/DEPENDS
+++ b/python/mod_python/DEPENDS
@@ -1,2 +1,2 @@
-depends apache2 &&
+depends apache2
depends Python
diff --git a/python/pyPgSQL/DEPENDS b/python/pyPgSQL/DEPENDS
index eff3dab..71722fb 100644
--- a/python/pyPgSQL/DEPENDS
+++ b/python/pyPgSQL/DEPENDS
@@ -1,2 +1,2 @@
-depends Python &&
+depends Python
depends postgresql
diff --git a/python/pyao/DEPENDS b/python/pyao/DEPENDS
index ba4f841..110e6b0 100644
--- a/python/pyao/DEPENDS
+++ b/python/pyao/DEPENDS
@@ -1,2 +1,2 @@
-depends Python &&
+depends Python
depends libao
diff --git a/python/pylirc/DEPENDS b/python/pylirc/DEPENDS
index 8f8c2b8..0050443 100644
--- a/python/pylirc/DEPENDS
+++ b/python/pylirc/DEPENDS
@@ -1,2 +1,2 @@
-depends lirc &&
+depends lirc
depends Python
diff --git a/python/pyogg/DEPENDS b/python/pyogg/DEPENDS
index 91c627e..3005e10 100644
--- a/python/pyogg/DEPENDS
+++ b/python/pyogg/DEPENDS
@@ -1,2 +1,2 @@
-depends pyao &&
+depends pyao
depends libogg
diff --git a/python/pyvorbis/DEPENDS b/python/pyvorbis/DEPENDS
index a3091a3..c81be01 100644
--- a/python/pyvorbis/DEPENDS
+++ b/python/pyvorbis/DEPENDS
@@ -1,2 +1,2 @@
-depends pyogg &&
+depends pyogg
depends libvorbis
diff --git a/qt4-apps/qsynth/DEPENDS b/qt4-apps/qsynth/DEPENDS
index 5f43799..e9e367a 100644
--- a/qt4-apps/qsynth/DEPENDS
+++ b/qt4-apps/qsynth/DEPENDS
@@ -1,2 +1,2 @@
-depends qt4 &&
+depends qt4
depends fluidsynth
diff --git a/qt4-apps/treeline/DEPENDS b/qt4-apps/treeline/DEPENDS
index fb21c0d..4f07fa8 100644
--- a/qt4-apps/treeline/DEPENDS
+++ b/qt4-apps/treeline/DEPENDS
@@ -1,3 +1,3 @@
-depends PyQt4 &&
-depends PyXML &&
+depends PyQt4
+depends PyXML
optional_depends "aspell" "" "" "to enable spell checking feature"
diff --git a/science/celestia-gtk/DEPENDS b/science/celestia-gtk/DEPENDS
index 8f95b43..0f20548 100644
--- a/science/celestia-gtk/DEPENDS
+++ b/science/celestia-gtk/DEPENDS
@@ -1,6 +1,6 @@
-depends libpng &&
-depends %GLX &&
-depends gtkglext &&
+depends libpng
+depends %GLX
+depends gtkglext
depends lua
optional_depends "libgnomeui" "--with-gnome" "--with-gtk" "for Gnome support (N for GTK+-2 only version)"
diff --git a/science/dx/DEPENDS b/science/dx/DEPENDS
index 43cbdd2..cfb3cb2 100644
--- a/science/dx/DEPENDS
+++ b/science/dx/DEPENDS
@@ -1,3 +1,3 @@
-depends openMotif &&
+depends openMotif
optional_depends "dxsamples" "" "" "nice examples and tutorials"
diff --git a/science/gerbv/DEPENDS b/science/gerbv/DEPENDS
index c72b64a..1e62edf 100644
--- a/science/gerbv/DEPENDS
+++ b/science/gerbv/DEPENDS
@@ -1,2 +1,2 @@
-depends gtk+-2 &&
+depends gtk+-2
depends libpng
diff --git a/science/gstat/DEPENDS b/science/gstat/DEPENDS
index 17712e4..00a7215 100644
--- a/science/gstat/DEPENDS
+++ b/science/gstat/DEPENDS
@@ -1,2 +1,2 @@
-optional_depends "gnuplot" "" "" "for gnuplot support" &&
-optional_depends "gd" "--with-gd" "" "for gif-output support of graphics"
+optional_depends "gnuplot" "" "" "for gnuplot support"
+optional_depends "gd" "--with-gd" "" "for gif-output support of graphics"
diff --git a/science/libticalcs/DEPENDS b/science/libticalcs/DEPENDS
index c63abc5..e77794c 100644
--- a/science/libticalcs/DEPENDS
+++ b/science/libticalcs/DEPENDS
@@ -1,2 +1,2 @@
-depends libtifiles &&
+depends libtifiles
depends libticables
diff --git a/science/maxima/DEPENDS b/science/maxima/DEPENDS
index 866b2ab..0d14794 100644
--- a/science/maxima/DEPENDS
+++ b/science/maxima/DEPENDS
@@ -1,3 +1,3 @@
-depends %LISP &&
-depends tk &&
+depends %LISP
+depends tk
depends gnuplot
diff --git a/science/qalculate-gtk/DEPENDS b/science/qalculate-gtk/DEPENDS
index 43455ab..cab5ad6 100644
--- a/science/qalculate-gtk/DEPENDS
+++ b/science/qalculate-gtk/DEPENDS
@@ -1,6 +1,6 @@
-depends libqalculate &&
-depends libglade &&
-depends scrollkeeper &&
+depends libqalculate
+depends libglade
+depends scrollkeeper
-optional_depends "gnuplot" "" "" "to enable plotting support" &&
+optional_depends "gnuplot" "" "" "to enable plotting support"
optional_depends "yelp" "" "" "to be able to display the manual"
diff --git a/science/tilp/DEPENDS b/science/tilp/DEPENDS
index be3022f..538885b 100644
--- a/science/tilp/DEPENDS
+++ b/science/tilp/DEPENDS
@@ -1,3 +1,3 @@
-depends libticalcs &&
-depends hd2u &&
+depends libticalcs
+depends hd2u
depends gtk+-2
diff --git a/science/wxMaxima/DEPENDS b/science/wxMaxima/DEPENDS
index e096140..1b6e91f 100644
--- a/science/wxMaxima/DEPENDS
+++ b/science/wxMaxima/DEPENDS
@@ -1,3 +1,3 @@
-depends wxGTK &&
-depends libxml &&
+depends wxGTK
+depends libxml
depends maxima
diff --git a/security/firestarter/DEPENDS b/security/firestarter/DEPENDS
index 3530661..89d9a59 100644
--- a/security/firestarter/DEPENDS
+++ b/security/firestarter/DEPENDS
@@ -1,2 +1,2 @@
-depends libgnomeui &&
+depends libgnomeui
depends iptables
diff --git a/security/openvpn/DEPENDS b/security/openvpn/DEPENDS
index 1e58976..5ded2dc 100644
--- a/security/openvpn/DEPENDS
+++ b/security/openvpn/DEPENDS
@@ -1,2 +1,2 @@
-optional_depends openssl "" "-disable-ssl -disable-crypto" "for openssl support (recommended)" &&
-optional_depends lzo "" "--disable-lzo" "for link compression (recommended)"
+optional_depends openssl "" "-disable-ssl -disable-crypto" "for openssl support (recommended)"
+optional_depends lzo "" "--disable-lzo" "for link compression (recommended)"
diff --git a/security/pam_mount/DEPENDS b/security/pam_mount/DEPENDS
index 63b7be0..1c6911c 100644
--- a/security/pam_mount/DEPENDS
+++ b/security/pam_mount/DEPENDS
@@ -1,2 +1,2 @@
-depends openssl &&
+depends openssl
depends Linux-PAM
diff --git a/security/setools/DEPENDS b/security/setools/DEPENDS
index 40071ee..8ee50c6 100644
--- a/security/setools/DEPENDS
+++ b/security/setools/DEPENDS
@@ -1,2 +1,2 @@
-depends policycoreutils &&
+depends policycoreutils
depends libglade
diff --git a/sql/sybase-ase/DEPENDS b/sql/sybase-ase/DEPENDS
index 8f81dbd..c0da223 100644
--- a/sql/sybase-ase/DEPENDS
+++ b/sql/sybase-ase/DEPENDS
@@ -1,2 +1,2 @@
-depends psmisc &&
+depends psmisc
depends rpmunpack
diff --git a/sql/xbsql/DEPENDS b/sql/xbsql/DEPENDS
index f02be1a..a7c820b 100644
--- a/sql/xbsql/DEPENDS
+++ b/sql/xbsql/DEPENDS
@@ -1,2 +1,2 @@
-depends ncurses &&
+depends ncurses
depends xbase
diff --git a/terminal/multi-aterm/DEPENDS b/terminal/multi-aterm/DEPENDS
index 879e2fd..bd26fb0 100644
--- a/terminal/multi-aterm/DEPENDS
+++ b/terminal/multi-aterm/DEPENDS
@@ -1,2 +1,2 @@
-optional_depends "%JPEG" "--enable-jpeg" "--disable-jpeg" "for jpeg background support" &&
+optional_depends "%JPEG" "--enable-jpeg" "--disable-jpeg" "for jpeg background support"
optional_depends "libpng" "--enable-png" "--disable-png" "for png background support"
diff --git a/terminal/qlogin/DEPENDS b/terminal/qlogin/DEPENDS
index f37223e..de62cb0 100644
--- a/terminal/qlogin/DEPENDS
+++ b/terminal/qlogin/DEPENDS
@@ -1,2 +1,2 @@
-depends gzip &&
+depends gzip
depends perl
diff --git a/terminal/screen/DEPENDS b/terminal/screen/DEPENDS
index 544b670..c0c6d60 100644
--- a/terminal/screen/DEPENDS
+++ b/terminal/screen/DEPENDS
@@ -1,2 +1,2 @@
-depends gawk &&
+depends gawk
depends perl
diff --git a/terminal/tilda/DEPENDS b/terminal/tilda/DEPENDS
index 2a02250..2bb1a43 100644
--- a/terminal/tilda/DEPENDS
+++ b/terminal/tilda/DEPENDS
@@ -1,3 +1,3 @@
-depends gtk+-2 &&
-depends vte &&
+depends gtk+-2
+depends vte
depends confuse
diff --git a/terminal/tsclient/DEPENDS b/terminal/tsclient/DEPENDS
index b9a84aa..31f1711 100644
--- a/terminal/tsclient/DEPENDS
+++ b/terminal/tsclient/DEPENDS
@@ -1,2 +1,2 @@
-depends rdesktop &&
+depends rdesktop
depends gnome-panel
diff --git a/utils/bc/DEPENDS b/utils/bc/DEPENDS
index 6cd0efb..5a91e26 100644
--- a/utils/bc/DEPENDS
+++ b/utils/bc/DEPENDS
@@ -1,3 +1,3 @@
-depends ed &&
+depends ed
optional_depends "readline" "--with-readline" "" "for fancy command input editing"
diff --git a/utils/btmgr/DEPENDS b/utils/btmgr/DEPENDS
index bc52aee..5bd7f9c 100644
--- a/utils/btmgr/DEPENDS
+++ b/utils/btmgr/DEPENDS
@@ -1,3 +1,3 @@
-depends ucl &&
-depends nasm &&
+depends ucl
+depends nasm
depends linuxdoc-tools
diff --git a/utils/dump/DEPENDS b/utils/dump/DEPENDS
index 29a2f9a..cb3a528 100644
--- a/utils/dump/DEPENDS
+++ b/utils/dump/DEPENDS
@@ -1,2 +1,2 @@
-depends e2fsprogs &&
+depends e2fsprogs
depends zlib
diff --git a/utils/fam/DEPENDS b/utils/fam/DEPENDS
index 6de87ce..b8d0233 100644
--- a/utils/fam/DEPENDS
+++ b/utils/fam/DEPENDS
@@ -1,3 +1,3 @@
-depends autoconf &&
-depends libtool &&
-depends portmap
+depends autoconf
+depends libtool
+depends portmap
diff --git a/utils/fdutils/DEPENDS b/utils/fdutils/DEPENDS
index 74c388f..af41975 100644
--- a/utils/fdutils/DEPENDS
+++ b/utils/fdutils/DEPENDS
@@ -1,2 +1,2 @@
-optional_depends "texinfo" "" "" "for documentation" &&
-optional_depends "teTeX" "" "" "for dvi documentation"
+optional_depends "texinfo" "" "" "for documentation"
+optional_depends "teTeX" "" "" "for dvi documentation"
diff --git a/utils/figlet/DEPENDS b/utils/figlet/DEPENDS
index 6ac77d4..3215aab 100644
--- a/utils/figlet/DEPENDS
+++ b/utils/figlet/DEPENDS
@@ -1,2 +1,2 @@
-optional_depends "figfonts-contrib" "" "" "for extra contributed fonts" &&
+optional_depends "figfonts-contrib" "" "" "for extra contributed fonts"
optional_depends "figfonts-intl" "" "" "for 17 international fonts"
diff --git a/utils/free42/DEPENDS b/utils/free42/DEPENDS
index 1d88156..51e2ae3 100644
--- a/utils/free42/DEPENDS
+++ b/utils/free42/DEPENDS
@@ -1,4 +1,4 @@
-depends gtk+-2 &&
-depends glib-2 &&
-depends libpng &&
+depends gtk+-2
+depends glib-2
+depends libpng
depends zlib
diff --git a/utils/gamin/DEPENDS b/utils/gamin/DEPENDS
index 146cbd5..cc4d61d 100644
--- a/utils/gamin/DEPENDS
+++ b/utils/gamin/DEPENDS
@@ -1,2 +1,2 @@
-depends libtool &&
+depends libtool
depends glib-2
diff --git a/utils/libPropList/DEPENDS b/utils/libPropList/DEPENDS
index 0fb1c17..f4ba407 100644
--- a/utils/libPropList/DEPENDS
+++ b/utils/libPropList/DEPENDS
@@ -1,2 +1,2 @@
-depends bison &&
+depends bison
depends flex
diff --git a/utils/lunar-init/DEPENDS b/utils/lunar-init/DEPENDS
index 9085fd4..1df6e2e 100644
--- a/utils/lunar-init/DEPENDS
+++ b/utils/lunar-init/DEPENDS
@@ -1,2 +1,2 @@
-depends net-tools &&
+depends net-tools
depends e2fsprogs
diff --git a/utils/memdump/DEPENDS b/utils/memdump/DEPENDS
index 187e3d5..dc34dad 100644
--- a/utils/memdump/DEPENDS
+++ b/utils/memdump/DEPENDS
@@ -1,2 +1,2 @@
-depends grep &&
+depends grep
depends sed
diff --git a/utils/metalog/DEPENDS b/utils/metalog/DEPENDS
index d8ed625..bf5484f 100644
--- a/utils/metalog/DEPENDS
+++ b/utils/metalog/DEPENDS
@@ -1,2 +1,2 @@
-depends chkconfig &&
+depends chkconfig
depends pcre
diff --git a/utils/sdscsyslogd/DEPENDS b/utils/sdscsyslogd/DEPENDS
index 4ca40a4..682d91a 100644
--- a/utils/sdscsyslogd/DEPENDS
+++ b/utils/sdscsyslogd/DEPENDS
@@ -1,8 +1,8 @@
-depends chkconfig &&
-depends glib-2 &&
-depends libxml2 &&
-depends flex &&
-depends bison &&
-depends autoconf &&
-depends automake &&
+depends chkconfig
+depends glib-2
+depends libxml2
+depends flex
+depends bison
+depends autoconf
+depends automake
depends roadrunner
diff --git a/utils/units/DEPENDS b/utils/units/DEPENDS
index 97a76ba..62cffdf 100644
--- a/utils/units/DEPENDS
+++ b/utils/units/DEPENDS
@@ -1,2 +1,2 @@
-depends ncurses &&
+depends ncurses
depends readline
diff --git a/utils/xmlclitools/DEPENDS b/utils/xmlclitools/DEPENDS
index b142220..6d5b36e 100644
--- a/utils/xmlclitools/DEPENDS
+++ b/utils/xmlclitools/DEPENDS
@@ -1,3 +1,3 @@
-depends "glib" &&
-depends "libxml2" &&
+depends "glib"
+depends "libxml2"
optional_depends "pcre" "" "--nopcre" "For enhanced regular expression support"
diff --git a/video/camE/DEPENDS b/video/camE/DEPENDS
index bf1fb6f..6755001 100644
--- a/video/camE/DEPENDS
+++ b/video/camE/DEPENDS
@@ -1,2 +1,2 @@
-depends giblib &&
+depends giblib
depends curl
diff --git a/video/dvdauthor/DEPENDS b/video/dvdauthor/DEPENDS
index 7d02cbe..7b09c09 100644
--- a/video/dvdauthor/DEPENDS
+++ b/video/dvdauthor/DEPENDS
@@ -1,3 +1,3 @@
-depends libdvdread &&
-depends libxml2 &&
+depends libdvdread
+depends libxml2
depends ImageMagick
diff --git a/video/goggles/DEPENDS b/video/goggles/DEPENDS
index fba6992..dd53387 100644
--- a/video/goggles/DEPENDS
+++ b/video/goggles/DEPENDS
@@ -1,3 +1,3 @@
-depends fox &&
-depends ogle &&
+depends fox
+depends ogle
depends %X
diff --git a/video/libprojectM/DEPENDS b/video/libprojectM/DEPENDS
index d5081fc..279b886 100644
--- a/video/libprojectM/DEPENDS
+++ b/video/libprojectM/DEPENDS
@@ -1,2 +1,2 @@
-depends ftgl &&
+depends ftgl
depends libvisual
diff --git a/video/ogle/DEPENDS b/video/ogle/DEPENDS
index 014a67b..367dd03 100644
--- a/video/ogle/DEPENDS
+++ b/video/ogle/DEPENDS
@@ -1,4 +1,4 @@
-depends libxml2 &&
-depends libdvdread &&
-depends libmad &&
+depends libxml2
+depends libdvdread
+depends libmad
depends a52dec
diff --git a/video/ogmtools/DEPENDS b/video/ogmtools/DEPENDS
index 36bfa2a..13df11e 100644
--- a/video/ogmtools/DEPENDS
+++ b/video/ogmtools/DEPENDS
@@ -1,3 +1,3 @@
-depends vorbis-tools &&
+depends vorbis-tools
optional_depends libdvdread "--with-dvdread" "--without-dvdread" "dvd reading support"
diff --git a/video/piave/DEPENDS b/video/piave/DEPENDS
index 082a3a5..edca1ed 100644
--- a/video/piave/DEPENDS
+++ b/video/piave/DEPENDS
@@ -1,5 +1,5 @@
-depends SDL_image &&
-depends libxml2 &&
-depends libraw1394 &&
-depends libavc1394 &&
-depends libdv
+depends SDL_image
+depends libxml2
+depends libraw1394
+depends libavc1394
+depends libdv
diff --git a/video/tvtime/DEPENDS b/video/tvtime/DEPENDS
index 7277f3f..1a34eae 100644
--- a/video/tvtime/DEPENDS
+++ b/video/tvtime/DEPENDS
@@ -1,4 +1,4 @@
-depends libxml2 &&
-depends libpng &&
-depends freetype2 &&
+depends libxml2
+depends libpng
+depends freetype2
depends %X
diff --git a/virtual/uml/DEPENDS b/virtual/uml/DEPENDS
index 0137232..7ed2bbe 100644
--- a/virtual/uml/DEPENDS
+++ b/virtual/uml/DEPENDS
@@ -1,3 +1,3 @@
-depends autoconf &&
-depends ncurses &&
+depends autoconf
+depends ncurses
depends readline
diff --git a/web/PostNuke/DEPENDS b/web/PostNuke/DEPENDS
index 3955c6c..1f0698e 100644
--- a/web/PostNuke/DEPENDS
+++ b/web/PostNuke/DEPENDS
@@ -1,3 +1,3 @@
-depends %APACHE &&
-depends %PHP &&
+depends %APACHE
+depends %PHP
depends mysql
diff --git a/web/PyDS/DEPENDS b/web/PyDS/DEPENDS
index 2299978..b8fc67f 100644
--- a/web/PyDS/DEPENDS
+++ b/web/PyDS/DEPENDS
@@ -1,12 +1,12 @@
-depends jpeg &&
-depends zlib &&
-depends Python &&
-depends medusa &&
-depends metakit &&
-depends Cheetah &&
-depends PyXML &&
-depends docutils &&
-depends pil &&
-depends SOAPpy &&
+depends jpeg
+depends zlib
+depends Python
+depends medusa
+depends metakit
+depends Cheetah
+depends PyXML
+depends docutils
+depends pil
+depends SOAPpy
optional_depends "SilverCity" "" "" "for syntax highlighting using css"
diff --git a/web/SOAPpy/DEPENDS b/web/SOAPpy/DEPENDS
index 6792e2e..2c16604 100644
--- a/web/SOAPpy/DEPENDS
+++ b/web/SOAPpy/DEPENDS
@@ -1,2 +1,2 @@
-depends Python &&
+depends Python
depends fpconst
diff --git a/web/apache-mod_ssl/DEPENDS b/web/apache-mod_ssl/DEPENDS
index a09d1fb..d0c1eba 100644
--- a/web/apache-mod_ssl/DEPENDS
+++ b/web/apache-mod_ssl/DEPENDS
@@ -1,3 +1,3 @@
-depends openssl &&
-depends mm &&
+depends openssl
+depends mm
depends db
diff --git a/web/cadaver/DEPENDS b/web/cadaver/DEPENDS
index 649f6e9..631dfbe 100644
--- a/web/cadaver/DEPENDS
+++ b/web/cadaver/DEPENDS
@@ -1,5 +1,5 @@
-depends neon &&
+depends neon
-optional_depends "openssl" "--with-ssl" "" "for SSL support" &&
-optional_depends "libxml2" "--with-libxml2" "" "for XML support" &&
+optional_depends "openssl" "--with-ssl" "" "for SSL support"
+optional_depends "libxml2" "--with-libxml2" "" "for XML support"
optional_depends "expat" "--with-expat" "" "for XML parsing support"
diff --git a/web/clearsilver/DEPENDS b/web/clearsilver/DEPENDS
index 9649cb6..6d4c7bc 100644
--- a/web/clearsilver/DEPENDS
+++ b/web/clearsilver/DEPENDS
@@ -1,3 +1,3 @@
-optional_depends "perl" "--with-perl=/usr/bin/perl" "--disable-perl" "For perl support" &&
-optional_depends "Python" "--with-python=/usr/bin/python" "--disable-python" "For Python support" &&
+optional_depends "perl" "--with-perl=/usr/bin/perl" "--disable-perl" "For perl support"
+optional_depends "Python" "--with-python=/usr/bin/python" "--disable-python" "For Python support"
optional_depends "ruby" "--with-ruby=/usr/bin/ruby" "--disable-ruby" "For ruby support"
diff --git a/web/dansguardian/DEPENDS b/web/dansguardian/DEPENDS
index 4154b60..a4a63a9 100644
--- a/web/dansguardian/DEPENDS
+++ b/web/dansguardian/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends "pcre" "--enable-pcre" "--disable-pcre" "for REGEX support" &&
+optional_depends "pcre" "--enable-pcre" "--disable-pcre" "for REGEX support"
optional_depends "clamav" \
"--enable-clamd" \
"--disable-clamd" \
diff --git a/web/mod_perl-old/DEPENDS b/web/mod_perl-old/DEPENDS
index 8a3e82e..036939a 100644
--- a/web/mod_perl-old/DEPENDS
+++ b/web/mod_perl-old/DEPENDS
@@ -1,2 +1,2 @@
-depends perl &&
+depends perl
depends apache
diff --git a/web/mod_perl/DEPENDS b/web/mod_perl/DEPENDS
index 5673501..f2e571e 100644
--- a/web/mod_perl/DEPENDS
+++ b/web/mod_perl/DEPENDS
@@ -1,2 +1,2 @@
-depends perl &&
+depends perl
depends apache2
diff --git a/web/mod_ruby/DEPENDS b/web/mod_ruby/DEPENDS
index 6018157..ce13574 100644
--- a/web/mod_ruby/DEPENDS
+++ b/web/mod_ruby/DEPENDS
@@ -1,2 +1,2 @@
-depends eruby &&
+depends eruby
depends apache2
diff --git a/web/peacock/DEPENDS b/web/peacock/DEPENDS
index 48849d4..d77f357 100644
--- a/web/peacock/DEPENDS
+++ b/web/peacock/DEPENDS
@@ -1,2 +1,2 @@
-depends libgnomeui &&
+depends libgnomeui
depends libgtkhtml
diff --git a/web/scgi_rails/DEPENDS b/web/scgi_rails/DEPENDS
index a555107..fc38328 100644
--- a/web/scgi_rails/DEPENDS
+++ b/web/scgi_rails/DEPENDS
@@ -1,2 +1,2 @@
-depends ruby &&
+depends ruby
depends mod_scgi
diff --git a/web/screem/DEPENDS b/web/screem/DEPENDS
index 21b1dd6..69aa7db 100644
--- a/web/screem/DEPENDS
+++ b/web/screem/DEPENDS
@@ -1,4 +1,4 @@
-depends libgnomeui &&
-depends libzvt &&
-depends libgtkhtml &&
+depends libgnomeui
+depends libzvt
+depends libgtkhtml
depends libgnomeprintui
diff --git a/web/w3c-libwww/DEPENDS b/web/w3c-libwww/DEPENDS
index d4f2bfa..01075b8 100644
--- a/web/w3c-libwww/DEPENDS
+++ b/web/w3c-libwww/DEPENDS
@@ -1,5 +1,5 @@
-depends perl &&
-depends zlib &&
+depends perl
+depends zlib
optional_depends "openssl" \
"--with-ssl" \
diff --git a/x11-apps/gpa/DEPENDS b/x11-apps/gpa/DEPENDS
index 951c192..98d9aae 100644
--- a/x11-apps/gpa/DEPENDS
+++ b/x11-apps/gpa/DEPENDS
@@ -1,2 +1,2 @@
-depends gpgme &&
+depends gpgme
depends gtk+-2
diff --git a/x11-apps/jpilot/DEPENDS b/x11-apps/jpilot/DEPENDS
index 7ecd724..91c9b36 100644
--- a/x11-apps/jpilot/DEPENDS
+++ b/x11-apps/jpilot/DEPENDS
@@ -1,2 +1,2 @@
-depends pilot-link &&
+depends pilot-link
depends gtk+-2
diff --git a/x11-utils/gipc/DEPENDS b/x11-utils/gipc/DEPENDS
index c4987eb..3295f09 100644
--- a/x11-utils/gipc/DEPENDS
+++ b/x11-utils/gipc/DEPENDS
@@ -1,3 +1,3 @@
-depends id3lib &&
-depends gtk+-2 &&
+depends id3lib
+depends gtk+-2
depends libipc
diff --git a/x11-utils/gkrellm-speedfreq/DEPENDS b/x11-utils/gkrellm-speedfreq/DEPENDS
index 5906657..c7254d3 100644
--- a/x11-utils/gkrellm-speedfreq/DEPENDS
+++ b/x11-utils/gkrellm-speedfreq/DEPENDS
@@ -1,2 +1,2 @@
-depends gkrellm2 &&
+depends gkrellm2
depends speedfreq
diff --git a/x11-utils/gkrellshoot/DEPENDS b/x11-utils/gkrellshoot/DEPENDS
index 1feb9d8..a3cdab0 100644
--- a/x11-utils/gkrellshoot/DEPENDS
+++ b/x11-utils/gkrellshoot/DEPENDS
@@ -1,2 +1,2 @@
-depends gkrellm2 &&
+depends gkrellm2
depends ImageMagick
diff --git a/x11-utils/lineak_xosdplugin/DEPENDS b/x11-utils/lineak_xosdplugin/DEPENDS
index 6e92954..3d38217 100644
--- a/x11-utils/lineak_xosdplugin/DEPENDS
+++ b/x11-utils/lineak_xosdplugin/DEPENDS
@@ -1,2 +1,2 @@
-depends lineakd &&
+depends lineakd
depends xosd
diff --git a/x11-utils/obconf/DEPENDS b/x11-utils/obconf/DEPENDS
index b4e40da..07cf040 100644
--- a/x11-utils/obconf/DEPENDS
+++ b/x11-utils/obconf/DEPENDS
@@ -1,5 +1,5 @@
-depends gtk+-2 &&
-depends openbox &&
-depends libglade &&
-depends startup-notification &&
+depends gtk+-2
+depends openbox
+depends libglade
+depends startup-notification
depends pkgconfig
diff --git a/x11-utils/type1inst/DEPENDS b/x11-utils/type1inst/DEPENDS
index 5da7f7c..8c1ba2f 100644
--- a/x11-utils/type1inst/DEPENDS
+++ b/x11-utils/type1inst/DEPENDS
@@ -1,2 +1,2 @@
-depends perl &&
-depends groff
+depends perl
+depends groff
diff --git a/x11-utils/wmweather/DEPENDS b/x11-utils/wmweather/DEPENDS
index a83fe64..ab92874 100644
--- a/x11-utils/wmweather/DEPENDS
+++ b/x11-utils/wmweather/DEPENDS
@@ -1,2 +1,2 @@
-depends %X &&
+depends %X
depends curl
diff --git a/x11-utils/xpad/DEPENDS b/x11-utils/xpad/DEPENDS
index 2cceab2..c8184bf 100644
--- a/x11-utils/xpad/DEPENDS
+++ b/x11-utils/xpad/DEPENDS
@@ -1,3 +1,3 @@
-depends gtk+-2 &&
+depends gtk+-2
optional_depends "gettext" "" "--disable-nls" "for NLS support"
diff --git a/x11-wm/3ddesktop/DEPENDS b/x11-wm/3ddesktop/DEPENDS
index ce542f4..615798a 100644
--- a/x11-wm/3ddesktop/DEPENDS
+++ b/x11-wm/3ddesktop/DEPENDS
@@ -1,3 +1,3 @@
-depends imlib2 &&
-depends %GLX &&
+depends imlib2
+depends %GLX
depends gettext
diff --git a/x11/xplanet/DEPENDS b/x11/xplanet/DEPENDS
index 44ad3a1..cc2cf4d 100644
--- a/x11/xplanet/DEPENDS
+++ b/x11/xplanet/DEPENDS
@@ -1,2 +1,2 @@
-depends automake &&
+depends automake
depends %GLX
diff --git a/xfce4/goodies/thunar-media-tags-plugin/DEPENDS b/xfce4/goodies/thunar-media-tags-plugin/DEPENDS
index 4fff28d..b22c96a 100644
--- a/xfce4/goodies/thunar-media-tags-plugin/DEPENDS
+++ b/xfce4/goodies/thunar-media-tags-plugin/DEPENDS
@@ -1,2 +1,2 @@
-depends Thunar &&
+depends Thunar
depends taglib
diff --git a/xfce4/goodies/xfce4-genmon-plugin/DEPENDS b/xfce4/goodies/xfce4-genmon-plugin/DEPENDS
index f98d98d..155a534 100644
--- a/xfce4/goodies/xfce4-genmon-plugin/DEPENDS
+++ b/xfce4/goodies/xfce4-genmon-plugin/DEPENDS
@@ -1,2 +1,2 @@
-depends xfce4-dev-tools &&
+depends xfce4-dev-tools
depends xfce4-panel
diff --git a/xfce4/goodies/xfce4-sensors-plugin/DEPENDS b/xfce4/goodies/xfce4-sensors-plugin/DEPENDS
index 3737246..747cba8 100644
--- a/xfce4/goodies/xfce4-sensors-plugin/DEPENDS
+++ b/xfce4/goodies/xfce4-sensors-plugin/DEPENDS
@@ -1,2 +1,2 @@
-depends xfce4-panel &&
+depends xfce4-panel
depends lm_sensors
diff --git a/xfce4/goodies/xfce4-volstatus-icon/DEPENDS b/xfce4/goodies/xfce4-volstatus-icon/DEPENDS
index 658aa46..a4d9396 100644
--- a/xfce4/goodies/xfce4-volstatus-icon/DEPENDS
+++ b/xfce4/goodies/xfce4-volstatus-icon/DEPENDS
@@ -1,3 +1,3 @@
-depends hal &&
-depends exo &&
+depends hal
+depends exo
depends libxfcegui4
diff --git a/zbeta/climm/DEPENDS b/zbeta/climm/DEPENDS
index 6c51b62..d070114 100644
--- a/zbeta/climm/DEPENDS
+++ b/zbeta/climm/DEPENDS
@@ -1,5 +1,5 @@
-depends gnutls &&
-depends tcl &&
-depends openssl &&
-depends gloox &&
+depends gnutls
+depends tcl
+depends openssl
+depends gloox
depends libotr
diff --git a/zbeta/giftcurs-cvs/DEPENDS b/zbeta/giftcurs-cvs/DEPENDS
index efa355e..439ca3b 100644
--- a/zbeta/giftcurs-cvs/DEPENDS
+++ b/zbeta/giftcurs-cvs/DEPENDS
@@ -1,2 +1,2 @@
-depends ncurses &&
+depends ncurses
depends gift-cvs
diff --git a/zbeta/giftoxic-cvs/DEPENDS b/zbeta/giftoxic-cvs/DEPENDS
index 7842efb..b4d9de1 100644
--- a/zbeta/giftoxic-cvs/DEPENDS
+++ b/zbeta/giftoxic-cvs/DEPENDS
@@ -1,4 +1,4 @@
-depends libgnomeui &&
-depends gift-cvs &&
-depends giftgnutella-cvs &&
-depends giftopenft-cvs
+depends libgnomeui
+depends gift-cvs
+depends giftgnutella-cvs
+depends giftopenft-cvs
diff --git a/zbeta/giftui-cvs/DEPENDS b/zbeta/giftui-cvs/DEPENDS
index c319755..18f0e66 100644
--- a/zbeta/giftui-cvs/DEPENDS
+++ b/zbeta/giftui-cvs/DEPENDS
@@ -1,2 +1,2 @@
-depends gtk+-2 &&
+depends gtk+-2
depends gift-cvs
diff --git a/zbeta/gloox/DEPENDS b/zbeta/gloox/DEPENDS
index 4fb89cb..c2a6fbd 100644
--- a/zbeta/gloox/DEPENDS
+++ b/zbeta/gloox/DEPENDS
@@ -1,5 +1,5 @@
-depends libidn &&
-depends gnutls &&
-depends openssl &&
+depends libidn
+depends gnutls
+depends openssl
depends zlib
diff --git a/zbeta/grub2/DEPENDS b/zbeta/grub2/DEPENDS
index 7242def..f28a396 100644
--- a/zbeta/grub2/DEPENDS
+++ b/zbeta/grub2/DEPENDS
@@ -1,2 +1,2 @@
-depends ncurses &&
+depends ncurses
depends gettext
diff --git a/zbeta/mailutils/DEPENDS b/zbeta/mailutils/DEPENDS
index 6422163..3a57e56 100644
--- a/zbeta/mailutils/DEPENDS
+++ b/zbeta/mailutils/DEPENDS
@@ -1,2 +1,2 @@
-depends guile &&
+depends guile
depends ncurses
diff --git a/zbeta/mercurial-hg/DEPENDS b/zbeta/mercurial-hg/DEPENDS
index 1b346e3..d5db27b 100644
--- a/zbeta/mercurial-hg/DEPENDS
+++ b/zbeta/mercurial-hg/DEPENDS
@@ -1,5 +1,5 @@
-depends Python &&
-depends rcs &&
-depends patch &&
-depends diffutils &&
+depends Python
+depends rcs
+depends patch
+depends diffutils
optional_depends tk "" "" "for a TK front-end hg tool"
diff --git a/zbeta/mutt-devel/DEPENDS b/zbeta/mutt-devel/DEPENDS
index 1953843..8a094ca 100644
--- a/zbeta/mutt-devel/DEPENDS
+++ b/zbeta/mutt-devel/DEPENDS
@@ -1,3 +1,3 @@
-depends ncurses &&
-optional_depends "ncursesw" "" "" "to enable multibyte character support" &&
+depends ncurses
+optional_depends "ncursesw" "" "" "to enable multibyte character support"
optional_depends "openssl" "--with-ssl" "" "to enable ssl support for pop/imap"
diff --git a/zbeta/nedit-cvs/DEPENDS b/zbeta/nedit-cvs/DEPENDS
index 6398c47..b62f301 100644
--- a/zbeta/nedit-cvs/DEPENDS
+++ b/zbeta/nedit-cvs/DEPENDS
@@ -1,5 +1,5 @@
# Don't add anymore lesstif apps in moonbase, openMotif is by FAR a more
# correct implementation. nedit works just fine with openMotif and lesstif conflicts
# with openMotif. lesstif is NOT as feature rich as openMotif.
-depends openMotif &&
+depends openMotif
depends bison
diff --git a/zbeta/njb-sharp/DEPENDS b/zbeta/njb-sharp/DEPENDS
index 04e8705..2202d0b 100644
--- a/zbeta/njb-sharp/DEPENDS
+++ b/zbeta/njb-sharp/DEPENDS
@@ -1,2 +1,2 @@
-depends libnjb &&
+depends libnjb
depends mono
diff --git a/zbeta/pan2-beta/DEPENDS b/zbeta/pan2-beta/DEPENDS
index d17f520..a7f4f08 100644
--- a/zbeta/pan2-beta/DEPENDS
+++ b/zbeta/pan2-beta/DEPENDS
@@ -1,3 +1,3 @@
-depends gtk+-2 &&
-depends pcre &&
+depends gtk+-2
+depends pcre
depends gmime
diff --git a/zbeta/pcb-cvs/DEPENDS b/zbeta/pcb-cvs/DEPENDS
index c3efc81..076be2a 100644
--- a/zbeta/pcb-cvs/DEPENDS
+++ b/zbeta/pcb-cvs/DEPENDS
@@ -1,12 +1,12 @@
-depends automake &&
-depends autoconf &&
-depends libtool &&
-depends pkgconfig &&
-depends gettext &&
-depends guile &&
-depends gtk+-2 &&
-depends groff &&
+depends automake
+depends autoconf
+depends libtool
+depends pkgconfig
+depends gettext
+depends guile
+depends gtk+-2
+depends groff
-optional_depends "doxygen" "--enable-doc" "--disable-doc" "For building Documentation" &&
-optional_depends "texinfo" "--enable-doc" "--disable-doc" "For building Documentation" &&
+optional_depends "doxygen" "--enable-doc" "--disable-doc" "For building Documentation"
+optional_depends "texinfo" "--enable-doc" "--disable-doc" "For building Documentation"
optional_depends "latex2html" "--enable-doc" "--disable-doc" "For building Documentation"
diff --git a/zbeta/pcb-git/DEPENDS b/zbeta/pcb-git/DEPENDS
index c3efc81..076be2a 100644
--- a/zbeta/pcb-git/DEPENDS
+++ b/zbeta/pcb-git/DEPENDS
@@ -1,12 +1,12 @@
-depends automake &&
-depends autoconf &&
-depends libtool &&
-depends pkgconfig &&
-depends gettext &&
-depends guile &&
-depends gtk+-2 &&
-depends groff &&
+depends automake
+depends autoconf
+depends libtool
+depends pkgconfig
+depends gettext
+depends guile
+depends gtk+-2
+depends groff
-optional_depends "doxygen" "--enable-doc" "--disable-doc" "For building Documentation" &&
-optional_depends "texinfo" "--enable-doc" "--disable-doc" "For building Documentation" &&
+optional_depends "doxygen" "--enable-doc" "--disable-doc" "For building Documentation"
+optional_depends "texinfo" "--enable-doc" "--disable-doc" "For building Documentation"
optional_depends "latex2html" "--enable-doc" "--disable-doc" "For building Documentation"
diff --git a/zbeta/smbnetfs/DEPENDS b/zbeta/smbnetfs/DEPENDS
index 32735dd..881661d 100644
--- a/zbeta/smbnetfs/DEPENDS
+++ b/zbeta/smbnetfs/DEPENDS
@@ -1,2 +1,2 @@
-depends fuse &&
-depends samba
+depends fuse
+depends samba
diff --git a/zbeta/xemacs-beta/DEPENDS b/zbeta/xemacs-beta/DEPENDS
index f30c113..fffcbc9 100644
--- a/zbeta/xemacs-beta/DEPENDS
+++ b/zbeta/xemacs-beta/DEPENDS
@@ -1,8 +1,8 @@
-depends gdbm &&
-depends db &&
-depends xemacs-base &&
-depends xemacs-efs &&
-depends libXpm &&
+depends gdbm
+depends db
+depends xemacs-base
+depends xemacs-efs
+depends libXpm
optional_depends "openMotif" \
"" \
diff --git a/zdeprecated/E-xmms/DEPENDS b/zdeprecated/E-xmms/DEPENDS
index 32799c7..92c2f8c 100644
--- a/zdeprecated/E-xmms/DEPENDS
+++ b/zdeprecated/E-xmms/DEPENDS
@@ -1,3 +1,3 @@
-depends xmms &&
-depends enlightenment &&
+depends xmms
+depends enlightenment
depends epplet-base
diff --git a/zdeprecated/audioscrobbler/DEPENDS b/zdeprecated/audioscrobbler/DEPENDS
index 4ddd352..f7cba6e 100644
--- a/zdeprecated/audioscrobbler/DEPENDS
+++ b/zdeprecated/audioscrobbler/DEPENDS
@@ -1,2 +1,2 @@
-depends xmms &&
+depends xmms
depends libmusicbrainz
diff --git a/zdeprecated/gkrellmms/DEPENDS b/zdeprecated/gkrellmms/DEPENDS
index d141a09..f8af299 100644
--- a/zdeprecated/gkrellmms/DEPENDS
+++ b/zdeprecated/gkrellmms/DEPENDS
@@ -1,2 +1,2 @@
-depends gkrellm2 &&
+depends gkrellm2
depends xmms
diff --git a/zdeprecated/gnustep/gnustep-base/DEPENDS b/zdeprecated/gnustep/gnustep-base/DEPENDS
index 7741d38..584daaf 100644
--- a/zdeprecated/gnustep/gnustep-base/DEPENDS
+++ b/zdeprecated/gnustep/gnustep-base/DEPENDS
@@ -1,7 +1,7 @@
-depends tiff &&
-depends ffcall &&
-depends gnustep-make &&
+depends tiff
+depends ffcall
+depends gnustep-make
-optional_depends "WindowMaker" "" "" "WindowMaker is an X11 window manager" &&
-optional_depends "libxml2" "" "" "for xml support" &&
+optional_depends "WindowMaker" "" "" "WindowMaker is an X11 window manager"
+optional_depends "libxml2" "" "" "for xml support"
optional_depends "openssl" "" "" "for more security"
diff --git a/zdeprecated/gst-player/DEPENDS b/zdeprecated/gst-player/DEPENDS
index 3c5cd9d..9f5918d 100644
--- a/zdeprecated/gst-player/DEPENDS
+++ b/zdeprecated/gst-player/DEPENDS
@@ -1,3 +1,3 @@
-depends gst-plugins &&
-depends gnome-desktop &&
+depends gst-plugins
+depends gnome-desktop
depends GConf
diff --git a/zdeprecated/lirc-xmms-plugin/DEPENDS b/zdeprecated/lirc-xmms-plugin/DEPENDS
index 784e1cb..2221d41 100644
--- a/zdeprecated/lirc-xmms-plugin/DEPENDS
+++ b/zdeprecated/lirc-xmms-plugin/DEPENDS
@@ -1,2 +1,2 @@
-depends lirc &&
+depends lirc
depends xmms
diff --git a/zdeprecated/modplugxmms/DEPENDS b/zdeprecated/modplugxmms/DEPENDS
index 68f7938..d872a28 100644
--- a/zdeprecated/modplugxmms/DEPENDS
+++ b/zdeprecated/modplugxmms/DEPENDS
@@ -1,7 +1,7 @@
-depends xmms &&
-depends libmodplug &&
+depends xmms
+depends libmodplug
-optional_depends "unzip" "" "" "for zipped modules support" &&
-optional_depends "gzip" "" "" "for gzipped modules support" &&
-optional_depends "bzip2" "" "" "for bzip2ed modules support" &&
+optional_depends "unzip" "" "" "for zipped modules support"
+optional_depends "gzip" "" "" "for gzipped modules support"
+optional_depends "bzip2" "" "" "for bzip2ed modules support"
optional_depends "unrar" "" "" "for rared modules support"
diff --git a/zdeprecated/piave/DEPENDS b/zdeprecated/piave/DEPENDS
index 082a3a5..edca1ed 100644
--- a/zdeprecated/piave/DEPENDS
+++ b/zdeprecated/piave/DEPENDS
@@ -1,5 +1,5 @@
-depends SDL_image &&
-depends libxml2 &&
-depends libraw1394 &&
-depends libavc1394 &&
-depends libdv
+depends SDL_image
+depends libxml2
+depends libraw1394
+depends libavc1394
+depends libdv
diff --git a/zdeprecated/ximian-connector/DEPENDS b/zdeprecated/ximian-connector/DEPENDS
index 527db4b..30ce364 100644
--- a/zdeprecated/ximian-connector/DEPENDS
+++ b/zdeprecated/ximian-connector/DEPENDS
@@ -1,3 +1,3 @@
-depends evolution &&
-depends openldap &&
+depends evolution
+depends openldap
depends heimdal
diff --git a/zdeprecated/xmms-mad/DEPENDS b/zdeprecated/xmms-mad/DEPENDS
index 80313b8..c7be27b 100644
--- a/zdeprecated/xmms-mad/DEPENDS
+++ b/zdeprecated/xmms-mad/DEPENDS
@@ -1,3 +1,3 @@
-depends libmad &&
-depends libid3tag &&
+depends libmad
+depends libid3tag
depends xmms
More information about the Lunar-commits
mailing list