@@ -, +, @@ 
---
 Manifest                                   |    1 +
 lirc-0.8.7_pre1.ebuild => lirc-9999.ebuild |   22 +++++++++-------------
 2 files changed, 10 insertions(+), 13 deletions(-)
 copy lirc-0.8.7_pre1.ebuild => lirc-9999.ebuild (96%)
--- a/Manifest	
+++ a/Manifest	
@@ -34,5 +34,6 @@ EBUILD lirc-0.8.4a.ebuild 9136 RMD160 cbf9c0b69fadb9fd113d4be6fe766a1a52810939 S
 EBUILD lirc-0.8.5.ebuild 9412 RMD160 f783b4d3e53f7f68b63627d2bbec709e40f11334 SHA1 5074ad15f3f746a64e0ec47c3ec0e164ed50a4fa SHA256 281e7e312963e88d00330abb375fb154fac18172ab5ea66a159d46c099341a6b
 EBUILD lirc-0.8.6-r3.ebuild 10244 RMD160 9683e1da67e687a74d063d68b6f1326052d510d8 SHA1 dbf05ce225e7ddad9c71aa16d46ebebd52c091f0 SHA256 d1b9b4307edee1749736edc42e47dea4cb3d89829c996ef11cf26aa9687dd3d0
 EBUILD lirc-0.8.7_pre1.ebuild 10104 RMD160 8d0cd0affc616e43ac3fa1c6d5810a1f088a314c SHA1 94392458f27868aee09b5d5211f2f9cbbe66457e SHA256 00b99f317926bea24f89755d9215625baa87f4555c06312658946c3aa114a51f
+EBUILD lirc-9999.ebuild 9978 RMD160 cb1482a5b2de0dd718b578658a59d3a340ac360e SHA1 e557ddadad8170c759a4d0e196b67d05bbc2e2e2 SHA256 c027f84cab2b745a4da8eeb4b7b6a9b6c50528182701de7779897aa6cd02c81f
 MISC ChangeLog 35361 RMD160 ea7f2058ec1bf3c54dae3e4d494d5d2b7325523f SHA1 36ea11ad9c93d1e3ff7512cdd6ad05b402fc0155 SHA256 42072073d016415a0521eca45e098090d61a1375680c5e184d1dbf915d50eb42
 MISC metadata.xml 376 RMD160 7b854dad1999c38592eabe928aab80615ba1f1e5 SHA1 17dc9c9591c77aa4ec2d98b9bc1f34ff68da31ad SHA256 e3b4637a67a93eb4b9457fa5941e8a6a891adca11a1ebc80c21a59650eac93aa
--- a/lirc-0.8.7_pre1.ebuild	
+++ a/lirc-0.8.7_pre1.ebuild	
@@ -2,26 +2,20 @@ 
 # 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
+ECVS_SERVER="lirc.cvs.sourceforge.net:/cvsroot/lirc"
+ECVS_MODULE=lirc
+
+inherit cvs 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
+SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS=""
 IUSE="debug doc X hardware-carrier transmitter"
 
-S="${WORKDIR}/${MY_P}"
-
 RDEPEND="
 	X? (
 		x11-libs/libX11
@@ -95,6 +89,8 @@ 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++))
@@ -247,7 +243,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${A}
+	cvs_src_unpack
 	cd "${S}"
 
 	# Rip out dos CRLF
--