gentoo resync : 07.04.2018

3 files changed, 161 insertions, 3 deletions

diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 0feb389a9de2..36e34b5616ce 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -22,13 +22,15 @@ AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a3
 AUX lircmd.conf 65 BLAKE2B e63ba72d49e51a09ebe848a63c8ca3865fe7cab40663e58e0c03ec303c7700f27017d2d127d54555c94bcd4a7e996f2cc992ef26acd96f7e5ec39889ce655d6d SHA512 75cea93359a18f5d3f398795904dac4b49abac8bdaf19e06d17a713a3bfc2e5ee154b1f137c3d731fb659ecc245ad880053378a5b5958a28af3f884f5827e228
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.0-rc2.tar.bz2 2552982 BLAKE2B d68639198dd7041865f6b7ac79cb94b63d8a85ee70f97628e27887d14f62814388a51521dabe91730570c382c6bb7edb36c15eba0f8ea9f5d4490dfce2bd121a SHA512 ab3426477f017e3a1b9da690189beae5086bbb52f88d302e6c91d7633f74ef781e6747f6b697b3ed6df13497a3e666f11c846104d2f00b975746d24bfd2a6cd5
+DIST lirc-0.10.0.tar.bz2 2523528 BLAKE2B 5c133b40936060fbaa0a9463b1b07d9197d935388e3eb4e46791b1f844b82ea6b6d42ae0c6ce249ca306688fa5d15718f5a3a54b497fc9f168b8b736b06bdd1e SHA512 06ccc1c8c80bfd17a6d180ae39a17779cbba341086f90a03a2e552bfb71e3abcb13f991312fba0e57df79c1882c1e29a2f273dddcd46a9ff53160b556e1547ab
 DIST lirc-0.9.0.tar.bz2 857286 BLAKE2B 034c7b8492dd42301bb6d40da8c6c95f714b925ee50e7396290231684024dc3fe3bb64987db92d2a4e4d56203436007e68222bbf9a775bb9d29bbefcc4a7c1e4 SHA512 e91534c63e6065bd7da3b15e1676edf1672b8beb21864a6825df86247d7d165bf2dee6f8191732933e24e42a406e46afc55559948e4061eed2de7b08fac13431
 DIST lirc-0.9.4a.tar.bz2 2292119 BLAKE2B 6ca7562716fde3327aa3f8f9913da7d349969f1bcac095bf2e9b1e3025d1e39176e2fb386ca08bcf80d458262f9eb96dab363ef3aa2c1d56b914ac8a36fcbacf SHA512 16be0ac5dd9b07d717ceba63cdc38c0db4a2bdcfc373ca6346d7cd4ab2cd2973aa7585d10b045fcaea952a3aabf7617c564ccb8268db6c62b172683a4b2cc188
 DIST lirc-0.9.4c.tar.bz2 2311300 BLAKE2B f58f3b3a701e0ae787e34ec65c1d29b0faa75958b95aa43663a78dbe04c1c1d5456df5a6c5e41c673db9f589a7c2d41423b5f6a667fac890fb18f29fd797438b SHA512 0a0d0e025b87a55ec919c92824d8288bfaf35cfebae0ee97d86e344109f584baa72a2eff6d24fbc526900671d6092e0eebef8d1566559b0d153e122e3127c0cb
 DIST lirc-0.9.4d.tar.bz2 2489704 BLAKE2B 89cf8989aa84905d292fdf72632b7e5854aa2b225a6a6183839fa3e5fbc6624474e2723d3456cf5c5e6216abd134805fba495e89469808cd5ff139c31f86c032 SHA512 fb3892e12fbe5277e04c451694f1ea4ed45cc424d66ea57b11c4ac4760afa7df4b37897f380b4ade464a82523a0cee336f216d2009ea9431333fd7ca74a8336c
+EBUILD lirc-0.10.0.ebuild 3624 BLAKE2B aebeafeab813fbe385de6fabe82eff81533030446fd94af464e0a83fe3e6218383a68a618f623851542bc7f6259ba10a73f56541ca8fbc48335ad479434e3512 SHA512 167ef954764d3fab43a3a085367bb8b274b6737b4ef3588db17496b5c36682450d1e1233c7439454211b88d85772015d0dab76afd60cd92693abb12c1d9dd2a7
 EBUILD lirc-0.10.0_rc2.ebuild 3624 BLAKE2B 1729fd08c45514c24a7d48ecdac50b17d9a8d52b95ee06c23af5f5a87f89ccb6704b61d0c6344ce4e28396ec754dfb9ed4a33403179b72ff8060053712f1b115 SHA512 bf10dd1f1fe53d0ffed5e2ed0a0439c8f29d6f291b8487dcd5f74a01bec67b06838c4e35816ad475f0b21f113b65696277f63d13567fd711da719718cd322acc
 EBUILD lirc-0.9.0-r6.ebuild 13250 BLAKE2B 81ca3c71e46089a8f3a1b412d53e60096f14c0825f8f4c7daf9fee9387e3eced4dda10c8e5dc4550a9e0eb1347b1db40972a3a2397154dce2a8e1d2ed8b99977 SHA512 0d620d93bccf35721830420a7e367b45c1b6a71891843db12fe4c96b0d1228de6367969545eeb0f0416833f195ed933eafef69d5d38a0a46a1f0ddc32829240b
 EBUILD lirc-0.9.4a-r2.ebuild 3412 BLAKE2B fee771153fbbf941641b86836d860f9bba1ccb00c834a7433fd48d1fbd51c737fbef0308119db2b7ca61e92b7ff615b7c0b4f0bedc5f9e4908b43db18acf9fdb SHA512 a4fbfa1f58525ba5ff464023b717a5c927299dfc2a57586e19d150de7600e76577004e9398f21cc062ee7e83e90c45f1b3bc8ed9f391be2ac3cda940683e1a66
 EBUILD lirc-0.9.4c.ebuild 3620 BLAKE2B 863f48ca71a933f76c7c8d307ef2545f54c5d66c9616a6ea171e46faa346c9644a6c1fb881d451b6c430f7111279ed783fe516068464b5c16f0b0858227c4d0a SHA512 f971cbe128d7516d21890f6a99ac581d059f41d769222a736da0779b2b551ec2267a04930faae27faced05549bcf1d725bc260b49c11ee400a7045a412a7ffd0
-EBUILD lirc-0.9.4d.ebuild 3620 BLAKE2B 863f48ca71a933f76c7c8d307ef2545f54c5d66c9616a6ea171e46faa346c9644a6c1fb881d451b6c430f7111279ed783fe516068464b5c16f0b0858227c4d0a SHA512 f971cbe128d7516d21890f6a99ac581d059f41d769222a736da0779b2b551ec2267a04930faae27faced05549bcf1d725bc260b49c11ee400a7045a412a7ffd0
+EBUILD lirc-0.9.4d.ebuild 3671 BLAKE2B a16deea9b8b715a085d908789d2c252c60b455aff352baf99ac20f7b708713bdac6c3069356072d2b2f996bd99347f4ee1f5552ca670c03a0f9d7e93b3bb5b16 SHA512 466f717db881bd0de70511960c878208efa989995fba7e24a7145c473e8fa81777d191daa2d67789694e2346cd26c7f24f1ff6a3e84300a0cebacd033f7981ef
 MISC metadata.xml 1311 BLAKE2B 4a944ee2bfec572a01ba493924490388f10609ac4c9f6d585e2a7169abbb96e395c181c2ccabe51faa81acb381f259c688bca9a3a217347c4256a29bbf1600cc SHA512 71aad60940c2cdd6e6059b749b6f7e2834dc4146429e78b8b66cc74be32a498f7b019766033baf089f217f95c48dc2576919730645e17d997a37acef058cd73c
diff --git a/app-misc/lirc/lirc-0.10.0.ebuild b/app-misc/lirc/lirc-0.10.0.ebuild
new file mode 100644
index 000000000000..8ddbc22037b4
--- /dev/null
+++ b/app-misc/lirc/lirc-0.10.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+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
+	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 )
+"
+
+pkg_setup() {
+	use uinput && CONFIG_CHECK="INPUT_UINPUT"
+}
+
+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"
+}
diff --git a/app-misc/lirc/lirc-0.9.4d.ebuild b/app-misc/lirc/lirc-0.9.4d.ebuild
index 25ec10062e31..57072953cadc 100644
--- a/app-misc/lirc/lirc-0.9.4d.ebuild
+++ b/app-misc/lirc/lirc-0.9.4d.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python3_4 python3_5 )
 
-inherit eutils flag-o-matic python-single-r1 systemd xdg-utils
+inherit autotools eutils flag-o-matic python-single-r1 systemd xdg-utils
 
 DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
 HOMEPAGE="http://www.lirc.org/"
@@ -71,6 +71,11 @@ PATCHES=(
 	"${FILESDIR}"/lirc-0.9.4-doc-path-fix.patch
 )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	xdg_environment_reset
 	econf \