gentoo resync : 14.07.2018

8 files changed, 5 insertions, 487 deletions

diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 6970f15f0535..5a166f2416a4 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -11,7 +11,6 @@ AUX lirc-0.9.0-kernel-2.6.39-fixes.patch 2175 BLAKE2B db4c75de0f7c2de3b99f50b173
 AUX lirc-0.9.0-kernel-3.3.0-fixes.patch 1545 BLAKE2B 400ef11e93b9cc58bbfa7f414df66208d1ad6fe14301b85dd05599b400aa1ecf6299b1e9692945f10f4b7ed085e8e087b0cdf218644bea0b7f785e00959d2be3 SHA512 75743844d7fe61a91174c1d7ee78a229e347659a35d1062a704c39e424d8a433efac4216a0b840282c38a4f2f22baa7a489c1c0402a40f734e7475992046a2ae
 AUX lirc-0.9.0-kernel-3.5-err-fix.patch 326 BLAKE2B ebfc117d5f1f1abe2a456ea6b5ed730ec22ebe03fee976eaf9005464afbfe5519f290cb5a107946286b8632a695d2f352ddb8581f63c429f75a7080d1916189b SHA512 c3a6e802b140595155a7ae8dc695bc13e4d6147323949a8dc9c86857bf7abcd442339eac64f99869925c308a100bfb1b7b0eb715f086afb8997252164ff079df
 AUX lirc-0.9.0-kernel-3.8-fixes.patch 2727 BLAKE2B 26601a6e34f0dadad36de1efa9b9a43127643a5c548372d9a64b2b919ddcef3d412ccd4bd59e8c18cd9d5fb9a41efe2d213a3f91397d9067a5851aa84b7832fe SHA512 0db9cbb3aba7d43dc497bc8009afb8335bfe013a06aa6936e1cd357e58c60f545575b06fb6941740d82b496dd4f2ac51b3a165435aee6b3c57107ae62bae7bdc
-AUX lirc-0.9.4-doc-path-fix.patch 892 BLAKE2B 12a7bf66bb91676152216be1806d7e577eaf0b4b0c82706d553ac9e1c5d4300f0c7c1433cd7448c849c937cbd7d561b1d0f0ae18df30228c6e092c9ef82607a6 SHA512 ba9e93b6f32d73bc46e55b0e58f099101f833ffc977b9307aa335fcd1f6cf537ce533854f739244393644ce8882379e9721ea29c80c2fa126554b3127911c8cd
 AUX lirc.service 216 BLAKE2B f1ee64926ab99eaeb5604f93d6394994eff97b9e5ae5b32a10d066e143e66278114722e15c3757815911ebc0485fde43c1f10e8abecf4a90550ccf4c08c5aa1b SHA512 c3e43d24f562ba5ac7e0f12d160026ebf5db00fe066d9e28e0cbb6767fb272474103ad271fba10b970a6613f6e4545150d61b7aa096c696fddca4f2db8019e49
 AUX lircd-0.8.6-r2 1204 BLAKE2B ae4082b6f063d3100865bb3e974d9ebec8f04e08dae8c296c30152f69700924b8850c85687a5cedb3895f52c1e7a576b0855a52e350462a0552da64cd3a7e6a4 SHA512 482fccd204671f6258822029b9eb9a1e22abf02e382b3814f924f171fd1168d46560f52a90727f3de60c27a78158173a4e0c3e848d45e489471c27851c907c05
 AUX lircd.conf.4 699 BLAKE2B 573b16d756f6df55c399fd77027ebb1e6bec1f28106d1a1d4cb028ab3694350a959486d33b82502a258492882e2fdfcb8f8e5220998ee4e1a503618ec247b30b SHA512 1fb1778f4cc72fc9c11b13a704b3abe80bcce5b3770b69b6b6bea8571e5293adad8c6968779b812e611b67734462c9a577cc71c6b16da3a5bfe31b8007300a62
@@ -19,18 +18,11 @@ AUX lircm.service 174 BLAKE2B 30db4e9dd3eed5ae896f60d2363d25f5bf11c83b946e668e7b
 AUX lircmd 364 BLAKE2B 71971476198f92bb2d26cbacc8fe330c4d73e0b36370180cfc6438047339487451b093455761b92660e3f3571c7884b97e6c79cbf7415bff6bcc6ad5198ddd43 SHA512 2f4aae24982a51c54fa59ddd8a48190c11f86ac67fc25bbb599f750be5b91e457c2f779e915943803bde2ec3e5e8988f3c0ffb9d1ea4a08c2e7f05cd3e8b75a5
 AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297aae75b17ed1bb858a57aa1f524d096ec2744f0d543b719f13e80a467869b7ac86e560cc396a24b0648 SHA512 6a69c7600024f00947dc35e3c6cebf7524fcf5f2a1e799fe70590fef2070c1049c4e6177711821f4e7b13972fd6f535591b48bb1006acd44fa650591b3265ace
 AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
-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.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
 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 3628 BLAKE2B 18880addbafab7abf3216e023ba27c568b1234f80a35bda0f45441d56f6e17c2ceb6623d5d25d9216b35d0aa4155eb060505d6c710913bf9052979654538e7d2 SHA512 375ada586cb5e60fc95d9c11962386d2cc2eb7e8ba8f3a40c12f766c9f256bd0812a5f9a564a1695eca60f05528e1f15d00b3fae359fb2a640525fac799a45b3
-EBUILD lirc-0.10.0_rc2.ebuild 3624 BLAKE2B 1729fd08c45514c24a7d48ecdac50b17d9a8d52b95ee06c23af5f5a87f89ccb6704b61d0c6344ce4e28396ec754dfb9ed4a33403179b72ff8060053712f1b115 SHA512 bf10dd1f1fe53d0ffed5e2ed0a0439c8f29d6f291b8487dcd5f74a01bec67b06838c4e35816ad475f0b21f113b65696277f63d13567fd711da719718cd322acc
+EBUILD lirc-0.10.1.ebuild 3628 BLAKE2B 18880addbafab7abf3216e023ba27c568b1234f80a35bda0f45441d56f6e17c2ceb6623d5d25d9216b35d0aa4155eb060505d6c710913bf9052979654538e7d2 SHA512 375ada586cb5e60fc95d9c11962386d2cc2eb7e8ba8f3a40c12f766c9f256bd0812a5f9a564a1695eca60f05528e1f15d00b3fae359fb2a640525fac799a45b3
 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 3671 BLAKE2B a16deea9b8b715a085d908789d2c252c60b455aff352baf99ac20f7b708713bdac6c3069356072d2b2f996bd99347f4ee1f5552ca670c03a0f9d7e93b3bb5b16 SHA512 466f717db881bd0de70511960c878208efa989995fba7e24a7145c473e8fa81777d191daa2d67789694e2346cd26c7f24f1ff6a3e84300a0cebacd033f7981ef
-MISC metadata.xml 1311 BLAKE2B 4a944ee2bfec572a01ba493924490388f10609ac4c9f6d585e2a7169abbb96e395c181c2ccabe51faa81acb381f259c688bca9a3a217347c4256a29bbf1600cc SHA512 71aad60940c2cdd6e6059b749b6f7e2834dc4146429e78b8b66cc74be32a498f7b019766033baf089f217f95c48dc2576919730645e17d997a37acef058cd73c
+MISC metadata.xml 1175 BLAKE2B 1bcfd5d3fed6ee42c3e53168cc40fd930e6b92bf52bc787c43439f053e1fb97bf841d71ec58ce3fae56187c77cac767613107e74a90f8871dcfe3f33e4ff293f SHA512 c1d6ff9a423c0ea5d52410d5dfa2cd9dd94b61109494c629706dc74c228032e19e6504884c50694450624d6c05f437eaaebaee0ab626f7004fc7377331fa847c
diff --git a/app-misc/lirc/files/lirc-0.9.4-doc-path-fix.patch b/app-misc/lirc/files/lirc-0.9.4-doc-path-fix.patch
deleted file mode 100644
index 9a2d6c2e638e..000000000000
--- a/app-misc/lirc/files/lirc-0.9.4-doc-path-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://sourceforge.net/p/lirc/tickets/214/
-
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 53d0f21..f833b4b 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -33,7 +33,6 @@ nodist_man_MANS         += man/xmode2.1 man/irxevent.1
- manpage_html            += man-html/irxevent.html man-html/xmode2.html
- endif
- 
--docdir                  = @datadir@/doc/@PACKAGE@
- dist_doc_DATA           = irxevent.keys
- 
- if HAVE_DOXYGEN
-@@ -58,10 +57,10 @@ if HAVE_PYMOD_YAML
- nodist_website_html_DATA  += table.html
- endif
- 
--vardocsdir              = $(localstatedir)/lib/lirc/plugins
-+vardocsdir              = $(docdir)/plugins
- vardocs_DATA            = index.html html-source/lirc.css
- 
--varimagedir             = $(localstatedir)/lib/lirc/images
-+varimagedir             = $(docdir)/images
- varimage_DATA           = $(dist_image_DATA)
- 
- website_imagedir        = $(docdir)/lirc.org/images
diff --git a/app-misc/lirc/files/lircmd.conf b/app-misc/lirc/files/lircmd.conf
deleted file mode 100644
index 319362a321aa..000000000000
--- a/app-misc/lirc/files/lircmd.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Options to pass to the lircmd process
-
-LIRCMD_OPTS="--uinput"
-
diff --git a/app-misc/lirc/lirc-0.10.0_rc2.ebuild b/app-misc/lirc/lirc-0.10.1.ebuild
index 464217b7e0af..9b8d2c10c013 100644
--- a/app-misc/lirc/lirc-0.10.0_rc2.ebuild
+++ b/app-misc/lirc/lirc-0.10.1.ebuild
@@ -1,9 +1,9 @@
-# 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 )
+PYTHON_COMPAT=( python3_4 python3_{5,6} )
 
 inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
 
diff --git a/app-misc/lirc/lirc-0.9.4a-r2.ebuild b/app-misc/lirc/lirc-0.9.4a-r2.ebuild
deleted file mode 100644
index fa9852918a23..000000000000
--- a/app-misc/lirc/lirc-0.9.4a-r2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic systemd
-
-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 ~ppc ~ppc64 ~x86"
-IUSE="doc static-libs X audio irman ftdi inputlirc iguanair systemd usb"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	iguanair? ( irman )
-"
-DEPEND="
-	doc? ( app-doc/doxygen )
-"
-
-RDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-	)
-	systemd? ( sys-apps/systemd )
-	audio? (
-		>media-libs/portaudio-18
-		media-libs/alsa-lib
-	)
-	irman? ( media-libs/libirman )
-	iguanair? ( app-misc/iguanaIR )
-	ftdi? ( dev-embedded/libftdi:0 )
-	inputlirc? ( app-misc/inputlircd )
-	usb? ( virtual/libusb:0 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/lirc-0.9.4-doc-path-fix.patch # https://bugs.gentoo.org/show_bug.cgi?id=589246 https://sourceforge.net/p/lirc/tickets/214/
-)
-
-src_configure() {
-	filter-flags -Wl,-O1
-	econf \
-		--localstatedir=/var \
-		$(use_enable static-libs static) \
-		$(use_with X x)
-}
-
-# Defined src_compile as a workaround for a parallel make issue
-# See https://bugs.gentoo.org/show_bug.cgi?id=588864
-# and https://sourceforge.net/p/lirc/tickets/210/
-src_compile() {
-	emake lib
-	emake
-}
-
-src_install() {
-	default
-
-	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.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 "${D}"/etc/lirc/lircd.conf ]]; then
-		newdoc "${D}"/etc/lirc/lircd.conf lircd.conf.example
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-
-	# Avoid QA notice
-	rm -d "${D}"/var/run/lirc || die
-	rm -d "${D}"/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 "${D}"/etc/lirc/lircd.conf ]]; then
-		cp "${D}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	fi
-
-	# stop portage from touching the config file
-	if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
-		rm -f "${D}"/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 "/etc/lirc/ directory"
-}
diff --git a/app-misc/lirc/lirc-0.9.4c.ebuild b/app-misc/lirc/lirc-0.9.4c.ebuild
deleted file mode 100644
index 25ec10062e31..000000000000
--- a/app-misc/lirc/lirc-0.9.4c.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2017 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
-
-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 ~ppc ~ppc64 ~x86"
-IUSE="audio doc ftdi gtk inputlirc static-libs systemd 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 )
-"
-
-PATCHES=(
-	# https://bugs.gentoo.org/show_bug.cgi?id=589246 https://sourceforge.net/p/lirc/tickets/214/
-	"${FILESDIR}"/lirc-0.9.4-doc-path-fix.patch
-)
-
-src_configure() {
-	xdg_environment_reset
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable static-libs static) \
-		$(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.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
deleted file mode 100644
index 57072953cadc..000000000000
--- a/app-misc/lirc/lirc-0.9.4d.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# 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 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/"
-
-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 ~ppc ~ppc64 ~x86"
-IUSE="audio doc ftdi gtk inputlirc static-libs systemd 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 )
-"
-
-PATCHES=(
-	# https://bugs.gentoo.org/show_bug.cgi?id=589246 https://sourceforge.net/p/lirc/tickets/214/
-	"${FILESDIR}"/lirc-0.9.4-doc-path-fix.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	xdg_environment_reset
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable static-libs static) \
-		$(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.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/metadata.xml b/app-misc/lirc/metadata.xml
index b1e7f0c27f85..3a8d3814118e 100644
--- a/app-misc/lirc/metadata.xml
+++ b/app-misc/lirc/metadata.xml
@@ -11,9 +11,7 @@
         <flag name="hardware-carrier">The transmitter device generates its clock signal in hardware</flag>
         <flag name="transmitter">Add transmitter support to some lirc-drivers (e.g. serial)</flag>
         <flag name="inputlirc">Add a dependency on app-misc/inputlircd</flag>
-        <flag name="irman">Add a dependency on media-libs/libirman</flag>
         <flag name="audio">Support using an audio device connected to an IR receiver</flag>
-        <flag name="iguanair">Support iguanaIR devices</flag>
         <flag name="ftdi">Support FTDI devices</flag>
         <flag name="gtk">Include GTK support which enables the use of lirc-setup</flag>
     </use>