Remove udev useflag, bug 158114, remove old ebuilds

(Portage version: 2.1.2-r7)

9 files changed, 12 insertions, 291 deletions

diff --git a/sys-apps/pcmciautils/ChangeLog b/sys-apps/pcmciautils/ChangeLog
index 6cf7ffc2605e..3abe92a4a366 100644
--- a/sys-apps/pcmciautils/ChangeLog
+++ b/sys-apps/pcmciautils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/pcmciautils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.30 2007/02/06 13:38:09 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.31 2007/02/10 22:16:36 genstef Exp $
+
+  10 Feb 2007; <genstef@gentoo.org>
+  -files/pcmciautils-012-pccardctl-uclibc.patch, -pcmciautils-012.ebuild,
+  -pcmciautils-013.ebuild, -pcmciautils-014.ebuild,
+  pcmciautils-014-r1.ebuild:
+  Remove udev useflag, bug 158114, remove old ebuilds
 
   06 Feb 2007; Simon Stelling <blubb@gentoo.org> pcmciautils-014-r1.ebuild:
   stable on amd64; bug 158859
diff --git a/sys-apps/pcmciautils/files/digest-pcmciautils-012 b/sys-apps/pcmciautils/files/digest-pcmciautils-012
deleted file mode 100644
index cf009e43551d..000000000000
--- a/sys-apps/pcmciautils/files/digest-pcmciautils-012
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1a5cc640c389660cb23ed4aaf306cf82 pcmciautils-012.tar.bz2 41683
-RMD160 4078157573d99281a409782ff77b2769ca8fb4af pcmciautils-012.tar.bz2 41683
-SHA256 f85584c69468bb4a8b21f5971f5037760bb29b81dfb94b0635091949121e5e8e pcmciautils-012.tar.bz2 41683
diff --git a/sys-apps/pcmciautils/files/digest-pcmciautils-013 b/sys-apps/pcmciautils/files/digest-pcmciautils-013
deleted file mode 100644
index f89d07ca4adb..000000000000
--- a/sys-apps/pcmciautils/files/digest-pcmciautils-013
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5882b7c84f095a7492b1ebe7577dce5a pcmciautils-013.tar.bz2 42944
-RMD160 e5f01a509d7c5e5094032ad9c0fccebaeb0ec673 pcmciautils-013.tar.bz2 42944
-SHA256 7c1adf1a5ebeba124cef4102cbbf9ca65b8493ad6b8fcfb48091e27e983ffc41 pcmciautils-013.tar.bz2 42944
diff --git a/sys-apps/pcmciautils/files/digest-pcmciautils-014 b/sys-apps/pcmciautils/files/digest-pcmciautils-014
deleted file mode 100644
index 98da5be1679d..000000000000
--- a/sys-apps/pcmciautils/files/digest-pcmciautils-014
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3f07c926875f6c5dcb83240f39725177 pcmciautils-014.tar.bz2 42996
-RMD160 61a264bdc08070735cee72fb7c5b91c7a35f6805 pcmciautils-014.tar.bz2 42996
-SHA256 6bef7c05ba9fad231fe7a188043c61c116c24bab5fa79d9d72c1d8e11ff38925 pcmciautils-014.tar.bz2 42996
diff --git a/sys-apps/pcmciautils/files/pcmciautils-012-pccardctl-uclibc.patch b/sys-apps/pcmciautils/files/pcmciautils-012-pccardctl-uclibc.patch
deleted file mode 100644
index b029e15b9498..000000000000
--- a/sys-apps/pcmciautils/files/pcmciautils-012-pccardctl-uclibc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/pccardctl.c.orig	2006-03-09 14:41:51 +0000
-+++ src/pccardctl.c	2006-03-09 14:42:04 +0000
-@@ -16,7 +16,6 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <string.h>
--#include <libintl.h>
- #include <locale.h>
- 
- #include <sysfs/libsysfs.h>
diff --git a/sys-apps/pcmciautils/pcmciautils-012.ebuild b/sys-apps/pcmciautils/pcmciautils-012.ebuild
deleted file mode 100644
index 8db7b9f030de..000000000000
--- a/sys-apps/pcmciautils/pcmciautils-012.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-012.ebuild,v 1.8 2006/03/26 23:24:12 morfic Exp $
-
-inherit eutils toolchain-funcs linux-info
-
-DESCRIPTION="PCMCIA userspace utilities for Linux kernel 2.6.13 and beyond"
-
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
-SRC_URI="mirror://kernel/linux/utils/kernel/pcmcia/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc sh x86"
-
-IUSE="debug static staticsocket udev"
-RDEPEND=">=sys-fs/sysfsutils-1.2.0-r1
-		>=sys-apps/module-init-tools-3.2_pre4
-		udev? ( >=sys-fs/udev-068 )
-		!udev? ( >=sys-apps/hotplug-20040920 )"
-DEPEND="${RDEPEND}
-		dev-util/yacc
-		sys-devel/flex
-		sys-apps/sed"
-
-CONFIG_CHECK="~PCMCIA"
-ERROR_PCMCIA="${P} requires 16-bit PCMCIA support (CONFIG_PCMCIA)"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 13; then
-		eerror
-		eerror "${P} requires at least kernel 2.6.13."
-		eerror
-		die "${P} requires at least kernel 2.6.13."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-pccardctl-uclibc.patch
-
-	sed -i \
-		-e "s:^\(KERNEL_DIR\) = .*:\1 = ${KV_DIR}:" \
-		-e "s:^\(V\) = false:\1 = true:" \
-		-e "s:^\(CFLAGS \:=.*\):\1 ${CFLAGS}:" \
-		${S}/Makefile || die
-
-	if use debug; then
-		sed -i -e "s:^\(DEBUG\) = .*:\1 = true:" ${S}/Makefile || die
-	fi
-
-	if use static; then
-		sed -i -e "s:^\(STATIC\) = .*:\1 = true:" ${S}/Makefile || die
-	fi
-
-	if use staticsocket; then
-		sed -i -e "s:^\(STARTUP\) = .*:\1 = false:" ${S}/Makefile || die
-	fi
-
-	if use udev; then
-		sed -i -e "s:^\(UDEV\) = .*:\1 = true:" ${S}/Makefile || die
-	else
-		sed -i -e "s:^\(UDEV\) = .*:\1 = false:" ${S}/Makefile || die
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getCC)" \
-		|| die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc doc/*.txt
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you relied on pcmcia-cs to automatically load the appropriate"
-	ewarn "PCMCIA-related modules upon boot, you need to add 'pcmcia' and the"
-	ewarn "PCMCIA socket driver you need for this system (yenta-socket,"
-	ewarn "i82092, i82365, ...) to /etc/modules.autoload.d/kernel-2.6"
-	ewarn
-}
diff --git a/sys-apps/pcmciautils/pcmciautils-013.ebuild b/sys-apps/pcmciautils/pcmciautils-013.ebuild
deleted file mode 100644
index 2888f1fd9d6c..000000000000
--- a/sys-apps/pcmciautils/pcmciautils-013.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-013.ebuild,v 1.4 2006/08/19 14:20:26 vapier Exp $
-
-inherit toolchain-funcs linux-info
-
-DESCRIPTION="PCMCIA userspace utilities for Linux kernel 2.6.13 and beyond"
-
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
-SRC_URI="mirror://kernel/linux/utils/kernel/pcmcia/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 arm ppc sh x86"
-
-IUSE="debug static staticsocket udev"
-RDEPEND=">=sys-fs/sysfsutils-1.2.0-r1
-		>=sys-apps/module-init-tools-3.2_pre4
-		udev? ( >=sys-fs/udev-068 )
-		!udev? ( >=sys-apps/hotplug-20040920 )"
-DEPEND="${RDEPEND}
-		dev-util/yacc
-		sys-devel/flex
-		sys-apps/sed"
-
-CONFIG_CHECK="~PCMCIA"
-ERROR_PCMCIA="${P} requires 16-bit PCMCIA support (CONFIG_PCMCIA)"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 13; then
-		eerror
-		eerror "${P} requires at least kernel 2.6.13."
-		eerror
-		die "${P} requires at least kernel 2.6.13."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i \
-		-e "s:^\(KERNEL_DIR\) = .*:\1 = ${KV_DIR}:" \
-		-e "s:^\(V\) = false:\1 = true:" \
-		-e "s:^\(CFLAGS \:=.*\):\1 ${CFLAGS}:" \
-		${S}/Makefile || die
-
-	if use debug; then
-		sed -i -e "s:^\(DEBUG\) = .*:\1 = true:" ${S}/Makefile || die
-	fi
-
-	if use static; then
-		sed -i -e "s:^\(STATIC\) = .*:\1 = true:" ${S}/Makefile || die
-	fi
-
-	if use staticsocket; then
-		sed -i -e "s:^\(STARTUP\) = .*:\1 = false:" ${S}/Makefile || die
-	fi
-
-	if use udev; then
-		sed -i -e "s:^\(UDEV\) = .*:\1 = true:" ${S}/Makefile || die
-	else
-		sed -i -e "s:^\(UDEV\) = .*:\1 = false:" ${S}/Makefile || die
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getCC)" \
-		|| die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc doc/*.txt
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you relied on pcmcia-cs to automatically load the appropriate"
-	ewarn "PCMCIA-related modules upon boot, you need to add 'pcmcia' and the"
-	ewarn "PCMCIA socket driver you need for this system (yenta-socket,"
-	ewarn "i82092, i82365, ...) to /etc/modules.autoload.d/kernel-2.6"
-	ewarn
-}
diff --git a/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild b/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild
index 2f727edb0a05..e919d996c479 100644
--- a/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild,v 1.5 2007/02/06 13:38:09 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild,v 1.6 2007/02/10 22:16:36 genstef Exp $
 
 inherit eutils toolchain-funcs linux-info
 
@@ -13,11 +13,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm ppc sh x86"
 
-IUSE="debug static staticsocket udev"
+IUSE="debug static staticsocket"
 RDEPEND=">=sys-fs/sysfsutils-1.2.0-r1
-	>=sys-apps/module-init-tools-3.2_pre4
-	udev? ( >=sys-fs/udev-068 )
-	!udev? ( >=sys-apps/hotplug-20040920 )"
+	>=sys-apps/module-init-tools-3.2_pre4"
 DEPEND="${RDEPEND}
 	dev-util/yacc
 	sys-devel/flex
@@ -59,11 +57,8 @@ src_unpack() {
 		sed -i -e "s:^\(STARTUP\) = .*:\1 = false:" ${S}/Makefile || die
 	fi
 
-	if use udev; then
-		sed -i -e "s:^\(UDEV\) = .*:\1 = true:" ${S}/Makefile || die
-	else
-		sed -i -e "s:^\(UDEV\) = .*:\1 = false:" ${S}/Makefile || die
-	fi
+	# we always use udev
+	sed -i -e "s:^\(UDEV\) = .*:\1 = true:" ${S}/Makefile || die
 }
 
 src_compile() {
diff --git a/sys-apps/pcmciautils/pcmciautils-014.ebuild b/sys-apps/pcmciautils/pcmciautils-014.ebuild
deleted file mode 100644
index dac4804c806f..000000000000
--- a/sys-apps/pcmciautils/pcmciautils-014.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-014.ebuild,v 1.1 2006/06/01 11:52:41 brix Exp $
-
-inherit toolchain-funcs linux-info
-
-DESCRIPTION="PCMCIA userspace utilities for Linux kernel 2.6.13 and beyond"
-
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
-SRC_URI="mirror://kernel/linux/utils/kernel/pcmcia/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86"
-
-IUSE="debug static staticsocket udev"
-RDEPEND=">=sys-fs/sysfsutils-1.2.0-r1
-		>=sys-apps/module-init-tools-3.2_pre4
-		udev? ( >=sys-fs/udev-068 )
-		!udev? ( >=sys-apps/hotplug-20040920 )"
-DEPEND="${RDEPEND}
-		dev-util/yacc
-		sys-devel/flex
-		sys-apps/sed"
-
-CONFIG_CHECK="~PCMCIA"
-ERROR_PCMCIA="${P} requires 16-bit PCMCIA support (CONFIG_PCMCIA)"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 13; then
-		eerror
-		eerror "${P} requires at least kernel 2.6.13."
-		eerror
-		die "${P} requires at least kernel 2.6.13."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i \
-		-e "s:^\(KERNEL_DIR\) = .*:\1 = ${KV_DIR}:" \
-		-e "s:^\(V\) = false:\1 = true:" \
-		-e "s:^\(CFLAGS \:=.*\):\1 ${CFLAGS}:" \
-		${S}/Makefile || die
-
-	if use debug; then
-		sed -i -e "s:^\(DEBUG\) = .*:\1 = true:" ${S}/Makefile || die
-	fi
-
-	if use static; then
-		sed -i -e "s:^\(STATIC\) = .*:\1 = true:" ${S}/Makefile || die
-	fi
-
-	if use staticsocket; then
-		sed -i -e "s:^\(STARTUP\) = .*:\1 = false:" ${S}/Makefile || die
-	fi
-
-	if use udev; then
-		sed -i -e "s:^\(UDEV\) = .*:\1 = true:" ${S}/Makefile || die
-	else
-		sed -i -e "s:^\(UDEV\) = .*:\1 = false:" ${S}/Makefile || die
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getCC)" \
-		|| die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc doc/*.txt
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you relied on pcmcia-cs to automatically load the appropriate"
-	ewarn "PCMCIA-related modules upon boot, you need to add 'pcmcia' and the"
-	ewarn "PCMCIA socket driver you need for this system (yenta-socket,"
-	ewarn "i82092, i82365, ...) to /etc/modules.autoload.d/kernel-2.6"
-	ewarn
-}