Fixed some sed code, Bug 195786. Fixed remotewonderplus patch.

Package-Manager: portage-2.1.3.12

4 files changed, 62 insertions, 16 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 0d1bde0d0317..d48ba447e839 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/lirc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.155 2007/10/13 18:14:33 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.156 2007/10/14 10:16:47 zzam Exp $
+
+  14 Oct 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/lirc-0.8.3_pre1-remotewonderplus.patch, lirc-0.8.3_pre1.ebuild:
+  Fixed some sed code, Bug 195786. Fixed remotewonderplus patch.
 
 *lirc-0.8.3_pre1 (13 Oct 2007)
 
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 4655c3001b5c..1640ad43d321 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX irexec-confd 280 RMD160 f669c7c98b9d7cac2010284ab6068d29d47ec811 SHA1 c6decc19a273d98d451de137a2ffbe16d5df28ae SHA256 c404ad3b624004cab25bd3a89593cdeb0abbc25771d6e52caf2f37cb4f7b2b79
 MD5 6abeb719007a883ff202cd75ffe922e8 files/irexec-confd 280
 RMD160 f669c7c98b9d7cac2010284ab6068d29d47ec811 files/irexec-confd 280
@@ -66,6 +69,10 @@ AUX lirc-0.8.2-kernel-2.6.23.patch 1224 RMD160 6e780550ddeb24d2ef58702b01c263d6a
 MD5 c2fca4693f97f9bb5735f2b96ea6f205 files/lirc-0.8.2-kernel-2.6.23.patch 1224
 RMD160 6e780550ddeb24d2ef58702b01c263d6ab7b1695 files/lirc-0.8.2-kernel-2.6.23.patch 1224
 SHA256 7a3af1f27df60fdd6f281ea4064cd603e4e429f9989218bce262e954e709dcce files/lirc-0.8.2-kernel-2.6.23.patch 1224
+AUX lirc-0.8.3_pre1-remotewonderplus.patch 943 RMD160 05a0696d51ff01c7d9644ad3ff4d56fef20be439 SHA1 971ad8b27d57c31439a1f7fb87dac2dc39d6c1e8 SHA256 547efbfa30f282ba9100495044e3b720c8f74c44f9a4e34db934d2ac7976fe29
+MD5 b3dbfd336f080c2040325fb7fdbf280a files/lirc-0.8.3_pre1-remotewonderplus.patch 943
+RMD160 05a0696d51ff01c7d9644ad3ff4d56fef20be439 files/lirc-0.8.3_pre1-remotewonderplus.patch 943
+SHA256 547efbfa30f282ba9100495044e3b720c8f74c44f9a4e34db934d2ac7976fe29 files/lirc-0.8.3_pre1-remotewonderplus.patch 943
 AUX lirc-remotewonderplus.patch 876 RMD160 5fa5bd312f60ec900a38b189134627f2c27449bc SHA1 b13a5c024b0eb6f9b65cb1a795c618832aad39e3 SHA256 12e296b694fa9f3889d191756cd9c3846822ca7e653ee3e26c00bf7bf5a73a88
 MD5 e68a17220295d3c72d78c9e78d9ec9b0 files/lirc-remotewonderplus.patch 876
 RMD160 5fa5bd312f60ec900a38b189134627f2c27449bc files/lirc-remotewonderplus.patch 876
@@ -123,14 +130,14 @@ EBUILD lirc-0.8.2_pre2.ebuild 7768 RMD160 2437273d778a5ba426026aaafab4e2528c4619
 MD5 4c7863d2f6891a08995b48c67e42f7c8 lirc-0.8.2_pre2.ebuild 7768
 RMD160 2437273d778a5ba426026aaafab4e2528c4619e6 lirc-0.8.2_pre2.ebuild 7768
 SHA256 b35bdae2c7011fb84d2279d12de811dbc128266d197f83e4bb70bb9e5c8ec67b lirc-0.8.2_pre2.ebuild 7768
-EBUILD lirc-0.8.3_pre1.ebuild 7674 RMD160 2824e3341f5bc3d425d5db27244e654d1832b949 SHA1 13026e7984d3dddff4a7111e7ecfa44c817d3d0d SHA256 e3ad2c2a82a56e10d2289bc86615cfd6eae9c7401b19fdc623b951f2b1aebc96
-MD5 9b6d8f9adbd4968c5620b18ced524865 lirc-0.8.3_pre1.ebuild 7674
-RMD160 2824e3341f5bc3d425d5db27244e654d1832b949 lirc-0.8.3_pre1.ebuild 7674
-SHA256 e3ad2c2a82a56e10d2289bc86615cfd6eae9c7401b19fdc623b951f2b1aebc96 lirc-0.8.3_pre1.ebuild 7674
-MISC ChangeLog 23969 RMD160 208cb4cedbba77c9520fc117ff90c3b71672af02 SHA1 8d47bb6edd7a6057b8a8d27c7509a7a64b877772 SHA256 2fc017530ef93c9ba5902a55c394a3b9bb8aa62de99fa2ed1a3d7e3a44d57a10
-MD5 8be2178ead549d70372105ca326aab4a ChangeLog 23969
-RMD160 208cb4cedbba77c9520fc117ff90c3b71672af02 ChangeLog 23969
-SHA256 2fc017530ef93c9ba5902a55c394a3b9bb8aa62de99fa2ed1a3d7e3a44d57a10 ChangeLog 23969
+EBUILD lirc-0.8.3_pre1.ebuild 7713 RMD160 643a0e7985f2811ad504227f69b892199fb8c707 SHA1 3e2d224df7f9f32ee5f1ffaf4d6bb33f739fdc88 SHA256 b529c1acde83ea9e466d4fc19bc3ac3a22e47dc6cb4138d64f9ef0761d72ec42
+MD5 70e8cc4cc0065827251081589df0bfee lirc-0.8.3_pre1.ebuild 7713
+RMD160 643a0e7985f2811ad504227f69b892199fb8c707 lirc-0.8.3_pre1.ebuild 7713
+SHA256 b529c1acde83ea9e466d4fc19bc3ac3a22e47dc6cb4138d64f9ef0761d72ec42 lirc-0.8.3_pre1.ebuild 7713
+MISC ChangeLog 24161 RMD160 66b04dd53d2a6a30e7b2c516e411229d0ac98f82 SHA1 737dad9ebb7ef5b2586628e56df866202d0d651b SHA256 0cad6e968d2704d00af4ad0f2a42e888a5d8de14ff9b69529258dd1fbdbbb7fc
+MD5 b795c1e0a8fa862aa8ec4889d4dfc407 ChangeLog 24161
+RMD160 66b04dd53d2a6a30e7b2c516e411229d0ac98f82 ChangeLog 24161
+SHA256 0cad6e968d2704d00af4ad0f2a42e888a5d8de14ff9b69529258dd1fbdbbb7fc ChangeLog 24161
 MISC metadata.xml 162 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af SHA1 7464d1657179a3f30c5ea2ad401590e4489ac945 SHA256 aaad144c69dd58781e1dc97b5fbad08a5b4db504bd3cbbb4ab27018a307d5d81
 MD5 dcc0143f6508e9fd068845f98b7bb403 metadata.xml 162
 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af metadata.xml 162
@@ -156,3 +163,10 @@ SHA256 85178d370b86564aebac9b79c8215c97625e85dc187208f93b64f3c9cea0552c files/di
 MD5 f10b4ad3629db03b5994e1ec47466dff files/digest-lirc-0.8.3_pre1 247
 RMD160 f24b17125eda2634a8b1d06a55b52e6f8fd4f2a5 files/digest-lirc-0.8.3_pre1 247
 SHA256 24e0ee567b857e06d93d64cbf7e9cbaee53a734e5c76862d9ff64dba06739dc3 files/digest-lirc-0.8.3_pre1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHEeyYt2vP6XvVdOcRAmHJAKDSO22lkUO+l6NAiol9EuSUpbhIkQCgtw12
+sQja7k9QJm3ynPJ4+7u9rIs=
+=JJGk
+-----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/files/lirc-0.8.3_pre1-remotewonderplus.patch b/app-misc/lirc/files/lirc-0.8.3_pre1-remotewonderplus.patch
new file mode 100644
index 000000000000..66527bcc5709
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.8.3_pre1-remotewonderplus.patch
@@ -0,0 +1,26 @@
+--- lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c.orig	2005-10-29 08:18:53.000000000 -0600
++++ lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c	2006-04-01 14:31:05.000000000 -0700
+@@ -147,8 +147,9 @@
+ /* init strings */
+ #define USB_OUTLEN		7
+ 
+-static char init1[] = {0x01, 0x00, 0x20, 0x14};
+-static char init2[] = {0x01, 0x00, 0x20, 0x14, 0x20, 0x20, 0x20};
++static char init1[] = {0x80, 0x05, 0x1b, 0x15, 0x14, 0x20, 0x24, 0x15};
++static char init2[] = {0x83, 0x03};
++static char init3[] = {0x84, 0xd7, 0x020};
+ 
+ struct in_endpt {
+ 	/* inner link in list of endpoints for the remote specified by ir */
+@@ -1034,8 +1034,9 @@
+ 			usb_sndintpipe(ir->usbdev, oep->ep->bEndpointAddress), oep->buf,
+ 			USB_OUTLEN, usb_remote_send, oep, oep->ep->bInterval);
+ 
+-		send_packet(oep, 0x8004, init1);
+-		send_packet(oep, 0x8007, init2);
++		send_packet(oep, 0x8007, init1);
++		send_packet(oep, 0x8002, init2);
++		send_packet(oep, 0x8003, init3);
+ 	}
+ }
+ 
diff --git a/app-misc/lirc/lirc-0.8.3_pre1.ebuild b/app-misc/lirc/lirc-0.8.3_pre1.ebuild
index b550d424c071..63e90c9cf9d5 100644
--- a/app-misc/lirc/lirc-0.8.3_pre1.ebuild
+++ b/app-misc/lirc/lirc-0.8.3_pre1.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.3_pre1.ebuild,v 1.1 2007/10/13 18:14:33 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.3_pre1.ebuild,v 1.2 2007/10/14 10:16:47 zzam 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/${P/_/}.tar.bz2"
+	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
 else
-	SRC_URI="http://lirc.sourceforge.net/software/snapshots/${P/_/}.tar.bz2"
+	SRC_URI="http://lirc.sourceforge.net/software/snapshots/${MY_P}.tar.bz2"
 fi
 
 LICENSE="GPL-2"
@@ -18,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug doc X hardware-carrier transmitter"
 
-S="${WORKDIR}/${P/_pre/pre}"
+S="${WORKDIR}/${MY_P}"
 
 RDEPEND="
 	X? (
@@ -232,7 +234,7 @@ src_unpack() {
 
 	# Apply patches needed for some special device-types
 	use lirc_devices_imon_pad2keys && epatch "${FILESDIR}"/${PN}-0.8.1-imon-pad2keys.patch
-	use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-remotewonderplus.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
@@ -240,10 +242,10 @@ src_unpack() {
 	fi
 
 	# respect CFLAGS
-	sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.in
+	sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac
 
 	# setting default device-node
-	sed -i -e '/#define LIRC_DRIVER_DEVICE/d' acconfig.h
+	sed -i -e '/#define LIRC_DRIVER_DEVICE/d' configure.ac acconfig.h
 	echo "#define LIRC_DRIVER_DEVICE \"${LIRC_DRIVER_DEVICE}\"" >> acconfig.h
 
 	eautoreconf