Version bump
authorSteve Dibb <beandog@gentoo.org>
Fri, 21 May 2010 02:47:00 +0000 (02:47 +0000)
committerSteve Dibb <beandog@gentoo.org>
Fri, 21 May 2010 02:47:00 +0000 (02:47 +0000)
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

app-misc/lirc/ChangeLog
app-misc/lirc/Manifest
app-misc/lirc/lirc-0.8.7_pre1.ebuild [new file with mode: 0644]

index c373fedb5b85f1cce35aaa291625f3b3a257d10f..998bb7ade3350ddd69696dfd48f6f253f006ac5c 100644 (file)
@@ -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.215 2010/05/21 02:32:35 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.216 2010/05/21 02:47:00 beandog Exp $
+
+*lirc-0.8.7_pre1 (21 May 2010)
+
+  21 May 2010; Steve Dibb <beandog@gentoo.org> +lirc-0.8.7_pre1.ebuild:
+  Version bump
 
 *lirc-0.8.6-r3 (21 May 2010)
 
index 4b8f346820453352bbd3d4f545380ef0983400ff..63f948266c61b9ca0389708fb527826a2c3625c5 100644 (file)
@@ -26,6 +26,7 @@ DIST lirc-0.8.4.tar.bz2 694420 RMD160 bc72c59f2ac3087b9c5918796f3c202cb1437e67 S
 DIST lirc-0.8.4a.tar.bz2 695650 RMD160 da334fc74c45ea81d22d26b1687692b4a1267888 SHA1 2f1d26c83a9f1ca876949bff80e1529e03618779 SHA256 22ce4239b3446c3f312643d83f5ccb22d549241272acebbac164f7b651608827
 DIST lirc-0.8.5.tar.bz2 716760 RMD160 f0fafeace28bf61f17bd3403ced6de3bfb9250b4 SHA1 d156655dd1694415a77492068a1b8e090bbaafcc SHA256 0b1594d9eacf278c66c8137b75f9a0a354e663b011ab373c7a207e63b45abcb6
 DIST lirc-0.8.6.tar.bz2 730341 RMD160 c4301b1ac966be48c856b606ae0fedd366cb608d SHA1 199aad7381e785945e4634f9a002e5ac35bf8930 SHA256 0a82e73b1bbf1712cff9d757739f9a2083be246d1b1d071f8808b5e6cca4d1a1
+DIST lirc-0.8.7pre1.tar.bz2 792651 RMD160 67c27459634fc07e5e6a3c31b4e7f412ea9cc512 SHA1 424bcfcc50378bb34876667e71bd2d8513d228d7 SHA256 5fd79d83e1de6d64dea809a5877738609c124ee68a639f3165bdd246b3ffb4be
 EBUILD lirc-0.8.3-r2.ebuild 9021 RMD160 6ddd9235fb94f9ccfebe0aec33d164555836ef2f SHA1 b6ecc239c4f7203fa949516c4cd99f1a3dd00dce SHA256 0f4ad34454682054fba3c42aa9964b561aa19f5922d026c2fc2f8b2a438b46d2
 EBUILD lirc-0.8.3_pre1.ebuild 8413 RMD160 5c1aad354c21af1c0e59a7664a618b4f845e4807 SHA1 b60cfb14611ba87df67cde41070f7c3b90e467a5 SHA256 aa2c154981ed8998d701e74744a73f84a758c2cfb69b2a4a07e2b6d42d75e932
 EBUILD lirc-0.8.4.ebuild 8942 RMD160 19d3fea9b5dedb272a640c30ee10d4a22dbf8b58 SHA1 f473243a365096732971a49ea8f20fde3fac913b SHA256 429ce5f9fd73a743676afa665f335e9dec0b8a73d528d45cc83a0d1d736fa2d6
@@ -34,5 +35,6 @@ EBUILD lirc-0.8.5.ebuild 9412 RMD160 f783b4d3e53f7f68b63627d2bbec709e40f11334 SH
 EBUILD lirc-0.8.6-r1.ebuild 10083 RMD160 9cacd5df5e4ee5659da7b0f2c4826780b4b4f9df SHA1 fd4df404550e0c2d75404c67d1cdb58a5484cf36 SHA256 c1629136d1f937c9c233d9009ff26cf0370bf32eaf71097dd61e481f584cebd0
 EBUILD lirc-0.8.6-r2.ebuild 10101 RMD160 b4c9cf29b93b3cdf28dbaf86fd9aa4e45636d9f2 SHA1 8640054c3821180e2339c017adb7323298c80ad3 SHA256 146c3c6b3bedb8c5fbe7dcfa9b2e1007a866e836775fb0edb8eb3fb3299c9ae8
 EBUILD lirc-0.8.6-r3.ebuild 10244 RMD160 9683e1da67e687a74d063d68b6f1326052d510d8 SHA1 dbf05ce225e7ddad9c71aa16d46ebebd52c091f0 SHA256 d1b9b4307edee1749736edc42e47dea4cb3d89829c996ef11cf26aa9687dd3d0
-MISC ChangeLog 35241 RMD160 f60b5519b1f02e9d751fe9b87560d859b981954a SHA1 a4b3c503a46a167fd98e809697c022580b2f44dd SHA256 72404def6131ca71fdd5dec321247a592d56c5384db5b20562e424c0caf3e219
+EBUILD lirc-0.8.7_pre1.ebuild 10104 RMD160 8d0cd0affc616e43ac3fa1c6d5810a1f088a314c SHA1 94392458f27868aee09b5d5211f2f9cbbe66457e SHA256 00b99f317926bea24f89755d9215625baa87f4555c06312658946c3aa114a51f
+MISC ChangeLog 35361 RMD160 ea7f2058ec1bf3c54dae3e4d494d5d2b7325523f SHA1 36ea11ad9c93d1e3ff7512cdd6ad05b402fc0155 SHA256 42072073d016415a0521eca45e098090d61a1375680c5e184d1dbf915d50eb42
 MISC metadata.xml 376 RMD160 7b854dad1999c38592eabe928aab80615ba1f1e5 SHA1 17dc9c9591c77aa4ec2d98b9bc1f34ff68da31ad SHA256 e3b4637a67a93eb4b9457fa5941e8a6a891adca11a1ebc80c21a59650eac93aa
diff --git a/app-misc/lirc/lirc-0.8.7_pre1.ebuild b/app-misc/lirc/lirc-0.8.7_pre1.ebuild
new file mode 100644 (file)
index 0000000..93035b4
--- /dev/null
@@ -0,0 +1,359 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.7_pre1.ebuild,v 1.1 2010/05/21 02:47:00 beandog 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 ~ppc64 ~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"
+
+}