3 files changed, 5 insertions, 108 deletions
diff --git a/sys-apps/pcmciautils/ChangeLog b/sys-apps/pcmciautils/ChangeLog
index d35c47e276ce..64ce694c5c53 100644
--- a/sys-apps/pcmciautils/ChangeLog
+++ b/sys-apps/pcmciautils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/pcmciautils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.48 2013/01/05 12:33:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.49 2013/01/05 14:43:23 kensington Exp $
+
+  05 Jan 2013; Michael Palimaka <kensington@gentoo.org>
+  -files/014-udev-rules.patch, -pcmciautils-014-r1.ebuild:
+  Remove old.
 
   05 Jan 2013; Raúl Porcel <armin76@gentoo.org> pcmciautils-018_p8.ebuild:
   sh stable wrt #434082
diff --git a/sys-apps/pcmciautils/files/014-udev-rules.patch b/sys-apps/pcmciautils/files/014-udev-rules.patch
deleted file mode 100644
index e4d911934cf3..000000000000
--- a/sys-apps/pcmciautils/files/014-udev-rules.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- udev/rules-base
-+++ udev/rules-base
-@@ -3,12 +3,12 @@
- # are so broken that we need to read out random bytes of it
- # instead of the manufactor, card or product ID. Then the
- # matching is done in userspace.
--ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
-+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
- 		RUN+="/sbin/pcmcia-check-broken-cis"
- 
- # However, the "weak" matching by func_id is only allowed _after_ modprobe
- # returns, so that "strong" matches have a higher priority.
--ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
-+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
- 		RUN+="/bin/sh -c 'echo 1 > /sys/$devpath/allow_func_id_match'"
- 
- # PCMCIA sockets:
---- udev/rules-modprobe
-+++ udev/rules-modprobe
-@@ -1,3 +1,3 @@
- # modprobe $modalias loads all possibly appropriate modules
--ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
--		RUN+="/sbin/modprobe $modalias"
-+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
-+		RUN+="/sbin/modprobe $env{MODALIAS}"
diff --git a/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild b/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild
deleted file mode 100644
index a4b68c000399..000000000000
--- a/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2012 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.11 2012/11/01 08:12:43 ssuominen 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"
-RDEPEND=">=sys-fs/sysfsutils-1.2.0-r1
-	virtual/modutils"
-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}
-	epatch "${FILESDIR}/014-udev-rules.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
-
-	# we always use udev
-	sed -i -e "s:^\(UDEV\) = .*:\1 = true:" "${S}"/Makefile || die
-}
-
-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
-}