Revert the recent dependency and metadata scanning rework

This reverts the following commits:
fbe522d120
278ad007ee
863888e44f
96daf6352f
cfd83555fc

This seems to trigger some mconf bugs when built with all feeds
packages, so I will try to find a less intrusive solution before the
release.

Signed-off-by: Felix Fietkau <nbd@nbd.name>

package/network/utils/comgt/Makefile

@@ -39,7 +39,7 @@ endef
 define Package/comgt-directip
 $(call Package/comgt/Default)
   TITLE:=Sierra Wireless Direct-IP support
-  DEPENDS:=+comgt +USB_SUPPORT:kmod-usb-serial +USB_SUPPORT:kmod-usb-serial-sierrawireless +USB_SUPPORT:kmod-usb-net +USB_SUPPORT:kmod-usb-net-sierrawireless
+  DEPENDS:=+comgt +kmod-usb-serial +kmod-usb-serial-sierrawireless +kmod-usb-net +kmod-usb-net-sierrawireless
 endef
 
 define Package/comgt-ncm

package/network/utils/umbim/Makefile

@@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/cmake.mk
 define Package/umbim
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libubox +USB_SUPPORT:kmod-usb-net +USB_SUPPORT:kmod-usb-net-cdc-mbim +wwan
+  DEPENDS:=+libubox +kmod-usb-net +kmod-usb-net-cdc-mbim +wwan
   TITLE:=Control utility for mobile broadband modems
 endef
 

package/network/utils/uqmi/Makefile

@@ -22,7 +22,7 @@ define Package/uqmi
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=WWAN
-  DEPENDS:=+libubox +libblobmsg-json +USB_SUPPORT:kmod-usb-net +USB_SUPPORT:kmod-usb-net-qmi-wwan +wwan
+  DEPENDS:=+libubox +libblobmsg-json +kmod-usb-net +kmod-usb-net-qmi-wwan +wwan
   TITLE:=Control utility for mobile broadband modems
 endef
 

package/system/mountd/Makefile

@@ -23,7 +23,7 @@ define Package/mountd
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=OpenWrt automount daemon
-  DEPENDS:=+USB_SUPPORT:kmod-usb-storage +uci +kmod-fs-autofs4
+  DEPENDS:=@USB_SUPPORT +uci +kmod-usb-storage +kmod-fs-autofs4
   URL:=http://www.openwrt.org
 endef