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

Package-Manager: portage-2.1.2_rc3-r9

6 files changed, 156 insertions, 9 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/Manifest b/sys-apps/pcmciautils/Manifest
index a125de1de3e7..6d3b4bc633f1 100644
--- a/sys-apps/pcmciautils/Manifest
+++ b/sys-apps/pcmciautils/Manifest
@@ -1,10 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 014-udev-rules.patch 1407 RMD160 2b2ce5fa24a9ab863503861310588dccc2df85e6 SHA1 9f020424e92124eac807bfcc29c210f0d9072ed7 SHA256 4b6279b097b2731bb51b23311edab6c8ecc10e156a1caca546b42c52f1ab3011
+MD5 11c9525fb64e7449468628922bf1eb3c files/014-udev-rules.patch 1407
+RMD160 2b2ce5fa24a9ab863503861310588dccc2df85e6 files/014-udev-rules.patch 1407
+SHA256 4b6279b097b2731bb51b23311edab6c8ecc10e156a1caca546b42c52f1ab3011 files/014-udev-rules.patch 1407
 AUX pcmciautils-012-pccardctl-uclibc.patch 251 RMD160 242595e56dd8a924baabbbc12cb7f70a93d9bf83 SHA1 8260aa8220c8703a3cb304663875d4e0ff674b65 SHA256 6ec3f1d14980c8b63f49269594582a93d60cf174ae46c563ddd81ec7d1ee8476
 MD5 7bc55616a05befe15cf8e86ed05fc57e files/pcmciautils-012-pccardctl-uclibc.patch 251
 RMD160 242595e56dd8a924baabbbc12cb7f70a93d9bf83 files/pcmciautils-012-pccardctl-uclibc.patch 251
 SHA256 6ec3f1d14980c8b63f49269594582a93d60cf174ae46c563ddd81ec7d1ee8476 files/pcmciautils-012-pccardctl-uclibc.patch 251
 DIST pcmciautils-012.tar.bz2 41683
 DIST pcmciautils-013.tar.bz2 42944
-DIST pcmciautils-014.tar.bz2 42996
+DIST pcmciautils-014.tar.bz2 42996 RMD160 61a264bdc08070735cee72fb7c5b91c7a35f6805 SHA1 24122b196ab9199e259ba35ffe243d9b2820446a SHA256 6bef7c05ba9fad231fe7a188043c61c116c24bab5fa79d9d72c1d8e11ff38925
 EBUILD pcmciautils-012.ebuild 2269 RMD160 61b3f20b846961622d5b4f961dea045f1d9b414a SHA1 dcca86379587a17f511e34a044e95b531dbd8a4e SHA256 128003dc386a2c9eb7b364a2d28329709318c5e3278e5202d6cbe50faf18003a
 MD5 5335d2301c91c6b5e920bedc87c6974f pcmciautils-012.ebuild 2269
 RMD160 61b3f20b846961622d5b4f961dea045f1d9b414a pcmciautils-012.ebuild 2269
@@ -13,14 +20,18 @@ EBUILD pcmciautils-013.ebuild 2205 RMD160 cbec9fdd4efa82223650bf2f8c6736ac17cb87
 MD5 159f4b908348fe4aefc607ca10460283 pcmciautils-013.ebuild 2205
 RMD160 cbec9fdd4efa82223650bf2f8c6736ac17cb8793 pcmciautils-013.ebuild 2205
 SHA256 3a979deb836fa7285734f319ce9c50fbf4814265060b2f8f08b387a0aceee771 pcmciautils-013.ebuild 2205
+EBUILD pcmciautils-014-r1.ebuild 2266 RMD160 29ab6678a5bc1b076396a96b4f4c2ed22d22a32d SHA1 b374f165da1e0076aaf1563cadb7f131ecdcfa67 SHA256 fb369d7043c7b2f34f7414fc2c2f46a5cfe5feab5d35bd6093a5aded2b161d83
+MD5 aabdb42f628c3758fed391fe08dceeda pcmciautils-014-r1.ebuild 2266
+RMD160 29ab6678a5bc1b076396a96b4f4c2ed22d22a32d pcmciautils-014-r1.ebuild 2266
+SHA256 fb369d7043c7b2f34f7414fc2c2f46a5cfe5feab5d35bd6093a5aded2b161d83 pcmciautils-014-r1.ebuild 2266
 EBUILD pcmciautils-014.ebuild 2207 RMD160 7eaa7e622ac84f58596683c052eba3c5b6f07aa5 SHA1 4913c9ccd33883c8f0253bb35f6a3d6c4d3a3541 SHA256 901f1ee2386b43cb473e7a6af8b227f3a3b8e7455fa19f5565f9f1d04765d70a
 MD5 8a916a2334bdb4db73d735f7ff612762 pcmciautils-014.ebuild 2207
 RMD160 7eaa7e622ac84f58596683c052eba3c5b6f07aa5 pcmciautils-014.ebuild 2207
 SHA256 901f1ee2386b43cb473e7a6af8b227f3a3b8e7455fa19f5565f9f1d04765d70a pcmciautils-014.ebuild 2207
-MISC ChangeLog 3757 RMD160 4fc7798a54a149439b1897f9797b685e917dbfc7 SHA1 76237b3bdbe0368123d9ec30c334fb1b42fe820f SHA256 1f63a7a693a75e1776739ca80e59d871bd91949d475ee7f58c1ed858656b9480
-MD5 cb66b55c249ae48d6458c54a60f70ab7 ChangeLog 3757
-RMD160 4fc7798a54a149439b1897f9797b685e917dbfc7 ChangeLog 3757
-SHA256 1f63a7a693a75e1776739ca80e59d871bd91949d475ee7f58c1ed858656b9480 ChangeLog 3757
+MISC ChangeLog 4003 RMD160 48cdc674f3981a35b6f67ed265c8eadd36aca00f SHA1 56f67c11d429e2c4e5701f01c81735f668570975 SHA256 56d3707b79d9423c95ff22be3591fe35dc59bede6154b1c077bdfa2489b9d236
+MD5 bd3a3e06bb951ed6997427ad26be094b ChangeLog 4003
+RMD160 48cdc674f3981a35b6f67ed265c8eadd36aca00f ChangeLog 4003
+SHA256 56d3707b79d9423c95ff22be3591fe35dc59bede6154b1c077bdfa2489b9d236 ChangeLog 4003
 MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 metadata.xml 159
@@ -31,6 +42,16 @@ SHA256 d2b06ab5d474956e75ecc7370a58ec2007d1f9ea265af30ca850847ac2894d97 files/di
 MD5 af764e4b3e678630cab86bc55a73a640 files/digest-pcmciautils-013 67
 RMD160 d1e0d46a94e458671500a17e10d07921bbe971f2 files/digest-pcmciautils-013 67
 SHA256 505aaa5819066ab14e83e96fed8ab8ef2d8c66072219ee5949c186f9c7272c95 files/digest-pcmciautils-013 67
-MD5 649e3b1561a331cb2024c32fcdc0691f files/digest-pcmciautils-014 67
-RMD160 65137be746f900653d842517d15f0bbc9f93c859 files/digest-pcmciautils-014 67
-SHA256 24fed48e465a8db3489e502b4d2692798fafd74a7ddd2f6276548c95ca9f8581 files/digest-pcmciautils-014 67
+MD5 337be08a8d1d0d4bd9315d1b593d83ab files/digest-pcmciautils-014 247
+RMD160 fbec9737a2fe0db4e79dd01cbbd801603c242680 files/digest-pcmciautils-014 247
+SHA256 401c3a3d242bf5deef2dcdab099314da5c1ef154af14565cd9175e0e87582cb7 files/digest-pcmciautils-014 247
+MD5 337be08a8d1d0d4bd9315d1b593d83ab files/digest-pcmciautils-014-r1 247
+RMD160 fbec9737a2fe0db4e79dd01cbbd801603c242680 files/digest-pcmciautils-014-r1 247
+SHA256 401c3a3d242bf5deef2dcdab099314da5c1ef154af14565cd9175e0e87582cb7 files/digest-pcmciautils-014-r1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFjDSvcxLzpIGCsLQRAtuSAJ9Jw7fuueBIV1s5xAWEj6bNNFD55gCgi187
+ATYf1w0BBlgcsegm+BVcEKQ=
+=tGJ+
+-----END PGP SIGNATURE-----
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
+}