Gentoo Archives: gentoo-commits

From: Daniel Campbell <zlg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/udevil/, sys-apps/udevil/files/
Date: Mon, 01 May 2017 12:44:09
Message-Id: 1493641764.bac129275380b55b46428510ff90155c9e492799.zlg@gentoo
1 commit: bac129275380b55b46428510ff90155c9e492799
2 Author: Daniel Campbell <zlg <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 1 12:29:04 2017 +0000
4 Commit: Daniel Campbell <zlg <AT> gentoo <DOT> org>
5 CommitDate: Mon May 1 12:29:24 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bac12927
7
8 sys-apps/udevil: revbump wrt bug 605662
9
10 Gentoo-Bug: 605662
11 Gentoo-Bug-URL: https://bugs.gentoo.org/605662
12 Package-Manager: Portage-2.3.5, Repoman-2.3.2
13
14 .../files/udevil-0.4.4-include-sysmacros-r1.patch | 27 ++++++++
15 sys-apps/udevil/udevil-0.4.4-r3.ebuild | 74 ++++++++++++++++++++++
16 2 files changed, 101 insertions(+)
17
18 diff --git a/sys-apps/udevil/files/udevil-0.4.4-include-sysmacros-r1.patch b/sys-apps/udevil/files/udevil-0.4.4-include-sysmacros-r1.patch
19 new file mode 100644
20 index 00000000000..2f9859d34e8
21 --- /dev/null
22 +++ b/sys-apps/udevil/files/udevil-0.4.4-include-sysmacros-r1.patch
23 @@ -0,0 +1,27 @@
24 +# Include sysmacros.h, solves Gentoo bug 580364
25 +# Upstream has merged similar changes, should be present
26 +# in 0.4.5
27 +--- a/src/udevil.c 2015-05-04 06:34:32.000000000 -0700
28 ++++ b/src/udevil.c 2017-01-02 07:25:14.744273858 -0800
29 +@@ -33,6 +33,9 @@
30 + #include <netdb.h>
31 + #include <arpa/inet.h>
32 +
33 ++// major/minor, dev_t, needed for glibc>=2.25
34 ++#include <sys/sysmacros.h>
35 ++
36 + // groups
37 + #include <grp.h>
38 +
39 +--- a/src/device-info.h 2017-01-02 07:47:23.373180528 -0800
40 ++++ b/src/device-info.h 2017-03-14 23:35:58.079222855 -0700
41 +@@ -18,6 +18,9 @@
42 + // intltool
43 + #include <glib/gi18n.h>
44 +
45 ++// dev_t
46 ++#include <sys/sysmacros.h>
47 ++
48 +
49 +
50 + typedef struct device_t {
51
52 diff --git a/sys-apps/udevil/udevil-0.4.4-r3.ebuild b/sys-apps/udevil/udevil-0.4.4-r3.ebuild
53 new file mode 100644
54 index 00000000000..c93bc7b9dcc
55 --- /dev/null
56 +++ b/sys-apps/udevil/udevil-0.4.4-r3.ebuild
57 @@ -0,0 +1,74 @@
58 +# Copyright 1999-2017 Gentoo Foundation
59 +# Distributed under the terms of the GNU General Public License v2
60 +
61 +EAPI=6
62 +
63 +inherit eutils autotools user
64 +
65 +DESCRIPTION="mount and unmount removable devices without a password"
66 +HOMEPAGE="https://ignorantguru.github.com/udevil/"
67 +SRC_URI="https://github.com/IgnorantGuru/udevil/archive/${PV}.tar.gz -> ${P}.tar.gz"
68 +
69 +LICENSE="GPL-3"
70 +SLOT="0"
71 +KEYWORDS="~amd64 ~x86"
72 +IUSE=""
73 +
74 +RDEPEND=">=app-shells/bash-4.0:*
75 + dev-libs/glib:2
76 + sys-apps/util-linux
77 + virtual/acl
78 + >=virtual/udev-143"
79 +DEPEND="${RDEPEND}
80 + dev-util/intltool
81 + sys-devel/gettext
82 + virtual/pkgconfig"
83 +
84 +pkg_setup(){
85 + enewgroup plugdev
86 +}
87 +
88 +src_prepare() {
89 + # This works for 0.4.4 too, no sense copying the patch
90 + epatch "${FILESDIR}"/${PN}-0.4.3-flags.patch
91 + epatch "${FILESDIR}"/${P}-stat.patch
92 + epatch "${FILESDIR}"/${P}-include-sysmacros.patch
93 + eapply_user
94 + eautoreconf
95 +}
96 +
97 +src_configure() {
98 + econf \
99 + --with-setfacl-prog="$(type -P setfacl)" \
100 + --enable-systemd
101 +}
102 +
103 +src_install() {
104 + default
105 + fowners root:plugdev /usr/bin/udevil
106 + fperms 4754 /usr/bin/udevil
107 +}
108 +
109 +pkg_postinst() {
110 + einfo
111 + elog "Please add your user to the plugdev group"
112 + elog "to be able to use ${PN} as a user"
113 + elog
114 + elog "Optional dependencies:"
115 + elog " gnome-extra/zenity (devmon popups)"
116 + elog " net-fs/davfs2 (mount WebDAV resources)"
117 + elog " net-fs/cifs-utils (mounting samba shares)"
118 + elog " net-fs/curlftpfs (mounting ftp shares)"
119 + elog " net-fs/nfs-utils (mounting nfs shares)"
120 + elog " net-fs/sshfs (mounting sftp shares)"
121 + elog " virtual/eject (eject via devmon)"
122 + if ! has_version 'sys-fs/udisks' ; then
123 + elog
124 + elog "When using ${PN} without udisks, and without the udisks-daemon running,"
125 + elog "you may need to enable kernel polling for device media changes to be detected."
126 + elog "See https://ignorantguru.github.com/${PN}/#polling"
127 + has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
128 + kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
129 + einfo
130 + fi
131 +}