New commits:
commit 94d584835039b80aeee077dc822206a3b1400989
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
thunar: switched from EXTRAS to GUDEV for udev
commit 2ac29f37f9b5706d140159235464e07c8b84a1e0
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
thunar-volman: switched from EXTRAS to GUDEV for udev.
commit b942fcdf8f596cf5e6d90075c7f01d139cade994
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
network-manager: switched from extras to gudev for udev.
*untested* as I don't use nm myself, a quick search turned up gentoo
using gudev as well instead of extras
commit 588245a2dc7e8f1b3d4d0dbc8d81c4ec56fcfcbd
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
gvfs: switched from EXTRA to GUDEV for udev
commit 4b7f39143d856716fa75f6f28112cc72e32fcb22
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
devicekit-power: switched udev's sub dep from extras to gudev
commit 8c84da76fbc83939787ad5b16e6f2f96ebc172f4
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
upower: switched udev's sub dep from extras to gudev
commit 477580ab0819e669fd116aecab26c40b48166616
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
udev: corrected PRE_SUB_DEPENDS to check for dependencies instead of in
a list.
commit e66c024cca43920d5ef2e9b33ffa674d43081624
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
pulseaudio: switched udev sub dep from EXTRAS to HWDB
commit 09e3a37ff28cf9bf5ac0f5985a04cdf88b828c5c
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
udev: added HWDB sub_depends option for other spells to use
commit d28e12d931f4587be4de23172bddcfdfa3fe6419
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>
udev: finished the splitting of EXTRAS in hwdb, udev_acl and gudev
support. Added support for floppy, made USBIDS and PCIIDS optional, fix
support for pciutils, usbutils and hwdata.
Spells depending on udev will need their sub_depends checked because
EXTRAS is on it's way out.
+if [[ "${UDEV_HWDB}" = '--enable-hwdb' ]]; then
+ if [[ "$(get_spell_provider ${SPELL} USBIDS)" == 'hwdata' ]]; then
+ OPTS="$OPTS --with-usb-ids-path=/usr/share/hwdata/usb.ids"
+ elif [[ "$(get_spell_provider ${SPELL} USBIDS)" == 'usbids' ]]; then
+ OPTS="$OPTS --with-usb-ids-path=/usr/share/usb.ids"
+ else
+ message "${PROBLEM_COLOR}"unknown USBIDS provider, you are on your
own.${DEFAULT_COLOR}"
+ fi &&
+
+ if [[ "$(get_spell_provider ${SPELL} PCIIDS)" == 'hwdata' ]]; then
+ OPTS="$OPTS --with-pci-ids-path=/usr/share/hwdata/pci.ids"
+ elif [[ "$(get_spell_provider ${SPELL} PCIIDS)" == 'pciutils' ]]; then
+ OPTS="$OPTS --with-pci-ids-path=/usr/share/pci.ids"
+ else
+ message "${PROBLEM_COLOR}"unknown PCIIDS provider, you are on your
own.${DEFAULT_COLOR}"
+ fi
+fi &&
+
default_build
diff --git a/disk/udev/CONFIGURE b/disk/udev/CONFIGURE
index 83005ed..8df1427 100755
--- a/disk/udev/CONFIGURE
+++ b/disk/udev/CONFIGURE
@@ -3,18 +3,15 @@ config_query_option UDEV_OPTS \
"--enable-debug" \
"--disable-debug" &&
-#
-# Remove this after stable-0.58 is released.
-# Bug #15994
-#
-if list_find "$UDEV_OPTS" '--enable-extras'; then
- list_remove UDEV_OPTS '--enable-extras'
-elif list_find "$UDEV_OPTS" '--disable-extras'; then
- list_remove UDEV_OPTS '--disable-extras'
-fi &&
-#
-# End Bug #15994
-#
+config_query_option UDEV_OPTS \
+ "Enable legacy floppy support?" n \
+ "--enable-floppy" "--disable-floppy" &&
+
+message "HWDB support can be disabled, but you probably should\n" \
+ "only do that when you mount /usr over a network." &&
+config_query_option UDEV_HWDB \
+ "Enable {pci,usb}.ids hardware database support?" y \
+ "--enable-hwdb" "--disable-hwdb" &&
if spell_ok hotplug; then
message "You seem to have hotplug installed. Hotplug has been" \
diff --git a/disk/udev/DEPENDS b/disk/udev/DEPENDS
index 666e274..453c84d 100755
--- a/disk/udev/DEPENDS
+++ b/disk/udev/DEPENDS
@@ -1,10 +1,13 @@
depends gnupg &&
depends smgl-fhs &&
depends gperf &&
-depends usbutils &&
-depends PCIIDS &&
+depends pkgconfig &&
+if [[ "${UDEV_HWDB}" == '--enable-hwdb' ]]; then
+ depends USBIDS &&
+ depends PCIIDS
+fi &&
-if [[ "$(get_spell_provider ${SPELL} PCIIDS)" = 'pciutils' ]]; then
+if [[ "$(get_spell_provider ${SPELL} PCIIDS)" == 'pciutils' ]]; then
depends -sub NO_ZLIB pciutils
fi &&
@@ -14,11 +17,10 @@ optional_depends acl \
"for local user acl permissions support" &&
if is_depends_enabled $SPELL acl; then
- depends pkgconfig &&
- depends libusb &&
- optional_depends consolekit '' '' 'seesion/seat support'
+ optional_depends consolekit '' '' 'session/seat support'
fi &&
+message "having glib2/gudev enabled means udevd will break for separate or
networked /usr" &&
optional_depends glib2 \
'--enable-gudev' \
'--disable-gudev' \
diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index 80fa5ee..4fe284e 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -1,6 +1,6 @@
SPELL=udev
VERSION=172
- PATCHLEVEL=0
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index 94941c7..f88e214 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,14 @@
+2011-07-13 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: use USBIDS instead of usbutils and make USBIDS and PCIIDS
optional.
+ corrected spelling of 'session', added /usr warning for gudev.
+ removed libusb (usbutils already depends on it), always depend on
pkgconfig.
+ * CONFIGURE: made hwdb usage optional, added floppy support
+ removed obsolete --enable-extras bugfix
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: split the leftovers from the old
sub_depends,
+ removed unused fake VOLUME_ID line.
+ added hwdb option.
+ * BUILD: add the missing options for pci and usb IDs based on the
selected provider.
+
2011-07-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 172
if [[ $DEVKIT_POWER_MAN == y ]]; then
depends libxslt &&
diff --git a/gnome2-libs/devicekit-power/HISTORY
b/gnome2-libs/devicekit-power/HISTORY
index 3e3fbdc..9526ada 100644
--- a/gnome2-libs/devicekit-power/HISTORY
+++ b/gnome2-libs/devicekit-power/HISTORY
@@ -1,3 +1,6 @@
+2011-07-13 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: switched udev's sub dep from EXTRAS to GUDEV
+
2010-10-31 Robin Cook <rcook AT wyrms.net>
* CONFLICTS: added