Closing bugs #20684 and #61978. Removing old ebuilds. Performing general QA cleanup.

(Portage version: 2.0.51.21-r1)

9 files changed, 64 insertions, 87 deletions

diff --git a/sys-apps/kudzu/ChangeLog b/sys-apps/kudzu/ChangeLog
index a36bbc79973e..dc341b9b7f61 100644
--- a/sys-apps/kudzu/ChangeLog
+++ b/sys-apps/kudzu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/kudzu
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kudzu/ChangeLog,v 1.15 2004/09/30 13:26:01 wolf31o2 Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kudzu/ChangeLog,v 1.16 2005/05/12 19:07:12 wolf31o2 Exp $
+
+  12 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> +files/kudzu.conf.d,
+  +files/kudzu.rc, -kudzu-0.99.66.ebuild, kudzu-0.99.99.ebuild,
+  -kudzu-1.1.43.ebuild, kudzu-1.1.62.ebuild:
+  Closing bugs #20684 and #61978. Removing old ebuilds. Performing general QA
+  cleanup.
 
   30 Sep 2004; Chris Gianelloni <wolf31o2@gentoo.org> kudzu-0.99.66.ebuild,
   kudzu-0.99.99.ebuild, kudzu-1.1.43.ebuild, kudzu-1.1.62.ebuild:
diff --git a/sys-apps/kudzu/files/digest-kudzu-0.99.66 b/sys-apps/kudzu/files/digest-kudzu-0.99.66
deleted file mode 100644
index c9b599e531b0..000000000000
--- a/sys-apps/kudzu/files/digest-kudzu-0.99.66
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9af261be9eaf6272c5b7f16c98d9a852 kudzu-0.99.66.tar.gz 188906
diff --git a/sys-apps/kudzu/files/digest-kudzu-1.1.43 b/sys-apps/kudzu/files/digest-kudzu-1.1.43
deleted file mode 100644
index 9e35a0597945..000000000000
--- a/sys-apps/kudzu/files/digest-kudzu-1.1.43
+++ /dev/null
@@ -1 +0,0 @@
-MD5 347f4502e5788e966f1220f5a15fe5b0 kudzu-1.1.43.tar.bz2 191121
diff --git a/sys-apps/kudzu/files/kudzu.conf.d b/sys-apps/kudzu/files/kudzu.conf.d
new file mode 100644
index 000000000000..8874c701defd
--- /dev/null
+++ b/sys-apps/kudzu/files/kudzu.conf.d
@@ -0,0 +1,9 @@
+# Kudzu configuration
+#
+
+# Below, you can set options
+# The example given is:
+# -s	Safe probes ONLY
+# -q	Quiet mode
+#KUDZU_OPTS="-s -q"
+
diff --git a/sys-apps/kudzu/files/kudzu.rc b/sys-apps/kudzu/files/kudzu.rc
new file mode 100644
index 000000000000..4fc13d25d334
--- /dev/null
+++ b/sys-apps/kudzu/files/kudzu.rc
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need bootmisc
+}
+
+start() {
+	ebegin "Starting Kudzu"
+	kudzu ${KUDZU_OPTS}
+	# Actually APPLY the settings
+	hwsetup
+	eend $?
+	return 0
+}
+
+stop() {
+	return 0
+}
diff --git a/sys-apps/kudzu/kudzu-0.99.66.ebuild b/sys-apps/kudzu/kudzu-0.99.66.ebuild
deleted file mode 100644
index b5569819c1e6..000000000000
--- a/sys-apps/kudzu/kudzu-0.99.66.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kudzu/kudzu-0.99.66.ebuild,v 1.15 2004/09/30 13:26:01 wolf31o2 Exp $
-
-DESCRIPTION="Red Hat Hardware detection tools"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-HOMEPAGE="http://www.knopper.net"
-
-KEYWORDS="x86 -ppc -sparc alpha -mips"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-RDEPEND="dev-libs/newt"
-DEPEND="$RDEPEND
-	sys-devel/gettext
-	sys-apps/pciutils
-	>=dev-libs/dietlibc-0.20
-	!sys-apps/kudzu-knoppix"
-
-src_compile() {
-	emake  || die
-	cd ddcprobe || die
-	emake || die
-}
-
-src_install() {
-	einstall DESTDIR=${D} PREFIX=/usr MANDIR=/usr/share/man || die "Install failed"
-	cd ${S}/ddcprobe || die
-	dosbin svgamodes modetest ddcxinfo ddcprobe || die
-}
-
diff --git a/sys-apps/kudzu/kudzu-0.99.99.ebuild b/sys-apps/kudzu/kudzu-0.99.99.ebuild
index 01edf0a46847..cbcf04ead7b8 100644
--- a/sys-apps/kudzu/kudzu-0.99.99.ebuild
+++ b/sys-apps/kudzu/kudzu-0.99.99.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kudzu/kudzu-0.99.99.ebuild,v 1.8 2004/09/30 13:26:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kudzu/kudzu-0.99.99.ebuild,v 1.9 2005/05/12 19:07:12 wolf31o2 Exp $
 
 DESCRIPTION="Red Hat Hardware detection tools"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
@@ -21,7 +21,7 @@ DEPEND="$RDEPEND
 src_compile() {
 	emake  || die
 
-	if [ "${ARCH} = "x86" -o "${ARCH} = "ppc" ]
+	if use x86
 	then
 		cd ddcprobe || die
 		emake || die
@@ -29,8 +29,17 @@ src_compile() {
 }
 
 src_install() {
-	einstall install-program DESTDIR=${D} PREFIX=/usr MANDIR=/usr/share/man || die "Install failed"
-	if [ "${ARCH} = "x86" -o "${ARCH} = "ppc" ]
+	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}.rc ${PN} || die
+	newconfd ${FILESDIR}/${PN}.conf.d ${PN} || die
+
+	if use x86
 	then
 		cd ${S}/ddcprobe || die
 		dosbin svgamodes modetest ddcxinfo ddcprobe || die
diff --git a/sys-apps/kudzu/kudzu-1.1.43.ebuild b/sys-apps/kudzu/kudzu-1.1.43.ebuild
deleted file mode 100644
index cdcb06fe0731..000000000000
--- a/sys-apps/kudzu/kudzu-1.1.43.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kudzu/kudzu-1.1.43.ebuild,v 1.6 2004/09/30 13:26:01 wolf31o2 Exp $
-
-DESCRIPTION="Red Hat Hardware detection tools"
-SRC_URI="http://www.ibiblio.org/onebase/devbase/app-packs/${P}.tar.bz2"
-HOMEPAGE="http://www.knopper.net"
-
-KEYWORDS="x86 amd64 -ppc alpha -sparc -mips"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-RDEPEND="dev-libs/newt"
-DEPEND="$RDEPEND
-	sys-devel/gettext
-	sys-apps/pciutils
-	>=dev-libs/dietlibc-0.20
-	!sys-apps/kudzu-knoppix"
-
-src_compile() {
-	emake  || die
-
-	if [ "${ARCH}" = "x86" -o "${ARCH}" = "ppc" ]
-	then
-		cd ddcprobe || die
-		emake || die
-	fi
-}
-
-src_install() {
-	einstall install-program DESTDIR=${D} PREFIX=/usr MANDIR=/usr/share/man \
-		|| die "Install failed"
-
-	if [ "${ARCH}" = "x86" -o "${ARCH}" = "ppc" ]
-	then
-		cd ${S}/ddcprobe || die
-		dosbin ddcxinfo ddcprobe || die
-	fi
-}
-
diff --git a/sys-apps/kudzu/kudzu-1.1.62.ebuild b/sys-apps/kudzu/kudzu-1.1.62.ebuild
index c73b37c874c5..10c5b977e9f2 100644
--- a/sys-apps/kudzu/kudzu-1.1.62.ebuild
+++ b/sys-apps/kudzu/kudzu-1.1.62.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kudzu/kudzu-1.1.62.ebuild,v 1.2 2004/09/30 13:26:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kudzu/kudzu-1.1.62.ebuild,v 1.3 2005/05/12 19:07:12 wolf31o2 Exp $
 
 DESCRIPTION="Red Hat Hardware detection tools"
 SRC_URI="http://www.ibiblio.org/onebase/devbase/app-packs/${P}.tar.bz2"
 HOMEPAGE="http://www.knopper.net"
 
-KEYWORDS="~x86 ~amd64 -ppc ~alpha -sparc -mips"
+KEYWORDS="x86 amd64 -ppc alpha -sparc -mips"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
@@ -21,7 +21,7 @@ DEPEND="$RDEPEND
 src_compile() {
 	emake  || die
 
-	if [ "${ARCH}" = "x86" -o "${ARCH}" = "ppc" -o "${ARCH}" = "amd64" ]
+	if use x86
 	then
 		cd ddcprobe || die
 		emake || die
@@ -32,7 +32,15 @@ src_install() {
 	einstall install-program DESTDIR=${D} PREFIX=/usr MANDIR=/usr/share/man \
 		|| die "Install failed"
 
-	if [ "${ARCH}" = "x86" -o "${ARCH}" = "ppc" -o "${ARCH}" = "amd64" ]
+	# Init script isn't appropriate
+	rm -rf ${D}/etc/rc.d
+
+	# Add our own init scripts
+	newinitd ${FILESDIR}/${PN}.rc ${PN} || die
+	newconfd ${FILESDIR}/${PN}.conf.d ${PN} || die
+
+
+	if use x86
 	then
 		cd ${S}/ddcprobe || die
 		dosbin ddcxinfo ddcprobe || die