Added patch for udev rules from bug #146948. Thanks to Lukasz Pawelczyk <havner@kamp.pl>.

(Portage version: 2.1.2_rc3-r9)

5 files changed, 127 insertions, 1 deletions

diff --git a/sys-apps/pcmciautils/ChangeLog b/sys-apps/pcmciautils/ChangeLog
index 772f7002bea0..f6cd7183d6d1 100644
--- a/sys-apps/pcmciautils/ChangeLog
+++ b/sys-apps/pcmciautils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/pcmciautils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.26 2006/09/10 12:05:59 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.27 2006/12/22 19:40:15 betelgeuse Exp $
+
+*pcmciautils-014-r1 (22 Dec 2006)
+
+  22 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
+  +files/014-udev-rules.patch, +pcmciautils-014-r1.ebuild:
+  Added patch for udev rules from bug #146948. Thanks to Lukasz Pawelczyk
+  <havner@kamp.pl>.
 
   10 Sep 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove brix from metadata.xml.
diff --git a/sys-apps/pcmciautils/files/014-udev-rules.patch b/sys-apps/pcmciautils/files/014-udev-rules.patch
new file mode 100644
index 000000000000..8c4347c16472
--- /dev/null
+++ b/sys-apps/pcmciautils/files/014-udev-rules.patch
@@ -0,0 +1,27 @@
+diff -urN pcmciautils-014.orig/udev/rules-base pcmciautils-014/udev/rules-base
+--- pcmciautils-014.orig/udev/rules-base	2006-06-01 11:07:52.000000000 +0200
++++ pcmciautils-014/udev/rules-base	2006-09-06 00:39:29.000000000 +0200
+@@ -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:
+diff -urN pcmciautils-014.orig/udev/rules-modprobe pcmciautils-014/udev/rules-modprobe
+--- pcmciautils-014.orig/udev/rules-modprobe	2006-06-01 11:07:52.000000000 +0200
++++ pcmciautils-014/udev/rules-modprobe	2006-09-06 00:39:47.000000000 +0200
+@@ -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/files/digest-pcmciautils-014 b/sys-apps/pcmciautils/files/digest-pcmciautils-014
index 9cc537828b06..98da5be1679d 100644
--- a/sys-apps/pcmciautils/files/digest-pcmciautils-014
+++ b/sys-apps/pcmciautils/files/digest-pcmciautils-014
@@ -1 +1,3 @@
 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/digest-pcmciautils-014-r1 b/sys-apps/pcmciautils/files/digest-pcmciautils-014-r1
new file mode 100644
index 000000000000..98da5be1679d
--- /dev/null
+++ b/sys-apps/pcmciautils/files/digest-pcmciautils-014-r1
@@ -0,0 +1,3 @@
+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/pcmciautils-014-r1.ebuild b/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild
new file mode 100644
index 000000000000..e2c89eef1ede
--- /dev/null
+++ b/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild
@@ -0,0 +1,87 @@
+# 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-r1.ebuild,v 1.1 2006/12/22 19:40:15 betelgeuse 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}
+	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
+
+	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
+}