From 5ca4b7a6aae3409f3d971fd92cc9d253d2d5dc8b Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Thu, 2 Jun 2011 08:48:55 +0000 Subject: version bump for bug 368721 Package-Manager: portage-2.1.9.42/cvs/Linux i686 --- app-misc/lirc/ChangeLog | 9 +- app-misc/lirc/Manifest | 12 +- app-misc/lirc/lirc-0.9.0.ebuild | 359 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 373 insertions(+), 7 deletions(-) create mode 100644 app-misc/lirc/lirc-0.9.0.ebuild diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog index c9741b94cd6b..721f39a4ffa0 100644 --- a/app-misc/lirc/ChangeLog +++ b/app-misc/lirc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-misc/lirc -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.221 2010/11/05 13:42:47 hwoarang Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.222 2011/06/02 08:48:55 fauli Exp $ + +*lirc-0.9.0 (02 Jun 2011) + + 02 Jun 2011; Christian Faulhammer +lirc-0.9.0.ebuild: + version bump for bug 368721 05 Nov 2010; Markos Chandras lirc-0.8.7.ebuild: Stable on amd64 wrt bug #343659 diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest index 14316d03de57..4ca5fa561116 100644 --- a/app-misc/lirc/Manifest +++ b/app-misc/lirc/Manifest @@ -16,15 +16,17 @@ AUX modulesd.lirc 482 RMD160 0c7ec9881b337529acaf15eb4bf7a66a8623fc6c SHA1 8415e DIST lirc-0.8.5.tar.bz2 716760 RMD160 f0fafeace28bf61f17bd3403ced6de3bfb9250b4 SHA1 d156655dd1694415a77492068a1b8e090bbaafcc SHA256 0b1594d9eacf278c66c8137b75f9a0a354e663b011ab373c7a207e63b45abcb6 DIST lirc-0.8.7.tar.bz2 832187 RMD160 d6542f25545a482de002b65ecc9d191ab4b1b388 SHA1 d964f4b2e1f0cbc8ac8384b585a32384eebc25fe SHA256 e431454f266c4ddc209c3cc84fc506cac6092eb5124b4f3dcc215c8584ea7a39 DIST lirc-0.8.7pre1.tar.bz2 792651 RMD160 67c27459634fc07e5e6a3c31b4e7f412ea9cc512 SHA1 424bcfcc50378bb34876667e71bd2d8513d228d7 SHA256 5fd79d83e1de6d64dea809a5877738609c124ee68a639f3165bdd246b3ffb4be +DIST lirc-0.9.0.tar.bz2 857286 RMD160 d8f1cf3a03573be36787e87adc71beba3e678a37 SHA1 8456bf7101d4f2d31d61c5073357a4981b458581 SHA256 6323afae6ad498d4369675f77ec3dbb680fe661bea586aa296e67f2e2daba4ff EBUILD lirc-0.8.5.ebuild 9406 RMD160 2f1db10b3b7727d567baf396ac30ad105ff2653e SHA1 a7fc9fd73db1fa94bb8db6b10fb6bfd15336e62b SHA256 be6a2cd847c60b8e997cfd0446ba15f5ccd370263282167f91ca0c6ee6a92fb4 EBUILD lirc-0.8.7.ebuild 10091 RMD160 c0a63d09a1236c502ec28c3561c01a2efa98337b SHA1 df5a27f20813c948751b7a78d066c061b72de3c9 SHA256 586159475bbc355bee0f0ce73f2c640b0ba43dd6b6ab34d0df7c8013540b7ce6 EBUILD lirc-0.8.7_pre1.ebuild 10095 RMD160 babbd37946c88735631a263f9ab0f7debd58e177 SHA1 ff7cb4aa86a98cd033dbea8cc283ad12bc6d3a43 SHA256 0dba5cd2431682ee7a1ec425972e9591fc792913eb66eb850aa1a03d958d3477 -MISC ChangeLog 36503 RMD160 5eded9f5a370a593f6879f29b0daf1efb95fe51d SHA1 9ec99e8b0fa083ae52f2ab8e58ea12537df105e2 SHA256 5623e3327b5aea5b88895cd6401412a503088129c182a2d9a0d2daa07d7651e6 +EBUILD lirc-0.9.0.ebuild 10090 RMD160 00a719c8b6f04ad759ca42a3b95534c56b33e006 SHA1 344f667616036dfde2dfa1f92ceb3c5ffcd3c4e4 SHA256 c96a6637e75fcc584201966ec1622d3663b9d96848edd623c783666b9a719a51 +MISC ChangeLog 36633 RMD160 8a057d4dc30325f9623c5a97569a8ac5943e6148 SHA1 84c804f6c9da2c8a5ca22460ed273e299808b792 SHA256 b30f05811994e4cbd5763036dc72df3f893520fbd42f4a6e0c59d15fd5834c84 MISC metadata.xml 376 RMD160 7b854dad1999c38592eabe928aab80615ba1f1e5 SHA1 17dc9c9591c77aa4ec2d98b9bc1f34ff68da31ad SHA256 e3b4637a67a93eb4b9457fa5941e8a6a891adca11a1ebc80c21a59650eac93aa -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAkzUCe8ACgkQ9/cejkQaxBCAUACZAcnaKK+8TizgM9SaPWtuLlSd -+tsAn3WOLyOsCfluXE1Y44oI5FXBxVwW -=k2u1 +iEYEARECAAYFAk3nTokACgkQNQqtfCuFneP0jQCfVFDhGMdL/H+HjHhS+zWVTEG0 +0gcAnid2SW2vE6HqnUro5YBPYLZzDkiX +=7AUM -----END PGP SIGNATURE----- diff --git a/app-misc/lirc/lirc-0.9.0.ebuild b/app-misc/lirc/lirc-0.9.0.ebuild new file mode 100644 index 000000000000..9a1e79b6ed2a --- /dev/null +++ b/app-misc/lirc/lirc-0.9.0.ebuild @@ -0,0 +1,359 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.9.0.ebuild,v 1.1 2011/06/02 08:48:55 fauli Exp $ + +inherit eutils linux-mod flag-o-matic autotools + +DESCRIPTION="decode and send infra-red signals of many commonly used remote controls" +HOMEPAGE="http://www.lirc.org/" + +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 ~x86" +IUSE="debug doc X hardware-carrier transmitter" + +S="${WORKDIR}/${MY_P}" + +RDEPEND=" + X? ( + x11-libs/libX11 + x11-libs/libSM + x11-libs/libICE + ) + lirc_devices_alsa_usb? ( media-libs/alsa-lib ) + lirc_devices_audio? ( >media-libs/portaudio-18 ) + lirc_devices_irman? ( media-libs/libirman )" + +# This are drivers with names matching the +# parameter --with-driver=NAME +IUSE_LIRC_DEVICES_DIRECT=" + all userspace accent act200l act220l + adaptec alsa_usb animax asusdh atilibusb + atiusb audio audio_alsa avermedia avermedia_vdomate + avermedia98 awlibusb bestbuy bestbuy2 breakoutbox + bte bw6130 caraca chronos commandir + cph06x creative creative_infracd + devinput digimatrix dsp dvico ea65 ene0100 + exaudio flyvideo ftdi gvbctv5pci hauppauge + hauppauge_dvb hercules_smarttv_stereo i2cuser + igorplugusb iguanaIR imon imon_24g imon_knob + imon_lcd imon_pad imon_rsc irdeo irdeo_remote + irlink irman irreal it87 ite8709 + knc_one kworld leadtek_0007 leadtek_0010 + leadtek_pvr2000 livedrive_midi + livedrive_seq logitech macmini mceusb + mediafocusI mouseremote + mouseremote_ps2 mp3anywhere mplay nslu2 + packard_bell parallel pcmak pcmak_usb + pctv pixelview_bt878 pixelview_pak + pixelview_pro provideo realmagic + remotemaster sa1100 samsung sasem sb0540 serial + silitek sir slinke streamzap tekram + tekram_bt829 tira ttusbir tuxbox tvbox udp uirt2 + uirt2_raw usb_uirt_raw usbx wpc8769l" + +# drivers that need special handling and +# must have another name specified for +# parameter --with-driver=NAME +IUSE_LIRC_DEVICES_SPECIAL=" + serial_igor_cesko + remote_wonder_plus xboxusb usbirboy inputlirc" + +IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}" + +#device-driver which use libusb +LIBUSB_USED_BY_DEV=" + all atilibusb awlibusb sasem igorplugusb imon imon_lcd imon_pad + imon_rsc streamzap mceusb xboxusb irlink commandir" + +for dev in ${LIBUSB_USED_BY_DEV}; do + DEPEND="${DEPEND} lirc_devices_${dev}? ( dev-libs/libusb )" +done + +# adding only compile-time depends +DEPEND="${RDEPEND} ${DEPEND} + virtual/linux-sources + lirc_devices_ftdi? ( dev-embedded/libftdi ) + lirc_devices_all? ( dev-embedded/libftdi )" + +# adding only run-time depends +RDEPEND="${RDEPEND} + lirc_devices_usbirboy? ( app-misc/usbirboy ) + lirc_devices_inputlirc? ( app-misc/inputlircd ) + lirc_devices_iguanaIR? ( app-misc/iguanaIR )" + +# add all devices to IUSE +for dev in ${IUSE_LIRC_DEVICES}; do + IUSE="${IUSE} lirc_devices_${dev}" +done + +add_device() { + : ${lirc_device_count:=0} + ((lirc_device_count++)) + + if [[ ${lirc_device_count} -eq 2 ]]; then + ewarn + ewarn "When selecting multiple devices for lirc to be supported," + ewarn "it can not be guaranteed that the drivers play nice together." + ewarn + ewarn "If this is not intended, then abort emerge now with Ctrl-C," + ewarn "Set LIRC_DEVICES and restart emerge." + ewarn + epause + fi + + local dev="${1}" + local desc="device ${dev}" + if [[ -n "${2}" ]]; then + desc="${2}" + fi + + elog "Compiling support for ${desc}" + MY_OPTS="${MY_OPTS} --with-driver=${dev}" +} + +pkg_setup() { + + if use lirc_devices_mceusb2 + then + ewarn "The mceusb2 driver has been merged into the mceusb." + ewarn "Please only use the latter now." + fi + + ewarn "If your LIRC device requires modules, you'll need MODULE_UNLOAD" + ewarn "support in your kernel." + + linux-mod_pkg_setup + + # set default configure options + MY_OPTS="" + LIRC_DRIVER_DEVICE="/dev/lirc0" + + if use lirc_devices_all; then + # compile in drivers for a lot of devices + add_device all "a lot of devices" + else + # compile in only requested drivers + local dev + for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do + if use lirc_devices_${dev}; then + add_device ${dev} + fi + done + + if use lirc_devices_remote_wonder_plus; then + add_device atiusb "device Remote Wonder Plus (atiusb-based)" + fi + + if use lirc_devices_serial_igor_cesko; then + add_device serial "serial with Igor Cesko design" + MY_OPTS="${MY_OPTS} --with-igor" + fi + + if use lirc_devices_imon_pad; then + ewarn "The imon_pad driver has incorporated the previous pad2keys patch" + ewarn "and removed the pad2keys_active option for the lirc_imon module" + ewarn "because it is always active." + ewarn "If you have an older imon VFD device, you may need to add the module" + ewarn "option display_type=1 to override autodetection and force VFD mode." + fi + + if use lirc_devices_xboxusb; then + add_device atiusb "device xboxusb" + fi + + if use lirc_devices_usbirboy; then + add_device userspace "device usbirboy" + LIRC_DRIVER_DEVICE="/dev/usbirboy" + fi + + if [[ "${MY_OPTS}" == "" ]]; then + if [[ "${PROFILE_ARCH}" == "xbox" ]]; then + # on xbox: use special driver + add_device atiusb "device xboxusb" + else + # no driver requested + elog + elog "Compiling only the lirc-applications, but no drivers." + elog "Enable drivers with LIRC_DEVICES if you need them." + MY_OPTS="--with-driver=none" + fi + fi + fi + + use hardware-carrier && MY_OPTS="${MY_OPTS} --without-soft-carrier" + use transmitter && MY_OPTS="${MY_OPTS} --with-transmitter" + + if [[ -n "${LIRC_OPTS}" ]] ; then + ewarn + ewarn "LIRC_OPTS is deprecated from lirc-0.8.0-r1 on." + ewarn + ewarn "Please use LIRC_DEVICES from now on." + ewarn "e.g. LIRC_DEVICES=\"serial sir\"" + ewarn + ewarn "Flags are now set per use-flags." + ewarn "e.g. transmitter, hardware-carrier" + + local opt + local unsupported_opts="" + + # test for allowed options for LIRC_OPTS + for opt in ${LIRC_OPTS}; do + case ${opt} in + --with-port=*|--with-irq=*|--with-timer=*|--with-tty=*) + MY_OPTS="${MY_OPTS} ${opt}" + ;; + *) + unsupported_opts="${unsupported_opts} ${opt}" + ;; + esac + done + if [[ -n ${unsupported_opts} ]]; then + ewarn "These options are no longer allowed to be set" + ewarn "with LIRC_OPTS: ${unsupported_opts}" + die "LIRC_OPTS is no longer recommended." + fi + fi + + # Setup parameter for linux-mod.eclass + MODULE_NAMES="lirc(misc:${S})" + BUILD_TARGETS="all" + + ECONF_PARAMS=" --localstatedir=/var + --with-syslog=LOG_DAEMON + --enable-sandboxed + --with-kerneldir=${KV_DIR} + --with-moduledir=/lib/modules/${KV_FULL}/misc + $(use_enable debug) + $(use_with X x) + ${MY_OPTS}" + + einfo + einfo "lirc-configure-opts: ${MY_OPTS}" + elog "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}" + + filter-flags -Wl,-O1 + + # force non-parallel make, Bug 196134 + MAKEOPTS="${MAKEOPTS} -j1" +} + +src_unpack() { + unpack ${A} + cd "${S}" + + # Rip out dos CRLF + edos2unix contrib/lirc.rules + + # Apply patches needed for some special device-types + use lirc_devices_audio || epatch "${FILESDIR}"/lirc-0.8.4-portaudio_check.patch + use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-0.8.3_pre1-remotewonderplus.patch + + # remove parallel driver on SMP systems + if linux_chkconfig_present SMP ; then + sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am + fi + + # Bug #187418 + if kernel_is ge 2 6 22 ; then + ewarn "Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+" + sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am + fi + + # respect CFLAGS + sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac + + # setting default device-node + local f + for f in configure.ac acconfig.h; do + [[ -f "$f" ]] && sed -i -e '/#define LIRC_DRIVER_DEVICE/d' "$f" + done + echo "#define LIRC_DRIVER_DEVICE \"${LIRC_DRIVER_DEVICE}\"" >> acconfig.h + + eautoreconf +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + newinitd "${FILESDIR}"/lircd-0.8.6 lircd + newinitd "${FILESDIR}"/lircmd lircmd + newconfd "${FILESDIR}"/lircd.conf.2 lircd + + insinto /etc/modprobe.d/ + newins "${FILESDIR}"/modprobed.lirc lirc.conf + + newinitd "${FILESDIR}"/irexec-initd-0.8.6-r2 irexec + newconfd "${FILESDIR}"/irexec-confd irexec + + if use doc ; then + dohtml doc/html/*.html + insinto /usr/share/doc/${PF}/images + doins doc/images/* + fi + + insinto /usr/share/lirc/remotes + doins -r remotes/* + + keepdir /var/run/lirc /etc/lirc + if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then + newdoc "${D}"/etc/lirc/lircd.conf lircd.conf.example + fi +} + +pkg_preinst() { + linux-mod_pkg_preinst + + local dir="${ROOT}/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" + fi + + # copy the first file that can be found + if [[ -f "${ROOT}"/etc/lirc/lircd.conf ]]; then + cp "${ROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf + elif [[ -f "${ROOT}"/etc/lircd.conf ]]; then + cp "${ROOT}"/etc/lircd.conf "${T}"/lircd.conf + MOVE_OLD_LIRCD_CONF=1 + elif [[ -f "${D}"/etc/lirc/lircd.conf ]]; then + cp "${D}"/etc/lirc/lircd.conf "${T}"/lircd.conf + fi + + # stop portage from touching the config file + if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then + rm -f "${D}"/etc/lirc/lircd.conf + fi +} + +pkg_postinst() { + linux-mod_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 "${ROOT}"/etc/lirc/lircd.conf + if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then + elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf" + rm -f "${ROOT}"/etc/lircd.conf + fi + fi + + ewarn + ewarn "The lirc_gpio driver will not work with Kernels 2.6.22+" + ewarn "You need to switch over to /dev/input/event? if you need gpio" + ewarn "This device can than then be used via lirc's dev/input driver." + ewarn + ewarn "The new default location for lircd.conf is inside of" + ewarn "/etc/lirc/ directory" + +} -- cgit v1.2.3-65-gdbad