6 files changed, 21 insertions, 14 deletions

diff --git a/noncore/net/opietooth/applet/config.in b/noncore/net/opietooth/applet/config.in
index 800f83f..59fdeb4 100644
--- a/noncore/net/opietooth/applet/config.in
+++ b/noncore/net/opietooth/applet/config.in
@@ -1,4 +1,4 @@
-  config #APPLET
-    boolean "applet"
+  config OPIETOOTH-APPLET
+    boolean
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIETOOTH && LIBOPIETOOTH
diff --git a/noncore/net/opietooth/blue-pin/config.in b/noncore/net/opietooth/blue-pin/config.in
index 2d922d2..a25cbde 100644
--- a/noncore/net/opietooth/blue-pin/config.in
+++ b/noncore/net/opietooth/blue-pin/config.in
@@ -1,4 +1,4 @@
-  config #BLUE-PIN
+  config BLUE-PIN
     boolean "blue-pin"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIETOOTH
diff --git a/noncore/net/opietooth/config.in.in b/noncore/net/opietooth/config.in.in
new file mode 100644
index 0000000..e09458c
--- a/dev/null
+++ b/noncore/net/opietooth/config.in.in
@@ -0,0 +1,7 @@
+config OPIETOOTH
+  bool "Opietooth"
+  depends (LIBQPE || LIBQPE-X11) && LIBOPIE
+
+if OPIETOOTH
+@sources@
+endif
diff --git a/noncore/net/opietooth/lib/config.in b/noncore/net/opietooth/lib/config.in
index a6602c3..2bb4d54 100644
--- a/noncore/net/opietooth/lib/config.in
+++ b/noncore/net/opietooth/lib/config.in
@@ -1,4 +1,4 @@
-  config #LIB
-    boolean "lib"
+  config LIBOPIETOOTH
+    boolean "libopietooth"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIETOOTH
diff --git a/noncore/net/opietooth/manager/config.in b/noncore/net/opietooth/manager/config.in
index 3a9cb92..445a657 100644
--- a/noncore/net/opietooth/manager/config.in
+++ b/noncore/net/opietooth/manager/config.in
@@ -1,4 +1,4 @@
-  config #MANAGER
-    boolean "manager"
+  config OPIETOOTH-MANAGER
+    boolean "Opietooth manager"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIETOOTH && LIBOPIETOOTH
diff --git a/packages b/packages
index c237bf4..b05f90a 100644
--- a/packages
+++ b/packages
@@ -34,13 +34,13 @@ CONFIG_TEST	noncore/apps/opie-console/test	test.pro
         CONFIG_UBROWSER         noncore/net/ubrowserubrowser.pro
         CONFIG_WELLENREITER     noncore/net/wellenreiterwellenreiter.pro
         CONFIG_WLANSETUP        noncore/unsupported/wlansetupwlansetup.pro
         CONFIG_ADDRESSBOOK      core/pim/addressbookaddressbook.pro
         CONFIG_ADVANCEDFM       noncore/apps/advancedfmadvancedfm.pro
         CONFIG_APPEARANCE2      noncore/settings/appearance2appearance2.pro
-        CONFIG_APPLET   noncore/net/opietooth/appletapplet.pro
+        CONFIG_OPIETOOTH-APPLET         noncore/net/opietooth/appletapplet.pro
         CONFIG_AQPKG    noncore/apps/aqpkgaqpkg.pro
         CONFIG_BACKUP   noncore/settings/backupbackup.pro
         CONFIG_BATTERYAPPLET    core/applets/batteryappletbatteryapplet.pro
         CONFIG_BEND     noncore/mail/bendbend.pro
         CONFIG_BLUE-PIN         noncore/net/opietooth/blue-pinblue-pin.pro
         CONFIG_BOUNCE   noncore/games/bouncebounce.pro
@@ -81,24 +81,24 @@ CONFIG_KEYBOARD	inputmethods/keyboard	keyboard.pro
         CONFIG_KEYPEBBLE        noncore/comm/keypebblekeypebble.pro
         CONFIG_KJUMPX   inputmethods/kjumpxkjumpx.pro
         CONFIG_KPACMAN  noncore/games/kpacmankpacman.pro
         CONFIG_LANGUAGE         noncore/settings/languagelanguage.pro
         CONFIG_LAUNCHER-SETTINGS        core/settings/launcherlauncher.pro
         CONFIG_LAUNCHER_CORE    core/launcherlauncher.pro
-        CONFIG_LIB      noncore/net/opietooth/liblib.pro
+        CONFIG_LIBOPIETOOTH     noncore/net/opietooth/liblib.pro
 CONFIG_LIBKATE  noncore/apps/tinykate/libkate libkate.pro
         CONFIG_LIBMAD   core/multimedia/opieplayer/libmadlibmad.pro
         CONFIG_LIBMAIL  noncore/mail/libmaillibmail.pro
         CONFIG_LIBMPEG3         core/multimedia/opieplayer/libmpeg3libmpeg3.pro
         CONFIG_LIBOPIE  libopielibopie.pro
         CONFIG_LIBQPE   librarylibrary.pro
         CONFIG_LIBQPE-X11       x11/libqpe-x11libqpe-x11.pro
         CONFIG_LIGHT-AND-POWER  core/settings/light-and-powerlight-and-power.pro
         CONFIG_LIQUID   noncore/styles/liquidliquid.pro
         CONFIG_LOGOUTAPPLET     core/applets/logoutappletlogoutapplet.pro
-        CONFIG_MANAGER  noncore/net/opietooth/managermanager.pro
+        CONFIG_OPIETOOTH-MANAGER        noncore/net/opietooth/managermanager.pro
         CONFIG_MEDIUMMOUNT      noncore/settings/mediummountmediummount.pro
         CONFIG_METAL    noncore/styles/metalmetal.pro
         CONFIG_MINDBREAKER      noncore/games/mindbreakermindbreaker.pro
         CONFIG_MINESWEEP        noncore/games/minesweepminesweep.pro
         CONFIG_MODPLUG  core/multimedia/opieplayer/modplugmodplug.pro
         CONFIG_MULTIKEY         inputmethods/multikeymultikey.pro