eudev-3.2.2-2: rebuild

2 files changed, 69 insertions, 42 deletions

diff --git a/pcr/eudev/PKGBUILD b/pcr/eudev/PKGBUILD
index b45f6ffed..8afd7dbe0 100644
--- a/pcr/eudev/PKGBUILD
+++ b/pcr/eudev/PKGBUILD
@@ -6,77 +6,80 @@
 _udev_ver=220
 
 pkgbase=eudev
-pkgname=( 'eudev' 'libeudev')
+pkgname=('eudev' 'libeudev')
 pkgver=3.2.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'armv7h')
 url="http://www.gentoo.org/proj/en/eudev/"
 license=('GPL')
 makedepends=('gobject-introspection' 'gperf' 'gtk-doc' 'intltool' 'kmod')
-options=('!libtool' '!staticlibs')
+options=('!libtool')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/gentoo/eudev/archive/v${pkgver}.tar.gz"
-	'initcpio_hooks'
-	'initcpio_install'
-	'udev-hwdb.hook')
+        'initcpio_hooks'
+        'initcpio_install'
+        'udev-hwdb.hook'
+        'udev-hwdb-path.patch')
 sha256sums=('80628191448886846ab9cc0e2af6782358a0afb81d5b4f8cd9d982d2626cca31'
             '892ce43218e0a458981bbce451252c8987dc398e60b8de288e7542b8f2409c13'
             '77dd1fd318b4456409aceb077f060b87944defb07cf39d29ad1968dc6f361875'
-            '846e9ddbb95c8394ba7efe75107cc1308426921bc042f5d6b48fa4c2dcbac151')
+            '846e9ddbb95c8394ba7efe75107cc1308426921bc042f5d6b48fa4c2dcbac151'
+            'e05e468d15d09fb49343f33bc8d21c08f54db3ecff412dc35d4acb0630f869a3')
 
 prepare(){
     cd "${srcdir}/${pkgbase}-${pkgver}"
+    patch -Np 1 -i ${srcdir}/udev-hwdb-path.patch
     sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
         -e 's/GROUP="cdrom"/GROUP="optical"/' \
         -e 's/GROUP="tape"/GROUP="storage"/' \
         -i rules/*.rules
+    ./autogen.sh
 }
 
 build() {
-	cd "${srcdir}/${pkgbase}-${pkgver}"
-	./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
+    cd "${srcdir}/${pkgbase}-${pkgver}"
+
+    ./configure \
+        --prefix=/usr \
+        --with-rootprefix=/usr \
+        --sysconfdir=/etc \
+        --libdir=/usr/lib \
+        --sbindir=/usr/bin \
+        --enable-introspection \
+        --enable-kmod \
+        --enable-manpages \
+        --enable-split-usr
 
-	make
+    make
 }
 
 package_eudev() {
-	pkgdesc="The userspace dev tools (udev) forked by Gentoo"
-	provides=("udev=${_udev_ver}")
-	depends=("libeudev" 'kbd' 'kmod' 'hwids' 'util-linux')
-	optdepends=('eudev-systemd: makes packages compiled with systemd features run'
-		'udev-openrc: udev starup scripts for openrc')
-	backup=('etc/udev/udev.conf')
-
+    pkgdesc="The userspace dev tools (udev) forked by Gentoo"
+    provides=("udev=${_udev_ver}")
+    depends=("libeudev" 'kbd' 'kmod' 'hwids')
+    optdepends=('eudev-systemd: makes packages compiled with systemd features run'
+                'udev-openrc: udev starup scripts for openrc')
+    backup=('etc/udev/udev.conf')
 
-	cd "${srcdir}/${pkgbase}-${pkgver}"
+    cd "${srcdir}/${pkgbase}-${pkgver}"
 
-	make DESTDIR="${pkgdir}" install
+    make DESTDIR="${pkgdir}" install
 
-	rm -rv "$pkgdir"/usr/lib/pkgconfig
-	rm -v "$pkgdir"/usr/include/libudev.h
-	rm -v "$pkgdir"/usr/lib/libudev*.{so*,a}
+    rm -rv "$pkgdir"/usr/lib/pkgconfig
+    rm -v "$pkgdir"/usr/include/libudev.h
+    rm -v "$pkgdir"/usr/lib/libudev*.{so*,a}
 
-	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"
+    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() {
-	pkgdesc="eudev client libraries"
-	depends=('glib2' 'glibc')
-	optdepends=('libeudev-systemd: systemd client libraries')
-	conflicts=('libudev.so')
-	provides=("libudev=${_udev_ver}" 'libudev.so')
+    pkgdesc="eudev client libraries"
+    depends=('glibc')
+    optdepends=('libeudev-systemd: systemd client libraries')
+    conflicts=('libudev.so')
+    provides=("libudev=${_udev_ver}" 'libudev.so')
 
-	cd "${srcdir}/${pkgbase}-${pkgver}"
-	make -C src/libudev DESTDIR="$pkgdir" install
+    cd "${srcdir}/${pkgbase}-${pkgver}"
+    make -C src/libudev DESTDIR="$pkgdir" install
 }
diff --git a/pcr/eudev/udev-hwdb-path.patch b/pcr/eudev/udev-hwdb-path.patch
new file mode 100644
index 000000000..b72a1b9d8
--- /dev/null
+++ b/pcr/eudev/udev-hwdb-path.patch
@@ -0,0 +1,24 @@
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 480d22a4e..da27f15b8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -173,13 +173,13 @@ AC_SUBST([udevlibexecdir], [${rootlibexecdir}])
+ # sysconfdir paths
+ AC_SUBST([udevconfdir],[${sysconfdir}/udev])
+ AC_SUBST([udevconffile],[${udevconfdir}/udev.conf])
+-AC_SUBST([udevhwdbdir],[${udevconfdir}/hwdb.d])
+-AC_SUBST([udevhwdbbin],[${udevconfdir}/hwdb.bin])
+
+ # udevlibexecdir paths
+ AC_SUBST([udevkeymapdir],[${udevlibexecdir}/keymaps])
+ AC_SUBST([udevkeymapforceredir],[${udevkeymapdir}/force-release])
+ AC_SUBST([udevrulesdir],[${udevlibexecdir}/rules.d])
++AC_SUBST([udevhwdbdir],[${udevlibexecdir}/hwdb.d])
++AC_SUBST([udevhwdbbin],[${udevlibexecdir}/hwdb.bin])
+
+ # pkgconfigdir paths
+ AC_SUBST([pkgconfiglibdir], [${libdir}/pkgconfig])
+