From 7fd19c41bf47d2fa411d6e40101c0bad9d803f29 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 8 Nov 2011 07:33:07 +0100
Subject: [PATCH 1/4] udev: update to 175.

---
 srcpkgs/libgudev/libgudev-devel.template | 2 --
 srcpkgs/libgudev/template                | 5 ++---
 srcpkgs/udev/template                    | 6 +++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/libgudev/libgudev-devel.template b/srcpkgs/libgudev/libgudev-devel.template
index b2b7eb81e5..bd69a8933c 100644
--- a/srcpkgs/libgudev/libgudev-devel.template
+++ b/srcpkgs/libgudev/libgudev-devel.template
@@ -6,8 +6,6 @@ long_desc="${long_desc}
  This package contains the libgudev development files (static libs, headers,
  etc), a library to interact with udev through the GLib bindings."
 
-revision=1
-
 Add_dependency run libudev-devel
 Add_dependency run glib-devel
 Add_dependency run libgudev
diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template
index 5e29009507..0ce9fddfb2 100644
--- a/srcpkgs/libgudev/template
+++ b/srcpkgs/libgudev/template
@@ -1,7 +1,6 @@
 # Template file for 'libudev'
 pkgname=libgudev
-version=174
-revision=1
+version=175
 wrksrc=udev-${version}
 #distfiles="${KERNEL_SITE}/utils/kernel/hotplug/udev-${version}.tar.bz2"
 distfiles="http://people.freedesktop.org/~kay/udev-${version}.tar.bz2"
@@ -13,7 +12,7 @@ short_desc="GObject-based wrapper library for libudev"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 license="GPL-2"
-checksum=832662179a5ff9782769b0feadd51aaaea6e603f91f6ef0ec8bb6aab0fb3ad1a
+checksum=4c7937fe5a1521316ea571188745b9a00a9fdf314228cffc53a7ba9e5968b7ab
 long_desc="
  This library makes it much simpler to use libudev from programs already using
  GObject. It also makes it possible to easily use libudev from other
diff --git a/srcpkgs/udev/template b/srcpkgs/udev/template
index 50d07186d8..99e7cddec7 100644
--- a/srcpkgs/udev/template
+++ b/srcpkgs/udev/template
@@ -1,8 +1,8 @@
 # Template file for 'udev'
 pkgname=udev
-version=174
+version=175
 #distfiles="${KERNEL_SITE}/utils/kernel/hotplug/udev-${version}.tar.bz2"
-distfiles="http://people.freedesktop.org/~kay/udev-${version}.tar.bz2"
+distfiles="http://people.freedesktop.org/~kay/udev/udev-${version}.tar.bz2"
 build_style=gnu-configure
 configure_args="--sbindir=/sbin --without-selinux --libexecdir=/lib/udev
 --with-rootlibdir=/lib --disable-introspection --enable-edd --enable-floppy
@@ -12,7 +12,7 @@ short_desc="/dev/ and hotplug management daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 license="GPL-2"
-checksum=832662179a5ff9782769b0feadd51aaaea6e603f91f6ef0ec8bb6aab0fb3ad1a
+checksum=4c7937fe5a1521316ea571188745b9a00a9fdf314228cffc53a7ba9e5968b7ab
 long_desc="
  udev is a daemon which dynamically creates and removes device nodes from
  /dev/, handles hotplug events and loads drivers at boot time."

From 56d421a0a5ca79d32ec14904358caebd4cbe68ab Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 8 Nov 2011 07:58:50 +0100
Subject: [PATCH 2/4] kernel-snapshot: +fanotify, -pcmcia, +rtc class modules.

---
 .../kernel-snapshot/files/x86_64-dotconfig    | 153 +++++++++---------
 srcpkgs/kernel-snapshot/template              |   6 +-
 2 files changed, 83 insertions(+), 76 deletions(-)

diff --git a/srcpkgs/kernel-snapshot/files/x86_64-dotconfig b/srcpkgs/kernel-snapshot/files/x86_64-dotconfig
index 939a0a0c71..83b83e364d 100644
--- a/srcpkgs/kernel-snapshot/files/x86_64-dotconfig
+++ b/srcpkgs/kernel-snapshot/files/x86_64-dotconfig
@@ -554,8 +554,7 @@ CONFIG_PCI_LABEL=y
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
+# CONFIG_PCMCIA is not set
 CONFIG_CARDBUS=y
 
 #
@@ -567,9 +566,6 @@ CONFIG_YENTA_RICOH=y
 CONFIG_YENTA_TI=y
 CONFIG_YENTA_ENE_TUNE=y
 CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
 CONFIG_HOTPLUG_PCI=m
 CONFIG_HOTPLUG_PCI_FAKE=m
 CONFIG_HOTPLUG_PCI_ACPI=m
@@ -1073,7 +1069,6 @@ CONFIG_CAN_JANZ_ICAN3=m
 CONFIG_PCH_CAN=m
 CONFIG_CAN_SJA1000=m
 # CONFIG_CAN_SJA1000_PLATFORM is not set
-CONFIG_CAN_EMS_PCMCIA=m
 # CONFIG_CAN_EMS_PCI is not set
 CONFIG_CAN_PEAK_PCI=m
 # CONFIG_CAN_KVASER_PCI is not set
@@ -1087,7 +1082,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB2=m
 CONFIG_CAN_SOFTING=m
-CONFIG_CAN_SOFTING_CS=m
 # CONFIG_CAN_DEBUG_DEVICES is not set
 CONFIG_IRDA=m
 
@@ -1168,10 +1162,6 @@ CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
 CONFIG_BT_HCIVHCI=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
@@ -1340,7 +1330,6 @@ CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
 CONFIG_PARPORT_PC_FIFO=y
 CONFIG_PARPORT_PC_SUPERIO=y
-CONFIG_PARPORT_PC_PCMCIA=m
 # CONFIG_PARPORT_GSC is not set
 CONFIG_PARPORT_AX88796=m
 CONFIG_PARPORT_1284=y
@@ -1574,11 +1563,6 @@ CONFIG_SCSI_PMCRAID=m
 CONFIG_SCSI_PM8001=m
 CONFIG_SCSI_SRP=m
 CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
 CONFIG_SCSI_DH=m
 CONFIG_SCSI_DH_RDAC=m
 CONFIG_SCSI_DH_HP_SW=m
@@ -1676,8 +1660,7 @@ CONFIG_PATA_CMD640_PCI=m
 CONFIG_PATA_MPIIX=m
 CONFIG_PATA_NS87410=m
 CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_RZ1000=m
+# CONFIG_PATA_RZ1000 is not set
 
 #
 # Generic fallback / legacy drivers
@@ -1812,8 +1795,6 @@ CONFIG_CAIF_HSI=m
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
 CONFIG_VORTEX=m
 CONFIG_TYPHOON=m
 CONFIG_NET_VENDOR_ADAPTEC=y
@@ -1824,7 +1805,6 @@ CONFIG_ACENIC=m
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_AMD8111_ETH=m
 CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
 CONFIG_ATL1=m
@@ -1862,7 +1842,7 @@ CONFIG_DE4X5=m
 CONFIG_WINBOND_840=m
 CONFIG_DM9102=m
 CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
+# CONFIG_PCMCIA_XIRCOM is not set
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_DE600=m
 CONFIG_DE620=m
@@ -1875,8 +1855,6 @@ CONFIG_NET_VENDOR_EXAR=y
 CONFIG_S2IO=m
 CONFIG_VXGE=m
 # CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
 CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
 CONFIG_NET_VENDOR_INTEL=y
@@ -1920,9 +1898,7 @@ CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
 CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
 CONFIG_NET_VENDOR_NVIDIA=y
 CONFIG_FORCEDETH=m
 CONFIG_NET_VENDOR_OKI=y
@@ -1955,7 +1931,6 @@ CONFIG_SIS190=m
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
 CONFIG_NET_VENDOR_SMSC=y
-CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
 CONFIG_SMSC9420=m
 CONFIG_NET_VENDOR_STMICRO=y
@@ -1977,8 +1952,6 @@ CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=m
 # CONFIG_VIA_RHINE_MMIO is not set
 CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
 # CONFIG_FDDI is not set
 CONFIG_NET_SB1000=m
 CONFIG_PHYLIB=y
@@ -2059,17 +2032,13 @@ CONFIG_USB_IPHETH=m
 CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
 CONFIG_WLAN=y
-CONFIG_PCMCIA_RAYCS=m
 CONFIG_LIBERTAS_THINFIRM=m
 # CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
 CONFIG_LIBERTAS_THINFIRM_USB=m
 CONFIG_AIRO=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
 CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
 CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
@@ -2104,7 +2073,6 @@ CONFIG_B43_BCMA=y
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_PIO=y
@@ -2131,7 +2099,6 @@ CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
 # CONFIG_IPW2100_DEBUG is not set
@@ -2162,7 +2129,6 @@ CONFIG_IWM=m
 # CONFIG_IWM_DEBUG is not set
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
 CONFIG_LIBERTAS_SDIO=m
 CONFIG_LIBERTAS_SPI=m
 # CONFIG_LIBERTAS_DEBUG is not set
@@ -2174,8 +2140,6 @@ CONFIG_PLX_HERMES=m
 CONFIG_TMD_HERMES=m
 CONFIG_NORTEL_HERMES=m
 CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
 CONFIG_ORINOCO_USB=m
 CONFIG_P54_COMMON=m
 CONFIG_P54_USB=m
@@ -2242,7 +2206,6 @@ CONFIG_VMXNET3=m
 # CONFIG_ISDN is not set
 CONFIG_PHONE=m
 CONFIG_PHONE_IXJ=m
-CONFIG_PHONE_IXJ_PCMCIA=m
 
 #
 # Input device support
@@ -2482,7 +2445,6 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
@@ -2526,19 +2488,8 @@ CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_NVRAM=m
-CONFIG_RTC=m
-CONFIG_GEN_RTC=m
-# CONFIG_GEN_RTC_X is not set
 CONFIG_R3964=m
 CONFIG_APPLICOM=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
 CONFIG_MWAVE=m
 CONFIG_RAW_DRIVER=m
 CONFIG_MAX_RAW_DEVS=256
@@ -2973,8 +2924,6 @@ CONFIG_SSB_BLOCKIO=y
 CONFIG_SSB_PCIHOST_POSSIBLE=y
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
 CONFIG_SSB_SDIOHOST_POSSIBLE=y
 CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_DEBUG is not set
@@ -3805,7 +3754,6 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_SEQUENCER_OSS=y
 CONFIG_SND_HRTIMER=m
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_RTCTIMER=m
 CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_VERBOSE_PROCFS=y
@@ -3943,9 +3891,6 @@ CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_USB_US122L=m
 CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_CACHE_LZO=y
 CONFIG_SND_SOC_I2C_AND_SPI=m
@@ -4083,7 +4028,6 @@ CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_U132_HCD=m
 CONFIG_USB_SL811_HCD=m
 # CONFIG_USB_SL811_HCD_ISO is not set
-CONFIG_USB_SL811_CS=m
 CONFIG_USB_R8A66597_HCD=m
 CONFIG_USB_RENESAS_USBHS_HCD=m
 CONFIG_USB_WHCI_HCD=m
@@ -4312,7 +4256,6 @@ CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMC_TIFM_SD=m
 CONFIG_MMC_SPI=m
-CONFIG_MMC_SDRICOH_CS=m
 CONFIG_MMC_CB710=m
 CONFIG_MMC_VIA_SDMMC=m
 CONFIG_MMC_VUB300=m
@@ -4415,7 +4358,82 @@ CONFIG_EDAC_I5000=m
 CONFIG_EDAC_I5100=m
 CONFIG_EDAC_I7300=m
 CONFIG_EDAC_SBRIDGE=m
-# CONFIG_RTC_CLASS is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3029C2=m
+
+#
+# SPI RTC drivers
+#
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_DS3234=m
+CONFIG_RTC_DRV_PCF2123=m
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_PCF50633=m
+CONFIG_RTC_DRV_AB8500=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_PCAP=m
+CONFIG_RTC_DRV_MC13XXX=m
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 
@@ -4554,13 +4572,6 @@ CONFIG_COMEDI_S526=m
 CONFIG_COMEDI_S626=m
 CONFIG_COMEDI_SSV_DNP=m
 CONFIG_COMEDI_PCMCIA_DRIVERS=m
-CONFIG_COMEDI_CB_DAS16_CS=m
-CONFIG_COMEDI_DAS08_CS=m
-CONFIG_COMEDI_NI_DAQ_700_CS=m
-CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
-CONFIG_COMEDI_NI_LABPC_CS=m
-CONFIG_COMEDI_NI_MIO_CS=m
-CONFIG_COMEDI_QUATECH_DAQP_CS=m
 CONFIG_COMEDI_USB_DRIVERS=m
 CONFIG_COMEDI_DT9812=m
 CONFIG_COMEDI_USBDUX=m
@@ -4764,6 +4775,7 @@ CONFIG_AD2S1210=m
 #
 # Triggers - standalone
 #
+CONFIG_IIO_PERIODIC_RTC_TRIGGER=m
 CONFIG_IIO_GPIO_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m
 # CONFIG_IIO_SIMPLE_DUMMY is not set
@@ -4771,8 +4783,6 @@ CONFIG_XVMALLOC=y
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_DEBUG is not set
 CONFIG_ZCACHE=m
-CONFIG_WLAGS49_H2=m
-CONFIG_WLAGS49_H25=m
 CONFIG_FB_SM7XX=m
 CONFIG_CRYSTALHD=m
 CONFIG_FB_XGI=m
@@ -4781,7 +4791,6 @@ CONFIG_ACPI_QUICKSTART=m
 CONFIG_BCM_WIMAX=m
 CONFIG_FT1000=m
 CONFIG_FT1000_USB=m
-CONFIG_FT1000_PCMCIA=m
 
 #
 # Speakup console speech
@@ -4964,7 +4973,7 @@ CONFIG_FILE_LOCKING=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
-# CONFIG_FANOTIFY is not set
+CONFIG_FANOTIFY=y
 CONFIG_QUOTA=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
diff --git a/srcpkgs/kernel-snapshot/template b/srcpkgs/kernel-snapshot/template
index 85dd987e10..290b00fc5f 100644
--- a/srcpkgs/kernel-snapshot/template
+++ b/srcpkgs/kernel-snapshot/template
@@ -4,14 +4,12 @@ _kernel_snapshot=yes
 _kernel_ver=3.2
 _kernel_ver_minor=0
 _kernel_patch_ver=rc1
+revision=1
 
 . ${XBPS_SRCPKGDIR}/kernel/template
-# Reset some stuff.
-unset revision
-
 # Override required vars.
 pkgname=kernel-snapshot
-#revision=1
+revision=$revision
 _kernel_headers_revision=${revision}
 version=${_kernel_ver}.${_kernel_ver_minor}${_kernel_patch_ver}
 short_desc="The Linux kernel (3.x series) and modules"

From c72ccd50158e3079667250c9e4f2e39348b3a5b3 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 8 Nov 2011 08:18:09 +0100
Subject: [PATCH 3/4] base-files: improved vkpurge for kernel-snapshot pkgs.

---
 srcpkgs/base-files/files/vkpurge | 12 +++++++++---
 srcpkgs/base-files/template      |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/base-files/files/vkpurge b/srcpkgs/base-files/files/vkpurge
index 848a25e270..7a20b0335a 100644
--- a/srcpkgs/base-files/files/vkpurge
+++ b/srcpkgs/base-files/files/vkpurge
@@ -23,13 +23,14 @@ _EOF
 
 list_kernels()
 {
-	local k kpkg installed kver skip
+	local k kpkg installed kver kvertmp skip
 
 	for k in /var/lib/initramfs-tools/*; do
-		kver=$(basename $k|sed -e 's|-rc|rc|')
+		kver=$(basename $k)
+		kvertmp=$(basename $k|sed -e 's|-rc|rc|')
 		for kpkg in kernel kernel-snapshot; do
 			installed=$(xbps-uhelper -r / version $kpkg)
-			if [ "$installed" = "$kver" ]; then
+			if [ "$installed" = "$kvertmp" ]; then
 				skip=1
 				break
 			fi
@@ -87,6 +88,11 @@ remove_kernel()
 	fi
 	# Execute post-remove kernel hooks.
 	run_hooks post-remove $rmkver
+
+	# Make sure there are no stale files.
+	if [ -f /var/lib/initramfs-tools/${rmkver} ]; then
+		rm -f /var/lib/initramfs-tools/${rmkver}
+	fi
 }
 
 if [ "$1" = "list" ]; then
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 677e3e5e94..4805f46af2 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,6 +1,6 @@
 # Template file for 'base-files'
 pkgname=base-files
-version=0.55
+version=0.56
 short_desc="Void GNU/Linux base system files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"

From 3fc53e8cabd7f5e0640d2b772d2d4e960114799d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 8 Nov 2011 08:50:15 +0100
Subject: [PATCH 4/4] kernel-snapshot: make CONFIG_RTC_DRV_CMOS built-in the
 kernel by default.

---
 srcpkgs/kernel-snapshot/files/x86_64-dotconfig | 2 +-
 srcpkgs/kernel-snapshot/template               | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kernel-snapshot/files/x86_64-dotconfig b/srcpkgs/kernel-snapshot/files/x86_64-dotconfig
index 83b83e364d..f42c08cb94 100644
--- a/srcpkgs/kernel-snapshot/files/x86_64-dotconfig
+++ b/srcpkgs/kernel-snapshot/files/x86_64-dotconfig
@@ -4413,7 +4413,7 @@ CONFIG_RTC_DRV_PCF2123=m
 #
 # Platform RTC drivers
 #
-CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_CMOS=y
 CONFIG_RTC_DRV_DS1286=m
 CONFIG_RTC_DRV_DS1511=m
 CONFIG_RTC_DRV_DS1553=m
diff --git a/srcpkgs/kernel-snapshot/template b/srcpkgs/kernel-snapshot/template
index 290b00fc5f..870e6c8d75 100644
--- a/srcpkgs/kernel-snapshot/template
+++ b/srcpkgs/kernel-snapshot/template
@@ -4,12 +4,11 @@ _kernel_snapshot=yes
 _kernel_ver=3.2
 _kernel_ver_minor=0
 _kernel_patch_ver=rc1
-revision=1
+revision=2
 
 . ${XBPS_SRCPKGDIR}/kernel/template
 # Override required vars.
 pkgname=kernel-snapshot
-revision=$revision
 _kernel_headers_revision=${revision}
 version=${_kernel_ver}.${_kernel_ver_minor}${_kernel_patch_ver}
 short_desc="The Linux kernel (3.x series) and modules"