1 |
commit: f6c5ac0de170ab7ad1b3701738c74e8c58c9c740 |
2 |
Author: Craig Andrews <candrews <AT> integralblue <DOT> com> |
3 |
AuthorDate: Sun Dec 18 02:39:47 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 30 21:54:51 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6c5ac0d |
7 |
|
8 |
app-misc/lirc-0.9.4c: version bump. |
9 |
|
10 |
* Clean up dependencies. |
11 |
* Remove irman and iguanair use flags: these have been moved out of lirc upstream. |
12 |
* Use xdg-utils.eclass to cleanup XDG_* env causing sandbox violation. |
13 |
* Fix dependencies for lirc-setup. |
14 |
|
15 |
Gentoo-Bug: https://bugs.gentoo.org/602978 |
16 |
Gentoo-Bug: https://bugs.gentoo.org/587770 |
17 |
Gentoo-Bug: https://bugs.gentoo.org/591264 |
18 |
|
19 |
Closes: https://github.com/gentoo/gentoo/pull/3150 |
20 |
|
21 |
app-misc/lirc/Manifest | 1 + |
22 |
app-misc/lirc/lirc-0.9.4c.ebuild | 150 +++++++++++++++++++++++++++++++++++++++ |
23 |
app-misc/lirc/metadata.xml | 1 + |
24 |
3 files changed, 152 insertions(+) |
25 |
|
26 |
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest |
27 |
index 244e890..7cb5196 100644 |
28 |
--- a/app-misc/lirc/Manifest |
29 |
+++ b/app-misc/lirc/Manifest |
30 |
@@ -1,2 +1,3 @@ |
31 |
DIST lirc-0.9.0.tar.bz2 857286 SHA256 6323afae6ad498d4369675f77ec3dbb680fe661bea586aa296e67f2e2daba4ff SHA512 e91534c63e6065bd7da3b15e1676edf1672b8beb21864a6825df86247d7d165bf2dee6f8191732933e24e42a406e46afc55559948e4061eed2de7b08fac13431 WHIRLPOOL 0a1c00b07898aa7a5d78865fb73c6d26c6331dd0a4945773a801d29e40298b365eb58cae113a95fcf73be678a24ac082ad0868e8051303d732882fb82a859a7b |
32 |
DIST lirc-0.9.4a.tar.bz2 2292119 SHA256 386086a74c7d12e7e8f26f7dbc8f40d20b9968c9ad2a42599483a51dd2da03ba SHA512 16be0ac5dd9b07d717ceba63cdc38c0db4a2bdcfc373ca6346d7cd4ab2cd2973aa7585d10b045fcaea952a3aabf7617c564ccb8268db6c62b172683a4b2cc188 WHIRLPOOL 93431c43d2dd31081e97113e2d49134de7feb29be53508900b3360408f7a099becf169fcebd0f6fc196280c594dc83d1299617ee54b65452828492db9bcd09ad |
33 |
+DIST lirc-0.9.4c.tar.bz2 2311300 SHA256 8974fe5dc8eaa717daab6785d2aefeec27615f01ec24b96d31e3381b2f70726a SHA512 0a0d0e025b87a55ec919c92824d8288bfaf35cfebae0ee97d86e344109f584baa72a2eff6d24fbc526900671d6092e0eebef8d1566559b0d153e122e3127c0cb WHIRLPOOL a614fc10b0e40831e81c558439ea528ae0628d64e55b272b9b5a97cb93cba2b8759062a5258c732fa97c2be7966226c3aca2efe2de84aad1f62211146d202efc |
34 |
|
35 |
diff --git a/app-misc/lirc/lirc-0.9.4c.ebuild b/app-misc/lirc/lirc-0.9.4c.ebuild |
36 |
new file mode 100644 |
37 |
index 00000000..b90eeb8 |
38 |
--- /dev/null |
39 |
+++ b/app-misc/lirc/lirc-0.9.4c.ebuild |
40 |
@@ -0,0 +1,150 @@ |
41 |
+# Copyright 1999-2016 Gentoo Foundation |
42 |
+# Distributed under the terms of the GNU General Public License v2 |
43 |
+# $Id$ |
44 |
+ |
45 |
+EAPI=6 |
46 |
+ |
47 |
+PYTHON_COMPAT=( python3_4 python3_5 ) |
48 |
+ |
49 |
+inherit eutils flag-o-matic python-single-r1 systemd xdg-utils |
50 |
+ |
51 |
+DESCRIPTION="decode and send infra-red signals of many commonly used remote controls" |
52 |
+HOMEPAGE="http://www.lirc.org/" |
53 |
+ |
54 |
+LIRC_DRIVER_DEVICE="/dev/lirc0" |
55 |
+ |
56 |
+MY_P=${PN}-${PV/_/} |
57 |
+ |
58 |
+if [[ "${PV/_pre/}" = "${PV}" ]]; then |
59 |
+ SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2" |
60 |
+else |
61 |
+ SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2" |
62 |
+fi |
63 |
+ |
64 |
+LICENSE="GPL-2" |
65 |
+SLOT="0" |
66 |
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
67 |
+IUSE="audio doc ftdi gtk inputlirc static-libs systemd usb X" |
68 |
+ |
69 |
+REQUIRED_USE=" |
70 |
+ gtk? ( X ) |
71 |
+" |
72 |
+ |
73 |
+S="${WORKDIR}/${MY_P}" |
74 |
+ |
75 |
+COMMON_DEPEND=" |
76 |
+ ${PYTHON_DEPS} |
77 |
+ audio? ( |
78 |
+ >media-libs/portaudio-18 |
79 |
+ media-libs/alsa-lib |
80 |
+ ) |
81 |
+ dev-python/pyyaml[${PYTHON_USEDEP}] |
82 |
+ ftdi? ( dev-embedded/libftdi:0 ) |
83 |
+ systemd? ( sys-apps/systemd ) |
84 |
+ usb? ( virtual/libusb:0 ) |
85 |
+ X? ( |
86 |
+ x11-libs/libICE |
87 |
+ x11-libs/libSM |
88 |
+ x11-libs/libX11 |
89 |
+ ) |
90 |
+" |
91 |
+ |
92 |
+DEPEND=" |
93 |
+ ${COMMON_DEPEND} |
94 |
+ dev-libs/libxslt |
95 |
+ doc? ( app-doc/doxygen ) |
96 |
+ sys-apps/kmod |
97 |
+ sys-kernel/linux-headers |
98 |
+" |
99 |
+ |
100 |
+RDEPEND=" |
101 |
+ ${COMMON_DEPEND} |
102 |
+ gtk? ( |
103 |
+ x11-libs/vte[introspection] |
104 |
+ dev-python/pygobject[${PYTHON_USEDEP}] |
105 |
+ ) |
106 |
+ inputlirc? ( app-misc/inputlircd ) |
107 |
+" |
108 |
+ |
109 |
+PATCHES=( |
110 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=589246 https://sourceforge.net/p/lirc/tickets/214/ |
111 |
+ "${FILESDIR}"/lirc-0.9.4-doc-path-fix.patch |
112 |
+) |
113 |
+ |
114 |
+src_configure() { |
115 |
+ xdg_environment_reset |
116 |
+ econf \ |
117 |
+ --localstatedir="${EPREFIX}/var" \ |
118 |
+ $(use_enable static-libs static) \ |
119 |
+ $(use_with X x) |
120 |
+} |
121 |
+ |
122 |
+src_install() { |
123 |
+ default |
124 |
+ |
125 |
+ if use !gtk ; then |
126 |
+ # lirc-setup requires gtk |
127 |
+ rm "${ED%/}"/usr/bin/lirc-setup |
128 |
+ fi |
129 |
+ |
130 |
+ newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd |
131 |
+ newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd |
132 |
+ newconfd "${FILESDIR}"/lircd.conf.4 lircd |
133 |
+ newconfd "${FILESDIR}"/lircmd.conf lircmd |
134 |
+ |
135 |
+ insinto /etc/modprobe.d/ |
136 |
+ newins "${FILESDIR}"/modprobed.lirc lirc.conf |
137 |
+ |
138 |
+ newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec |
139 |
+ newconfd "${FILESDIR}"/irexec-confd irexec |
140 |
+ |
141 |
+ keepdir /etc/lirc |
142 |
+ if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then |
143 |
+ newdoc "${ED%/}"/etc/lirc/lircd.conf lircd.conf.example |
144 |
+ fi |
145 |
+ |
146 |
+ find "${ED}" -name '*.la' -delete || die |
147 |
+ |
148 |
+ # Avoid QA notice |
149 |
+ rm -d "${ED%/}"/var/run/lirc || die |
150 |
+ rm -d "${ED%/}"/var/run || die |
151 |
+} |
152 |
+ |
153 |
+pkg_preinst() { |
154 |
+ local dir="${EROOT%/}/etc/modprobe.d" |
155 |
+ if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then |
156 |
+ elog "Renaming ${dir}/lirc to lirc.conf" |
157 |
+ mv -f "${dir}/lirc" "${dir}/lirc.conf" || die |
158 |
+ fi |
159 |
+ |
160 |
+ # copy the first file that can be found |
161 |
+ if [[ -f "${EROOT%/}"/etc/lirc/lircd.conf ]]; then |
162 |
+ cp "${EROOT%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die |
163 |
+ elif [[ -f "${EROOT%/}"/etc/lircd.conf ]]; then |
164 |
+ cp "${EROOT%/}"/etc/lircd.conf "${T}"/lircd.conf || die |
165 |
+ MOVE_OLD_LIRCD_CONF=1 |
166 |
+ elif [[ -f "${ED%/}"/etc/lirc/lircd.conf ]]; then |
167 |
+ cp "${ED%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die |
168 |
+ fi |
169 |
+ |
170 |
+ # stop portage from touching the config file |
171 |
+ if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then |
172 |
+ rm -f "${ED%/}"/etc/lirc/lircd.conf || die |
173 |
+ fi |
174 |
+} |
175 |
+ |
176 |
+pkg_postinst() { |
177 |
+ # copy config file to new location |
178 |
+ # without portage knowing about it |
179 |
+ # so it will not delete it on unmerge or ever touch it again |
180 |
+ if [[ -e "${T}"/lircd.conf ]]; then |
181 |
+ cp "${T}"/lircd.conf "${EROOT%/}"/etc/lirc/lircd.conf || die |
182 |
+ if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then |
183 |
+ elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf" |
184 |
+ rm -f "${EROOT%/}"/etc/lircd.conf || die |
185 |
+ fi |
186 |
+ fi |
187 |
+ |
188 |
+ einfo "The new default location for lircd.conf is inside of" |
189 |
+ einfo "${EROOT%/}/etc/lirc/ directory" |
190 |
+} |
191 |
|
192 |
diff --git a/app-misc/lirc/metadata.xml b/app-misc/lirc/metadata.xml |
193 |
index 3d42ab3..e563da1 100644 |
194 |
--- a/app-misc/lirc/metadata.xml |
195 |
+++ b/app-misc/lirc/metadata.xml |
196 |
@@ -19,6 +19,7 @@ |
197 |
<flag name="audio">Support using an audio device connected to an IR receiver</flag> |
198 |
<flag name="iguanair">Support iguanaIR devices</flag> |
199 |
<flag name="ftdi">Support FTDI devices</flag> |
200 |
+ <flag name="gtk">Include GTK support which enables the use of lirc-setup</flag> |
201 |
</use> |
202 |
<upstream> |
203 |
<remote-id type="sourceforge">lirc</remote-id> |