82 files changed, 82 insertions, 82 deletions

diff --git a/noncore/applets/notesapplet/config.in b/noncore/applets/notesapplet/config.in
index a2f7d4d..6a90f19 100644
--- a/noncore/applets/notesapplet/config.in
+++ b/noncore/applets/notesapplet/config.in
@@ -1,4 +1,4 @@
   config NOTESAPPLET
     boolean "notesapplet"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/applets/wirelessapplet/config.in b/noncore/applets/wirelessapplet/config.in
index 55f1aa1..e502f93 100644
--- a/noncore/applets/wirelessapplet/config.in
+++ b/noncore/applets/wirelessapplet/config.in
@@ -1,4 +1,4 @@
   config WIRELESSAPPLET
     boolean "wirelessapplet"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/apps/advancedfm/config.in b/noncore/apps/advancedfm/config.in
index 968d373..c1e25c2 100644
--- a/noncore/apps/advancedfm/config.in
+++ b/noncore/apps/advancedfm/config.in
@@ -1,4 +1,4 @@
   config ADVANCEDFM
     boolean "advancedfm"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/apps/checkbook/config.in b/noncore/apps/checkbook/config.in
index 89ab053..3a7993b 100644
--- a/noncore/apps/checkbook/config.in
+++ b/noncore/apps/checkbook/config.in
@@ -1,4 +1,4 @@
   config CHECKBOOK
     boolean "checkbook"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/apps/confedit/config.in b/noncore/apps/confedit/config.in
index 13e6d27..09bb9df 100644
--- a/noncore/apps/confedit/config.in
+++ b/noncore/apps/confedit/config.in
@@ -1,4 +1,4 @@
   config CONFEDIT
     boolean "confedit"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/apps/dictionary/config.in b/noncore/apps/dictionary/config.in
index 2527127..e3afbfc 100644
--- a/noncore/apps/dictionary/config.in
+++ b/noncore/apps/dictionary/config.in
@@ -1,4 +1,4 @@
 #  config #DICTIONARY
 #    boolean "dictionary"
 #    default "y"
-#    depends LIBQPE && LIBOPIE
+#    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/apps/opie-console/config.in b/noncore/apps/opie-console/config.in
index f7793fa..01c9a1c 100644
--- a/noncore/apps/opie-console/config.in
+++ b/noncore/apps/opie-console/config.in
@@ -1,8 +1,8 @@
 menu "opie-console"
 
   config #TEST
     boolean "opie-console"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
   source noncore/apps/opie-console/test/config.in
 endmenu
diff --git a/noncore/apps/opie-reader/config.in b/noncore/apps/opie-reader/config.in
index 801c4d9..9d63eb2 100644
--- a/noncore/apps/opie-reader/config.in
+++ b/noncore/apps/opie-reader/config.in
@@ -1,4 +1,4 @@
   config OPIE-READER
     boolean "opie-reader"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/apps/opie-sheet/config.in b/noncore/apps/opie-sheet/config.in
index 7b66faf..d9450bb 100644
--- a/noncore/apps/opie-sheet/config.in
+++ b/noncore/apps/opie-sheet/config.in
@@ -1,4 +1,4 @@
   config OPIE-SHEET
     boolean "opie-sheet"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/apps/opie-write/config.in b/noncore/apps/opie-write/config.in
index 79650e9..9842b4b 100644
--- a/noncore/apps/opie-write/config.in
+++ b/noncore/apps/opie-write/config.in
@@ -1,4 +1,4 @@
 #  config #OPIE-WRITE
 #    boolean "opie-write"
 #    default "y"
-#    depends LIBQPE && LIBOPIE
+#    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/apps/oxygen/config.in b/noncore/apps/oxygen/config.in
index b83022a..1fd0987 100644
--- a/noncore/apps/oxygen/config.in
+++ b/noncore/apps/oxygen/config.in
@@ -1,4 +1,4 @@
   config OXYGEN
     boolean "oxygen"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/apps/tableviewer/config.in b/noncore/apps/tableviewer/config.in
index 8490d5d..31fadc0 100644
--- a/noncore/apps/tableviewer/config.in
+++ b/noncore/apps/tableviewer/config.in
@@ -1,4 +1,4 @@
   config TABLEVIEWER
     boolean "tableviewer"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/comm/keypebble/config.in b/noncore/comm/keypebble/config.in
index 7a81539..107d510 100644
--- a/noncore/comm/keypebble/config.in
+++ b/noncore/comm/keypebble/config.in
@@ -1,4 +1,4 @@
   config KEYPEBBLE
     boolean "keypebble"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/comm/mobilemsg/config.in b/noncore/comm/mobilemsg/config.in
index a7f92ff..45c4ca4 100644
--- a/noncore/comm/mobilemsg/config.in
+++ b/noncore/comm/mobilemsg/config.in
@@ -1,4 +1,4 @@
 #  config #MOBILEMSG
 #    boolean "mobilemsg"
 #    default "y"
-#    depends LIBQPE && LIBOPIE
+#    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/decorations/flat/config.in b/noncore/decorations/flat/config.in
index 80dc87d..74fc990 100644
--- a/noncore/decorations/flat/config.in
+++ b/noncore/decorations/flat/config.in
@@ -1,4 +1,4 @@
   config DECO_FLAT
     boolean "flat"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/decorations/liquid/config.in b/noncore/decorations/liquid/config.in
index 946d97d..2f41734 100644
--- a/noncore/decorations/liquid/config.in
+++ b/noncore/decorations/liquid/config.in
@@ -1,4 +1,4 @@
   config DECO_LIQUID
     boolean "liquid"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/decorations/polished/config.in b/noncore/decorations/polished/config.in
index 9feb134..df6c514 100644
--- a/noncore/decorations/polished/config.in
+++ b/noncore/decorations/polished/config.in
@@ -1,4 +1,4 @@
   config DECO_POLISHED
     boolean "polished"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/bounce/config.in b/noncore/games/bounce/config.in
index c7f2c02..92ea429 100644
--- a/noncore/games/bounce/config.in
+++ b/noncore/games/bounce/config.in
@@ -1,4 +1,4 @@
   config BOUNCE
     boolean "bounce"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/buzzword/config.in b/noncore/games/buzzword/config.in
index ad2525e..757daee 100644
--- a/noncore/games/buzzword/config.in
+++ b/noncore/games/buzzword/config.in
@@ -1,4 +1,4 @@
   config BUZZWORD
     boolean "buzzword"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/chess/config.in b/noncore/games/chess/config.in
index e64e73c..6cddb51 100644
--- a/noncore/games/chess/config.in
+++ b/noncore/games/chess/config.in
@@ -1,4 +1,4 @@
 #  config #CHESS
 #    boolean "chess"
 #    default "y"
-#    depends LIBQPE && LIBOPIE
+#    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/fifteen/config.in b/noncore/games/fifteen/config.in
index da35a05..880e178 100644
--- a/noncore/games/fifteen/config.in
+++ b/noncore/games/fifteen/config.in
@@ -1,4 +1,4 @@
   config FIFTEEN
     boolean "fifteen"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/go/config.in b/noncore/games/go/config.in
index da542c3..25395f7 100644
--- a/noncore/games/go/config.in
+++ b/noncore/games/go/config.in
@@ -1,4 +1,4 @@
   config GO
     boolean "go"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/kbill/config.in b/noncore/games/kbill/config.in
index 91a14d1..eb1900e 100644
--- a/noncore/games/kbill/config.in
+++ b/noncore/games/kbill/config.in
@@ -1,4 +1,4 @@
   config KBILL
     boolean "kbill"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/kcheckers/config.in b/noncore/games/kcheckers/config.in
index 1a3c60b..a0226f0 100644
--- a/noncore/games/kcheckers/config.in
+++ b/noncore/games/kcheckers/config.in
@@ -1,4 +1,4 @@
   config KCHECKERS
     boolean "kcheckers"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/kpacman/config.in b/noncore/games/kpacman/config.in
index c8a4bc6..4e1befa 100644
--- a/noncore/games/kpacman/config.in
+++ b/noncore/games/kpacman/config.in
@@ -1,4 +1,4 @@
   config KPACMAN
     boolean "kpacman"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/mindbreaker/config.in b/noncore/games/mindbreaker/config.in
index f141ebc..8eff9da 100644
--- a/noncore/games/mindbreaker/config.in
+++ b/noncore/games/mindbreaker/config.in
@@ -1,4 +1,4 @@
   config MINDBREAKER
     boolean "mindbreaker"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/minesweep/config.in b/noncore/games/minesweep/config.in
index 90934b9..74c9e0d 100644
--- a/noncore/games/minesweep/config.in
+++ b/noncore/games/minesweep/config.in
@@ -1,4 +1,4 @@
   config MINESWEEP
     boolean "minesweep"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/parashoot/config.in b/noncore/games/parashoot/config.in
index db6239c..956bdbb 100644
--- a/noncore/games/parashoot/config.in
+++ b/noncore/games/parashoot/config.in
@@ -1,4 +1,4 @@
   config PARASHOOT
     boolean "parashoot"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/qasteroids/config.in b/noncore/games/qasteroids/config.in
index a619624..74eaa07 100644
--- a/noncore/games/qasteroids/config.in
+++ b/noncore/games/qasteroids/config.in
@@ -1,4 +1,4 @@
   config QASTEROIDS
     boolean "qasteroids"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/snake/config.in b/noncore/games/snake/config.in
index 0048f9c..eade45e 100644
--- a/noncore/games/snake/config.in
+++ b/noncore/games/snake/config.in
@@ -1,4 +1,4 @@
   config SNAKE
     boolean "snake"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/solitaire/config.in b/noncore/games/solitaire/config.in
index 8264469..20dce9e 100644
--- a/noncore/games/solitaire/config.in
+++ b/noncore/games/solitaire/config.in
@@ -1,4 +1,4 @@
   config SOLITAIRE
     boolean "solitaire"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/tetrix/config.in b/noncore/games/tetrix/config.in
index 596d2b5..e7d3993 100644
--- a/noncore/games/tetrix/config.in
+++ b/noncore/games/tetrix/config.in
@@ -1,4 +1,4 @@
   config TETRIX
     boolean "tetrix"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/tictac/config.in b/noncore/games/tictac/config.in
index 9b65b8d..eff34ca 100644
--- a/noncore/games/tictac/config.in
+++ b/noncore/games/tictac/config.in
@@ -1,4 +1,4 @@
   config TICTAC
     boolean "tictac"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/games/wordgame/config.in b/noncore/games/wordgame/config.in
index 3969dc8..32b6eac 100644
--- a/noncore/games/wordgame/config.in
+++ b/noncore/games/wordgame/config.in
@@ -1,4 +1,4 @@
   config WORDGAME
     boolean "wordgame"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/graphics/drawpad/config.in b/noncore/graphics/drawpad/config.in
index 732330b..50fa916 100644
--- a/noncore/graphics/drawpad/config.in
+++ b/noncore/graphics/drawpad/config.in
@@ -1,4 +1,4 @@
   config DRAWPAD
     boolean "drawpad"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/multimedia/opieplayer2/config.in b/noncore/multimedia/opieplayer2/config.in
index 2a03125..da0a647 100644
--- a/noncore/multimedia/opieplayer2/config.in
+++ b/noncore/multimedia/opieplayer2/config.in
@@ -1,4 +1,4 @@
 #  config #OPIEPLAYER2
 #    boolean "opieplayer2"
 #    default "y"
-#    depends LIBQPE && LIBOPIE
+#    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/multimedia/showimg/config.in b/noncore/multimedia/showimg/config.in
index 0316ea6..0540c72 100644
--- a/noncore/multimedia/showimg/config.in
+++ b/noncore/multimedia/showimg/config.in
@@ -1,4 +1,4 @@
   config SHOWIMG
     boolean "showimg"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/networksetup/config.in b/noncore/net/networksetup/config.in
index b18bdbd..e151d6f 100644
--- a/noncore/net/networksetup/config.in
+++ b/noncore/net/networksetup/config.in
@@ -1,10 +1,10 @@
 menu "networksetup"
 
   config INTERFACES
     boolean "networksetup"
     default "y"
-    depends LIBQPE && LIBOPIE && WLAN && INTERFACES
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && WLAN && INTERFACES
 
   source noncore/net/networksetup/wlan/config.in
   source noncore/net/networksetup/interfaces/config.in
 endmenu
diff --git a/noncore/net/networksetup/interfaces/config.in b/noncore/net/networksetup/interfaces/config.in
index 431e51b..b9873f7 100644
--- a/noncore/net/networksetup/interfaces/config.in
+++ b/noncore/net/networksetup/interfaces/config.in
@@ -1,4 +1,4 @@
   config INTERFACES
     boolean "interfaces"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/networksetup/wlan/config.in b/noncore/net/networksetup/wlan/config.in
index 4853a32..7f552fc 100644
--- a/noncore/net/networksetup/wlan/config.in
+++ b/noncore/net/networksetup/wlan/config.in
@@ -1,4 +1,4 @@
   config WLAN
     boolean "wlan"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/opieftp/config.in b/noncore/net/opieftp/config.in
index fdb0e90..9d1e561 100644
--- a/noncore/net/opieftp/config.in
+++ b/noncore/net/opieftp/config.in
@@ -1,4 +1,4 @@
   config OPIEFTP
     boolean "opieftp"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/opieirc/config.in b/noncore/net/opieirc/config.in
index 7aaa5d3..30184a9 100644
--- a/noncore/net/opieirc/config.in
+++ b/noncore/net/opieirc/config.in
@@ -1,4 +1,4 @@
   config OPIEIRC
     boolean "opieirc"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/opietooth/applet/config.in b/noncore/net/opietooth/applet/config.in
index 80afbe5..4d689b5 100644
--- a/noncore/net/opietooth/applet/config.in
+++ b/noncore/net/opietooth/applet/config.in
@@ -1,4 +1,4 @@
 #  config #APPLET
 #    boolean "applet"
 #    default "y"
-#    depends LIBQPE && LIBOPIE
+#    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/opietooth/blue-pin/config.in b/noncore/net/opietooth/blue-pin/config.in
index c3e3056..395537c 100644
--- a/noncore/net/opietooth/blue-pin/config.in
+++ b/noncore/net/opietooth/blue-pin/config.in
@@ -1,4 +1,4 @@
 #  config #BLUE-PIN
 #    boolean "blue-pin"
 #    default "y"
-#    depends LIBQPE && LIBOPIE
+#    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/opietooth/lib/config.in b/noncore/net/opietooth/lib/config.in
index a8964f6..21c2fa3 100644
--- a/noncore/net/opietooth/lib/config.in
+++ b/noncore/net/opietooth/lib/config.in
@@ -1,4 +1,4 @@
 #  config #LIB
 #    boolean "lib"
 #    default "y"
-#    depends LIBQPE && LIBOPIE
+#    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/opietooth/manager/config.in b/noncore/net/opietooth/manager/config.in
index 704448f..a8c9f62 100644
--- a/noncore/net/opietooth/manager/config.in
+++ b/noncore/net/opietooth/manager/config.in
@@ -1,4 +1,4 @@
 #  config #MANAGER
 #    boolean "manager"
 #    default "y"
-#    depends LIBQPE && LIBOPIE
+#    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/ubrowser/config.in b/noncore/net/ubrowser/config.in
index 4b15046..562741d 100644
--- a/noncore/net/ubrowser/config.in
+++ b/noncore/net/ubrowser/config.in
@@ -1,4 +1,4 @@
 #  config #UBROWSER
 #    boolean "ubrowser"
 #    default "y"
-#    depends LIBQPE && LIBOPIE
+#    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/net/wellenreiter/config.in b/noncore/net/wellenreiter/config.in
index ff4a0cb..d6b48d8 100644
--- a/noncore/net/wellenreiter/config.in
+++ b/noncore/net/wellenreiter/config.in
@@ -1,4 +1,4 @@
 #  config #WELLENREITER
 #    boolean "wellenreiter"
 #    default "y"
-#    depends LIBQPE && LIBOPIE
+#    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/appearance2/config.in b/noncore/settings/appearance2/config.in
index e853545..0da6502 100644
--- a/noncore/settings/appearance2/config.in
+++ b/noncore/settings/appearance2/config.in
@@ -1,4 +1,4 @@
   config APPEARANCE2
     boolean "appearance2"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/aqpkg/config.in b/noncore/settings/aqpkg/config.in
index b16c0b8..4b5ffa7 100644
--- a/noncore/settings/aqpkg/config.in
+++ b/noncore/settings/aqpkg/config.in
@@ -1,4 +1,4 @@
   config AQPKG
     boolean "aqpkg"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/backup/config.in b/noncore/settings/backup/config.in
index 5fc09ef..b59f33f 100644
--- a/noncore/settings/backup/config.in
+++ b/noncore/settings/backup/config.in
@@ -1,4 +1,4 @@
   config BACKUP
     boolean "backup"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/language/config.in b/noncore/settings/language/config.in
index 1315904..ce5e335 100644
--- a/noncore/settings/language/config.in
+++ b/noncore/settings/language/config.in
@@ -1,4 +1,4 @@
   config LANGUAGE
     boolean "language"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/mediummount/config.in b/noncore/settings/mediummount/config.in
index 2bf9442..76e9500 100644
--- a/noncore/settings/mediummount/config.in
+++ b/noncore/settings/mediummount/config.in
@@ -1,4 +1,4 @@
   config MEDIUMMOUNT
     boolean "mediummount"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/netsystemtime/config.in b/noncore/settings/netsystemtime/config.in
index 0420d8e..697c1ea 100644
--- a/noncore/settings/netsystemtime/config.in
+++ b/noncore/settings/netsystemtime/config.in
@@ -1,4 +1,4 @@
   config NETSYSTEMTIME
     boolean "netsystemtime"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/networksettings/config.in b/noncore/settings/networksettings/config.in
index b18bdbd..e151d6f 100644
--- a/noncore/settings/networksettings/config.in
+++ b/noncore/settings/networksettings/config.in
@@ -1,10 +1,10 @@
 menu "networksetup"
 
   config INTERFACES
     boolean "networksetup"
     default "y"
-    depends LIBQPE && LIBOPIE && WLAN && INTERFACES
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && WLAN && INTERFACES
 
   source noncore/net/networksetup/wlan/config.in
   source noncore/net/networksetup/interfaces/config.in
 endmenu
diff --git a/noncore/settings/networksettings/interfaces/config.in b/noncore/settings/networksettings/interfaces/config.in
index 431e51b..b9873f7 100644
--- a/noncore/settings/networksettings/interfaces/config.in
+++ b/noncore/settings/networksettings/interfaces/config.in
@@ -1,4 +1,4 @@
   config INTERFACES
     boolean "interfaces"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/networksettings/wlan/config.in b/noncore/settings/networksettings/wlan/config.in
index 4853a32..7f552fc 100644
--- a/noncore/settings/networksettings/wlan/config.in
+++ b/noncore/settings/networksettings/wlan/config.in
@@ -1,4 +1,4 @@
   config WLAN
     boolean "wlan"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/sound/config.in b/noncore/settings/sound/config.in
index 5e0b52f..e99b200 100644
--- a/noncore/settings/sound/config.in
+++ b/noncore/settings/sound/config.in
@@ -1,4 +1,4 @@
   config SOUND
     boolean "sound"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/sshkeys/config.in b/noncore/settings/sshkeys/config.in
index 634aa3a..1e7f626 100644
--- a/noncore/settings/sshkeys/config.in
+++ b/noncore/settings/sshkeys/config.in
@@ -1,4 +1,4 @@
   config SSHKEYS
     boolean "sshkeys"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/sysinfo/config.in b/noncore/settings/sysinfo/config.in
index 062f035..f321b94 100644
--- a/noncore/settings/sysinfo/config.in
+++ b/noncore/settings/sysinfo/config.in
@@ -1,4 +1,4 @@
   config SYSINFO
     boolean "sysinfo"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/tabmanager/config.in b/noncore/settings/tabmanager/config.in
index f0c4c08..3737058 100644
--- a/noncore/settings/tabmanager/config.in
+++ b/noncore/settings/tabmanager/config.in
@@ -1,4 +1,4 @@
   config TABMANAGER
     boolean "tabmanager"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/usermanager/config.in b/noncore/settings/usermanager/config.in
index 2dd0b9e..5484a4e 100644
--- a/noncore/settings/usermanager/config.in
+++ b/noncore/settings/usermanager/config.in
@@ -1,4 +1,4 @@
   config USERMANAGER
     boolean "usermanager"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/styles/flat/config.in b/noncore/styles/flat/config.in
index 1c82de1..ae6edb6 100644
--- a/noncore/styles/flat/config.in
+++ b/noncore/styles/flat/config.in
@@ -1,4 +1,4 @@
   config FLAT
     boolean "flat"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/styles/fresh/config.in b/noncore/styles/fresh/config.in
index f71de8d..7199c18 100644
--- a/noncore/styles/fresh/config.in
+++ b/noncore/styles/fresh/config.in
@@ -1,4 +1,4 @@
   config FRESH
     boolean "fresh"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/styles/liquid/config.in b/noncore/styles/liquid/config.in
index d2bbddb..b510625 100644
--- a/noncore/styles/liquid/config.in
+++ b/noncore/styles/liquid/config.in
@@ -1,4 +1,4 @@
   config LIQUID
     boolean "liquid"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/styles/metal/config.in b/noncore/styles/metal/config.in
index 1d86924..991fc74 100644
--- a/noncore/styles/metal/config.in
+++ b/noncore/styles/metal/config.in
@@ -1,4 +1,4 @@
   config METAL
     boolean "metal"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/styles/theme/config.in b/noncore/styles/theme/config.in
index c90a422..27c8125 100644
--- a/noncore/styles/theme/config.in
+++ b/noncore/styles/theme/config.in
@@ -1,4 +1,4 @@
   config THEME
     boolean "theme"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/todayplugins/stockticker/config.in b/noncore/todayplugins/stockticker/config.in
index e9ee1b7..036b04c 100644
--- a/noncore/todayplugins/stockticker/config.in
+++ b/noncore/todayplugins/stockticker/config.in
@@ -1,10 +1,10 @@
 menu "stockticker"
 
   config TODAY_STOCKTICKER
     boolean "stockticker"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
 
   source noncore/todayplugins/stockticker/stockticker/config.in
   source noncore/todayplugins/stockticker/stocktickerlib/config.in
 endmenu
diff --git a/noncore/tools/calc2/binary/config.in b/noncore/tools/calc2/binary/config.in
index 7db862d..3a90707 100644
--- a/noncore/tools/calc2/binary/config.in
+++ b/noncore/tools/calc2/binary/config.in
@@ -1,4 +1,4 @@
 #  config #BINARY
 #    boolean "binary"
 #    default "y"
-#    depends LIBQPE && LIBOPIE
+#    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/tools/calc2/simple/config.in b/noncore/tools/calc2/simple/config.in
index 726b78d..a22a020 100644
--- a/noncore/tools/calc2/simple/config.in
+++ b/noncore/tools/calc2/simple/config.in
@@ -1,4 +1,4 @@
 #  config #SIMPLE
 #    boolean "simple"
 #    default "y"
-#    depends LIBQPE && LIBOPIE
+#    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/tools/calculator/config.in b/noncore/tools/calculator/config.in
index 9a8d8be..a290e5e 100644
--- a/noncore/tools/calculator/config.in
+++ b/noncore/tools/calculator/config.in
@@ -1,4 +1,4 @@
   config CALCULATOR
     boolean "calculator"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/tools/clock/config.in b/noncore/tools/clock/config.in
index c9c099c..341b42a 100644
--- a/noncore/tools/clock/config.in
+++ b/noncore/tools/clock/config.in
@@ -1,4 +1,4 @@
   config CLOCK
     boolean "clock"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/tools/formatter/config.in b/noncore/tools/formatter/config.in
index 70146bd..89c05e2 100644
--- a/noncore/tools/formatter/config.in
+++ b/noncore/tools/formatter/config.in
@@ -1,4 +1,4 @@
   config FORMATTER
     boolean "formatter"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/tools/opie-sh/config.in b/noncore/tools/opie-sh/config.in
index 77c1857..782ae5f 100644
--- a/noncore/tools/opie-sh/config.in
+++ b/noncore/tools/opie-sh/config.in
@@ -1,4 +1,4 @@
   config OPIE-SH
     boolean "opie-sh"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/tools/remote/config.in b/noncore/tools/remote/config.in
index ef51047..231696b 100644
--- a/noncore/tools/remote/config.in
+++ b/noncore/tools/remote/config.in
@@ -1,4 +1,4 @@
   config REMOTE
     boolean "remote"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/unsupported/filebrowser/config.in b/noncore/unsupported/filebrowser/config.in
index 46debbd..02c6521 100644
--- a/noncore/unsupported/filebrowser/config.in
+++ b/noncore/unsupported/filebrowser/config.in
@@ -1,4 +1,4 @@
   config FILEBROWSER
     boolean "filebrowser"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/unsupported/gsmtool/config.in b/noncore/unsupported/gsmtool/config.in
index 76c7eb7..f023d61 100644
--- a/noncore/unsupported/gsmtool/config.in
+++ b/noncore/unsupported/gsmtool/config.in
@@ -1,4 +1,4 @@
 #  config #GSMTOOL
 #    boolean "gsmtool"
 #    default "y"
-#    depends LIBQPE && LIBOPIE
+#    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/unsupported/mail2/bend/config.in b/noncore/unsupported/mail2/bend/config.in
index 3d33fe4..1cea22f 100644
--- a/noncore/unsupported/mail2/bend/config.in
+++ b/noncore/unsupported/mail2/bend/config.in
@@ -1,4 +1,4 @@
   config BEND
     boolean "bend"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/unsupported/mail2/config.in b/noncore/unsupported/mail2/config.in
index 2263230..4c50723 100644
--- a/noncore/unsupported/mail2/config.in
+++ b/noncore/unsupported/mail2/config.in
@@ -1,9 +1,9 @@
 menu "mail"
 
   config BEND
     boolean "mail"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
   source noncore/mail/bend/config.in
   source noncore/mail/libmail/config.in
 endmenu
diff --git a/noncore/unsupported/mail2/libmail/config.in b/noncore/unsupported/mail2/libmail/config.in
index 6712dbe..e9ce917 100644
--- a/noncore/unsupported/mail2/libmail/config.in
+++ b/noncore/unsupported/mail2/libmail/config.in
@@ -1,4 +1,4 @@
   config LIBMAIL
     boolean "libmail"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/unsupported/oipkg/config.in b/noncore/unsupported/oipkg/config.in
index 63a96e3..987994e 100644
--- a/noncore/unsupported/oipkg/config.in
+++ b/noncore/unsupported/oipkg/config.in
@@ -1,4 +1,4 @@
   config OIPKG
     boolean "oipkg"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/unsupported/qpdf/config.in b/noncore/unsupported/qpdf/config.in
index 2f0dc9d..dfd4f0a 100644
--- a/noncore/unsupported/qpdf/config.in
+++ b/noncore/unsupported/qpdf/config.in
@@ -1,4 +1,4 @@
   config QPDF
     boolean "qpdf"
     default "y"
-    depends LIBQPE && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE