bump

5 files changed, 62 insertions, 29 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 085db0894b7c..4d73765b46c4 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-misc/lirc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.5 2003/09/08 21:59:38 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.6 2003/10/11 21:53:03 lanius Exp $
+
+*lirc-0.7.0_pre2 (11 Oct 2003)
+
+  11 Oct 2003; Heinrich Wendel <lanius@gentoo.org> lirc-0.6.5.ebuild,
+  lirc-0.7.0_pre2.ebuild, files/lirc-0.6.5-gentoo.diff.bz2:
+  cleanups
+
+*lirc-0.7.0_pre2 (11 Oct 2003)
+
+  11 Oct 2003; Heinrich Wendel <lanius@gentoo.org> lirc-0.7.0_pre2.ebuild:
+  version bump
 
 *lirc-0.6.6-r2 (09 Sep 2003)
 
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index eb79012a1a2f..9b5a89af6943 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,11 +1,10 @@
-MD5 1769c08a9137c7b57a212c540f4c8cb2 ChangeLog 1049
-MD5 54f0aeec515402889839ad3c0eff8246 lirc-0.6.5.ebuild 3242
-MD5 5de0738bf50c20fb2e8e5c6e16f8c458 lirc-0.6.6-r1.ebuild 3869
 MD5 6a4ea5fd0affb4818ac58fc7afe12712 lirc-0.6.6-r2.ebuild 3771
-MD5 4b16494c8df335f7bd12a7221a67a1e5 files/digest-lirc-0.6.5 63
+MD5 5de0738bf50c20fb2e8e5c6e16f8c458 lirc-0.6.6-r1.ebuild 3869
+MD5 ac55122f8c1922a0620e7a60bd68d4c0 lirc-0.7.0_pre2.ebuild 3759
+MD5 9ea403fc81feafe5326d26bb286901d1 ChangeLog 1345
+MD5 569e8244bbd5f7c76f4de38896482894 files/lirc-0.6.6-r2-gentoo.diff.bz2 67470
 MD5 eb1d5f40e0d59edbc1ac2a097cea5850 files/digest-lirc-0.6.6-r1 63
-MD5 6031968a1ddb51ff5265d1f22bd2d237 files/lirc-0.6.6-gentoo.diff.bz2 2215
-MD5 75e7e1656176c823db004656b3fbd787 files/lircd 375
-MD5 16ee4cd3d6b19367f57742df17f3d4b9 files/lirc-0.6.5-gentoo.diff.bz2 1593
 MD5 eb1d5f40e0d59edbc1ac2a097cea5850 files/digest-lirc-0.6.6-r2 63
-MD5 569e8244bbd5f7c76f4de38896482894 files/lirc-0.6.6-r2-gentoo.diff.bz2 67470
+MD5 75e7e1656176c823db004656b3fbd787 files/lircd 375
+MD5 cee0550f10a0a0d63fcae5209819f4d9 files/digest-lirc-0.7.0_pre2 67
+MD5 6031968a1ddb51ff5265d1f22bd2d237 files/lirc-0.6.6-gentoo.diff.bz2 2215
diff --git a/app-misc/lirc/files/digest-lirc-0.6.5 b/app-misc/lirc/files/digest-lirc-0.6.5
deleted file mode 100644
index 9d62ad96de88..000000000000
--- a/app-misc/lirc/files/digest-lirc-0.6.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 35f4ae0b38e96f92db36eb415855f220 lirc-0.6.5.tar.bz2 318552
diff --git a/app-misc/lirc/files/lirc-0.6.5-gentoo.diff.bz2 b/app-misc/lirc/files/lirc-0.6.5-gentoo.diff.bz2
deleted file mode 100644
index 9c050649fa23..000000000000
--- a/app-misc/lirc/files/lirc-0.6.5-gentoo.diff.bz2
+++ /dev/null
diff --git a/app-misc/lirc/lirc-0.6.5.ebuild b/app-misc/lirc/lirc-0.7.0_pre2.ebuild
index 35750603590b..240c2af33b8a 100644
--- a/app-misc/lirc/lirc-0.6.5.ebuild
+++ b/app-misc/lirc/lirc-0.7.0_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.6.5.ebuild,v 1.6 2003/09/08 21:59:38 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.7.0_pre2.ebuild,v 1.1 2003/10/11 21:53:03 lanius Exp $
 
 inherit eutils
 
@@ -8,9 +8,17 @@ DESCRIPTION="LIRC is a package that allows you to decode and send infra-red \
 	signals of many (but not all) commonly used remote controls."
 HOMEPAGE="http://www.lirc.org"
 
-[ "x${LIRC_OPTS}" = x ] && LIRC_OPTS="--with-driver=any \
+[ "x${LIRC_OPTS}" = x ] && LIRC_OPTS="--with-driver=serial \
 	--with-port=0x3f8 --with-irq=4"
 
+# We have a SMP enabled kernel?
+if [ ! -z "`uname -v | grep SMP`" ]
+then
+	export SMP=1
+else
+	export SMP=0
+fi
+
 # This are the defaults. With this support for all supported remotes
 # will be build.
 # If you want other options then set the Environment variable to your needs.
@@ -43,25 +51,24 @@ HOMEPAGE="http://www.lirc.org"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="~x86 ~ppc"
 
 DEPEND="virtual/linux-sources"
 
-SRC_URI="mirror://sourceforge/lirc/${P}.tar.bz2"
+MY_P=${P/_/}
 
-S=${WORKDIR}/${P}
+SRC_URI="http://lirc.sourceforge.net/software/snapshots/${MY_P}.tar.bz2"
 
-src_unpack() {
-	unpack ${P}.tar.bz2
-	epatch ${FILESDIR}/${P}-gentoo.diff.bz2 || die
+S=${WORKDIR}/${MY_P}
 
-	# You need my little patch, because with it:
-	# - lirc compiles with gentoo 2.4.19pre-ac and vanilla kernels
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed	-i "s:-O2 -g:${CFLAGS}:" configure
+	sed -i "s:-O2 -g:${CFLAGS}:" configure.in
 }
 
-
 src_compile() {
-
 	#Let portage tell us where to put our modules
 	check_KV
 
@@ -80,8 +87,16 @@ src_compile() {
 	case ${LIRC_OPTS}
 	in
 	  *"any"*)
-		emake -C drivers "SUBDIRS=lirc_dev lirc_serial \
-		lirc_parallel lirc_sir lirc_it87 lirc_i2c lirc_gpio" || die
+		if [ "${SMP}" = 1 ]; then
+			# The parallel driver will not work with SMP kernels
+			# so we need to compile without it
+			emake -C drivers "SUBDIRS=lirc_dev lirc_serial \
+			lirc_sir lirc_it87 lirc_i2c lirc_gpio" || die
+		else
+			emake -C drivers "SUBDIRS=lirc_dev lirc_serial \
+			lirc_parallel lirc_sir lirc_it87 lirc_i2c \
+			lirc_gpio" || die
+		fi
 	;;
 	esac
 }
@@ -93,16 +108,26 @@ src_install() {
 	in
 	  *"any"*)
 		insinto /lib/modules/${KV}/misc
-		for i in lirc_dev lirc_serial \
-			lirc_parallel lirc_sir lirc_it87 lirc_i2c lirc_gpio
-		do
+		if [ "${SMP}" = 1 ]; then
+			for i in lirc_dev lirc_serial \
+				lirc_sir lirc_it87 lirc_i2c lirc_gpio
+			do
+			doins drivers/${i}/${i}.o
+			done
+		else
+			for i in lirc_dev lirc_serial \
+				lirc_parallel lirc_sir lirc_it87 lirc_i2c lirc_gpio
+			do
 			doins drivers/${i}/${i}.o
-		done
+			done
+		fi
 	;;
 	esac
 
 	exeinto /etc/init.d
 	doexe ${FILESDIR}/lircd
+
+	dohtml doc/html/*.html
 }
 
 pkg_postinst () {
@@ -118,4 +143,3 @@ pkg_postinst () {
 	einfo "variable to your needs."
 	einfo
 }
-