8 files changed, 14 insertions, 114 deletions
diff --git a/sys-apps/hwsetup/ChangeLog b/sys-apps/hwsetup/ChangeLog
index c0313202b2e7..211080214e14 100644
--- a/sys-apps/hwsetup/ChangeLog
+++ b/sys-apps/hwsetup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/hwsetup
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.20 2005/06/22 14:05:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.21 2005/06/30 15:02:29 wolf31o2 Exp $
+
+  30 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -hwsetup-1.0-r2.ebuild, hwsetup-1.0-r3.ebuild:
+  Removing old version and marking stable.
 
   22 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r2.ebuild,
   hwsetup-1.0-r3.ebuild:
diff --git a/sys-apps/hwsetup/files/digest-hwsetup-1.0-r2 b/sys-apps/hwsetup/files/digest-hwsetup-1.0-r2
deleted file mode 100644
index b3852e0446f7..000000000000
--- a/sys-apps/hwsetup/files/digest-hwsetup-1.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 12ed659c6ce09dd4c06ee4bc07f0adfe hwsetup_1.0-14.tar.gz 8491
diff --git a/sys-apps/hwsetup/hwsetup-1.0-r2.ebuild b/sys-apps/hwsetup/hwsetup-1.0-r2.ebuild
deleted file mode 100644
index 8c623820ca60..000000000000
--- a/sys-apps/hwsetup/hwsetup-1.0-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.0-r2.ebuild,v 1.7 2005/06/22 14:05:06 wolf31o2 Exp $
-
-inherit eutils
-
-MY_PV=${PV}-14
-DESCRIPTION="Hardware setup program"
-HOMEPAGE="http://www.knopper.net/"
-SRC_URI="http://developer.linuxtag.net/knoppix/sources/${PN}_${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 -mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-DEPEND="|| (
-	sys-apps/kudzu-knoppix
-	sys-apps/kudzu )"
-RDEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-}
-
-src_compile() {
-	emake  || die
-}
-
-src_install() {
-	einstall DESTDIR=${D} PREFIX=/usr MANDIR=/usr/share/man || die "Install failed"
-}
diff --git a/sys-apps/hwsetup/hwsetup-1.0-r3.ebuild b/sys-apps/hwsetup/hwsetup-1.0-r3.ebuild
index 9756a21e47e0..afd34af8d687 100644
--- a/sys-apps/hwsetup/hwsetup-1.0-r3.ebuild
+++ b/sys-apps/hwsetup/hwsetup-1.0-r3.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/sys-apps/hwsetup/hwsetup-1.0-r3.ebuild,v 1.2 2005/06/22 14:05:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.0-r3.ebuild,v 1.3 2005/06/30 15:02:29 wolf31o2 Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://developer.linuxtag.net/knoppix/sources/${PN}_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 -mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 -mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="|| (
diff --git a/sys-apps/kudzu-knoppix/ChangeLog b/sys-apps/kudzu-knoppix/ChangeLog
index 982590157328..04350ed59b2c 100644
--- a/sys-apps/kudzu-knoppix/ChangeLog
+++ b/sys-apps/kudzu-knoppix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/kudzu-knoppix
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kudzu-knoppix/ChangeLog,v 1.21 2005/06/25 18:17:34 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kudzu-knoppix/ChangeLog,v 1.22 2005/06/30 14:59:45 wolf31o2 Exp $
+
+  30 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -kudzu-knoppix-1.1.36-r1.ebuild, kudzu-knoppix-1.1.36-r2.ebuild:
+  Removing old version and marking stable.
 
   25 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> +files/sunlance.patch,
   kudzu-knoppix-1.1.36-r2.ebuild:
diff --git a/sys-apps/kudzu-knoppix/files/digest-kudzu-knoppix-1.1.36-r1 b/sys-apps/kudzu-knoppix/files/digest-kudzu-knoppix-1.1.36-r1
deleted file mode 100644
index d86c15dff275..000000000000
--- a/sys-apps/kudzu-knoppix/files/digest-kudzu-knoppix-1.1.36-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bfe68a139a64937c13df69d14213cb5b kudzu-knoppix_1.1.36-2.tar.gz 708324
diff --git a/sys-apps/kudzu-knoppix/kudzu-knoppix-1.1.36-r1.ebuild b/sys-apps/kudzu-knoppix/kudzu-knoppix-1.1.36-r1.ebuild
deleted file mode 100644
index a0c1d7d1435f..000000000000
--- a/sys-apps/kudzu-knoppix/kudzu-knoppix-1.1.36-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kudzu-knoppix/kudzu-knoppix-1.1.36-r1.ebuild,v 1.8 2005/06/22 14:03:52 wolf31o2 Exp $
-
-inherit eutils
-
-MY_PV=${PV}-2
-S=${WORKDIR}/kudzu-${PV}
-DESCRIPTION="Knoppix version of the Red Hat hardware detection tools"
-HOMEPAGE="http://www.knopper.net/"
-SRC_URI="http://developer.linuxtag.net/knoppix/sources/${PN}_${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 -mips ppc ppc64 ~sparc x86"
-IUSE="livecd nls"
-
-RDEPEND="!livecd? ( dev-libs/newt )"
-DEPEND="${RDEPEND}
-	!livecd? (
-		sys-devel/gettext
-		sys-libs/slang
-		>=dev-libs/dietlibc-0.20
-	)
-	sys-apps/pciutils
-	!sys-apps/kudzu"
-
-src_unpack() {
-	unpack ${A}
-	if ! use nls; then
-		epatch "${FILESDIR}/${P}-nonls-v4.patch" || die "epatch failed"
-	fi
-}
-
-src_compile() {
-	# Fix the modules directory to match Gentoo layout.
-	perl -pi -e 's|/etc/modutils/kudzu|/etc/modules.d/kudzu|g' *.*
-
-	if use livecd; then
-		emake libkudzu.a RPM_OPT_FLAGS="${CFLAGS}" || die
-	else
-		emake RPM_OPT_FLAGS="${CFLAGS}" || die
-	fi
-
-	if use x86 || use ppc
-	then
-		cd ddcprobe || die
-		emake RPM_OPT_FLAGS="${CFLAGS}" || die
-	fi
-}
-
-src_install() {
-	if use livecd; then
-		dodir /etc/sysconfig
-		insinto /usr/include/kudzu
-		doins *.h
-		dolib.a libkudzu.a
-	else
-		einstall install-program DESTDIR=${D} PREFIX=/usr \
-			MANDIR=/usr/share/man || die "Install failed"
-		# Init script isn't appropriate
-		rm -rf ${D}/etc/rc.d
-		# Add our own init scripts
-		newinitd ${FILESDIR}/${PN/-knoppix}.rc ${PN/-knoppix} || die
-		newconfd ${FILESDIR}/${PN/-knoppix}.conf.d ${PN/-knoppix} || die
-	fi
-
-	if use x86 || use ppc
-	then
-		cd ${S}/ddcprobe || die
-		dosbin ddcxinfo ddcprobe || die
-	fi
-}
diff --git a/sys-apps/kudzu-knoppix/kudzu-knoppix-1.1.36-r2.ebuild b/sys-apps/kudzu-knoppix/kudzu-knoppix-1.1.36-r2.ebuild
index c6b636bc480c..9923b402ddbc 100644
--- a/sys-apps/kudzu-knoppix/kudzu-knoppix-1.1.36-r2.ebuild
+++ b/sys-apps/kudzu-knoppix/kudzu-knoppix-1.1.36-r2.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/sys-apps/kudzu-knoppix/kudzu-knoppix-1.1.36-r2.ebuild,v 1.5 2005/06/25 18:17:34 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kudzu-knoppix/kudzu-knoppix-1.1.36-r2.ebuild,v 1.6 2005/06/30 14:59:45 wolf31o2 Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://developer.linuxtag.net/knoppix/sources/${PN}_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 -mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 -mips ppc ppc64 sparc x86"
 IUSE="livecd nls minimal python"
 
 RDEPEND="!livecd? ( !minimal? ( dev-libs/newt ) )