Clean up.

Package-Manager: portage-2.1.4

12 files changed, 13 insertions, 323 deletions

diff --git a/sys-apps/kudzu/ChangeLog b/sys-apps/kudzu/ChangeLog
index 60dd5b65adf6..6743e3e57d3e 100644
--- a/sys-apps/kudzu/ChangeLog
+++ b/sys-apps/kudzu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/kudzu
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kudzu/ChangeLog,v 1.26 2007/06/20 06:19:16 dberkholz Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kudzu/ChangeLog,v 1.27 2008/01/31 06:29:25 dberkholz Exp $
+
+  31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/1.2.52-remove-pci-fill-class.patch,
+  -files/1.2.52-remove-sata-ata-storage-classes.patch, -kudzu-1.2.52.ebuild:
+  Clean up.
 
 *kudzu-1.2.71 (20 Jun 2007)
 
diff --git a/sys-apps/kudzu/files/1.2.52-remove-pci-fill-class.patch b/sys-apps/kudzu/files/1.2.52-remove-pci-fill-class.patch
deleted file mode 100644
index 6ac45885e9cf..000000000000
--- a/sys-apps/kudzu/files/1.2.52-remove-pci-fill-class.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Remove a class that only exists as a patch to Red Hat pciutils.
-
--Donnie Berkholz <dberkholz@gentoo.org>
-
-Index: pci.c
-===================================================================
-RCS file: /usr/local/CVS/kudzu/pci.c,v
-retrieving revision 1.110
-retrieving revision 1.109
-diff -u -b -B -r1.110 -r1.109
---- pci.c	8 Sep 2004 19:00:57 -0000	1.110
-+++ pci.c	3 Sep 2004 21:14:39 -0000	1.109
-@@ -746,7 +748,7 @@
- 		    subvend = config[PCI_SUBSYSTEM_VENDOR_ID+1] << 8 | config[PCI_SUBSYSTEM_VENDOR_ID];
- 		    subdev = config[PCI_SUBSYSTEM_ID+1] << 8 | config[PCI_SUBSYSTEM_ID];
- 		}
--		pci_fill_info(p, PCI_FILL_IDENT | PCI_FILL_CLASS | PCI_FILL_IRQ | PCI_FILL_BASES | PCI_FILL_ROM_BASE | PCI_FILL_SIZES);
-+		pci_fill_info(p, PCI_FILL_IDENT | PCI_FILL_IRQ | PCI_FILL_BASES | PCI_FILL_ROM_BASE | PCI_FILL_SIZES);
- 		bustype = PCI_NORMAL;
- 	        for (bridgenum=0; cardbus_bridges[bridgenum]; bridgenum++) {
- 			if (p->bus == cardbus_bridges[bridgenum])
diff --git a/sys-apps/kudzu/files/1.2.52-remove-sata-ata-storage-classes.patch b/sys-apps/kudzu/files/1.2.52-remove-sata-ata-storage-classes.patch
deleted file mode 100644
index 21824e950ae6..000000000000
--- a/sys-apps/kudzu/files/1.2.52-remove-sata-ata-storage-classes.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Remove some storage classes that only exist as patches to Red Hat pciutils.
-
--Donnie Berkholz <dberkholz@gentoo.org>
-
-Index: pci.c
-===================================================================
-RCS file: /usr/local/CVS/kudzu/pci.c,v
-retrieving revision 1.141
-retrieving revision 1.140
-diff -u -b -B -r1.141 -r1.140
---- pci.c	9 Aug 2006 17:47:46 -0000	1.141
-+++ pci.c	28 Feb 2006 19:49:56 -0000	1.140
-@@ -142,10 +142,6 @@
- 	return PCI_CLASS_BRIDGE_CARDBUS;
-      case CLASS_IDE:
- 	return PCI_CLASS_STORAGE_IDE;
--     case CLASS_ATA:
--	return PCI_CLASS_STORAGE_ATA;
--     case CLASS_SATA:
--	return PCI_CLASS_STORAGE_SATA;
-      default:
- 	return 0;
-     }
-@@ -170,10 +166,6 @@
- 	return CLASS_FLOPPY;
-      case PCI_CLASS_STORAGE_RAID:
- 	return CLASS_RAID;
--     case PCI_CLASS_STORAGE_ATA:
--	return CLASS_ATA;
--     case PCI_CLASS_STORAGE_SATA:
--	return CLASS_SATA;
-      case PCI_CLASS_MULTIMEDIA_AUDIO:
-      /* HD Audio */
-      case 0x0403:
-@@ -360,9 +352,7 @@
- 	(probeClass & CLASS_FIREWIRE) ||
- 	(probeClass & CLASS_SOCKET) ||
- 	(probeClass & CLASS_CAPTURE) ||
--	(probeClass & CLASS_RAID) ||
--	(probeClass & CLASS_ATA) ||
--	(probeClass & CLASS_SATA)) {
-+	(probeClass & CLASS_RAID)) {
- 	pacc = pci_alloc();
- 	if (!pacc) return devlist;
- 	if (!getAliases(aliases, "pci")) {
diff --git a/sys-apps/kudzu/files/digest-kudzu-1.2.52 b/sys-apps/kudzu/files/digest-kudzu-1.2.52
deleted file mode 100644
index ecf39dde4171..000000000000
--- a/sys-apps/kudzu/files/digest-kudzu-1.2.52
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e7f6b605cb376e9033238fc87872ea30 kudzu-1.2.52-1.src.rpm 225268
-RMD160 0d6e37599d729808c8608ca400185c146dab53d1 kudzu-1.2.52-1.src.rpm 225268
-SHA256 5767dd6403d9850ea66ec9fa615745053a8d66ce10ca81c093a5b8796ff6b0cb kudzu-1.2.52-1.src.rpm 225268
diff --git a/sys-apps/kudzu/kudzu-1.2.52.ebuild b/sys-apps/kudzu/kudzu-1.2.52.ebuild
deleted file mode 100644
index 3c0ee9e00930..000000000000
--- a/sys-apps/kudzu/kudzu-1.2.52.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kudzu/kudzu-1.2.52.ebuild,v 1.4 2007/05/02 06:46:27 dberkholz Exp $
-
-inherit eutils python rpm multilib
-
-# Revision of the RPM. Shouldn't affect us, as we're just grabbing the source
-# tarball out of it
-RPMREV="1"
-
-MY_P="${PN/lib}-${PV}"
-
-DESCRIPTION="Red Hat Hardware detection tools"
-SRC_URI="mirror://fedora/development/source/SRPMS/${MY_P}-${RPMREV}.src.rpm"
-HOMEPAGE="http://rhlinux.redhat.com/kudzu/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/popt
-	sys-apps/hwdata-redhat
-	!sys-libs/libkudzu"
-DEPEND="dev-libs/popt
-	sys-apps/pciutils"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	rpm_src_unpack
-	cd "${S}"
-	epatch \
-		"${FILESDIR}"/sunlance.patch \
-		"${FILESDIR}"/${PV}-remove-sata-ata-storage-classes.patch \
-		"${FILESDIR}"/${PV}-remove-pci-fill-class.patch \
-		"${FILESDIR}"/${PV}-remove-pci-device-class.patch
-}
-
-src_compile() {
-	emake \
-		all \
-		RPM_OPT_FLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	emake install install-program \
-		DESTDIR="${D}" \
-		libdir="${D}/usr/$(get_libdir)" \
-		|| die "install failed"
-
-	# don't install incompatible init scripts
-	rm -rf \
-		"${D}"/etc/rc.d \
-		|| die "removing rc.d files failed"
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/sys-apps/usermode/ChangeLog b/sys-apps/usermode/ChangeLog
index 25366b75483a..261d04b1d67f 100644
--- a/sys-apps/usermode/ChangeLog
+++ b/sys-apps/usermode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/usermode
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode/ChangeLog,v 1.5 2007/10/15 10:38:44 dberkholz Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode/ChangeLog,v 1.6 2008/01/31 06:30:33 dberkholz Exp $
+
+  31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  -usermode-1.86.ebuild, -usermode-1.87.ebuild, -usermode-1.92.ebuild:
+  Clean up.
 
 *usermode-1.93 (15 Oct 2007)
 
diff --git a/sys-apps/usermode/files/digest-usermode-1.86 b/sys-apps/usermode/files/digest-usermode-1.86
deleted file mode 100644
index 2b61165d443e..000000000000
--- a/sys-apps/usermode/files/digest-usermode-1.86
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a8d0a968e58a95ef529ff12b7ea04fa7 usermode-1.86-1.src.rpm 446130
-RMD160 fc68561f07d05d141e6d2954f95cde5b89bb2778 usermode-1.86-1.src.rpm 446130
-SHA256 5c1985e2a6ab4ae96c17b149d611aff799e77e09cbfadea06a2d63ded1ddc9fe usermode-1.86-1.src.rpm 446130
diff --git a/sys-apps/usermode/files/digest-usermode-1.87 b/sys-apps/usermode/files/digest-usermode-1.87
deleted file mode 100644
index 1a9e4905534a..000000000000
--- a/sys-apps/usermode/files/digest-usermode-1.87
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 232151b4853261367cfab45aab1acd53 usermode-1.87-3.src.rpm 447955
-RMD160 950769a5fcf8102be9619bb273b3be5b17900696 usermode-1.87-3.src.rpm 447955
-SHA256 3e9165675d604f58d604efbfcf51b32396248105ba64b285b48f819aea788902 usermode-1.87-3.src.rpm 447955
diff --git a/sys-apps/usermode/files/digest-usermode-1.92 b/sys-apps/usermode/files/digest-usermode-1.92
deleted file mode 100644
index 8ee389575a7d..000000000000
--- a/sys-apps/usermode/files/digest-usermode-1.92
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6b2dfa6b60c55246fa10eb6aa49bbca3 usermode-1.92-1.src.rpm 373136
-RMD160 81231a161f2687c1a6577fac90ac13dc5d2b9455 usermode-1.92-1.src.rpm 373136
-SHA256 7dd2f681dc81c5c858cf4a3ceec6015024008a2180c37992bd82d0d878599778 usermode-1.92-1.src.rpm 373136
diff --git a/sys-apps/usermode/usermode-1.86.ebuild b/sys-apps/usermode/usermode-1.86.ebuild
deleted file mode 100644
index 8559bec90fe2..000000000000
--- a/sys-apps/usermode/usermode-1.86.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode/usermode-1.86.ebuild,v 1.2 2007/10/15 09:39:54 dberkholz Exp $
-
-inherit flag-o-matic rpm
-
-# Revision of the RPM. Shouldn't affect us, as we're just grabbing the source
-# tarball out of it
-RPMREV="1"
-
-DESCRIPTION="Tools for certain user account management tasks"
-HOMEPAGE="http://fedoraproject.org/wiki/SystemConfig/"
-SRC_URI="mirror://fedora/development/source/SRPMS/${P}-${RPMREV}.src.rpm"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="debug selinux"
-RDEPEND="=dev-libs/glib-2*
-	=x11-libs/gtk+-2*
-	=gnome-base/libglade-2*
-	sys-apps/attr
-	x11-libs/libSM
-	dev-util/desktop-file-utils
-	sys-libs/system-config-base
-	>=sys-libs/pam-0.75
-	dev-perl/XML-Parser
-	sys-libs/libuser"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_compile() {
-	append-ldflags -Wl,-z,now
-
-	econf \
-		$(use_with selinux) \
-		$(use_enable debug) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# This needs to be suid, it's the main interface with suid-requiring stuff
-	fperms 4711 /usr/sbin/userhelper
-
-	# Don't install a shutdown executable, it will be preferred over /sbin/
-	rm "${D}"/usr/bin/shutdown
-}
diff --git a/sys-apps/usermode/usermode-1.87.ebuild b/sys-apps/usermode/usermode-1.87.ebuild
deleted file mode 100644
index 9d30b328fdbb..000000000000
--- a/sys-apps/usermode/usermode-1.87.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode/usermode-1.87.ebuild,v 1.2 2007/10/15 09:39:54 dberkholz Exp $
-
-inherit flag-o-matic rpm autotools
-
-# Revision of the RPM. Shouldn't affect us, as we're just grabbing the source
-# tarball out of it
-RPMREV="3"
-
-DESCRIPTION="Tools for certain user account management tasks"
-HOMEPAGE="http://fedoraproject.org/wiki/SystemConfig/"
-SRC_URI="mirror://fedora/development/source/SRPMS/${P}-${RPMREV}.src.rpm"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="debug selinux"
-RDEPEND="=dev-libs/glib-2*
-	=x11-libs/gtk+-2*
-	=gnome-base/libglade-2*
-	sys-apps/attr
-	x11-libs/libSM
-	dev-util/desktop-file-utils
-	sys-libs/system-config-base
-	>=sys-libs/pam-0.75
-	dev-perl/XML-Parser
-	sys-libs/libuser"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_unpack() {
-	rpm_src_unpack
-	cd "${S}"
-
-	# Change vendor prefix of desktop file from redhat to gentoo
-	sed -i -e "s:^\(VENDOR=\).*:\1gentoo:g" Makefile.am
-
-	# Invalid categories in desktop-file-utils-0.11 (#153395)
-	sed -i \
-		-e "/AdvancedSettings/d" \
-		-e "/Application/d" \
-		-e "/X-Red-Hat-Base/d" \
-		Makefile.am
-
-	eautoreconf
-}
-
-src_compile() {
-	append-ldflags -Wl,-z,now
-
-	econf \
-		$(use_with selinux) \
-		$(use_enable debug) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# This needs to be suid, it's the main interface with suid-requiring stuff
-	fperms 4711 /usr/sbin/userhelper
-
-	# Don't install a shutdown executable, it will be preferred over /sbin/
-	rm "${D}"/usr/bin/shutdown
-}
diff --git a/sys-apps/usermode/usermode-1.92.ebuild b/sys-apps/usermode/usermode-1.92.ebuild
deleted file mode 100644
index 17012a88bb90..000000000000
--- a/sys-apps/usermode/usermode-1.92.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usermode/usermode-1.92.ebuild,v 1.2 2007/10/15 09:39:54 dberkholz Exp $
-
-inherit flag-o-matic rpm autotools
-
-# Revision of the RPM. Shouldn't affect us, as we're just grabbing the source
-# tarball out of it
-RPMREV="1"
-
-DESCRIPTION="Tools for certain user account management tasks"
-HOMEPAGE="http://fedoraproject.org/wiki/SystemConfig/"
-SRC_URI="mirror://fedora/development/source/SRPMS/${P}-${RPMREV}.src.rpm"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="debug selinux"
-RDEPEND="=dev-libs/glib-2*
-	=x11-libs/gtk+-2*
-	=gnome-base/libglade-2*
-	sys-apps/attr
-	x11-libs/libSM
-	dev-util/desktop-file-utils
-	sys-libs/system-config-base
-	>=sys-libs/pam-0.75
-	dev-perl/XML-Parser
-	sys-libs/libuser"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_unpack() {
-	rpm_src_unpack
-	cd "${S}"
-
-	# Change vendor prefix of desktop file from redhat to gentoo
-	sed -i -e "s:^\(VENDOR=\).*:\1gentoo:g" Makefile.am
-
-	# Invalid categories in desktop-file-utils-0.11 (#153395)
-	sed -i \
-		-e "/AdvancedSettings/d" \
-		-e "/Application/d" \
-		-e "/X-Red-Hat-Base/d" \
-		Makefile.am
-
-	eautoreconf
-}
-
-src_compile() {
-	append-ldflags -Wl,-z,now
-
-	econf \
-		$(use_with selinux) \
-		$(use_enable debug) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# This needs to be suid, it's the main interface with suid-requiring stuff
-	fperms 4711 /usr/sbin/userhelper
-
-	# Don't install a shutdown executable, it will be preferred over /sbin/
-	rm "${D}"/usr/bin/shutdown
-}