4 files changed, 100 insertions, 12 deletions
diff --git a/sys-apps/pcmciautils/ChangeLog b/sys-apps/pcmciautils/ChangeLog
index 4129670c1c30..c682e7df8130 100644
--- a/sys-apps/pcmciautils/ChangeLog
+++ b/sys-apps/pcmciautils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/pcmciautils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.14 2005/12/12 20:00:21 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.15 2005/12/28 10:35:07 brix Exp $
+
+*pcmciautils-012 (28 Dec 2005)
+
+  28 Dec 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +pcmciautils-012.ebuild:
+  Version bump.
 
   12 Dec 2005; Luis Medinas <metalgod@gentoo.org> pcmciautils-011.ebuild:
   Added ~amd64 keyword. Bug #114383.
diff --git a/sys-apps/pcmciautils/Manifest b/sys-apps/pcmciautils/Manifest
index a93ddd27cb9b..83b59f36695f 100644
--- a/sys-apps/pcmciautils/Manifest
+++ b/sys-apps/pcmciautils/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 123472bfc208e5a8070e2fe55a570866 ChangeLog 2128
+MD5 037bb7e6f4931f92dc6e2a9ac43ddef3 ChangeLog 2258
 MD5 f0b6ef73c257acea57b05a10e0019fc2 files/digest-pcmciautils-010 67
 MD5 c4cd2ddab2c4cdfcb454995185f927d3 files/digest-pcmciautils-011 67
+MD5 e61be18a09805cd66618da8fb7ce7f52 files/digest-pcmciautils-012 67
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 b68341bcf321e70be9ff26f8bbac4a13 pcmciautils-010.ebuild 2280
 MD5 dc4673af665ef26d13eca1279d7cb9f0 pcmciautils-011.ebuild 2181
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDndbrwUpWvClEHQoRAtf5AJ4+w8/sxVMq7MANRgEivcbUELqAfACeNGgP
-DlJJvCYuHq6jZLnjVHXtzow=
-=sNJc
------END PGP SIGNATURE-----
+MD5 fd6df9c8b022e96359ed7b060d0ff4f8 pcmciautils-012.ebuild 2176
diff --git a/sys-apps/pcmciautils/files/digest-pcmciautils-012 b/sys-apps/pcmciautils/files/digest-pcmciautils-012
new file mode 100644
index 000000000000..5dc457bd7e8c
--- /dev/null
+++ b/sys-apps/pcmciautils/files/digest-pcmciautils-012
@@ -0,0 +1 @@
+MD5 1a5cc640c389660cb23ed4aaf306cf82 pcmciautils-012.tar.bz2 41683
diff --git a/sys-apps/pcmciautils/pcmciautils-012.ebuild b/sys-apps/pcmciautils/pcmciautils-012.ebuild
new file mode 100644
index 000000000000..4b0888fd4767
--- /dev/null
+++ b/sys-apps/pcmciautils/pcmciautils-012.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2005 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.1 2005/12/28 10:35:07 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 ~ppc ~x86"
+
+IUSE="cis debug static staticsocket udev"
+RDEPEND="!virtual/pcmcia
+		>=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 )
+		cis? ( sys-apps/pcmcia-cs-cis )"
+DEPEND="${RDEPEND}
+		dev-util/yacc
+		sys-devel/flex
+		sys-apps/sed"
+PROVIDE="virtual/pcmcia"
+
+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
+}