1 |
commit: e2dc560329d213f2e527b9140234157c19965240 |
2 |
Author: Craig Andrews <candrews <AT> integralblue <DOT> com> |
3 |
AuthorDate: Mon Jun 27 21:36:38 2016 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 1 20:44:13 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2dc5603 |
7 |
|
8 |
app-misc/lirc-0.9.4: version bump |
9 |
|
10 |
Significantly cleaned up and uses upstream's systemd units. |
11 |
|
12 |
Gentoo-bug: 515902, 579478 |
13 |
Closes: https://github.com/gentoo/gentoo/pull/1774 |
14 |
|
15 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
16 |
|
17 |
app-misc/lirc/Manifest | 1 + |
18 |
app-misc/lirc/files/irexec-initd | 28 +++++++++ |
19 |
app-misc/lirc/lirc-0.9.4.ebuild | 126 +++++++++++++++++++++++++++++++++++++++ |
20 |
app-misc/lirc/metadata.xml | 36 +++++++---- |
21 |
4 files changed, 181 insertions(+), 10 deletions(-) |
22 |
|
23 |
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest |
24 |
index 354c2b9..f9c2e81 100644 |
25 |
--- a/app-misc/lirc/Manifest |
26 |
+++ b/app-misc/lirc/Manifest |
27 |
@@ -1 +1,2 @@ |
28 |
DIST lirc-0.9.0.tar.bz2 857286 SHA256 6323afae6ad498d4369675f77ec3dbb680fe661bea586aa296e67f2e2daba4ff SHA512 e91534c63e6065bd7da3b15e1676edf1672b8beb21864a6825df86247d7d165bf2dee6f8191732933e24e42a406e46afc55559948e4061eed2de7b08fac13431 WHIRLPOOL 0a1c00b07898aa7a5d78865fb73c6d26c6331dd0a4945773a801d29e40298b365eb58cae113a95fcf73be678a24ac082ad0868e8051303d732882fb82a859a7b |
29 |
+DIST lirc-0.9.4.tar.bz2 2291164 SHA256 dd18a6751674fd61e4a96eebc3b9e5c883389d6230811943513443522dfc5dd0 SHA512 0220cfa0e1900691eed3d6b0624c27e0a99825cd60303304eee7c60e3ae1d8e939d05d32680da64cdbf764919708888ce05803e9ab2423f4bf019b4acd8542f1 WHIRLPOOL 83390295e55445f2d10372e1515b0163d5b3b1e9903f132e018d975d66998d98ffee1caaa1fe26577a0ce18fce20ec025fd5cc0aaf5074728269b12e84d55268 |
30 |
|
31 |
diff --git a/app-misc/lirc/files/irexec-initd b/app-misc/lirc/files/irexec-initd |
32 |
new file mode 100644 |
33 |
index 0000000..377ca0d |
34 |
--- /dev/null |
35 |
+++ b/app-misc/lirc/files/irexec-initd |
36 |
@@ -0,0 +1,28 @@ |
37 |
+#!/sbin/runscript |
38 |
+# Copyright 2003 Martin Hierling <mad@×××××××××××.de> |
39 |
+# Distributed under the terms of the GNU General Public License v2 |
40 |
+# $Id$ |
41 |
+ |
42 |
+: ${IREXEC_USER:=root} |
43 |
+ |
44 |
+depend() { |
45 |
+ need lircd |
46 |
+} |
47 |
+ |
48 |
+start() { |
49 |
+ if [ "x${IREXEC_USER}" = "xroot" -a "x${IREXEC_DISABLE_ROOT_WARNING}" != "xyes" ]; then |
50 |
+ ewarn "Warning: Running irexec as root can open security holes" |
51 |
+ fi |
52 |
+ |
53 |
+ ebegin "Starting irexec" |
54 |
+ start-stop-daemon --start --chuid ${IREXEC_USER} --user ${IREXEC_USER} --chdir / \ |
55 |
+ --exec /usr/bin/irexec -- --daemon ${IREXEC_OPTS} |
56 |
+ eend $? "Failed to start irexec." |
57 |
+} |
58 |
+ |
59 |
+stop() { |
60 |
+ ebegin "Stopping irexec" |
61 |
+ start-stop-daemon --stop --exec /usr/bin/irexec --user ${IREXEC_USER} |
62 |
+ eend $? "Failed to stop irexec." |
63 |
+} |
64 |
+ |
65 |
|
66 |
diff --git a/app-misc/lirc/lirc-0.9.4.ebuild b/app-misc/lirc/lirc-0.9.4.ebuild |
67 |
new file mode 100644 |
68 |
index 0000000..c78d883 |
69 |
--- /dev/null |
70 |
+++ b/app-misc/lirc/lirc-0.9.4.ebuild |
71 |
@@ -0,0 +1,126 @@ |
72 |
+# Copyright 1999-2016 Gentoo Foundation |
73 |
+# Distributed under the terms of the GNU General Public License v2 |
74 |
+# $Id$ |
75 |
+ |
76 |
+EAPI=6 |
77 |
+ |
78 |
+inherit eutils flag-o-matic systemd |
79 |
+ |
80 |
+DESCRIPTION="decode and send infra-red signals of many commonly used remote controls" |
81 |
+HOMEPAGE="http://www.lirc.org/" |
82 |
+ |
83 |
+LIRC_DRIVER_DEVICE="/dev/lirc0" |
84 |
+ |
85 |
+MY_P=${PN}-${PV/_/} |
86 |
+ |
87 |
+if [[ "${PV/_pre/}" = "${PV}" ]]; then |
88 |
+ SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2" |
89 |
+else |
90 |
+ SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2" |
91 |
+fi |
92 |
+ |
93 |
+LICENSE="GPL-2" |
94 |
+SLOT="0" |
95 |
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
96 |
+IUSE="doc static-libs X audio irman ftdi inputlirc iguanair systemd" |
97 |
+ |
98 |
+S="${WORKDIR}/${MY_P}" |
99 |
+ |
100 |
+REQUIRED_USE=" |
101 |
+ iguanair? ( irman ) |
102 |
+" |
103 |
+DEPEND=" |
104 |
+ doc? ( app-doc/doxygen ) |
105 |
+" |
106 |
+ |
107 |
+RDEPEND=" |
108 |
+ X? ( |
109 |
+ x11-libs/libX11 |
110 |
+ x11-libs/libSM |
111 |
+ x11-libs/libICE |
112 |
+ ) |
113 |
+ systemd? ( sys-apps/systemd ) |
114 |
+ audio? ( |
115 |
+ >media-libs/portaudio-18 |
116 |
+ media-libs/alsa-lib |
117 |
+ ) |
118 |
+ irman? ( media-libs/libirman ) |
119 |
+ iguanair? ( app-misc/iguanaIR ) |
120 |
+ ftdi? ( dev-embedded/libftdi:0 ) |
121 |
+ inputlirc? ( app-misc/inputlircd ) |
122 |
+" |
123 |
+ |
124 |
+src_configure() { |
125 |
+ filter-flags -Wl,-O1 |
126 |
+ econf \ |
127 |
+ $(use_enable static-libs static) \ |
128 |
+ $(use_with X x) |
129 |
+} |
130 |
+ |
131 |
+src_install() { |
132 |
+ default |
133 |
+ |
134 |
+ newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd |
135 |
+ newinitd "${FILESDIR}"/lircmd lircmd |
136 |
+ newconfd "${FILESDIR}"/lircd.conf.4 lircd |
137 |
+ |
138 |
+ insinto /etc/modprobe.d/ |
139 |
+ newins "${FILESDIR}"/modprobed.lirc lirc.conf |
140 |
+ |
141 |
+ newinitd "${FILESDIR}"/irexec-initd irexec |
142 |
+ newconfd "${FILESDIR}"/irexec-confd irexec |
143 |
+ |
144 |
+ if use doc ; then |
145 |
+ dodoc -r doc/html |
146 |
+ insinto /usr/share/doc/${PF}/images |
147 |
+ doins doc/images/* |
148 |
+ fi |
149 |
+ |
150 |
+ keepdir /etc/lirc |
151 |
+ if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then |
152 |
+ newdoc "${D}"/etc/lirc/lircd.conf lircd.conf.example |
153 |
+ fi |
154 |
+ |
155 |
+ if ! use static-libs; then |
156 |
+ rm "${D}/usr/$(get_libdir)/liblirc_client.la" || die |
157 |
+ fi |
158 |
+} |
159 |
+ |
160 |
+pkg_preinst() { |
161 |
+ local dir="${EROOT}/etc/modprobe.d" |
162 |
+ if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then |
163 |
+ elog "Renaming ${dir}/lirc to lirc.conf" |
164 |
+ mv -f "${dir}/lirc" "${dir}/lirc.conf" || die |
165 |
+ fi |
166 |
+ |
167 |
+ # copy the first file that can be found |
168 |
+ if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then |
169 |
+ cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die |
170 |
+ elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then |
171 |
+ cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf || die |
172 |
+ MOVE_OLD_LIRCD_CONF=1 |
173 |
+ elif [[ -f "${D}"/etc/lirc/lircd.conf ]]; then |
174 |
+ cp "${D}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die |
175 |
+ fi |
176 |
+ |
177 |
+ # stop portage from touching the config file |
178 |
+ if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then |
179 |
+ rm -f "${D}"/etc/lirc/lircd.conf || die |
180 |
+ fi |
181 |
+} |
182 |
+ |
183 |
+pkg_postinst() { |
184 |
+ # copy config file to new location |
185 |
+ # without portage knowing about it |
186 |
+ # so it will not delete it on unmerge or ever touch it again |
187 |
+ if [[ -e "${T}"/lircd.conf ]]; then |
188 |
+ cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf || die |
189 |
+ if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then |
190 |
+ elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf" |
191 |
+ rm -f "${EROOT}"/etc/lircd.conf || die |
192 |
+ fi |
193 |
+ fi |
194 |
+ |
195 |
+ einfo "The new default location for lircd.conf is inside of" |
196 |
+ einfo "/etc/lirc/ directory" |
197 |
+} |
198 |
|
199 |
diff --git a/app-misc/lirc/metadata.xml b/app-misc/lirc/metadata.xml |
200 |
index 08ba009..3d42ab3 100644 |
201 |
--- a/app-misc/lirc/metadata.xml |
202 |
+++ b/app-misc/lirc/metadata.xml |
203 |
@@ -1,14 +1,30 @@ |
204 |
<?xml version="1.0" encoding="UTF-8"?> |
205 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
206 |
<pkgmetadata> |
207 |
- <!-- maintainer-needed --> |
208 |
- <use> |
209 |
- <flag name="hardware-carrier">The transmitter device generates its clock |
210 |
- signal in hardware</flag> |
211 |
- <flag name="transmitter">Add transmitter support to some lirc-drivers |
212 |
- (e.g. serial)</flag> |
213 |
- </use> |
214 |
- <upstream> |
215 |
- <remote-id type="sourceforge">lirc</remote-id> |
216 |
- </upstream> |
217 |
+ <!-- maintainer-needed --> |
218 |
+ <maintainer type="person"> |
219 |
+ <email>candrews@××××××××××××.com</email> |
220 |
+ <name>Craig Andrews</name> |
221 |
+ <description>Proxied maintainer; set to assignee in all bugs</description> |
222 |
+ </maintainer> |
223 |
+ <maintainer type="project"> |
224 |
+ <email>proxy-maint@g.o</email> |
225 |
+ <name>Proxy Maintainers</name> |
226 |
+ </maintainer> |
227 |
+ <use> |
228 |
+ <flag name="hardware-carrier">The transmitter device generates its clock signal in hardware</flag> |
229 |
+ <flag name="transmitter">Add transmitter support to some lirc-drivers (e.g. serial)</flag> |
230 |
+ <flag name="inputlirc">Add a dependency on app-misc/inputlircd</flag> |
231 |
+ <flag name="irman">Add a dependency on media-libs/libirman</flag> |
232 |
+ <flag name="audio">Support using an audio device connected to an IR receiver</flag> |
233 |
+ <flag name="iguanair">Support iguanaIR devices</flag> |
234 |
+ <flag name="ftdi">Support FTDI devices</flag> |
235 |
+ </use> |
236 |
+ <upstream> |
237 |
+ <remote-id type="sourceforge">lirc</remote-id> |
238 |
+ </upstream> |
239 |
+ <longdescription lang="en"> |
240 |
+ LIRC (Linux Infrared remote control) allows users to receive and send infrared signals. |
241 |
+ </longdescription> |
242 |
</pkgmetadata> |
243 |
+ |