various things, please changelog

Package-Manager: portage-2.0.51.19

12 files changed, 43 insertions, 740 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index f779604f3fd7..c3cce1710985 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for app-misc/lirc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.64 2005/04/01 03:29:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.65 2005/04/13 18:22:41 lanius Exp $
+
+  13 Apr 2005; Heinrich Wendel <lanius@gentoo.org> -lirc-0.7.0_pre3.ebuild,
+  -lirc-0.7.0_pre6.ebuild, -lirc-0.7.0_pre7.ebuild, -lirc-0.7.0_pre8.ebuild,
+  -lirc-0.7.0.ebuild, lirc-0.7.0-r1.ebuild:
+  don't overwrite lircd.conf, bug #88199
+
+  13 Apr 2005; Heinrich Wendel <lanius@gentoo.org> -lirc-0.7.0_pre3.ebuild,
+  -lirc-0.7.0_pre6.ebuild, -lirc-0.7.0_pre7.ebuild, -lirc-0.7.0_pre8.ebuild,
+  -lirc-0.7.0.ebuild, lirc-0.7.0-r1.ebuild:
+  cleanups
+
+  13 Apr 2005; Heinrich Wendel <lanius@gentoo.org> lirc-0.7.0-r1.ebuild:
+  fix bt878 compilation, bug #87505
+
+  13 Apr 2005; Heinrich Wendel <lanius@gentoo.org> lirc-0.7.0-r1.ebuild:
+  update driver list; fix smp detection
 
   31 Mar 2005; Aron Griffis <agriffis@gentoo.org> lirc-0.7.0-r1.ebuild:
   stable on ia64
diff --git a/app-misc/lirc/files/digest-lirc-0.7.0 b/app-misc/lirc/files/digest-lirc-0.7.0
deleted file mode 100644
index 05088a5c2b19..000000000000
--- a/app-misc/lirc/files/digest-lirc-0.7.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4fbcc8b0d69ca5ecbdda40576964573f lirc-0.7.0.tar.bz2 464270
-MD5 6dcc4716e2a6a09a1674cc1757c6b92e 01-add-2.6-devfs-and-sysfs-to-lirc_dev.patch 4007
diff --git a/app-misc/lirc/files/digest-lirc-0.7.0_pre3 b/app-misc/lirc/files/digest-lirc-0.7.0_pre3
deleted file mode 100644
index 9a19d59c4065..000000000000
--- a/app-misc/lirc/files/digest-lirc-0.7.0_pre3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c4ad77f59b6d9b24a6df6beb099a835 lirc-0.7.0pre3.tar.bz2 437242
diff --git a/app-misc/lirc/files/digest-lirc-0.7.0_pre6 b/app-misc/lirc/files/digest-lirc-0.7.0_pre6
deleted file mode 100644
index 38727ef2208b..000000000000
--- a/app-misc/lirc/files/digest-lirc-0.7.0_pre6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d1b6f241673cc7404b1a11eaf137bcfc lirc-0.7.0pre6.tar.bz2 448090
diff --git a/app-misc/lirc/files/digest-lirc-0.7.0_pre7 b/app-misc/lirc/files/digest-lirc-0.7.0_pre7
deleted file mode 100644
index 8e9b751a1cf3..000000000000
--- a/app-misc/lirc/files/digest-lirc-0.7.0_pre7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6e8e6d847042e17151eaf58266b58759 lirc-0.7.0pre7.tar.bz2 452630
-MD5 6dcc4716e2a6a09a1674cc1757c6b92e 01-add-2.6-devfs-and-sysfs-to-lirc_dev.patch 4007
diff --git a/app-misc/lirc/files/digest-lirc-0.7.0_pre8 b/app-misc/lirc/files/digest-lirc-0.7.0_pre8
deleted file mode 100644
index 0baad2b9243f..000000000000
--- a/app-misc/lirc/files/digest-lirc-0.7.0_pre8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aa3b1dccf187753753e392d681bc8b21 lirc-0.7.0pre8.tar.bz2 464294
diff --git a/app-misc/lirc/lirc-0.7.0-r1.ebuild b/app-misc/lirc/lirc-0.7.0-r1.ebuild
index 990c556afe0d..2ce740a26454 100644
--- a/app-misc/lirc/lirc-0.7.0-r1.ebuild
+++ b/app-misc/lirc/lirc-0.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.7.0-r1.ebuild,v 1.11 2005/04/01 03:29:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.7.0-r1.ebuild,v 1.12 2005/04/13 18:22:41 lanius Exp $
 
 inherit eutils linux-mod flag-o-matic
 
@@ -19,16 +19,24 @@ HOMEPAGE="http://www.lirc.org"
 # --with-driver=X
 
 # where X is one of:
-# none, any, animax, avermedia, avermedia98,
-# bestbuy, bestbuy2, caraca, chronos, comX,
-# cph03x, cph06x, creative, fly98, flyvideo,
-# hauppauge,hauppauge_dvb, ipaq, irdeo,
+# none, any, act200l, animax, atilibusb,
+# atiusb, audio, avermedia, avermedia_vdomate,
+# avermedia98, bestbuy, bestbuy2, breakoutbox,
+# bte, caraca, chronos, comX,
+# creative_infracd, dsp, cph03x, cph06x,
+# creative, devinput, exaudio, flyvideo,
+# gvbctv5pci, hauppauge, hauppauge_dvb,
+# hercules_smarttv_stereo, igorplugusb, irdeo,
 # irdeo_remote, irman, irreal, it87, knc_one,
-# logitech, lptX, mediafocusI, packard_bell,
-# parallel, pctv, pixelview_bt878,
-# pixelview_pak, pixelview_pro, provideo,
-# realmagic, remotemaster, serial, silitek,
-# sir, slinke, streamzap tekram
+# kworld, leadtek_0007, leadtek_0010,
+# livedrive_midi, livedrive_seq, logitech,
+# lptX, mceusb, mediafocusI, mp3anywhere,
+# packard_bell, parallel, pcmak, pcmak_usb,
+# pctv, pixelview_bt878, pixelview_pak,
+# pixelview_pro, provideo, realmagic,
+# remotemaster, sa1100, sasem, serial,
+# silitek, sir, slinke, tekram, tekram_bt829,
+# tira, tvbox, udp, uirt2, uirt2_raw"
 # winfast_tv2000 is now leadtek_0010
 
 # This could be usefull too
@@ -70,6 +78,9 @@ src_unpack() {
 
 	filter-flags -Wl,-O1
 	sed	-i -e "s:-O2 -g:${CFLAGS}:" configure configure.in
+
+	# fix bz878 compilation, bug #87505
+	sed -i -e "s:lircd.conf.pixelview_bt878:lircd.conf.playtv_bt878" configure configure.in
 }
 
 src_compile() {
@@ -80,7 +91,7 @@ src_compile() {
 		--with-port=0x3f8 --with-irq=4"
 
 	# remove parallel driver on SMP systems
-	if [ ! -z "`uname -v | grep SMP`" ]; then
+	if linux_chkconfig_present SMP ; then
 		sed -i -e "s:lirc_parallel::" drivers/Makefile
 	fi
 
@@ -126,6 +137,10 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	cp ${ROOT}/etc/lircd.conf ${IMAGE}/etc
+}
+
 pkg_postinst() {
 	einfo
 	einfo "The lirc Linux Infrared Remote Control Package has been"
diff --git a/app-misc/lirc/lirc-0.7.0.ebuild b/app-misc/lirc/lirc-0.7.0.ebuild
deleted file mode 100644
index 764a92dd37bb..000000000000
--- a/app-misc/lirc/lirc-0.7.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.7.0.ebuild,v 1.5 2005/01/01 15:12:16 eradicator Exp $
-
-inherit eutils linux-mod
-
-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"
-
-# LIRC_OPTS = ???? v
-# 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.
-
-# Note: If you don't specify the driver configure becomes interactiv.
-
-# You have to know, which driver you want;
-# --with-driver=X
-
-# where X is one of:
-# none, any, animax, avermedia, avermedia98,
-# bestbuy, bestbuy2, caraca, chronos, comX,
-# cph03x, cph06x, creative, fly98, flyvideo,
-# hauppauge,hauppauge_dvb, ipaq, irdeo,
-# irdeo_remote, irman, irreal, it87, knc_one,
-# logitech, lptX, mediafocusI, packard_bell,
-# parallel, pctv, pixelview_bt878,
-# pixelview_pak, pixelview_pro, provideo,
-# realmagic, remotemaster, serial, silitek,
-# sir, slinke, streamzap tekram, winfast_tv2000
-
-# This could be usefull too
-
-# --with-port=port	# port number for the lirc device.
-# --with-irq=irq	# irq line for the lirc device.
-# --with-timer=value	# timer value for the parallel driver
-# --with-tty=file	# tty to use (Irman, RemoteMaster, etc.)
-# --without-soft-carrier	# if your serial hw generates carrier
-# --with-transmitter	# if you use a transmitter diode
-
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="debug doc streamzap"
-KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~amd64 ~ppc64"
-
-DEPEND="virtual/linux-sources"
-
-SRC_URI="mirror://sourceforge/lirc/${P}.tar.bz2
-	http://www.hardeman.nu/~david/lirc/broken-out/01-add-2.6-devfs-and-sysfs-to-lirc_dev.patch"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use streamzap && epatch ${FILESDIR}/lirc-0.7.0-streamzap.patch.bz2
-	#epatch ${FILESDIR}/${P}-configure.in.patch
-	sed	-i -e "s:-O2 -g:${CFLAGS}:" configure configure.in
-}
-
-src_compile() {
-	[ "x${LIRC_OPTS}" = x ] && LIRC_OPTS="--with-driver=serial \
-		--with-port=0x3f8 --with-irq=4"
-
-	# remove parallel driver on SMP systems
-	if [ ! -z "`uname -v | grep SMP`" ]
-	then
-		sed -i -e "s:lirc_parallel::" drivers/Makefile
-	fi
-
-	# Patch bad configure for /usr/src/linux
-	sed -si "s|/usr/src/kernel\-source\-\`uname \-r\` /usr/src/linux\-\`uname \-r\` ||" \
-		acinclude.m4 aclocal.m4 configure || die "/usr/src/linux sed failed"
-
-	get_version
-	sed -si "s|\`uname \-r\`|${KV_FULL}|" configure configure.in setup.sh || \
-		die "/lib/modules sed failed"
-
-	unset ARCH
-	econf \
-		--disable-manage-devices \
-		--localstatedir=/var \
-		--with-syslog=LOG_DAEMON \
-		--enable-sandboxed \
-		`use_enable debug` \
-		${LIRC_OPTS} || die "./configure failed"
-
-	convert_to_m ${S}/Makefile
-	emake || die
-
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/lircd
-	doexe ${FILESDIR}/lircmd
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/lircd.conf lircd
-
-	if [ "${PROFILE_ARCH}" == "xbox" ]; then
-		insinto /etc
-		newins ${FILESDIR}/xbox-lircd.conf lircd.conf
-	fi
-
-	if use doc ; then
-		dohtml doc/html/*.html
-		insinto /usr/share/doc/${PF}/images
-		doins doc/images/*
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "The lirc Linux Infrared Remote Control Package has been"
-	einfo "merged, please read the documentation, and if necessary"
-	einfo "add what is needed to /etc/modules.autoload or"
-	einfo "/etc/modules.d.  If you need special compile options"
-	einfo "then read the comments at the begin of this"
-	einfo "ebuild (source) and set the LIRC_OPTS environment"
-	einfo "variable to your needs."
-	einfo
-
-	update_depmod
-}
diff --git a/app-misc/lirc/lirc-0.7.0_pre3.ebuild b/app-misc/lirc/lirc-0.7.0_pre3.ebuild
deleted file mode 100644
index c391f27e7a9d..000000000000
--- a/app-misc/lirc/lirc-0.7.0_pre3.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.7.0_pre3.ebuild,v 1.7 2005/01/01 15:12:16 eradicator Exp $
-
-inherit eutils kernel-mod
-
-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=serial \
-	--with-port=0x3f8 --with-irq=4"
-
-# 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.
-
-# Note: If you don't specify the driver configure becomes interactiv.
-
-# You have to know, which driver you want;
-# --with-driver=X
-
-# where X is one of:
-# none, any, animax, avermedia, avermedia98,
-# bestbuy, bestbuy2, caraca, chronos, comX,
-# cph03x, cph06x, creative, fly98, flyvideo,
-# hauppauge,hauppauge_dvb, ipaq, irdeo,
-# irdeo_remote, irman, irreal, it87, knc_one,
-# logitech, lptX, mediafocusI, packard_bell,
-# parallel, pctv, pixelview_bt878,
-# pixelview_pak, pixelview_pro, provideo,
-# realmagic, remotemaster, serial, silitek,
-# sir, slinke, tekram, winfast_tv2000
-
-# This could be usefull too
-
-# --with-port=port	# port number for the lirc device.
-# --with-irq=irq	# irq line for the lirc device.
-# --with-timer=value	# timer value for the parallel driver
-# --with-tty=file	# tty to use (Irman, RemoteMaster, etc.)
-# --without-soft-carrier	# if your serial hw generates carrier
-# --with-transmitter	# if you use a transmitter diode
-
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-KEYWORDS="x86 ppc alpha ia64"
-
-DEPEND="virtual/linux-sources"
-
-MY_P=${P/_/}
-
-SRC_URI="http://lirc.sourceforge.net/software/snapshots/${MY_P}.tar.bz2"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed	-i -e "s:-O2 -g:${CFLAGS}:" configure configure.in
-}
-
-is_SMP() {
-	# We have a SMP enabled kernel?
-	if [ ! -z "`uname -v | grep SMP`" ]
-	then
-		return 0
-	else
-		return 1
-	fi
-}
-
-src_compile() {
-	ewarn "If you are using a 2.6 kernel you have to patch it for lirc support."
-	ewarn "There are several patches floating around, one of them can be found at "
-	ewarn "http://flameeyes.web.ctonet.it/."
-
-	# Let portage tell us where to put our modules
-	check_KV
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--with-kerneldir="/usr/src/linux" \
-		--with-moduledir="/lib/modules/${KV}/misc" \
-		--disable-manage-devices \
-		--enable-sandboxed \
-		${LIRC_OPTS} || die "./configure failed"
-
-	if kernel-mod_is_2_6_kernel; then
-		(cd daemons; emake) || die
-		(cd tools; emake) || die
-		(cd doc; emake) || die
-	else
-		emake || die
-
-		case ${LIRC_OPTS}
-		in
-		  *"any"*)
-			if is_SMP; 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
-	fi
-}
-
-src_install() {
-	if kernel-mod_is_2_6_kernel; then
-		(cd daemons; make DESTDIR=${D} install) || die
-		(cd tools; make DESTDIR=${D} install) || die
-		(cd doc; make DESTDIR=${D} install) || die
-	else
-		emake || die
-		make DESTDIR=${D} install || die
-
-		case ${LIRC_OPTS}
-		in
-		  *"any"*)
-			insinto /lib/modules/${KV}/misc
-			if is_SMP; 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
-			fi
-		;;
-		esac
-	fi
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/lircd
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/lircd.conf lircd
-
-	dohtml doc/html/*.html
-}
-
-pkg_postinst() {
-	if kernel-mod_is_2_4_kernel; then
-		/usr/sbin/update-modules
-	fi
-
-	einfo
-	einfo "The lirc Linux Infrared Remote Control Package has been"
-	einfo "merged, please read the documentation, and if necessary"
-	einfo "add what is needed to /etc/modules.autoload or"
-	einfo "/etc/modules.d.  If you need special compile options"
-	einfo "then read the comments at the begin of this"
-	einfo "ebuild (source) and set the LIRC_OPTS environment"
-	einfo "variable to your needs."
-	einfo
-}
diff --git a/app-misc/lirc/lirc-0.7.0_pre6.ebuild b/app-misc/lirc/lirc-0.7.0_pre6.ebuild
deleted file mode 100644
index 1f66956fcaaa..000000000000
--- a/app-misc/lirc/lirc-0.7.0_pre6.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.7.0_pre6.ebuild,v 1.3 2005/01/01 15:12:16 eradicator Exp $
-
-inherit eutils kernel-mod
-
-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"
-
-# LIRC_OPTS = ???? v
-# 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.
-
-# Note: If you don't specify the driver configure becomes interactiv.
-
-# You have to know, which driver you want;
-# --with-driver=X
-
-# where X is one of:
-# none, any, animax, avermedia, avermedia98,
-# bestbuy, bestbuy2, caraca, chronos, comX,
-# cph03x, cph06x, creative, fly98, flyvideo,
-# hauppauge,hauppauge_dvb, ipaq, irdeo,
-# irdeo_remote, irman, irreal, it87, knc_one,
-# logitech, lptX, mediafocusI, packard_bell,
-# parallel, pctv, pixelview_bt878,
-# pixelview_pak, pixelview_pro, provideo,
-# realmagic, remotemaster, serial, silitek,
-# sir, slinke, tekram, winfast_tv2000
-
-# This could be usefull too
-
-# --with-port=port	# port number for the lirc device.
-# --with-irq=irq	# irq line for the lirc device.
-# --with-timer=value	# timer value for the parallel driver
-# --with-tty=file	# tty to use (Irman, RemoteMaster, etc.)
-# --without-soft-carrier	# if your serial hw generates carrier
-# --with-transmitter	# if you use a transmitter diode
-
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-KEYWORDS="~x86 ~ppc ~alpha ~ia64 amd64 ppc64"
-
-DEPEND="virtual/linux-sources"
-
-MY_P=${P/_/}
-
-SRC_URI="http://lirc.sourceforge.net/software/snapshots/${MY_P}.tar.bz2"
-
-S=${WORKDIR}/${MY_P}
-
-is_SMP() {
-	# We have a SMP enabled kernel?
-	if [ ! -z "`uname -v | grep SMP`" ]
-	then
-		return 0
-	else
-		return 1
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed	-i -e "s:-O2 -g:${CFLAGS}:" configure configure.in
-}
-
-src_compile() {
-	ewarn "If you are using a 2.6 kernel you have to patch it for lirc support."
-	ewarn "There are several patches floating around, one of them can be found at "
-	ewarn "http://flameeyes.web.ctonet.it/."
-
-	# Let portage tell us where to put our modules
-	check_KV
-
-	[ "x${LIRC_OPTS}" = x ] && LIRC_OPTS="--with-driver=serial \
-		--with-port=0x3f8 --with-irq=4"
-
-	unset ARCH
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--with-kerneldir="/usr/src/linux" \
-		--with-moduledir="/lib/modules/${KV}/misc" \
-		--disable-manage-devices \
-		--enable-sandboxed \
-		--with-syslog=LOG_DAEMON \
-		${LIRC_OPTS} || die "./configure failed"
-
-	if kernel-mod_is_2_6_kernel; then
-		(cd daemons; emake) || die
-		(cd tools; emake) || die
-		(cd doc; emake) || die
-	else
-		emake || die
-
-		case ${LIRC_OPTS}
-		in
-		  *"any"*)
-			if is_SMP; 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
-	fi
-}
-
-src_install() {
-	if kernel-mod_is_2_6_kernel; then
-		(cd daemons; make DESTDIR=${D} install) || die
-		(cd tools; make DESTDIR=${D} install) || die
-		(cd doc; make DESTDIR=${D} install) || die
-	else
-		emake || die
-		make DESTDIR=${D} install || die
-
-		case ${LIRC_OPTS}
-		in
-		  *"any"*)
-			insinto /lib/modules/${KV}/misc
-			if is_SMP; 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
-			fi
-		;;
-		esac
-	fi
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/lircd
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/lircd.conf lircd
-
-	if [ "${PROFILE_ARCH}" == "xbox" ]; then
-		insinto /etc
-		newins ${FILESDIR}/xbox-lircd.conf lircd.conf
-	fi
-
-	dohtml doc/html/*.html
-}
-
-pkg_postinst() {
-	if kernel-mod_is_2_4_kernel; then
-		/usr/sbin/update-modules
-	fi
-
-	einfo
-	einfo "The lirc Linux Infrared Remote Control Package has been"
-	einfo "merged, please read the documentation, and if necessary"
-	einfo "add what is needed to /etc/modules.autoload or"
-	einfo "/etc/modules.d.  If you need special compile options"
-	einfo "then read the comments at the begin of this"
-	einfo "ebuild (source) and set the LIRC_OPTS environment"
-	einfo "variable to your needs."
-	einfo
-}
diff --git a/app-misc/lirc/lirc-0.7.0_pre7.ebuild b/app-misc/lirc/lirc-0.7.0_pre7.ebuild
deleted file mode 100644
index e94c7981f7cf..000000000000
--- a/app-misc/lirc/lirc-0.7.0_pre7.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.7.0_pre7.ebuild,v 1.13 2005/01/01 15:12:16 eradicator Exp $
-
-inherit eutils kmod
-
-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"
-
-# LIRC_OPTS = ???? v
-# 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.
-
-# Note: If you don't specify the driver configure becomes interactiv.
-
-# You have to know, which driver you want;
-# --with-driver=X
-
-# where X is one of:
-# none, any, animax, avermedia, avermedia98,
-# bestbuy, bestbuy2, caraca, chronos, comX,
-# cph03x, cph06x, creative, fly98, flyvideo,
-# hauppauge,hauppauge_dvb, ipaq, irdeo,
-# irdeo_remote, irman, irreal, it87, knc_one,
-# logitech, lptX, mediafocusI, packard_bell,
-# parallel, pctv, pixelview_bt878,
-# pixelview_pak, pixelview_pro, provideo,
-# realmagic, remotemaster, serial, silitek,
-# sir, slinke, tekram, winfast_tv2000
-
-# This could be usefull too
-
-# --with-port=port	# port number for the lirc device.
-# --with-irq=irq	# irq line for the lirc device.
-# --with-timer=value	# timer value for the parallel driver
-# --with-tty=file	# tty to use (Irman, RemoteMaster, etc.)
-# --without-soft-carrier	# if your serial hw generates carrier
-# --with-transmitter	# if you use a transmitter diode
-
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="doc"
-KEYWORDS="x86 ppc alpha ~ia64 amd64 ~ppc64 sparc"
-
-DEPEND="virtual/linux-sources"
-
-MY_P=${P/_/}
-
-SRC_URI="http://lirc.sourceforge.net/software/snapshots/${MY_P}.tar.bz2
-	http://www.hardeman.nu/~david/lirc/broken-out/01-add-2.6-devfs-and-sysfs-to-lirc_dev.patch"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${DISTDIR}/01-add-2.6-devfs-and-sysfs-to-lirc_dev.patch
-	epatch ${FILESDIR}/${P}-configure.patch
-	sed	-i -e "s:-O2 -g:${CFLAGS}:" configure configure.in
-}
-
-src_compile() {
-	[ "x${LIRC_OPTS}" = x ] && LIRC_OPTS="--with-driver=serial \
-		--with-port=0x3f8 --with-irq=4"
-
-	# remove parallel driver on SMP systems
-	if [ ! -z "`uname -v | grep SMP`" ]
-	then
-		sed -i -e "s:lirc_parallel::" drivers/Makefile
-	fi
-
-	unset ARCH
-	econf \
-		--disable-manage-devices \
-		--localstatedir=/var \
-		--with-syslog=LOG_DAEMON \
-		--enable-sandboxed \
-		${LIRC_OPTS} || die "./configure failed"
-
-	drivers=`cat drivers/Makefile | grep "^SUBDIRS ="`
-	if is_kernel 2 6 && ! is_koutput && [ "$drivers" != "SUBDIRS = " ]; then
-		kmod_make_linux_writable
-	fi
-
-	emake || die
-
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/lircd
-	doexe ${FILESDIR}/lircmd
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/lircd.conf lircd
-
-	if [ "${PROFILE_ARCH}" == "xbox" ]; then
-		insinto /etc
-		newins ${FILESDIR}/xbox-lircd.conf lircd.conf
-	fi
-
-	if use doc ; then
-		dohtml doc/html/*.html
-		insinto /usr/share/doc/${PF}/images
-		doins doc/images/*
-	fi
-}
-
-pkg_postinst() {
-	/usr/sbin/update-modules
-
-	einfo
-	einfo "The lirc Linux Infrared Remote Control Package has been"
-	einfo "merged, please read the documentation, and if necessary"
-	einfo "add what is needed to /etc/modules.autoload or"
-	einfo "/etc/modules.d.  If you need special compile options"
-	einfo "then read the comments at the begin of this"
-	einfo "ebuild (source) and set the LIRC_OPTS environment"
-	einfo "variable to your needs."
-	einfo
-}
diff --git a/app-misc/lirc/lirc-0.7.0_pre8.ebuild b/app-misc/lirc/lirc-0.7.0_pre8.ebuild
deleted file mode 100644
index ae7e2d294663..000000000000
--- a/app-misc/lirc/lirc-0.7.0_pre8.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.7.0_pre8.ebuild,v 1.2 2005/01/01 15:12:16 eradicator Exp $
-
-inherit eutils kmod
-
-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"
-
-# LIRC_OPTS = ???? v
-# 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.
-
-# Note: If you don't specify the driver configure becomes interactiv.
-
-# You have to know, which driver you want;
-# --with-driver=X
-
-# where X is one of:
-# none, any, animax, avermedia, avermedia98,
-# bestbuy, bestbuy2, caraca, chronos, comX,
-# cph03x, cph06x, creative, fly98, flyvideo,
-# hauppauge,hauppauge_dvb, ipaq, irdeo,
-# irdeo_remote, irman, irreal, it87, knc_one,
-# logitech, lptX, mediafocusI, packard_bell,
-# parallel, pctv, pixelview_bt878,
-# pixelview_pak, pixelview_pro, provideo,
-# realmagic, remotemaster, serial, silitek,
-# sir, slinke, tekram, winfast_tv2000
-
-# This could be usefull too
-
-# --with-port=port	# port number for the lirc device.
-# --with-irq=irq	# irq line for the lirc device.
-# --with-timer=value	# timer value for the parallel driver
-# --with-tty=file	# tty to use (Irman, RemoteMaster, etc.)
-# --without-soft-carrier	# if your serial hw generates carrier
-# --with-transmitter	# if you use a transmitter diode
-
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="doc"
-KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~amd64 ~ppc64 ~sparc"
-
-DEPEND="virtual/linux-sources"
-
-MY_P=${P/_/}
-
-SRC_URI="http://lirc.sourceforge.net/software/snapshots/${MY_P}.tar.bz2"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed	-i -e "s:-O2 -g:${CFLAGS}:" configure configure.in
-}
-
-src_compile() {
-	[ "x${LIRC_OPTS}" = x ] && LIRC_OPTS="--with-driver=serial \
-		--with-port=0x3f8 --with-irq=4"
-
-	# remove parallel driver on SMP systems
-	if [ ! -z "`uname -v | grep SMP`" ]
-	then
-		sed -i -e "s:lirc_parallel::" drivers/Makefile
-	fi
-
-	unset ARCH
-	econf \
-		--disable-manage-devices \
-		--localstatedir=/var \
-		--with-syslog=LOG_DAEMON \
-		--enable-sandboxed \
-		${LIRC_OPTS} || die "./configure failed"
-
-	drivers=`cat drivers/Makefile | grep "^SUBDIRS ="`
-	if is_kernel 2 6 && ! is_koutput && [ "$drivers" != "SUBDIRS = " ]; then
-		kmod_make_linux_writable
-	fi
-
-	emake || die
-
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/lircd
-	doexe ${FILESDIR}/lircmd
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/lircd.conf lircd
-
-	if [ "${PROFILE_ARCH}" == "xbox" ]; then
-		insinto /etc
-		newins ${FILESDIR}/xbox-lircd.conf lircd.conf
-	fi
-
-	if use doc ; then
-		dohtml doc/html/*.html
-		insinto /usr/share/doc/${PF}/images
-		doins doc/images/*
-	fi
-}
-
-pkg_postinst() {
-	/usr/sbin/update-modules
-
-	einfo
-	einfo "The lirc Linux Infrared Remote Control Package has been"
-	einfo "merged, please read the documentation, and if necessary"
-	einfo "add what is needed to /etc/modules.autoload or"
-	einfo "/etc/modules.d.  If you need special compile options"
-	einfo "then read the comments at the begin of this"
-	einfo "ebuild (source) and set the LIRC_OPTS environment"
-	einfo "variable to your needs."
-	einfo
-}