Sat Apr 21 00:01:27 UTC 2012

9 files changed, 193 insertions, 10 deletions

diff --git a/testing/cogl/PKGBUILD b/testing/cogl/PKGBUILD
index 05ebe35b3..f26b71002 100644
--- a/testing/cogl/PKGBUILD
+++ b/testing/cogl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 155032 2012-04-01 11:31:05Z heftig $
+# $Id: PKGBUILD 156493 2012-04-19 16:37:07Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=cogl
-pkgver=1.10.0
+pkgver=1.10.2
 pkgrel=1
 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango')
 makedepends=('mesa' 'gobject-introspection')
 options=(!libtool !emptydirs)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('544b648cd5dc0a0ea438acd89d83727d82d6c29927db33a519ce2b28dc1ad07d')
+sha256sums=('042cf87ec35d2eac78719856356e415dd5333f9f613093c5db8b438630c1ecb3')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/testing/gnupg/PKGBUILD b/testing/gnupg/PKGBUILD
new file mode 100644
index 000000000..edf608de2
--- /dev/null
+++ b/testing/gnupg/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 156501 2012-04-19 23:08:56Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Judd Vinet <jvinet@zeroflux.org>
+
+pkgname=gnupg
+pkgver=2.0.19
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('curl: gpg2keys_curl'
+            'libldap: gpg2keys_ldap'
+            'libusb-compat: scdaemon'
+            'texinfo: documentation')
+makedepends=('curl' 'libldap' 'libusb-compat' 'texinfo')
+depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr')
+source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+sha1sums=('190c09e6688f688fb0a5cf884d01e240d957ac1f'
+          'f6e6830610a8629b0aad69d789373bf8ca481733')
+
+install=install
+
+conflicts=('gnupg2')
+provides=("gnupg2=${pkgver}")
+replaces=('gnupg2')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure --prefix=/usr --libexecdir=/usr/lib/gnupg
+	make
+}
+
+check() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make check
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	ln -s gpg2 "${pkgdir}"/usr/bin/gpg
+	ln -s gpg2 "${pkgdir}"/usr/bin/gpgv
+	ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
+}
diff --git a/testing/gnupg/install b/testing/gnupg/install
new file mode 100644
index 000000000..3a5dc9fd6
--- /dev/null
+++ b/testing/gnupg/install
@@ -0,0 +1,20 @@
+info_dir=/usr/share/info
+info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+    usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+    usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2> /dev/null
+  done
+}
diff --git a/testing/kmod/PKGBUILD b/testing/kmod/PKGBUILD
index a027ee19f..964def177 100644
--- a/testing/kmod/PKGBUILD
+++ b/testing/kmod/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 155335 2012-04-01 20:12:30Z tomegun $
+# $Id: PKGBUILD 156503 2012-04-19 23:17:12Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=kmod
-pkgver=7
-pkgrel=2
+pkgver=8
+pkgrel=1
 pkgdesc="Linux kernel module handling"
 arch=('i686' 'x86_64')
 url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
@@ -17,7 +17,7 @@ source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.t
         "depmod-search.conf"
         "0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch"
         "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch")
-md5sums=('7bd916ae1c8a38e7697fdd8118bc98eb'
+md5sums=('d4e3d038b5370b1e8ff237c55666aa64'
          'dd62cbf62bd8f212f51ef8c43bec9a77'
          'ba73b9e98db1abbf41274f922fcfbd55'
          'c9af56636c5667cf4ce3a31ea56e03d9')
diff --git a/testing/lvm2/11-dm-initramfs.rules b/testing/lvm2/11-dm-initramfs.rules
new file mode 100644
index 000000000..d2c167324
--- /dev/null
+++ b/testing/lvm2/11-dm-initramfs.rules
@@ -0,0 +1,3 @@
+# needed with new udev/mkinitcpio and as implemented in dracut:
+# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54>
+SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist"
diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD
new file mode 100644
index 000000000..37ce623dc
--- /dev/null
+++ b/testing/lvm2/PKGBUILD
@@ -0,0 +1,59 @@
+# $Id: PKGBUILD 156515 2012-04-20 02:14:32Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Maintainer: Thomas Bächler <thomas@archlinux.org>
+
+pkgbase=lvm2
+pkgname=('lvm2' 'device-mapper')
+pkgver=2.02.95
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://sourceware.org/lvm2/"
+license=('GPL2' 'LGPL2.1')
+groups=('base')
+source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
+        lvm2_install
+        lvm2_hook
+        11-dm-initramfs.rules)
+sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85'
+          '45f5e31045065e7bdf5d6f2e21c857b4978024b4'
+          '08007f13cf1a9caf6e4aca76dd2ed6a4ab037601'
+          '7d63aa838703c9f986531a78164b556f765f5cce'
+          'f6a554eea9557c3c236df2943bb6e7e723945c41')
+
+build() {
+  cd "${srcdir}/LVM2.${pkgver}"
+  unset LDFLAGS
+  ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var \
+    --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
+    --enable-udev_sync --enable-udev_rules
+  make
+}
+
+package_device-mapper() {
+  pkgdesc="Device mapper userspace library and tools"
+  url="http://sourceware.org/dm/"
+  depends=('glibc' 'udev')
+
+  cd "${srcdir}/LVM2.${pkgver}"
+  make DESTDIR="${pkgdir}" install_device-mapper
+  # extra udev rule for device-mapper in initramfs
+  install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules"
+}
+
+package_lvm2() {
+  pkgdesc="Logical Volume Manager 2 utilities"
+  depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline')
+  conflicts=('lvm' 'mkinitcpio<0.7')
+  backup=('etc/lvm/lvm.conf')
+  options=('!makeflags')
+
+  cd "${srcdir}/LVM2.${pkgver}"
+  make DESTDIR="${pkgdir}" install_lvm2
+  # install applib
+  make -C liblvm DESTDIR="${pkgdir}" install
+  # /etc directories
+  install -d "${pkgdir}"/etc/lvm/{archive,backup}
+  # mkinitcpio hook
+  install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2"
+  install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2"
+}
diff --git a/testing/lvm2/lvm2_hook b/testing/lvm2/lvm2_hook
new file mode 100644
index 000000000..efb104998
--- /dev/null
+++ b/testing/lvm2/lvm2_hook
@@ -0,0 +1,25 @@
+# vim:set ft=sh:
+run_hook ()
+{
+    /sbin/modprobe -q dm-mod >/dev/null 2>&1
+    if [ -e "/sys/class/misc/device-mapper" ]; then
+        if [ ! -e "/dev/mapper/control" ]; then
+            local major minor
+            IFS=: read major minor < /sys/class/misc/device-mapper/dev
+            mkdir /dev/mapper
+            mknod "/dev/mapper/control" c ${major} ${minor}
+        fi
+
+        # If the lvmwait= parameter has been specified on the command line
+        # wait for the device(s) before trying to activate the volume group(s)
+        for pvdev in ${lvmwait//,/ }; do
+            poll_device ${pvdev} ${rootdelay}
+        done
+
+        [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null"
+
+        msg "Activating logical volumes..."
+        [ -d /etc/lvm ] && /sbin/lvm vgscan
+        eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET
+    fi
+}
diff --git a/testing/lvm2/lvm2_install b/testing/lvm2/lvm2_install
new file mode 100644
index 000000000..98a995b14
--- /dev/null
+++ b/testing/lvm2/lvm2_install
@@ -0,0 +1,29 @@
+# vim: set ft=sh:
+
+build()
+{
+    MODULES=" dm-mod dm-snapshot dm-mirror"
+    BINARIES=""
+    FILES=""
+    SCRIPT="lvm2"
+
+    add_binary "/sbin/lvm"
+    add_binary "/sbin/dmsetup"
+    add_file "/usr/lib/udev/rules.d/10-dm.rules"
+    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
+    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
+    add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
+    add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
+}
+
+help ()
+{
+cat<<HELPEOF
+  This hook loads the necessary modules for an LVM2 root device.
+
+  The optional lvmwait= parameter followed by a comma-separated
+  list of device names can be given on the command line.
+  It will cause the hook to wait until all given devices exist
+  before trying to scan and activate any volume groups.
+HELPEOF
+}
diff --git a/testing/rhythmbox/PKGBUILD b/testing/rhythmbox/PKGBUILD
index f0c7de120..07e88f91c 100644
--- a/testing/rhythmbox/PKGBUILD
+++ b/testing/rhythmbox/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 155254 2012-04-01 11:36:54Z heftig $
+# $Id: PKGBUILD 156495 2012-04-19 20:31:39Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rhythmbox
 pkgver=2.96
-pkgrel=1
+pkgrel=2
 pkgdesc="An iTunes-like music playback and management application"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.rhythmbox.org"
 depends=('clutter' 'clutter-gtk' 'clutter-gst' 'dconf' 'desktop-file-utils' 'grilo' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib' 'libdmapsharing' 'libgpod' 'libmtp' 'libmusicbrainz3'
-         'libnotify' 'libpeas' 'libwebkit3' 'lirc-utils' 'media-player-info' 'mx' 'python2-gobject' 'python2-mako' 'totem-plparser')
+         'libnotify' 'libpeas' 'libwebkit3' 'lirc-utils' 'media-player-info' 'mx' 'python2-gobject' 'python2-mako' 'totem-plparser' 'tdb')
 makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection')
 optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
             'gstreamer0.10-bad-plugins: Extra media codecs'