* [gentoo-commits] dev/mgorny:master commit in: app-misc/lirc/
@ 2011-04-10 18:37 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2011-04-10 18:37 UTC (permalink / raw
To: gentoo-commits
commit: cb5853cc14adc96937d2b4fe1ca86b18f193d097
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 18:37:56 2011 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 18:37:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=cb5853cc
app-misc/lirc: Upstream switched to git. Adapt the ebuild.
(Portage version: 2.2.0_alpha29_p5/git/Linux x86_64, signed Manifest commit with key 05DE07BB)
---
app-misc/lirc/Manifest | 10 +++++-----
app-misc/lirc/lirc-9999.ebuild | 9 ++++-----
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index a0c624c..69e1652 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -9,12 +9,12 @@ AUX lircd-0.8.6 973 RMD160 4e8a04b8d052558a91e8278589cc04d70f164a0d SHA1 e333b81
AUX lircd.conf.2 317 RMD160 dbd600cb97ce10ba06e29e32fe5d3eac6cf19a7d SHA1 054bde131b965e2fea8599accbf69fc489cb66e8 SHA256 694d96ffc0c5b8d258592d89c0221aa9b10d69ce024a69a0cc935d899e0b855e
AUX lircmd 466 RMD160 32f2b2411afc60522944f5c3dff9f53aac242a9c SHA1 79939de790d20704009643bd810e3186090d0e36 SHA256 d47f22a33a83c14a4a0c333d6a445c40e550c491899fb0c6d323e23fe1eac7b7
AUX modprobed.lirc 549 RMD160 89edfd587932959df9e521d146cef7c67cf97b18 SHA1 f59d8f031859eb6b6dccd1faf15d7ed2251288b1 SHA256 b4951252321ea326d3ec401e5ff1112716c5aaf5b2ca94d9f5e187e22ad35c44
-EBUILD lirc-9999.ebuild 9663 RMD160 d935c13193ff7f05794bf6cb43aa7b9ce5247c46 SHA1 5396d95b2e23e15d175ba0c24821cfd4624cf5d8 SHA256 bb9f7417722515c51f7152e86945de28bbdca05a7051ab634dcf7bd145d67c13
+EBUILD lirc-9999.ebuild 9658 RMD160 6aaf4580c400a473e18f06711ce5e3aab6a31b47 SHA1 4cba2ef807ba706aad8b1b403bc27c0ca21cd3f4 SHA256 7d60e4bcadaad9ea147b8b7b61a93addd473ed0f55cf86670f426997b95c0352
MISC metadata.xml 503 RMD160 f5092cf05fa1df7a5f870266524268bfd3f97eaa SHA1 b620321ffad90cc7a5b264a77a0335325effccc9 SHA256 3973a17b633f5e115bb64b52451845a957e9f99fa69b187cf4020d3851e11441
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAkzVvq4ACgkQnGSe5QXeB7vCcQCgkVDAW+P/rzqFjoi23+tsHJA1
-BCQAnib/OKYydFmeG0QYlxu6XJTUaLS5
-=sJSV
+iEYEARECAAYFAk2h+QQACgkQnGSe5QXeB7vX4QCg3RR8hREhULLlUPfCuWtIvEfZ
+n0gAoOREEbNA4an2R/QRk6SztPRfnGkm
+=MZtq
-----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/lirc-9999.ebuild b/app-misc/lirc/lirc-9999.ebuild
index 016f676..9ac8c47 100644
--- a/app-misc/lirc/lirc-9999.ebuild
+++ b/app-misc/lirc/lirc-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-ECVS_SERVER="lirc.cvs.sourceforge.net:/cvsroot/lirc"
-ECVS_MODULE=lirc
+EGIT_REPO_URI="git://lirc.git.sourceforge.net/gitroot/lirc/lirc"
-inherit autotools cvs eutils flag-o-matic linux-mod
+inherit autotools eutils flag-o-matic git linux-mod
DESCRIPTION="Decode and send infra-red signals of many commonly used remote controls"
HOMEPAGE="http://www.lirc.org/"
@@ -242,7 +241,7 @@ pkg_setup() {
}
src_unpack() {
- cvs_src_unpack
+ git_src_unpack
cd "${S}"
# Rip out dos CRLF
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/mgorny:master commit in: app-misc/lirc/
@ 2011-06-19 18:58 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2011-06-19 18:58 UTC (permalink / raw
To: gentoo-commits
commit: 2c03b6477a081a2394e1b5f95b94f4186c85b2de
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 18:58:37 2011 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 18:58:37 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=2c03b647
app-misc/lirc: Sync with lirc-0.9.0, migrate to git-2.
(Portage version: 2.2.0_alpha41_p11/git/Linux x86_64, signed Manifest commit with key 42B9401D)
---
app-misc/lirc/Manifest | 12 ++++++----
app-misc/lirc/lirc-9999.ebuild | 46 +++++++++++++++++++++++----------------
2 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 69e1652..5e4e27a 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX irexec-confd 280 RMD160 f669c7c98b9d7cac2010284ab6068d29d47ec811 SHA1 c6decc19a273d98d451de137a2ffbe16d5df28ae SHA256 c404ad3b624004cab25bd3a89593cdeb0abbc25771d6e52caf2f37cb4f7b2b79
AUX irexec-initd-0.8.6-r2 816 RMD160 e9969072ccbdcb284781a4224c9fa2afc72fecaf SHA1 ab066d769417e13c194112ba99f309bb1cb0d2e5 SHA256 5e5a31fbd93294a6e210499a880fcab371b23706824c9d60d827b0187d7bade4
@@ -9,12 +9,14 @@ AUX lircd-0.8.6 973 RMD160 4e8a04b8d052558a91e8278589cc04d70f164a0d SHA1 e333b81
AUX lircd.conf.2 317 RMD160 dbd600cb97ce10ba06e29e32fe5d3eac6cf19a7d SHA1 054bde131b965e2fea8599accbf69fc489cb66e8 SHA256 694d96ffc0c5b8d258592d89c0221aa9b10d69ce024a69a0cc935d899e0b855e
AUX lircmd 466 RMD160 32f2b2411afc60522944f5c3dff9f53aac242a9c SHA1 79939de790d20704009643bd810e3186090d0e36 SHA256 d47f22a33a83c14a4a0c333d6a445c40e550c491899fb0c6d323e23fe1eac7b7
AUX modprobed.lirc 549 RMD160 89edfd587932959df9e521d146cef7c67cf97b18 SHA1 f59d8f031859eb6b6dccd1faf15d7ed2251288b1 SHA256 b4951252321ea326d3ec401e5ff1112716c5aaf5b2ca94d9f5e187e22ad35c44
-EBUILD lirc-9999.ebuild 9658 RMD160 6aaf4580c400a473e18f06711ce5e3aab6a31b47 SHA1 4cba2ef807ba706aad8b1b403bc27c0ca21cd3f4 SHA256 7d60e4bcadaad9ea147b8b7b61a93addd473ed0f55cf86670f426997b95c0352
+EBUILD lirc-9999.ebuild 9903 RMD160 6080d3dd8a58b6a1a2b176d82f28921d7ec9890c SHA1 963e4d394d206384170cfb7d8ea79faf4db03709 SHA256 eb041d98670ce9e3f3d6007eec86b24b5f9a5a93c85945cd89b97e19f53dab27
MISC metadata.xml 503 RMD160 f5092cf05fa1df7a5f870266524268bfd3f97eaa SHA1 b620321ffad90cc7a5b264a77a0335325effccc9 SHA256 3973a17b633f5e115bb64b52451845a957e9f99fa69b187cf4020d3851e11441
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2h+QQACgkQnGSe5QXeB7vX4QCg3RR8hREhULLlUPfCuWtIvEfZ
-n0gAoOREEbNA4an2R/QRk6SztPRfnGkm
-=MZtq
+iJwEAQEIAAYFAk3+Rt0ACgkQfXuS5UK5QB12AwP8CEDRS4JzwZpcz4z+/e+DHY+/
+9tc12ei7B8T2k+aqAsWKTq1abgqkL5qF/EaaYBwbb7DTTcYbhjTvZ/CcXpwjhfvT
+uigpORb4NBqzgr6QPb5f8p0+klNePYtH6KI3/BXGqW3awcE+fp2l75fRS36zTBQM
+kjvJhGZMug5P0tftZZ4=
+=CsyN
-----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/lirc-9999.ebuild b/app-misc/lirc/lirc-9999.ebuild
index 9ac8c47..8a201a9 100644
--- a/app-misc/lirc/lirc-9999.ebuild
+++ b/app-misc/lirc/lirc-9999.ebuild
@@ -4,9 +4,9 @@
EGIT_REPO_URI="git://lirc.git.sourceforge.net/gitroot/lirc/lirc"
-inherit autotools eutils flag-o-matic git linux-mod
+inherit autotools eutils flag-o-matic git-2 linux-mod
-DESCRIPTION="Decode and send infra-red signals of many commonly used remote controls"
+DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
HOMEPAGE="http://www.lirc.org/"
LICENSE="GPL-2"
@@ -41,7 +41,7 @@ IUSE_LIRC_DEVICES_DIRECT="
irlink irman irreal it87 ite8709
knc_one kworld leadtek_0007 leadtek_0010
leadtek_pvr2000 livedrive_midi
- livedrive_seq logitech macmini mceusb
+ livedrive_seq logitech macmini
mediafocusI mouseremote
mouseremote_ps2 mp3anywhere mplay nslu2
packard_bell parallel pcmak pcmak_usb
@@ -64,7 +64,7 @@ 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"
+ imon_rsc streamzap xboxusb irlink commandir"
for dev in ${LIBUSB_USED_BY_DEV}; do
DEPEND="${DEPEND} lirc_devices_${dev}? ( dev-libs/libusb )"
@@ -87,8 +87,6 @@ for dev in ${IUSE_LIRC_DEVICES}; do
IUSE="${IUSE} lirc_devices_${dev}"
done
-S=${WORKDIR}/${PN}
-
add_device() {
: ${lirc_device_count:=0}
((lirc_device_count++))
@@ -116,10 +114,10 @@ add_device() {
pkg_setup() {
- if use lirc_devices_mceusb2
+ if use lirc_devices_mceusb2 || use lirc_devices_mceusb
then
- ewarn "The mceusb2 driver has been merged into the mceusb."
- ewarn "Please only use the latter now."
+ ewarn "The mceusb2 and mceusb drivers have been merged into the mainline kernel"
+ ewarn "Please only use the latter now and the userspace driver"
fi
ewarn "If your LIRC device requires modules, you'll need MODULE_UNLOAD"
@@ -256,6 +254,15 @@ src_unpack() {
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
@@ -269,28 +276,28 @@ src_unpack() {
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
- newinitd "${FILESDIR}"/lircd-0.8.6 lircd || die
- newinitd "${FILESDIR}"/lircmd lircmd || die
- newconfd "${FILESDIR}"/lircd.conf.2 lircd || die
+ 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 || die
+ newins "${FILESDIR}"/modprobed.lirc lirc.conf
- newinitd "${FILESDIR}"/irexec-initd-0.8.6-r2 irexec || die
- newconfd "${FILESDIR}"/irexec-confd irexec || die
+ newinitd "${FILESDIR}"/irexec-initd-0.8.6-r2 irexec
+ newconfd "${FILESDIR}"/irexec-confd irexec
if use doc ; then
- dohtml doc/html/*.html || die
+ dohtml doc/html/*.html
insinto /usr/share/doc/${PF}/images
- doins doc/images/* || die
+ doins doc/images/*
fi
insinto /usr/share/lirc/remotes
- doins -r remotes/* || die
+ 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 || die
+ newdoc "${D}"/etc/lirc/lircd.conf lircd.conf.example
fi
}
@@ -340,4 +347,5 @@ pkg_postinst() {
ewarn
ewarn "The new default location for lircd.conf is inside of"
ewarn "/etc/lirc/ directory"
+
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/mgorny:master commit in: app-misc/lirc/
@ 2011-07-13 20:51 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2011-07-13 20:51 UTC (permalink / raw
To: gentoo-commits
commit: 62d79b05a339821f1cb63a41a227f381a192ea32
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 20:52:02 2011 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 20:52:02 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=62d79b05
app-misc/lirc: Fix git-2.eclass use.
(Portage version: 2.2.0_alpha44_p2/git/Linux x86_64, signed Manifest commit with key 42B9401D)
---
app-misc/lirc/Manifest | 12 ++++++------
app-misc/lirc/lirc-9999.ebuild | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 5e4e27a..25bdb74 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -9,14 +9,14 @@ AUX lircd-0.8.6 973 RMD160 4e8a04b8d052558a91e8278589cc04d70f164a0d SHA1 e333b81
AUX lircd.conf.2 317 RMD160 dbd600cb97ce10ba06e29e32fe5d3eac6cf19a7d SHA1 054bde131b965e2fea8599accbf69fc489cb66e8 SHA256 694d96ffc0c5b8d258592d89c0221aa9b10d69ce024a69a0cc935d899e0b855e
AUX lircmd 466 RMD160 32f2b2411afc60522944f5c3dff9f53aac242a9c SHA1 79939de790d20704009643bd810e3186090d0e36 SHA256 d47f22a33a83c14a4a0c333d6a445c40e550c491899fb0c6d323e23fe1eac7b7
AUX modprobed.lirc 549 RMD160 89edfd587932959df9e521d146cef7c67cf97b18 SHA1 f59d8f031859eb6b6dccd1faf15d7ed2251288b1 SHA256 b4951252321ea326d3ec401e5ff1112716c5aaf5b2ca94d9f5e187e22ad35c44
-EBUILD lirc-9999.ebuild 9903 RMD160 6080d3dd8a58b6a1a2b176d82f28921d7ec9890c SHA1 963e4d394d206384170cfb7d8ea79faf4db03709 SHA256 eb041d98670ce9e3f3d6007eec86b24b5f9a5a93c85945cd89b97e19f53dab27
+EBUILD lirc-9999.ebuild 9905 RMD160 ec35b58c651480ac8735581d85761ebe708df52e SHA1 2b7eea0b3bb9338fc3455a0e7d18288514f71144 SHA256 37a97155854387a827936384e5d4d57deb62923bf7c4e50bc6ec114d804b7c92
MISC metadata.xml 503 RMD160 f5092cf05fa1df7a5f870266524268bfd3f97eaa SHA1 b620321ffad90cc7a5b264a77a0335325effccc9 SHA256 3973a17b633f5e115bb64b52451845a957e9f99fa69b187cf4020d3851e11441
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iJwEAQEIAAYFAk3+Rt0ACgkQfXuS5UK5QB12AwP8CEDRS4JzwZpcz4z+/e+DHY+/
-9tc12ei7B8T2k+aqAsWKTq1abgqkL5qF/EaaYBwbb7DTTcYbhjTvZ/CcXpwjhfvT
-uigpORb4NBqzgr6QPb5f8p0+klNePYtH6KI3/BXGqW3awcE+fp2l75fRS36zTBQM
-kjvJhGZMug5P0tftZZ4=
-=CsyN
+iJwEAQEIAAYFAk4eBXIACgkQfXuS5UK5QB0DuAP+N6hfTv8MahD3+rUwVkbCleXG
+4+qGs5IZnZppqokmcwodmQ/P5yiMHsklub3WATTp2lVUa8Sc5YGfRBHpNJGBtgaf
+mNQLdkaL/ZZ1llTf3tKwqRn/KpSb0rGT6NV+0PGvSYq7eKuNWKLjRyLV9BebSSMs
+2xMWCbuJfLKBsulsclo=
+=8vQP
-----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/lirc-9999.ebuild b/app-misc/lirc/lirc-9999.ebuild
index 8a201a9..39b9d5f 100644
--- a/app-misc/lirc/lirc-9999.ebuild
+++ b/app-misc/lirc/lirc-9999.ebuild
@@ -239,7 +239,7 @@ pkg_setup() {
}
src_unpack() {
- git_src_unpack
+ git-2_src_unpack
cd "${S}"
# Rip out dos CRLF
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-07-13 20:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-13 20:51 [gentoo-commits] dev/mgorny:master commit in: app-misc/lirc/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2011-06-19 18:58 Michał Górny
2011-04-10 18:37 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox