From 65dad129b8b296dd6c793ddeea1b1b2594b6f756 Mon Sep 17 00:00:00 2001 From: fbt Date: Wed, 24 Jun 2015 12:10:28 +0300 Subject: [PATCH 1/2] remove gudev --- PKGBUILD | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 2b73857..f0a4b63 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: artoo +# Maintainer: fbt +# Contributor: artoo # Contributor: Alexey D. # Contributor: Ivailo Monev @@ -7,7 +8,7 @@ _src_uri='http://dev.gentoo.org/~blueness/eudev' pkgname=( 'eudev' 'libeudev' ) pkgver=3.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="The userspace dev tools (udev) forked by Gentoo" arch=('i686' 'x86_64') url="http://www.gentoo.org/proj/en/eudev/" @@ -28,7 +29,7 @@ build() { --libdir=/usr/lib \ --sbindir=/usr/bin \ --with-html-dir=/usr/share/doc/${pkgname}-${pkgver}/html \ - --enable-gudev \ + --disable-gudev \ --enable-introspection \ --enable-kmod \ --enable-split-usr @@ -71,15 +72,11 @@ package_eudev() { # ...libs mkdir -pm755 usr/lib - mv "$pkgdir"/usr/lib/lib{g,}udev*.{so,a}* usr/lib - - # ...pkgconfig - mkdir -pm755 usr/lib/pkgconfig - mv "$pkgdir"/usr/lib/pkgconfig/{libudev,gudev-1.0}.pc usr/lib/pkgconfig + mv "$pkgdir"/usr/lib/libudev*.{so,a}* usr/lib # ...headers mkdir -pm755 usr/include - mv "$pkgdir"/usr/include/{gudev-1.0,libudev.h} usr/include + mv "$pkgdir"/usr/include/libudev.h usr/include } package_libeudev() { @@ -87,12 +84,10 @@ package_libeudev() { depends=( 'glibc' 'glib2' ) provides=( "libudev=${_udevver}" - 'libgudev-1.0.so' 'libudev.so' ) conflicts=( 'libeudev>=1.8' - 'libgudev-1.0.so' 'libudev.so' ) From 48f56d0de8d83bbcb7011cab4cfa27004c701147 Mon Sep 17 00:00:00 2001 From: fbt Date: Thu, 25 Jun 2015 16:45:12 +0300 Subject: [PATCH 2/2] pkgconfig fix --- PKGBUILD | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index f0a4b63..a0e8036 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,7 +8,7 @@ _src_uri='http://dev.gentoo.org/~blueness/eudev' pkgname=( 'eudev' 'libeudev' ) pkgver=3.1.2 -pkgrel=2 +pkgrel=3 pkgdesc="The userspace dev tools (udev) forked by Gentoo" arch=('i686' 'x86_64') url="http://www.gentoo.org/proj/en/eudev/" @@ -71,8 +71,9 @@ package_eudev() { cd "${srcdir}/_libeudev" # ...libs - mkdir -pm755 usr/lib - mv "$pkgdir"/usr/lib/libudev*.{so,a}* usr/lib + mkdir -pm755 usr/lib usr/lib/pkgconfig + mv "$pkgdir"/usr/lib/libudev*.{so,a}* usr/lib/ + mv "$pkgdir"/usr/lib/pkgconfig/libudev.pc usr/lib/pkgconfig/libudev.pc # ...headers mkdir -pm755 usr/include