gentoo Easter resync : 12.04.2020

3 files changed, 1 insertions, 167 deletions

diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 1a8533293f99..9eff0852328a 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -10,5 +10,4 @@ AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
 EBUILD lirc-0.10.1-r3.ebuild 3848 BLAKE2B 86b6a69cc1b3127806884dd52cba85aea21a7621aa21fe46daebdd250bf7f8e98da1347c0f7caaaddae06696724bc82b07ffecb21390878487d3329a95829a6e SHA512 75ba28d58e744557c82f7aa9de722ee703c0596cc769726a5480b469b32d295b956d65d02fe3a13fd59611f95c5eaadd53f5af8d6ad4c95965da1488f1be7937
 EBUILD lirc-0.10.1-r4.ebuild 3895 BLAKE2B 5b598a3a94abf8a80710f643b264fcbbdd18cfea180118db6fba9ebbe68fd23a0f4b17d9bb363226448da163c93c65b594b966eaa21d4598c9fe9e25c95208df SHA512 f276a6c04cbd28c54a140428dbb22c98cdd664e709c8432a35d0249006761712a46a8343a88a9596573ddda8c4bc0c444587ddae40d0dc7ea1544edda8f157b9
-EBUILD lirc-0.10.1.ebuild 3834 BLAKE2B 3f449d519f75120f7a558fb626562e2cd178e783993a980b6e04018b05249e46a51432ece7137a721cb87e679a3535e66fce54df17a075970d9fd97d2226e319 SHA512 514a8c5a44baaf0ad87f86a06050c90da3bba5f2b2038e6e7a5a36f85e2792bf6c7546a7144a1ef418afeeae608b0fc3ff4bf3e16d7a6e418abade771e15defd
-MISC metadata.xml 969 BLAKE2B 6dabf8921994f06c7f9e39e2049c0ac86b5e5523c554eec3c061151627512f6f17d14eeb00256585dd9fd323f4293f74175ace6bd87846ba461a72ab6e7caef4 SHA512 fc510d070b7b97d28159b77a7540b38e8558efd8a780dffe8755e3bcea7bbd601211f19733c217ce670407c523b6c5daac2c9aedde2ddeecb81dda8472c48fb6
+MISC metadata.xml 818 BLAKE2B 01aa3a8beeeed191a70a2154861022ce2af9fea56e1e3b8d8fc2126b647629823a750f0a64040fb65e376e6ca78070747ff40903521c84fc78af7aa5be45cf76 SHA512 4de2c162a07647f17797f827936626710a56980baebb8596436417aa0501d3b2e44c633c8c298813bed9b9ec12425e5ec89769df33e858f6a86fa328e6e252a1
diff --git a/app-misc/lirc/lirc-0.10.1.ebuild b/app-misc/lirc/lirc-0.10.1.ebuild
deleted file mode 100644
index ff58dab0f42e..000000000000
--- a/app-misc/lirc/lirc-0.10.1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{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
-	)
-	$(python_gen_cond_dep '
-		<dev-python/pyyaml-5[${PYTHON_MULTI_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
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-	')
-	doc? ( app-doc/doxygen )
-	sys-apps/kmod
-	sys-kernel/linux-headers
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	gtk? (
-		x11-libs/vte[introspection]
-		$(python_gen_cond_dep '
-			dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	inputlirc? ( app-misc/inputlircd )
-"
-
-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"
-}
diff --git a/app-misc/lirc/metadata.xml b/app-misc/lirc/metadata.xml
index 98b33f1b6a8d..248b19f7b6db 100644
--- a/app-misc/lirc/metadata.xml
+++ b/app-misc/lirc/metadata.xml
@@ -16,8 +16,5 @@
     <upstream>
         <remote-id type="sourceforge">lirc</remote-id>
     </upstream>
-    <longdescription lang="en">
-        LIRC (Linux Infrared remote control) allows users to receive and send infrared signals.
-    </longdescription>
 </pkgmetadata>