summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2015-02-11 18:10:31 +0300
committerVlad Glagolev2015-02-11 18:10:31 +0300
commit01317669fe327e50ba03ff3ce15352ffa6e37479 (patch)
treeae65a02bc7041c237db195167108420d4cbd224c
parente3c378e5017903b95b8ffff964b691861d467837 (diff)
parent6bb0aa644327af60df0779dcd06cb7782d7559ca (diff)
Merge branch 'master' into devel-xorg-modular
Conflicts: libs/sdl2/HISTORY xorg-driver/xf86-video-intel/DEPENDS xorg-driver/xf86-video-intel/HISTORY xorg-xserver/xorg-server/DEPENDS xorg-xserver/xorg-server/HISTORY
-rwxr-xr-xaudio-drivers/pulseaudio/DEPENDS2
-rw-r--r--audio-drivers/pulseaudio/HISTORY10
-rwxr-xr-xaudio-libs/libgpod/DEPENDS2
-rw-r--r--audio-libs/libgpod/HISTORY5
-rwxr-xr-xaudio-soft/media-player-info/DEPENDS2
-rw-r--r--audio-soft/media-player-info/HISTORY5
-rwxr-xr-xcluster/drbd/DEPENDS2
-rw-r--r--cluster/drbd/HISTORY5
-rwxr-xr-xcrypto/pcsc-lite/DEPENDS2
-rw-r--r--crypto/pcsc-lite/HISTORY7
-rw-r--r--disk/eudev/HISTORY11
-rwxr-xr-xdisk/eudev/PROVIDES2
-rwxr-xr-xdisk/eudev/REPAIR^2546e42efb97f0db2ee2d49b8bf5dfce^PROVIDES1
-rwxr-xr-xdisk/gparted/DEPENDS2
-rw-r--r--disk/gparted/HISTORY5
-rwxr-xr-x[-rw-r--r--]disk/libatasmart/DEPENDS2
-rw-r--r--disk/libatasmart/HISTORY3
-rw-r--r--disk/udev/HISTORY6
-rwxr-xr-x[-rw-r--r--]disk/udev/PROVIDES2
-rwxr-xr-xdisk/udev/REPAIR^2546e42efb97f0db2ee2d49b8bf5dfce^PROVIDES1
-rwxr-xr-xdisk/udisks/DEPENDS2
-rw-r--r--disk/udisks/HISTORY3
-rwxr-xr-xdisk/udisks2/DEPENDS2
-rw-r--r--disk/udisks2/HISTORY3
-rwxr-xr-xe-17/e17/DEPENDS2
-rw-r--r--e-17/e17/HISTORY3
-rwxr-xr-xe-17/eeze/DEPENDS2
-rw-r--r--e-17/eeze/HISTORY3
-rwxr-xr-xgnome2-libs/devicekit/DEPENDS2
-rw-r--r--gnome2-libs/devicekit/HISTORY5
-rwxr-xr-xgnome2-libs/gvfs/DEPENDS6
-rw-r--r--gnome2-libs/gvfs/HISTORY5
-rwxr-xr-xgraphics/libgphoto2/DEPENDS8
-rw-r--r--graphics/libgphoto2/HISTORY4
-rwxr-xr-xkernels/drm/DEPENDS2
-rw-r--r--kernels/drm/HISTORY3
-rwxr-xr-xlibs/libdrm/DEPENDS2
-rw-r--r--libs/libdrm/HISTORY3
-rwxr-xr-xlibs/libusb/DEPENDS2
-rw-r--r--libs/libusb/HISTORY5
-rwxr-xr-xlibs/libvirt/DEPENDS4
-rw-r--r--libs/libvirt/HISTORY3
-rwxr-xr-xlibs/sdl2/DEPENDS2
-rw-r--r--libs/sdl2/HISTORY3
-rwxr-xr-xlibs/upower/DEPENDS2
-rw-r--r--libs/upower/HISTORY3
-rwxr-xr-xnet/connman/DEPENDS2
-rw-r--r--net/connman/HISTORY5
-rwxr-xr-xnet/dhcpcd/DEPENDS2
-rw-r--r--net/dhcpcd/HISTORY3
-rwxr-xr-xprinter/system-config-printer/DEPENDS2
-rw-r--r--printer/system-config-printer/HISTORY3
-rwxr-xr-xqt5/qtbase/DEPENDS2
-rw-r--r--qt5/qtbase/HISTORY8
-rwxr-xr-x[-rw-r--r--]qt5/qtimageformats/CONFLICTS0
-rw-r--r--qt5/qtimageformats/HISTORY3
-rwxr-xr-x[-rw-r--r--]qt5/qtserialport/CONFLICTS0
-rwxr-xr-xqt5/qtserialport/DEPENDS2
-rw-r--r--qt5/qtserialport/HISTORY4
-rwxr-xr-xshell-term-fm/spacefm/DEPENDS2
-rw-r--r--shell-term-fm/spacefm/HISTORY3
-rwxr-xr-xsmgl/init.d/DEPENDS2
-rw-r--r--smgl/init.d/HISTORY3
-rwxr-xr-xsmgl/systemd/DEPENDS2
-rw-r--r--smgl/systemd/HISTORY17
-rwxr-xr-xutils/bluez5/DEPENDS2
-rw-r--r--utils/bluez5/HISTORY5
-rwxr-xr-xutils/cdemu-daemon/DEPENDS4
-rw-r--r--utils/cdemu-daemon/HISTORY5
-rwxr-xr-xutils/hal/DEPENDS2
-rw-r--r--utils/hal/HISTORY3
-rwxr-xr-xutils/pcmciautils/DEPENDS2
-rw-r--r--utils/pcmciautils/HISTORY5
-rwxr-xr-xutils/xen/DEPENDS2
-rw-r--r--utils/xen/HISTORY3
-rwxr-xr-xvideo/guvcview/DEPENDS2
-rw-r--r--video/guvcview/HISTORY6
-rwxr-xr-xvideo/kino/DEPENDS3
-rw-r--r--video/kino/HISTORY5
-rwxr-xr-xvideo/vlc/DEPENDS2
-rw-r--r--video/vlc/HISTORY3
-rwxr-xr-xwm-addons/razor-qt/DEPENDS2
-rw-r--r--wm-addons/razor-qt/HISTORY5
-rwxr-xr-xxorg-driver/xf86-input-wacom/DEPENDS5
-rw-r--r--xorg-driver/xf86-input-wacom/HISTORY5
-rwxr-xr-xxorg-driver/xf86-video-intel/DEPENDS2
-rw-r--r--xorg-driver/xf86-video-intel/HISTORY5
-rwxr-xr-xxorg-xserver/xorg-server/DEPENDS28
-rw-r--r--xorg-xserver/xorg-server/HISTORY7
89 files changed, 249 insertions, 90 deletions
diff --git a/audio-drivers/pulseaudio/DEPENDS b/audio-drivers/pulseaudio/DEPENDS
index 356aa0b1e8..acfaa3edbe 100755
--- a/audio-drivers/pulseaudio/DEPENDS
+++ b/audio-drivers/pulseaudio/DEPENDS
@@ -71,7 +71,7 @@ optional_depends lirc \
"--enable-lirc" \
"--disable-lirc" \
"Enable infra-red remote control support?" &&
-optional_depends UDEV \
+optional_depends DEVICE-MANAGER \
"--enable-udev --disable-hal-compat" \
"--disable-udev" \
"for device hotplug support" &&
diff --git a/audio-drivers/pulseaudio/HISTORY b/audio-drivers/pulseaudio/HISTORY
index 052330a25a..b07bca8a79 100644
--- a/audio-drivers/pulseaudio/HISTORY
+++ b/audio-drivers/pulseaudio/HISTORY
@@ -1,6 +1,10 @@
-2014-08-19 Treeve Jelbert <treeve@sourcemage.org>
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
+2014-08-19 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: openssl => SSL
-2014-06-09 Treeve Jelbert <treeve@sourcemage.org>
+
+2014-06-09 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: 5.0
* DEPENDS: fix UDEV, gtk+2 => gtk+3, add fftw, remove hal, add orc
gettedxt is nneded in order to build .desktop files
@@ -13,7 +17,7 @@
* DEPENDS: Replaced xorg-libs with libx11, libice, libsm, libxext, libxtst
gtk+2 support also needs libxxf86vm
-2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
+2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: udev => UDEV
2013-02-15 Sukneet Basuta <sukneet@sourcemage.org>
diff --git a/audio-libs/libgpod/DEPENDS b/audio-libs/libgpod/DEPENDS
index c77edf7866..e41e826d43 100755
--- a/audio-libs/libgpod/DEPENDS
+++ b/audio-libs/libgpod/DEPENDS
@@ -24,7 +24,7 @@ optional_depends gtk-doc \
'--enable-gtk-doc' \
'--disable-gtk-doc' \
'to build documentation' &&
-optional_depends UDEV \
+optional_depends DEVICE-MANAGER \
'--enable-udev' \
'--disable-udev' \
'to enable udev support' &&
diff --git a/audio-libs/libgpod/HISTORY b/audio-libs/libgpod/HISTORY
index b83d3dc42a..c5d4cdc0aa 100644
--- a/audio-libs/libgpod/HISTORY
+++ b/audio-libs/libgpod/HISTORY
@@ -1,4 +1,7 @@
-2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
+2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: udev => UDEV
2013-02-18 Remko van der Vossen <wich@sourcemage.org>
diff --git a/audio-soft/media-player-info/DEPENDS b/audio-soft/media-player-info/DEPENDS
index 72cf303b4b..f2ee01b4b7 100755
--- a/audio-soft/media-player-info/DEPENDS
+++ b/audio-soft/media-player-info/DEPENDS
@@ -1,3 +1,3 @@
depends pkgconfig &&
-depends UDEV &&
+depends DEVICE-MANAGER &&
depends python3
diff --git a/audio-soft/media-player-info/HISTORY b/audio-soft/media-player-info/HISTORY
index c4774d4c47..5c69c4d592 100644
--- a/audio-soft/media-player-info/HISTORY
+++ b/audio-soft/media-player-info/HISTORY
@@ -1,4 +1,7 @@
-2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
+2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: udev => UDEV
2013-07-24 Treeve Jelbert <treeve@sourcemage.org>
diff --git a/cluster/drbd/DEPENDS b/cluster/drbd/DEPENDS
index 6d50ffc67d..cde3365497 100755
--- a/cluster/drbd/DEPENDS
+++ b/cluster/drbd/DEPENDS
@@ -1,6 +1,6 @@
depends flex &&
-optional_depends UDEV \
+optional_depends DEVICE-MANAGER \
"--with-udev" \
"--without-udev" \
"for udev integration" &&
diff --git a/cluster/drbd/HISTORY b/cluster/drbd/HISTORY
index 9f1233ec5c..5bbb1ff081 100644
--- a/cluster/drbd/HISTORY
+++ b/cluster/drbd/HISTORY
@@ -1,4 +1,7 @@
-2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
+2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: udev => UDEV
2013-01-25 Vlad Glagolev <stealth@sourcemage.org>
diff --git a/crypto/pcsc-lite/DEPENDS b/crypto/pcsc-lite/DEPENDS
index f7316fa8bd..d4015ab5e8 100755
--- a/crypto/pcsc-lite/DEPENDS
+++ b/crypto/pcsc-lite/DEPENDS
@@ -2,5 +2,5 @@ depends -sub CXX gcc &&
if [[ $PCSC_DEVICE_ACCESS == libusb ]]; then
depends LIBUSB "--enable-libusb"
elif [[ $PCSC_DEVICE_ACCESS == udev ]]; then
- depends UDEV "--enable-libudev"
+ depends DEVICE-MANAGER "--enable-libudev"
fi
diff --git a/crypto/pcsc-lite/HISTORY b/crypto/pcsc-lite/HISTORY
index 351d0fff44..7bc2a5b0aa 100644
--- a/crypto/pcsc-lite/HISTORY
+++ b/crypto/pcsc-lite/HISTORY
@@ -1,7 +1,10 @@
-2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
+2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: udev => UDEV
-2012-05-09 Treeve Jelbert <treeve@sourcemage.org>
+2012-05-09 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: libusb => LIBUSB
2012-04-09 Ladislav Hagara <hgr@vabo.cz>
diff --git a/disk/eudev/HISTORY b/disk/eudev/HISTORY
index 59be90363f..039cffe341 100644
--- a/disk/eudev/HISTORY
+++ b/disk/eudev/HISTORY
@@ -1,10 +1,15 @@
-22014-10-30 Treeve Jelbert <treeve@sourcemage.org>
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * PROVIDES: UDEV -> DEVICE-MANAGER, fixed the bug -- providers must
+ not match spell names (the case doesn't matter here)
+ * REPAIR^2546e42efb97f0db2ee2d49b8bf5dfce^PROVIDES: added
+
+2014-10-30 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 2.1
-22014-09-01 Treeve Jelbert <treeve@sourcemage.org>
+2014-09-01 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.10
-22014-06-20 Treeve Jelbert <treeve@sourcemage.org>
+2014-06-20 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.8
* PRE_BUILD: create 'input' group
diff --git a/disk/eudev/PROVIDES b/disk/eudev/PROVIDES
index 5ca78e5af2..083c9a3429 100755
--- a/disk/eudev/PROVIDES
+++ b/disk/eudev/PROVIDES
@@ -1 +1 @@
-UDEV
+DEVICE-MANAGER
diff --git a/disk/eudev/REPAIR^2546e42efb97f0db2ee2d49b8bf5dfce^PROVIDES b/disk/eudev/REPAIR^2546e42efb97f0db2ee2d49b8bf5dfce^PROVIDES
new file mode 100755
index 0000000000..083c9a3429
--- /dev/null
+++ b/disk/eudev/REPAIR^2546e42efb97f0db2ee2d49b8bf5dfce^PROVIDES
@@ -0,0 +1 @@
+DEVICE-MANAGER
diff --git a/disk/gparted/DEPENDS b/disk/gparted/DEPENDS
index 5c8605184a..539b00adad 100755
--- a/disk/gparted/DEPENDS
+++ b/disk/gparted/DEPENDS
@@ -1,7 +1,7 @@
depends -sub CXX gcc &&
depends xml-parser-expat &&
depends parted &&
-depends UDEV &&
+depends DEVICE-MANAGER &&
depends gtkmm2 &&
optional_depends gnome-doc-utils '' '--disable-doc' 'for documentation' &&
optional_depends rarian '' '--disable-scrollkeeper' 'to register help files with rarian' &&
diff --git a/disk/gparted/HISTORY b/disk/gparted/HISTORY
index 6888bb0fec..607539897f 100644
--- a/disk/gparted/HISTORY
+++ b/disk/gparted/HISTORY
@@ -1,10 +1,13 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2014-02-20 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.18.0
2013-09-19 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.16.2
-2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
+2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: udev => UDEV
2013-05-02 Ladislav Hagara <hgr@vabo.cz>
diff --git a/disk/libatasmart/DEPENDS b/disk/libatasmart/DEPENDS
index 389e196b49..964adec8e9 100644..100755
--- a/disk/libatasmart/DEPENDS
+++ b/disk/libatasmart/DEPENDS
@@ -1,2 +1,2 @@
depends pkgconfig &&
-depends UDEV
+depends DEVICE-MANAGER
diff --git a/disk/libatasmart/HISTORY b/disk/libatasmart/HISTORY
index 8a49b78c8f..88fd77ad37 100644
--- a/disk/libatasmart/HISTORY
+++ b/disk/libatasmart/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER, changed mode to 755
+
2013-10-21 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: added, for UDEV
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index 88f18617da..54ec131e77 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,9 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * PROVIDES: UDEV -> DEVICE-MANAGER, fixed the bug -- providers must
+ not match spell names (the case doesn't matter here); changed mode to
+ 755
+ * REPAIR^2546e42efb97f0db2ee2d49b8bf5dfce^PROVIDES: added
+
2013-07-27 Treeve Jelbert <treeve@sourcemage.org>
* CONFLICTS: add eudev
* PROVIDES: added
diff --git a/disk/udev/PROVIDES b/disk/udev/PROVIDES
index 5ca78e5af2..083c9a3429 100644..100755
--- a/disk/udev/PROVIDES
+++ b/disk/udev/PROVIDES
@@ -1 +1 @@
-UDEV
+DEVICE-MANAGER
diff --git a/disk/udev/REPAIR^2546e42efb97f0db2ee2d49b8bf5dfce^PROVIDES b/disk/udev/REPAIR^2546e42efb97f0db2ee2d49b8bf5dfce^PROVIDES
new file mode 100755
index 0000000000..083c9a3429
--- /dev/null
+++ b/disk/udev/REPAIR^2546e42efb97f0db2ee2d49b8bf5dfce^PROVIDES
@@ -0,0 +1 @@
+DEVICE-MANAGER
diff --git a/disk/udisks/DEPENDS b/disk/udisks/DEPENDS
index e8ecbef8da..08a22f6846 100755
--- a/disk/udisks/DEPENDS
+++ b/disk/udisks/DEPENDS
@@ -5,7 +5,7 @@ depends libatasmart &&
depends docbook-xsl &&
depends -sub GOBJ policykit &&
depends dbus-glib &&
-depends -sub GUDEV UDEV &&
+depends -sub GUDEV DEVICE-MANAGER &&
optional_depends man \
"--enable-man-pages" \
diff --git a/disk/udisks/HISTORY b/disk/udisks/HISTORY
index 8e27358770..0d775bda09 100644
--- a/disk/udisks/HISTORY
+++ b/disk/udisks/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2014-02-12 Tommy Boatman <tboatman@sourcemage.org>
* DEPENDS: needs policykit regardless of gtk-doc
needs dbus-glib
diff --git a/disk/udisks2/DEPENDS b/disk/udisks2/DEPENDS
index ae205ea29d..0ac808cb32 100755
--- a/disk/udisks2/DEPENDS
+++ b/disk/udisks2/DEPENDS
@@ -1,8 +1,8 @@
depends pkgconfig &&
depends glib2 &&
-depends UDEV &&
depends acl &&
depends libxslt &&
+depends DEVICE-MANAGER &&
depends libatasmart &&
depends policykit &&
depends perl &&
diff --git a/disk/udisks2/HISTORY b/disk/udisks2/HISTORY
index f09f8e3df6..76e546ecd5 100644
--- a/disk/udisks2/HISTORY
+++ b/disk/udisks2/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2014-12-19 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: 2.1.4
diff --git a/e-17/e17/DEPENDS b/e-17/e17/DEPENDS
index 78c8b1eb8c..6349d9b030 100755
--- a/e-17/e17/DEPENDS
+++ b/e-17/e17/DEPENDS
@@ -41,7 +41,7 @@ optional_depends hal \
"--disable-device-hal --disable-mount-hal" \
"Enable HAL device backend and mounting support?" &&
-optional_depends UDEV \
+optional_depends DEVICE-MANAGER \
"--enable-device-udev" "--disable-device-udev" \
"Enable UDEV device backend?" &&
diff --git a/e-17/e17/HISTORY b/e-17/e17/HISTORY
index 5c3e08eba6..4ad1c35b8b 100644
--- a/e-17/e17/HISTORY
+++ b/e-17/e17/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2014-07-03 Ismael Luceno <ismael@sourcemage.org>
* DETAILS: Use get_scm_version
diff --git a/e-17/eeze/DEPENDS b/e-17/eeze/DEPENDS
index 0c66048353..1f02354526 100755
--- a/e-17/eeze/DEPENDS
+++ b/e-17/eeze/DEPENDS
@@ -1,7 +1,7 @@
depends util-linux &&
depends ecore &&
depends eet &&
-depends UDEV &&
+depends DEVICE-MANAGER &&
optional_depends doxygen \
'--enable-doc' \
diff --git a/e-17/eeze/HISTORY b/e-17/eeze/HISTORY
index ef4b63254e..92aef04080 100644
--- a/e-17/eeze/HISTORY
+++ b/e-17/eeze/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2013-07-30 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 1.7.8
diff --git a/gnome2-libs/devicekit/DEPENDS b/gnome2-libs/devicekit/DEPENDS
index 204572145e..8a7033c7ca 100755
--- a/gnome2-libs/devicekit/DEPENDS
+++ b/gnome2-libs/devicekit/DEPENDS
@@ -1,7 +1,7 @@
depends dbus &&
depends dbus-glib &&
depends pkgconfig &&
-depends UDEV &&
+depends DEVICE-MANAGER &&
optional_depends docbook-xsl \
"--enable-man-pages" \
"--disable-man-pages" \
diff --git a/gnome2-libs/devicekit/HISTORY b/gnome2-libs/devicekit/HISTORY
index 0d0fa4cad0..fde4d90e0a 100644
--- a/gnome2-libs/devicekit/HISTORY
+++ b/gnome2-libs/devicekit/HISTORY
@@ -1,4 +1,7 @@
-2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
+2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: udev => UDEV
2010-08-11 Robin Cook <rcook@wyrms.net>
diff --git a/gnome2-libs/gvfs/DEPENDS b/gnome2-libs/gvfs/DEPENDS
index 5adb5b0aca..3f6b5f16f4 100755
--- a/gnome2-libs/gvfs/DEPENDS
+++ b/gnome2-libs/gvfs/DEPENDS
@@ -19,13 +19,13 @@ optional_depends libcdio-paranoia \
"--disable-cdda" \
"build with CDDA backend" &&
-optional_depends UDEV \
+optional_depends DEVICE-MANAGER \
"--enable-udev" \
"--disable-udev" \
"build with udev support" &&
-if is_depends_enabled $SPELL UDEV; then
- optional_depends -sub GUDEV UDEV \
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL DEVICE-MANAGER); then
+ optional_depends -sub GUDEV DEVICE-MANAGER \
"--enable-gudev" \
"--disable-gudev" \
"build with gudev support"
diff --git a/gnome2-libs/gvfs/HISTORY b/gnome2-libs/gvfs/HISTORY
index a805826aaf..3c52fb4d5a 100644
--- a/gnome2-libs/gvfs/HISTORY
+++ b/gnome2-libs/gvfs/HISTORY
@@ -1,7 +1,10 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER, fixed provider dependency check
+
2015-01-25 Ismael Luceno <ismael@sourcemage.org>
* DETAILS: updated spell to 1.23.4
-2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
+2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: udev => UDEV
2013-05-09 Ladislav Hagara <hgr@vabo.cz>
diff --git a/graphics/libgphoto2/DEPENDS b/graphics/libgphoto2/DEPENDS
index 14734e2bd6..e3a340cfd1 100755
--- a/graphics/libgphoto2/DEPENDS
+++ b/graphics/libgphoto2/DEPENDS
@@ -8,13 +8,13 @@ fi &&
# test kernel version
-local GPH_KDEV
+local GPH_KVER &&
GPH_KVER=`uname -r |cut -c-3` &&
if [[ $GPH_KVER != "2.4" ]];then
- optional_depends UDEV "udevscriptdir=$INSTALL_ROOT/lib/udev" "" \
- "for kernel UDEV support"
+ optional_depends DEVICE-MANAGER "udevscriptdir=$INSTALL_ROOT/lib/udev" "" \
+ "for kernel UDEV support"
else
- optional_depends hotplug "" "" "for kernel hotplug support"
+ optional_depends hotplug "" "" "for kernel hotplug support"
fi &&
optional_depends lockdev "" "" "serial port locking" &&
diff --git a/graphics/libgphoto2/HISTORY b/graphics/libgphoto2/HISTORY
index 03e69189e8..b05c2c2cde 100644
--- a/graphics/libgphoto2/HISTORY
+++ b/graphics/libgphoto2/HISTORY
@@ -1,3 +1,7 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER, corrected a typo in the variable for
+ kernel version
+
2015-01-04 Ismael Luceno <ismael@sourcemage.org>
* DETAILS: Fix SOURCE_URL[0]
diff --git a/kernels/drm/DEPENDS b/kernels/drm/DEPENDS
index e8dea01817..4514ee9d80 100755
--- a/kernels/drm/DEPENDS
+++ b/kernels/drm/DEPENDS
@@ -1,6 +1,6 @@
depends git &&
-optional_depends 'UDEV' \
+optional_depends DEVICE-MANAGER \
'--enable-udev' \
'--disable-udev' \
'for using udev instead of mknod'
diff --git a/kernels/drm/HISTORY b/kernels/drm/HISTORY
index 2a89c3ce03..c52f2ec906 100644
--- a/kernels/drm/HISTORY
+++ b/kernels/drm/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2014-07-03 Ismael Luceno <ismael@sourcemage.org>
* DETAILS: Use get_scm_version
diff --git a/libs/libdrm/DEPENDS b/libs/libdrm/DEPENDS
index 128318a329..2875a921b4 100755
--- a/libs/libdrm/DEPENDS
+++ b/libs/libdrm/DEPENDS
@@ -1,7 +1,7 @@
depends libpthread-stubs &&
depends libpciaccess &&
-optional_depends UDEV \
+optional_depends DEVICE-MANAGER \
"--enable-udev" \
"--disable-udev" \
"support for using udev instead of mknod"
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index ead1068460..49b5d23e62 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2015-01-22 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: 2.4.59
diff --git a/libs/libusb/DEPENDS b/libs/libusb/DEPENDS
index 901a4da8bc..dc867b5b34 100755
--- a/libs/libusb/DEPENDS
+++ b/libs/libusb/DEPENDS
@@ -10,7 +10,7 @@ optional_depends doxygen \
"" \
"Build C++ API documentation" &&
-optional_depends UDEV \
+optional_depends DEVICE-MANAGER \
"--enable-udev" \
"--disable-udev" \
"udev support"
diff --git a/libs/libusb/HISTORY b/libs/libusb/HISTORY
index 90158f1a35..caa0cf76d8 100644
--- a/libs/libusb/HISTORY
+++ b/libs/libusb/HISTORY
@@ -1,4 +1,7 @@
-2014-0615 Treeve Jelbert <treeve@sourcemage.org>
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
+2014-06-15 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.0.19
2014-04-05 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
diff --git a/libs/libvirt/DEPENDS b/libs/libvirt/DEPENDS
index ea9b7de3ca..148511dcb6 100755
--- a/libs/libvirt/DEPENDS
+++ b/libs/libvirt/DEPENDS
@@ -29,7 +29,7 @@ optional_depends iptables \
'' \
'for IP table routing support' &&
-optional_depends xen-tools \
+optional_depends xen \
'--with-xen' \
'--without-xen' \
'for Xen support' &&
@@ -61,7 +61,7 @@ optional_depends libssh2 \
'--without-ssh2' \
'SSH2 support' &&
-optional_depends 'UDEV' \
+optional_depends DEVICE-MANAGER \
'--with-udev' \
'--without-udev' \
'to use udev for host device enumeration' &&
diff --git a/libs/libvirt/HISTORY b/libs/libvirt/HISTORY
index 0bb714f86d..f98d1c7bb9 100644
--- a/libs/libvirt/HISTORY
+++ b/libs/libvirt/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER; fixed xen dependency
+
2014-12-29 Eric Sandall <sandalle@sourcemage.org>
* DEPENDS: Uses ebtables for firewall/NAT
diff --git a/libs/sdl2/DEPENDS b/libs/sdl2/DEPENDS
index 15e21db243..fcebaa0c08 100755
--- a/libs/sdl2/DEPENDS
+++ b/libs/sdl2/DEPENDS
@@ -82,7 +82,7 @@ suggest_depends mesalib \
"--enable-video-opengles" "--disable-video-opengles" \
"Include OpenGL ES support?" &&
-suggest_depends UDEV \
+suggest_depends DEVICE-MANAGER \
"--enable-libudev" "--disable-libudev" \
"Enable libudev support?" &&
diff --git a/libs/sdl2/HISTORY b/libs/sdl2/HISTORY
index 0d7f4fc901..d4f47b743d 100644
--- a/libs/sdl2/HISTORY
+++ b/libs/sdl2/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2014-09-25 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: MESALIB => mesalib
diff --git a/libs/upower/DEPENDS b/libs/upower/DEPENDS
index fcaede350f..20a1350cfb 100755
--- a/libs/upower/DEPENDS
+++ b/libs/upower/DEPENDS
@@ -3,7 +3,7 @@ depends glib2 &&
depends dbus &&
depends dbus-glib &&
depends policykit &&
-depends -sub GUDEV UDEV &&
+depends -sub GUDEV DEVICE-MANAGER &&
depends LIBUSB &&
optional_depends gobject-introspection \
diff --git a/libs/upower/HISTORY b/libs/upower/HISTORY
index bec838edc5..4902966c32 100644
--- a/libs/upower/HISTORY
+++ b/libs/upower/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2014-12-19 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 0.99.2
diff --git a/net/connman/DEPENDS b/net/connman/DEPENDS
index 2ee355e2b2..d1cc010152 100755
--- a/net/connman/DEPENDS
+++ b/net/connman/DEPENDS
@@ -1,5 +1,5 @@
depends glib2 &&
-depends UDEV &&
+depends DEVICE-MANAGER &&
depends dbus &&
depends iptables &&
depends gnutls
diff --git a/net/connman/HISTORY b/net/connman/HISTORY
index 35649a25ae..0e293b0ce0 100644
--- a/net/connman/HISTORY
+++ b/net/connman/HISTORY
@@ -1,4 +1,7 @@
-2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
+2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: udev => UDEV
2012-11-02 Ladislav Hagara <hgr@vabo.cz>
diff --git a/net/dhcpcd/DEPENDS b/net/dhcpcd/DEPENDS
index 0d87f06b92..b6ca61dd26 100755
--- a/net/dhcpcd/DEPENDS
+++ b/net/dhcpcd/DEPENDS
@@ -2,4 +2,4 @@
# checking are in place on a virgin system before casting
depends gnupg &&
depends smgl-fhs &&
-optional_depends UDEV '' '' 'device detection'
+optional_depends DEVICE-MANAGER '' '' 'for device detection'
diff --git a/net/dhcpcd/HISTORY b/net/dhcpcd/HISTORY
index f9e2168159..c9bb096ba2 100644
--- a/net/dhcpcd/HISTORY
+++ b/net/dhcpcd/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2015-01-31 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 6.7.1
diff --git a/printer/system-config-printer/DEPENDS b/printer/system-config-printer/DEPENDS
index 17e5860236..9a38e53410 100755
--- a/printer/system-config-printer/DEPENDS
+++ b/printer/system-config-printer/DEPENDS
@@ -7,4 +7,4 @@ depends python &&
depends xmlto &&
depends desktop-file-utils &&
-optional_depends UDEV '--with-udev-rules' '' 'use udev for hardware detection'
+optional_depends DEVICE-MANAGER '--with-udev-rules' '' 'use udev for hardware detection'
diff --git a/printer/system-config-printer/HISTORY b/printer/system-config-printer/HISTORY
index bb338456f3..d85396710f 100644
--- a/printer/system-config-printer/HISTORY
+++ b/printer/system-config-printer/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2013-07-28 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.4.1
diff --git a/qt5/qtbase/DEPENDS b/qt5/qtbase/DEPENDS
index 34eb5b38e7..73fd3d8ebe 100755
--- a/qt5/qtbase/DEPENDS
+++ b/qt5/qtbase/DEPENDS
@@ -98,7 +98,7 @@ optional_depends 'gtk+2' \
'-no-gtkstyle' \
'for GTK+ theme integration' &&
-optional_depends UDEV '' '' 'generic evdev keyboard support' &&
+optional_depends DEVICE-MANAGER '' '' 'generic evdev keyboard support' &&
optional_depends libxkbcommon '' '' 'XKB keyboard/input handling' &&
if [[ $QT_ACCESS == "-accessibility" ]]; then
diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index dd614c0ea9..8b8f55c7de 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,7 +1,9 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2014-08-19 Treeve Jelbert <treeve@sourcemage.org>
- * DEPENDS: openssl => SSL
- fix flage
- * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
+ * DEPENDS: openssl => SSL, fix flags
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
2014-02-05 Tommy Boatman <tboatman@sourcemage.org>
* BUILD: removed demos to match CONFIGURE
diff --git a/qt5/qtimageformats/CONFLICTS b/qt5/qtimageformats/CONFLICTS
index 423e12ed84..423e12ed84 100644..100755
--- a/qt5/qtimageformats/CONFLICTS
+++ b/qt5/qtimageformats/CONFLICTS
diff --git a/qt5/qtimageformats/HISTORY b/qt5/qtimageformats/HISTORY
index 6a87ab684a..1de897b9ab 100644
--- a/qt5/qtimageformats/HISTORY
+++ b/qt5/qtimageformats/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFLICTS: changed mode to 755
+
2013-12-12 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 5.2.0
diff --git a/qt5/qtserialport/CONFLICTS b/qt5/qtserialport/CONFLICTS
index 4afa6daf27..4afa6daf27 100644..100755
--- a/qt5/qtserialport/CONFLICTS
+++ b/qt5/qtserialport/CONFLICTS
diff --git a/qt5/qtserialport/DEPENDS b/qt5/qtserialport/DEPENDS
index c860a1600a..94562d9aa5 100755
--- a/qt5/qtserialport/DEPENDS
+++ b/qt5/qtserialport/DEPENDS
@@ -1,2 +1,2 @@
depends qtbase &&
-optional_depends UDEV '' '' 'hardware detection'
+optional_depends DEVICE-MANAGER '' '' 'hardware detection'
diff --git a/qt5/qtserialport/HISTORY b/qt5/qtserialport/HISTORY
index 2fd53a0adf..58134ad6ee 100644
--- a/qt5/qtserialport/HISTORY
+++ b/qt5/qtserialport/HISTORY
@@ -1,3 +1,7 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+ * CONFLICTS: changed mode to 755
+
2013-12-12 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 5.2.0
new spell, for modular qt5
diff --git a/shell-term-fm/spacefm/DEPENDS b/shell-term-fm/spacefm/DEPENDS
index 79fb84c9d8..df52f5f2ad 100755
--- a/shell-term-fm/spacefm/DEPENDS
+++ b/shell-term-fm/spacefm/DEPENDS
@@ -1,7 +1,7 @@
. "$GRIMOIRE/FUNCTIONS" &&
depends bash &&
-depends UDEV &&
+depends DEVICE-MANAGER &&
depends $SPACEFM_GTK "--with-${SPACEFM_GTK/gtk+/gtk}" &&
diff --git a/shell-term-fm/spacefm/HISTORY b/shell-term-fm/spacefm/HISTORY
index eb3fa17119..9eb59c4680 100644
--- a/shell-term-fm/spacefm/HISTORY
+++ b/shell-term-fm/spacefm/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2014-04-05 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DEPENDS: depend on UDEV instead of udev
diff --git a/smgl/init.d/DEPENDS b/smgl/init.d/DEPENDS
index 94531c1f52..6be44b034e 100755
--- a/smgl/init.d/DEPENDS
+++ b/smgl/init.d/DEPENDS
@@ -21,7 +21,7 @@ then
spell_ok udev ||
spell_ok eudev
then
- depends UDEV
+ depends DEVICE-MANAGER
else
message "You have a kernel < 2.6.15, it is too old for" \
"latest udev.\nUsing udev-old spell instead." &&
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index ae63e13e50..9251b97a93 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2013-07-27 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: udev => udev
diff --git a/smgl/systemd/DEPENDS b/smgl/systemd/DEPENDS
index 3b9fc31eb4..4c163a4753 100755
--- a/smgl/systemd/DEPENDS
+++ b/smgl/systemd/DEPENDS
@@ -1,6 +1,6 @@
runtime_depends util-linux &&
-depends UDEV &&
+depends DEVICE-MANAGER &&
depends dbus &&
depends intltool &&
depends libcap &&
diff --git a/smgl/systemd/HISTORY b/smgl/systemd/HISTORY
index 529f662e5e..3fbe533c4c 100644
--- a/smgl/systemd/HISTORY
+++ b/smgl/systemd/HISTORY
@@ -1,18 +1,21 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: udev => UDEV
2011-12-21 David Kowis <dkowis@shlrm.org>
- * DETAILS: added more information to the long description and refomratted it
+ * DETAILS: added more information to the long description and reformatted it
2011-12-20 David Kowis <dkowis@shlrm.org>
- * DEPENDS: added additional dependencies
- * CONFIGURE: added configure options
- * BUILD: set the root directory correctly
- * INSTALL: added logic to barf out one more config file that's needed
- * UP_TRIGGERS: Set the triggers to fire only if we're doing a fresh install
+ * DEPENDS: added additional dependencies
+ * CONFIGURE: added configure options
+ * BUILD: set the root directory correctly
+ * INSTALL: added logic to barf out one more config file that's needed
+ * UP_TRIGGERS: Set the triggers to fire only if we're doing a fresh install
2011-12-19 David Kowis <dkowis@shlrm.org>
- * DEPENDS: needs intltool to successfully build
+ * DEPENDS: needs intltool to successfully build
* DETAILS: version to 37
2011-06-13 David Kowis <dkowis@shlrm.org>
diff --git a/utils/bluez5/DEPENDS b/utils/bluez5/DEPENDS
index 9b1d3a31ce..cafc4d000c 100755
--- a/utils/bluez5/DEPENDS
+++ b/utils/bluez5/DEPENDS
@@ -9,7 +9,7 @@ optional_depends cups \
"--disable-cups" \
"for CUPS backend support" &&
-optional_depends UDEV \
+optional_depends DEVICE-MANAGER \
"--enable-udevrules" \
"--disable-udevrules" \
"install the udev rules"
diff --git a/utils/bluez5/HISTORY b/utils/bluez5/HISTORY
index 76afeccadc..2f3dd267b4 100644
--- a/utils/bluez5/HISTORY
+++ b/utils/bluez5/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2015-01-10 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 5.27
- spell creaaated, based on bluez
+ spell created, based on bluez
diff --git a/utils/cdemu-daemon/DEPENDS b/utils/cdemu-daemon/DEPENDS
index e3327c79cb..b82a5dfb79 100755
--- a/utils/cdemu-daemon/DEPENDS
+++ b/utils/cdemu-daemon/DEPENDS
@@ -5,7 +5,5 @@ depends glib2 &&
depends libdaemon &&
depends libmirage &&
depends sysfsutils &&
-depends UDEV &&
+depends DEVICE-MANAGER &&
depends libao
-
-
diff --git a/utils/cdemu-daemon/HISTORY b/utils/cdemu-daemon/HISTORY
index 8ef5d4a91f..47cba9db0a 100644
--- a/utils/cdemu-daemon/HISTORY
+++ b/utils/cdemu-daemon/HISTORY
@@ -1,4 +1,7 @@
-2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
+2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: udev => UDEV
2011-07-30 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
diff --git a/utils/hal/DEPENDS b/utils/hal/DEPENDS
index b81ae84855..d56e9c3e22 100755
--- a/utils/hal/DEPENDS
+++ b/utils/hal/DEPENDS
@@ -3,7 +3,7 @@ depends AWK &&
depends glib2 &&
depends intltool &&
depends libtool &&
-depends UDEV '--with-udev-prefix=/etc' &&
+depends DEVICE-MANAGER "--with-udev-prefix=$INSTALL_ROOT/etc" &&
depends xml-parser-expat &&
depends pkgconfig &&
depends util-linux &&
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index ede6d8634f..ece6892b23 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER, use INSTALL_ROOT
+
2014-04-05 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DEPENDS: depend on UDEV instead of udev
diff --git a/utils/pcmciautils/DEPENDS b/utils/pcmciautils/DEPENDS
index 3a81c2b69e..7d814dfd57 100755
--- a/utils/pcmciautils/DEPENDS
+++ b/utils/pcmciautils/DEPENDS
@@ -1,3 +1,3 @@
-depends UDEV &&
+depends DEVICE-MANAGER &&
depends flex &&
depends sysfsutils
diff --git a/utils/pcmciautils/HISTORY b/utils/pcmciautils/HISTORY
index d078035c0a..e6df469fe4 100644
--- a/utils/pcmciautils/HISTORY
+++ b/utils/pcmciautils/HISTORY
@@ -1,4 +1,7 @@
-2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
+2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: udev => UDEV
2012-02-04 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
diff --git a/utils/xen/DEPENDS b/utils/xen/DEPENDS
index 5541bb8685..3a7775d766 100755
--- a/utils/xen/DEPENDS
+++ b/utils/xen/DEPENDS
@@ -6,7 +6,7 @@ depends pyxml &&
depends iproute2 &&
depends dev86 &&
depends curl &&
-depends UDEV &&
+depends DEVICE-MANAGER &&
depends yajl &&
if [[ $XEN_HVM == y ]]; then
diff --git a/utils/xen/HISTORY b/utils/xen/HISTORY
index 1ef42e4912..bab5e0ecc0 100644
--- a/utils/xen/HISTORY
+++ b/utils/xen/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2014-09-03 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 4.2.5 (4.2); SECURITY_PATCH++
* DEPENDS: added missing yajl dependency
diff --git a/video/guvcview/DEPENDS b/video/guvcview/DEPENDS
index 5c07f42934..d0cfbf3583 100755
--- a/video/guvcview/DEPENDS
+++ b/video/guvcview/DEPENDS
@@ -1,6 +1,6 @@
depends gtk+3 &&
depends sdl &&
-depends UDEV &&
+depends DEVICE-MANAGER &&
depends libpng &&
depends v4l-utils &&
depends portaudio19 &&
diff --git a/video/guvcview/HISTORY b/video/guvcview/HISTORY
index 2147535c07..fca3ded523 100644
--- a/video/guvcview/HISTORY
+++ b/video/guvcview/HISTORY
@@ -1,10 +1,13 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2014-10-07 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.0.1
2013-12-11 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.7.2
-2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
+2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: udev => UDEV
2013-07-23 Ladislav Hagara <hgr@vabo.cz>
@@ -18,6 +21,7 @@
2012-08-20 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.6.1
+
2012-06-25 Vlad Glagolev <stealth@sourcemage.org>
* PRE_BUILD: apply the patch if uvcvideo.h (comes with kernel sources
> 3.0) isn't found
diff --git a/video/kino/DEPENDS b/video/kino/DEPENDS
index 5b34b9c783..d74087679f 100755
--- a/video/kino/DEPENDS
+++ b/video/kino/DEPENDS
@@ -6,7 +6,8 @@ depends libiec61883 &&
depends libsamplerate &&
depends xml-parser-expat &&
depends libdv &&
-optional_depends UDEV "--with-udev-rules-dir=$INSTALL_ROOT/etc/udev/rules.d/" \
+
+optional_depends DEVICE-MANAGER "--with-udev-rules-dir=$INSTALL_ROOT/etc/udev/rules.d/" \
'' \
'detect jog/shuttle device' &&
optional_depends LIBAVCODEC '--disable-local-ffmpeg' \
diff --git a/video/kino/HISTORY b/video/kino/HISTORY
index 157fd0b8c7..d2af2929f9 100644
--- a/video/kino/HISTORY
+++ b/video/kino/HISTORY
@@ -1,4 +1,7 @@
-2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
+2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: udev => UDEV
2011-07-30 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
diff --git a/video/vlc/DEPENDS b/video/vlc/DEPENDS
index 89cfe83707..2084bcacc7 100755
--- a/video/vlc/DEPENDS
+++ b/video/vlc/DEPENDS
@@ -255,7 +255,7 @@ if is_depends_enabled $SPELL vcdimager-unstable; then
depends libcdio
fi &&
-optional_depends "UDEV" \
+optional_depends DEVICE-MANAGER \
"--enable-udev" \
"--disable-udev" \
"for device discovery through udev" &&
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index b620024852..7c85749f98 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2014-08-01 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.1.5
* DEPENDS: -opengl option removed, does not exist
diff --git a/wm-addons/razor-qt/DEPENDS b/wm-addons/razor-qt/DEPENDS
index d06990ce4f..3cf5d90249 100755
--- a/wm-addons/razor-qt/DEPENDS
+++ b/wm-addons/razor-qt/DEPENDS
@@ -1,5 +1,5 @@
depends qt4 &&
-depends UDEV &&
+depends DEVICE-MANAGER &&
depends file &&
depends cmake &&
optional_depends doxygen '' '' 'to build developer documentation' &&
diff --git a/wm-addons/razor-qt/HISTORY b/wm-addons/razor-qt/HISTORY
index c04a729932..6174d99a9a 100644
--- a/wm-addons/razor-qt/HISTORY
+++ b/wm-addons/razor-qt/HISTORY
@@ -1,4 +1,7 @@
-2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
+2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: udev => UDEV
2012-10-25 Ladislav Hagara <hgr@vabo.cz>
diff --git a/xorg-driver/xf86-input-wacom/DEPENDS b/xorg-driver/xf86-input-wacom/DEPENDS
index 3da6bce70c..8514a2a603 100755
--- a/xorg-driver/xf86-input-wacom/DEPENDS
+++ b/xorg-driver/xf86-input-wacom/DEPENDS
@@ -1,4 +1,4 @@
-depends UDEV &&
+depends DEVICE-MANAGER &&
depends util-macros &&
depends xproto &&
depends kbproto &&
@@ -9,5 +9,4 @@ depends libx11 &&
depends libxi &&
depends libxrandr &&
depends libxinerama &&
-depends xorg-server
-
+depends xorg-server
diff --git a/xorg-driver/xf86-input-wacom/HISTORY b/xorg-driver/xf86-input-wacom/HISTORY
index 96598cf6a9..e3f5f6ef1f 100644
--- a/xorg-driver/xf86-input-wacom/HISTORY
+++ b/xorg-driver/xf86-input-wacom/HISTORY
@@ -1,4 +1,7 @@
-2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
+2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: udev => UDEV
2013-02-22 Robin Cook <rcook@wyrms.net>
diff --git a/xorg-driver/xf86-video-intel/DEPENDS b/xorg-driver/xf86-video-intel/DEPENDS
index 5dd34a44a2..1807f899f4 100755
--- a/xorg-driver/xf86-video-intel/DEPENDS
+++ b/xorg-driver/xf86-video-intel/DEPENDS
@@ -31,7 +31,7 @@ if is_depends_enabled $SPELL libxvmc; then
depends xcb-util
fi &&
-optional_depends udev \
+optional_depends DEVICE-MANAGER \
"--enable-udev" \
"--disable-udev" \
"for udev-based monitor hotplug detection support"
diff --git a/xorg-driver/xf86-video-intel/HISTORY b/xorg-driver/xf86-video-intel/HISTORY
index be43c2d787..0a01ee6837 100644
--- a/xorg-driver/xf86-video-intel/HISTORY
+++ b/xorg-driver/xf86-video-intel/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2014-08-27 Thomas Orgis <sobukus@sourcemage.org>
* DEPENDS: removed mesalib references, relying on configure as things
get too complicated with two mesalib spells of which one is the only
@@ -5,7 +8,7 @@
* DETAILS: required bump to 2.99.911 (old version fails because of
XDamage changes, apparently)
-2014-04-14 Treeve Jelbert <treeve@sourcemage.org>
+2014-04-14 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: mesalib => MESALIB
2013-11-08 Vlad Glagolev <stealth@sourcemage.org>
diff --git a/xorg-xserver/xorg-server/DEPENDS b/xorg-xserver/xorg-server/DEPENDS
index 6d4ce13442..94f3498826 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -45,10 +45,32 @@ optional_depends libxvmc \
"--disable-xvmc" \
"Enable support for XvMC" &&
- optional_depends UDEV \
- "--enable-config-udev --disable-config-hal" \
+#
+# May only select one:
+# configure: error: Hotplugging through both libudev and dbus/hal not allowed
+#
+# NOTE: as hal depends on dbus, we can safely enable/disable dbus's configure
+# options with hal
+#
+# hal is preferred by upstream:
+# --enable-config-udev Build udev support (default: auto)
+# --enable-config-dbus Build D-BUS API support (default: no)
+# --disable-config-hal Build HAL support (default: auto)
+#
+
+message "You can either use hal+dbus OR udev for hotplugging" &&
+message "but NOT both" &&
+optional_depends hal \
+ "--enable-config-hal --enable-config-dbus --disable-config-udev" \
+ "--disable-config-hal --disable-config-dbus" \
+ "Enable HAL support" &&
+
+if ! is_depends_enabled $SPELL hal; then
+ optional_depends DEVICE-MANAGER \
+ "--enable-config-udev --disable-config-dbus --disable-config-hal" \
"--disable-config-udev" \
- "enable udev kernel config support" &&
+ "enable udev kernel config support"
+fi &&
optional_depends dmxproto \
"--enable-dmx" \
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY
index 9037c61043..3cac2fa3de 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2015-02-11 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: 1.17.1
SECURITY_PATCH=9 fix CVE-2015-0255
@@ -40,7 +43,7 @@
2014-08-24 Thomas Orgis <sobukus@sourcemage.org>
* DEPENDS: needs xcb cruft to build
-2014-08-19 Treeve Jelbert <treeve@sourcemage.org>
+2014-08-19 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: openssl => SSL
* SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL
@@ -54,7 +57,7 @@
* SUB_DEPENDS, PRE_SUB_DEPENDS: add glamor support
* DEPENDS: add libepoxy, optional wayland, nettle
-2014-04-14 Treeve Jelbert <treeve@sourcemage.org>
+2014-04-14 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: mesalib => MESALIB
2014-04-14 Treeve Jelbert <treeve@sourcemage.org>