initial upload

4 files changed, 108 insertions, 112 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6754f21f0c0d..3d39a3ef9b3f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,55 +1,46 @@
 pkgbase = eudev-git
-	pkgdesc = The userspace dev tools (udev) forked by Gentoo
-	pkgver = 20150619
+	pkgver = 3.2.9
 	pkgrel = 1
 	url = https://github.com/gentoo/eudev
-	install = eudev-git.install
-	arch = i686
 	arch = x86_64
 	groups = base
+	groups = base-openrc
 	license = GPL
-	makedepends = git
 	makedepends = gobject-introspection
 	makedepends = gperf
-	makedepends = libxslt
-	makedepends = docbook-xsl
-	depends = util-linux
-	depends = glib2
-	depends = kmod
-	depends = hwids
-	depends = bash
-	provides = eudev
-	provides = libgudev
-	conflicts = eudev
-	conflicts = udev
-	conflicts = systemd
-	conflicts = libsystemd
-	conflicts = systemd-tools
-	conflicts = libgudev
-	replaces = eudev
-	replaces = udev
-	replaces = systemd
-	replaces = libsystemd
-	replaces = systemd-tools
-	replaces = libgudev
-	options = !makeflags
+	makedepends = gtk-doc
+	makedepends = intltool
+	makedepends = kmod
 	options = !libtool
-	backup = etc/udev/udev.conf
-	backup = etc/udev/rules.d/80-net-name-slot.rules
-	source = git://github.com/gentoo/eudev.git
+	options = !staticlibs
+	source = git+https://anongit.gentoo.org/git/proj/eudev.git
 	source = initcpio_hooks
 	source = initcpio_install
-	source = 80-net-name-slot.rules
-	md5sums = SKIP
-	md5sums = e99e9189aa2f6084ac28b8ddf605aeb8
-	md5sums = d3a7b1d77e53d401ed37827ad297846a
-	md5sums = d83a59d647b511b815ee0e8c85dcd54a
+	source = udev-hwdb.hook
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = eudev-git
+	pkgdesc = The userspace dev tools (udev) forked by Gentoo
+	depends = libeudev
+	depends = kbd
+	depends = kmod
+	depends = hwids
+	depends = util-linux
+	provides = udev=243git
 	provides = eudev
-	provides = libgudev
-	provides = udev=
-	provides = systemd=
-	provides = libsystemd=
-	provides = systemd-tools=
+	conflicts = eudev
+	backup = etc/udev/udev.conf
+
+pkgname = libeudev-git
+	pkgdesc = eudev client libraries
+	depends = glib2
+	depends = glibc
+	provides = libudev=243git
+	provides = libudev.so
+	provides = libeudev
+	conflicts = libudev.so
+	conflicts = libeudev
 
diff --git a/PKGBUILD b/PKGBUILD
index bedc4f6654f9..10137404aa35 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,89 +1,82 @@
-# Maintainer: Alexey D. <lq07829icatm@rambler.ru>
+# Maintainer:  Vincent Grande <shoober420@gmail.com>
+# Contributor: Chris Cromer <chris@cromer.cl>
+# Contributor: artoo <artoo@manjaro.org>
+# Contributor: Alexey D. <lq07829icatm@rambler.ru>
 # Contributor: Ivailo Monev <xakepa10@gmail.com>
-pkgname='eudev-git'
-pkgdesc="The userspace dev tools (udev) forked by Gentoo"
-pkgver=20150619
+
+_udev_ver=243git
+
+pkgname=( 'eudev-git' 'libeudev-git')
+pkgver=3.2.9
 pkgrel=1
-provides=('eudev' 'libgudev')
-replaces=('eudev' 'udev' 'systemd' 'libsystemd' 'systemd-tools' 'libgudev')
-conflicts=('eudev' 'udev' 'systemd' 'libsystemd' 'systemd-tools' 'libgudev')
-groups=('base')
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="https://github.com/gentoo/eudev"
 license=('GPL')
-depends=('util-linux' 'glib2' 'kmod' 'hwids' 'bash')
-makedepends=('git' 'gobject-introspection' 'gperf' 'libxslt' 'docbook-xsl')
-options=(!makeflags !libtool)
-install="${pkgname}.install"
-backup=('etc/udev/udev.conf' 'etc/udev/rules.d/80-net-name-slot.rules')
-source=('git://github.com/gentoo/eudev.git'
-        'initcpio_hooks'
-        'initcpio_install'
-        '80-net-name-slot.rules')
-md5sums=('SKIP'
-         'e99e9189aa2f6084ac28b8ddf605aeb8'
-         'd3a7b1d77e53d401ed37827ad297846a'
-         'd83a59d647b511b815ee0e8c85dcd54a')
-_gitname="eudev"
-
-pkgver()
-{
-  cd "${srcdir}/${_gitname}"
+makedepends=('gobject-introspection' 'gperf' 'gtk-doc' 'intltool' 'kmod')
+options=('!libtool' '!staticlibs')
+source=("git+https://anongit.gentoo.org/git/proj/eudev.git"
+	'initcpio_hooks'
+	'initcpio_install'
+	'udev-hwdb.hook')
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP')
 
-  # Date of last commit
-  git log -1 --format="%ci" HEAD | cut -d\  -f1 | tr -d '-'
+prepare(){
+	cd "${srcdir}/${pkgbase}-${pkgver}"
+	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
+		-e 's/GROUP="tape"/GROUP="storage"/' \
+		-e 's/GROUP="cdrom"/GROUP="optical"/' \
+		-i rules/*.rules
 }
 
-build() {
-  cd "${srcdir}/${_gitname}"
-
-  if [ -f "Makefile" ];then
-    msg2 "Cleaning up..."
-    make clean
-  fi
+groups=('base' 'base-openrc')
 
-  msg2 "Configuring sources..."
-  ./autogen.sh
-  ./configure --prefix=/usr \
-              --with-rootprefix=/usr \
-              --sysconfdir=/etc \
-              --libdir=/usr/lib \
-              --sbindir=/usr/bin \
-              --enable-gudev \
-              --enable-introspection
+build() {
+	cd eudev
+	./autogen.sh
+	./configure \
+		--prefix=/usr \
+		--with-rootprefix=/usr \
+		--sysconfdir=/etc \
+		--libdir=/usr/lib \
+		--sbindir=/usr/bin \
+		--enable-introspection \
+		--enable-kmod \
+		--enable-manpages \
+		--enable-split-usr
 
-  msg2 "Compiling..."
-  make
+	make
 }
 
+package_eudev-git() {
+	pkgdesc="The userspace dev tools (udev) forked by Gentoo"
+	provides=("udev=${_udev_ver}" "eudev")
+	conflicts=(eudev)
+	depends=("libeudev" 'kbd' 'kmod' 'hwids' 'util-linux')
+	backup=('etc/udev/udev.conf')
 
-package() {
-  cd "${srcdir}/${_gitname}"
-  make DESTDIR="${pkgdir}" install
-
-  # Install the mkinitpcio hook
-  install -Dm644 "${srcdir}/initcpio_hooks" "${pkgdir}/usr/lib/initcpio/hooks/udev"
-  install -Dm644 "${srcdir}/initcpio_install" "${pkgdir}/usr/lib/initcpio/install/udev"
 
-  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
-  for i in "${pkgdir}/usr/lib/udev/rules.d/"*.rules; do
-    sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g;
-               s#GROUP="tape"#GROUP="storage"#g;
-               s#GROUP="cdrom"#GROUP="optical"#g' "${i}"
-  done
+	cd eudev
 
-  # input group is not used in Arch Linux at this moment
-  sed '/GROUP="input"/d' -i "${pkgdir}/usr/lib/udev/rules.d/50-udev-default.rules"
+	make DESTDIR="${pkgdir}" install
 
-  # Make new interface naming policy disabled by default
-  rm -f "${pkgdir}/usr/lib/udev/rules.d/80-net-name-slot.rules"
-  install -Dm644 "${srcdir}/80-net-name-slot.rules" "${pkgdir}/etc/udev/rules.d/80-net-name-slot.rules"
+	rm -rv "$pkgdir"/usr/lib/pkgconfig
+	rm -v "$pkgdir"/usr/include/libudev.h
+	rm -v "$pkgdir"/usr/lib/libudev*.{so*,a}
 
-  # Getting udev version
-  udevver=$(grep UDEV_VERSION configure.ac | egrep -o "[0-9]{3}")
-  provides+=("udev=$udevver")
-  provides+=("systemd=$udevver")
-  provides+=("libsystemd=$udevver")
-  provides+=("systemd-tools=$udevver")
+	install -Dm644 "${srcdir}/initcpio_hooks" "${pkgdir}/usr/lib/initcpio/hooks/udev"
+	install -Dm644 "${srcdir}/initcpio_install" "${pkgdir}/usr/lib/initcpio/install/udev"
+	install -Dm644 "$srcdir/udev-hwdb.hook" "$pkgdir/usr/share/libalpm/hooks/udev-hwdb.hook"
 }
 
+package_libeudev-git() {
+	pkgdesc="eudev client libraries"
+	depends=('glib2' 'glibc')
+	conflicts=('libudev.so' 'libeudev')
+	provides=("libudev=${_udev_ver}" 'libudev.so' 'libeudev')
+
+	cd eudev
+	make -C src/libudev DESTDIR="$pkgdir" install
+}
diff --git a/initcpio_install b/initcpio_install
index 033e9ea6e22a..610b71c3d0c7 100755
--- a/initcpio_install
+++ b/initcpio_install
@@ -8,7 +8,7 @@ build() {
     for rule in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do
         add_file "/usr/lib/udev/rules.d/$rule"
     done
-    
+
     for tool in ata_id scsi_id; do
         add_file "/usr/lib/udev/$tool"
     done
diff --git a/udev-hwdb.hook b/udev-hwdb.hook
new file mode 100644
index 000000000000..12f3e58cc819
--- /dev/null
+++ b/udev-hwdb.hook
@@ -0,0 +1,12 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/udev/hwdb.d/*
+Target = etc/udev/hwdb.d/*
+
+[Action]
+Description = Updating udev Hardware Database...
+When = PostTransaction
+Exec = /usr/bin/udevadm hwdb --update