7 files changed, 19 insertions, 98 deletions
diff --git a/sys-apps/pcmciautils/ChangeLog b/sys-apps/pcmciautils/ChangeLog
index 8563731bad0c..3012e8d989ab 100644
--- a/sys-apps/pcmciautils/ChangeLog
+++ b/sys-apps/pcmciautils/ChangeLog
@@ -1,6 +1,12 @@
 # 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.20 2006/03/24 16:31:25 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.21 2006/03/26 13:26:34 brix Exp $
+
+*pcmciautils-013 (26 Mar 2006)
+
+  26 Mar 2006; Henrik Brix Andersen <brix@gentoo.org>
+  -pcmciautils-010.ebuild, -pcmciautils-011.ebuild, +pcmciautils-013.ebuild:
+  Version bump. Pruned old ebuilds.
 
   24 Mar 2006; Henrik Brix Andersen <brix@gentoo.org>
   +files/pcmciautils-012-pccardctl-uclibc.patch, pcmciautils-012.ebuild:
diff --git a/sys-apps/pcmciautils/Manifest b/sys-apps/pcmciautils/Manifest
index fef47178b5bf..f63c4b8a4954 100644
--- a/sys-apps/pcmciautils/Manifest
+++ b/sys-apps/pcmciautils/Manifest
@@ -1,9 +1,7 @@
-MD5 da45ec90493ffce383a82d0ed38249d1 ChangeLog 3004
-MD5 f0b6ef73c257acea57b05a10e0019fc2 files/digest-pcmciautils-010 67
-MD5 c4cd2ddab2c4cdfcb454995185f927d3 files/digest-pcmciautils-011 67
+MD5 97a13b116b66b534d008584600dedbc2 ChangeLog 3204
 MD5 e61be18a09805cd66618da8fb7ce7f52 files/digest-pcmciautils-012 67
+MD5 af764e4b3e678630cab86bc55a73a640 files/digest-pcmciautils-013 67
 MD5 7bc55616a05befe15cf8e86ed05fc57e files/pcmciautils-012-pccardctl-uclibc.patch 251
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
-MD5 c4ef57a636ce47082452f47f164174e5 pcmciautils-010.ebuild 2199
-MD5 21e277d920e9e5078e820311b92d23c6 pcmciautils-011.ebuild 2096
 MD5 d2d84c0d80f36863623b6375539d0664 pcmciautils-012.ebuild 2268
+MD5 6f2b0321e4966b0ef3d8d7d4c47487e3 pcmciautils-013.ebuild 2104
diff --git a/sys-apps/pcmciautils/files/digest-pcmciautils-010 b/sys-apps/pcmciautils/files/digest-pcmciautils-010
deleted file mode 100644
index d9a6594efd80..000000000000
--- a/sys-apps/pcmciautils/files/digest-pcmciautils-010
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff3cb012fd1a8801e912054b45420ac2 pcmciautils-010.tar.bz2 35949
diff --git a/sys-apps/pcmciautils/files/digest-pcmciautils-011 b/sys-apps/pcmciautils/files/digest-pcmciautils-011
deleted file mode 100644
index 995c088d5a72..000000000000
--- a/sys-apps/pcmciautils/files/digest-pcmciautils-011
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8a7a014ea8177cf4514032722b695a9e pcmciautils-011.tar.bz2 41225
diff --git a/sys-apps/pcmciautils/files/digest-pcmciautils-013 b/sys-apps/pcmciautils/files/digest-pcmciautils-013
new file mode 100644
index 000000000000..05c874d701ae
--- /dev/null
+++ b/sys-apps/pcmciautils/files/digest-pcmciautils-013
@@ -0,0 +1 @@
+MD5 5882b7c84f095a7492b1ebe7577dce5a pcmciautils-013.tar.bz2 42944
diff --git a/sys-apps/pcmciautils/pcmciautils-010.ebuild b/sys-apps/pcmciautils/pcmciautils-010.ebuild
deleted file mode 100644
index 0acffe6ca9b2..000000000000
--- a/sys-apps/pcmciautils/pcmciautils-010.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-010.ebuild,v 1.5 2006/01/19 17:40:39 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="~x86"
-
-IUSE="debug 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
-
-	if use debug; then
-		sed -i -e "s:^\(DEBUG\) = .*:\1 = true:" ${S}/Makefile
-	fi
-
-	if use staticsocket; then
-		sed -i -e "s:^\(STARTUP\) = .*:\1 = false:" ${S}/Makefile
-	fi
-
-	if use udev; then
-		sed -i -e "s:^\(UDEV\) = .*:\1 = true:" ${S}/Makefile
-	else
-		sed -i -e "s:^\(UDEV\) = .*:\1 = false:" ${S}/Makefile
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getCC)" \
-		|| die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-}
-
-pkg_postinst() {
-	einfo
-	einfo "A mini-HOWTO for using pcmciautils can be found at:"
-	einfo "http://www.kernel.org/pub/linux/utils/kernel/pcmcia/howto.html"
-	ewarn
-	ewarn "If you relied on pcmcia-cs to automatically load the"
-	ewarn "appropriate PCMCIA-related modules upon boot, you need"
-	ewarn "to add "
-	ewarn "		pcmcia"
-	ewarn "and the PCMCIA socket driver you need for this system"
-	ewarn "(yenta-socket, i82092, i82365, ...) to"
-	ewarn "/etc/modules.autoload.d/kernel-2.6"
-	ewarn
-}
diff --git a/sys-apps/pcmciautils/pcmciautils-011.ebuild b/sys-apps/pcmciautils/pcmciautils-013.ebuild
index 195fe5ae1123..1b54c43de627 100644
--- a/sys-apps/pcmciautils/pcmciautils-011.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-013.ebuild
@@ -1,6 +1,6 @@
 # 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-011.ebuild,v 1.6 2006/01/19 17:40:39 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-013.ebuild,v 1.1 2006/03/26 13:26:34 brix Exp $
 
 inherit toolchain-funcs linux-info
 
@@ -11,9 +11,9 @@ SRC_URI="mirror://kernel/linux/utils/kernel/pcmcia/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86"
 
-IUSE="debug staticsocket udev"
+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 )
@@ -42,7 +42,7 @@ src_unpack() {
 
 	sed -i \
 		-e "s:^\(KERNEL_DIR\) = .*:\1 = ${KV_DIR}:" \
-		-e "s:^\(V\)=false:\1=true:" \
+		-e "s:^\(V\) = false:\1 = true:" \
 		-e "s:^\(CFLAGS \:=.*\):\1 ${CFLAGS}:" \
 		${S}/Makefile || die
 
@@ -50,6 +50,10 @@ src_unpack() {
 		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