gentoo resync : 15.09.2019

3 files changed, 181 insertions, 0 deletions

diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index d19aa74b16a0..51342f5206e1 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,5 +1,6 @@
 AUX irexec-confd 280 BLAKE2B ad6663659c459811710a257cf357ddd5efbd17c09201c6e3ecc68d680004e8212e76365e09984b6c422fb5fa9603245c7443d1b71bb6064a2ed35734ab6dd630 SHA512 2b33e1044086d11fd6e1f9a204ce925182a3a2b92ef4399610e01702f9c2c8fbc87cae52961123297171eef3d40468ac17437b4281b26a5f3b256c9cebc612ac
 AUX irexec-initd-0.9.4a-r2 681 BLAKE2B d2bf21ab1fe275bf5afea31a890c1de3300e836879b76c1c33bb40a59d9ad2b33285745a4d0a78f8bc2f589ba44e6fde31c7d07a02d9751e4b13b23975b1d9aa SHA512 0514712ce1a3e147e1c798319f90663baab7509299e2eb35551a716cf208e42b225f8539968bba1bd15270006fb728ff2f458015fb07bf325df8b0e095f5a206
+AUX lirc-0.10.1-runtimedirectory.patch 440 BLAKE2B 793d89aed133faa03d0febafa86779cba1e028c1966025b4386a37818c3a5b1e867170fb1e7ae8fad8e2b32655979748a2dfe54544910036715ba3a616e81a03 SHA512 afb2dfddbdb0f2e07ed3203225827b755e3654761b7e05f3cd68d404b1a959c052bc355b2c7b3114d68356ec889b3eb0f61a97a77e386a4f10fefc92dfe20848
 AUX lirc-0.10.1-unsafe-load.patch 2070 BLAKE2B 765e558f7d10081628b2516b6ae6c5ef3d7511fe6953032693c3e02b8d76b287d51ca71fefa4e789c159de6117cc4f741e1fae889550ae053759b6519d45ec71 SHA512 9a39a57b3855360133b6276afa08eed21064850bc7e0039ec1f6f7594859349b2489344e68ea2317371f264d48e63aebf0191ac3983fb0245d0b24a297d27753
 AUX lircd-0.8.6-r2 1204 BLAKE2B ae4082b6f063d3100865bb3e974d9ebec8f04e08dae8c296c30152f69700924b8850c85687a5cedb3895f52c1e7a576b0855a52e350462a0552da64cd3a7e6a4 SHA512 482fccd204671f6258822029b9eb9a1e22abf02e382b3814f924f171fd1168d46560f52a90727f3de60c27a78158173a4e0c3e848d45e489471c27851c907c05
 AUX lircd.conf.4 699 BLAKE2B 573b16d756f6df55c399fd77027ebb1e6bec1f28106d1a1d4cb028ab3694350a959486d33b82502a258492882e2fdfcb8f8e5220998ee4e1a503618ec247b30b SHA512 1fb1778f4cc72fc9c11b13a704b3abe80bcce5b3770b69b6b6bea8571e5293adad8c6968779b812e611b67734462c9a577cc71c6b16da3a5bfe31b8007300a62
@@ -8,5 +9,6 @@ AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a3
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
 EBUILD lirc-0.10.1-r1.ebuild 3740 BLAKE2B 094a39484b473f0a36d5ace14edecc3ac8e33a4fe7a5d739bd55f34a0aab83ec2ebed9abc0df51d50ef9f9affcfd1f7dd112449a7ec3b6941ebb949441050120 SHA512 e9e5f1bc6746ec2bb8cf11c3935ae480ab94603f7e97b0e7530c63d7560c34d281fc7117eb1e783e1c403d04de7e55503747798f9e4c0b96ed6b968d6656a8a7
+EBUILD lirc-0.10.1-r2.ebuild 3787 BLAKE2B f3be53c6caa978247c3b3cd2bcb4c40c319ca7ce359ec4682b469ac30b123a43fdbb08870db9c29e90a7ea7ac77cca21b8b3db6c644d2099de907067362bcccd SHA512 ed9617b3fb0f60095b1226ce1ce6bb788295bcd1ee042e0892e4b4b2b9ffd98bb2b7a71692af60bfccb8f47afd23141af43650968220189e050671c5de84a462
 EBUILD lirc-0.10.1.ebuild 3726 BLAKE2B 7054ad4a9a02d499e4460c9178f24eead6da0efa148e680e96c0a261899a05e63fc77221f270e448e2a3269a538b1a92f58b90592193f569ee1b29499b7e68d3 SHA512 db8f02c0931238d4d8d73a2217076d31d4b609dcd874a246005633d98ec655ac51d818e4007a673d19db279d3a1995609c6d3e0ac0cbb4a28242432ab1ae351e
 MISC metadata.xml 969 BLAKE2B 6dabf8921994f06c7f9e39e2049c0ac86b5e5523c554eec3c061151627512f6f17d14eeb00256585dd9fd323f4293f74175ace6bd87846ba461a72ab6e7caef4 SHA512 fc510d070b7b97d28159b77a7540b38e8558efd8a780dffe8755e3bcea7bbd601211f19733c217ce670407c523b6c5daac2c9aedde2ddeecb81dda8472c48fb6
diff --git a/app-misc/lirc/files/lirc-0.10.1-runtimedirectory.patch b/app-misc/lirc/files/lirc-0.10.1-runtimedirectory.patch
new file mode 100644
index 000000000000..256ac9eda20b
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.10.1-runtimedirectory.patch
@@ -0,0 +1,18 @@
+https://sourceforge.net/p/lirc/git/merge-requests/42/
+
+Author: Craig Andrews <candrews@integralblue.com>
+Date:   Sat Sep 14 21:03:49 2019 -0400
+
+    systemd: ensure lirc runtime directory exists
+
+diff --git a/systemd/lircd.service b/systemd/lircd.service
+--- a/systemd/lircd.service
++++ b/systemd/lircd.service
+@@ -8,6 +8,7 @@
+ [Service]
+ Type=simple
+ ExecStart=/usr/sbin/lircd --nodaemon
++RuntimeDirectory=lirc
+ ; User=lirc
+ ; Group=lirc
+
diff --git a/app-misc/lirc/lirc-0.10.1-r2.ebuild b/app-misc/lirc/lirc-0.10.1-r2.ebuild
new file mode 100644
index 000000000000..1395b4dc65ef
--- /dev/null
+++ b/app-misc/lirc/lirc-0.10.1-r2.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
+
+DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
+HOMEPAGE="http://www.lirc.org/"
+
+LIRC_DRIVER_DEVICE="/dev/lirc0"
+
+MY_P=${PN}-${PV/_/-}
+
+if [[ "${PV/_pre/}" = "${PV}" ]]; then
+	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
+else
+	SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	gtk? ( X )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	audio? (
+		>media-libs/portaudio-18
+		media-libs/alsa-lib
+	)
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	ftdi? ( dev-embedded/libftdi:0 )
+	systemd? ( sys-apps/systemd )
+	usb? ( virtual/libusb:0 )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/libxslt
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( app-doc/doxygen )
+	sys-apps/kmod
+	sys-kernel/linux-headers
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	gtk? (
+		x11-libs/vte[introspection]
+		dev-python/pygobject[${PYTHON_USEDEP}]
+	)
+	inputlirc? ( app-misc/inputlircd )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-unsafe-load.patch"
+	"${FILESDIR}/${P}-runtimedirectory.patch"
+)
+
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+	use uinput && CONFIG_CHECK="~INPUT_UINPUT"
+	python-single-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_configure() {
+	xdg_environment_reset
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable static-libs static) \
+		$(use_enable devinput) \
+		$(use_enable uinput) \
+		$(use_with X x)
+}
+
+src_install() {
+	default
+
+	if use !gtk ; then
+		# lirc-setup requires gtk
+		rm "${ED}"/usr/bin/lirc-setup || die
+	fi
+
+	newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
+	newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd
+	newconfd "${FILESDIR}"/lircd.conf.4 lircd
+	newconfd "${FILESDIR}"/lircmd-0.10.0.conf lircmd
+
+	insinto /etc/modprobe.d/
+	newins "${FILESDIR}"/modprobed.lirc lirc.conf
+
+	newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec
+	newconfd "${FILESDIR}"/irexec-confd irexec
+
+	keepdir /etc/lirc
+	if [[ -e "${ED}"/etc/lirc/lircd.conf ]]; then
+		newdoc "${ED}"/etc/lirc/lircd.conf lircd.conf.example
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+
+	# Avoid QA notice
+	rm -d "${ED}"/var/run/lirc || die
+	rm -d "${ED}"/var/run || die
+}
+
+pkg_preinst() {
+	local dir="${EROOT}/etc/modprobe.d"
+	if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
+		elog "Renaming ${dir}/lirc to lirc.conf"
+		mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
+	fi
+
+	# copy the first file that can be found
+	if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then
+		cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+	elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then
+		cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf || die
+		MOVE_OLD_LIRCD_CONF=1
+	elif [[ -f "${ED}"/etc/lirc/lircd.conf ]]; then
+		cp "${ED}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+	fi
+
+	# stop portage from touching the config file
+	if [[ -e "${ED}"/etc/lirc/lircd.conf ]]; then
+		rm -f "${ED}"/etc/lirc/lircd.conf || die
+	fi
+}
+
+pkg_postinst() {
+	# copy config file to new location
+	# without portage knowing about it
+	# so it will not delete it on unmerge or ever touch it again
+	if [[ -e "${T}"/lircd.conf ]]; then
+		cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf || die
+		if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
+			elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
+			rm -f "${EROOT}"/etc/lircd.conf || die
+		fi
+	fi
+
+	einfo "The new default location for lircd.conf is inside of"
+	einfo "${EROOT}/etc/lirc/ directory"
+}