summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2007-02-10 22:16:36 +0000
committerStefan Schweizer <genstef@gentoo.org>2007-02-10 22:16:36 +0000
commitca32f7cbd67b26e2bb31a6d58b74c87d02ebf6d9 (patch)
treecb5ac82d02171beaabf50d46231637cbb3a037d9 /sys-apps/pcmciautils
parentversion bump, reported by Bas van Dijk <basvandijk@home.nl> in bug 166183 (diff)
downloadhistorical-ca32f7cbd67b26e2bb31a6d58b74c87d02ebf6d9.tar.gz
historical-ca32f7cbd67b26e2bb31a6d58b74c87d02ebf6d9.tar.bz2
historical-ca32f7cbd67b26e2bb31a6d58b74c87d02ebf6d9.zip
Remove udev useflag, bug 158114, remove old ebuilds
Package-Manager: portage-2.1.2-r7
Diffstat (limited to 'sys-apps/pcmciautils')
-rw-r--r--sys-apps/pcmciautils/ChangeLog8
-rw-r--r--sys-apps/pcmciautils/Manifest43
-rw-r--r--sys-apps/pcmciautils/files/digest-pcmciautils-0123
-rw-r--r--sys-apps/pcmciautils/files/digest-pcmciautils-0133
-rw-r--r--sys-apps/pcmciautils/files/digest-pcmciautils-0143
-rw-r--r--sys-apps/pcmciautils/files/pcmciautils-012-pccardctl-uclibc.patch10
-rw-r--r--sys-apps/pcmciautils/pcmciautils-012.ebuild89
-rw-r--r--sys-apps/pcmciautils/pcmciautils-013.ebuild86
-rw-r--r--sys-apps/pcmciautils/pcmciautils-014-r1.ebuild15
-rw-r--r--sys-apps/pcmciautils/pcmciautils-014.ebuild86
10 files changed, 20 insertions, 326 deletions
diff --git a/sys-apps/pcmciautils/ChangeLog b/sys-apps/pcmciautils/ChangeLog
index 6cf7ffc2605e..3abe92a4a366 100644
--- a/sys-apps/pcmciautils/ChangeLog
+++ b/sys-apps/pcmciautils/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-apps/pcmciautils
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.30 2007/02/06 13:38:09 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.31 2007/02/10 22:16:36 genstef Exp $
+
+ 10 Feb 2007; <genstef@gentoo.org>
+ -files/pcmciautils-012-pccardctl-uclibc.patch, -pcmciautils-012.ebuild,
+ -pcmciautils-013.ebuild, -pcmciautils-014.ebuild,
+ pcmciautils-014-r1.ebuild:
+ Remove udev useflag, bug 158114, remove old ebuilds
06 Feb 2007; Simon Stelling <blubb@gentoo.org> pcmciautils-014-r1.ebuild:
stable on amd64; bug 158859
diff --git a/sys-apps/pcmciautils/Manifest b/sys-apps/pcmciautils/Manifest
index 45368da48910..948825ef419c 100644
--- a/sys-apps/pcmciautils/Manifest
+++ b/sys-apps/pcmciautils/Manifest
@@ -2,46 +2,19 @@ AUX 014-udev-rules.patch 1407 RMD160 2b2ce5fa24a9ab863503861310588dccc2df85e6 SH
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 RMD160 4078157573d99281a409782ff77b2769ca8fb4af SHA1 e7d26aed8401905edcdd8408aa6ac9c356361e5e SHA256 f85584c69468bb4a8b21f5971f5037760bb29b81dfb94b0635091949121e5e8e
-DIST pcmciautils-013.tar.bz2 42944 RMD160 e5f01a509d7c5e5094032ad9c0fccebaeb0ec673 SHA1 6e0a903232788c8e0405416c7e5c7b34e9d118d4 SHA256 7c1adf1a5ebeba124cef4102cbbf9ca65b8493ad6b8fcfb48091e27e983ffc41
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
-SHA256 128003dc386a2c9eb7b364a2d28329709318c5e3278e5202d6cbe50faf18003a pcmciautils-012.ebuild 2269
-EBUILD pcmciautils-013.ebuild 2205 RMD160 cbec9fdd4efa82223650bf2f8c6736ac17cb8793 SHA1 b94e9dac3e533ad5446b22830333a21a3ef46180 SHA256 3a979deb836fa7285734f319ce9c50fbf4814265060b2f8f08b387a0aceee771
-MD5 159f4b908348fe4aefc607ca10460283 pcmciautils-013.ebuild 2205
-RMD160 cbec9fdd4efa82223650bf2f8c6736ac17cb8793 pcmciautils-013.ebuild 2205
-SHA256 3a979deb836fa7285734f319ce9c50fbf4814265060b2f8f08b387a0aceee771 pcmciautils-013.ebuild 2205
-EBUILD pcmciautils-014-r1.ebuild 2250 RMD160 38915b5925ffd14e1b9ba850718c75de3ea8d0c4 SHA1 b604a061e96de51355de2eae67fc07722c523a18 SHA256 7ebd9d6c971fc38d7e9e0c12b7f38b973b28e976277cdf50db98f4dac8ba82fc
-MD5 51a5e53736f7a6635dd4e7fb55cce087 pcmciautils-014-r1.ebuild 2250
-RMD160 38915b5925ffd14e1b9ba850718c75de3ea8d0c4 pcmciautils-014-r1.ebuild 2250
-SHA256 7ebd9d6c971fc38d7e9e0c12b7f38b973b28e976277cdf50db98f4dac8ba82fc pcmciautils-014-r1.ebuild 2250
-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 4324 RMD160 c53cade955eaf135dd8caf5501cfd996aaaa4936 SHA1 e157d5e0fa579c3ebe70d3f29dbe58ee38ecfd62 SHA256 ca82196a3894905ae779ef66ec7773071f3c7857be607aaf91cb65c51ede283e
-MD5 85263e44f07705676919ab71f3296a25 ChangeLog 4324
-RMD160 c53cade955eaf135dd8caf5501cfd996aaaa4936 ChangeLog 4324
-SHA256 ca82196a3894905ae779ef66ec7773071f3c7857be607aaf91cb65c51ede283e ChangeLog 4324
+EBUILD pcmciautils-014-r1.ebuild 2106 RMD160 f7f099da4fc9ce85651ee66d1ddf0d3aa973c897 SHA1 90c2781e5ca7e185344ac26586cd1856e3a66e4f SHA256 c37459321fd53469224adb1267e0ad3f204401555d82daebc2654948d2309153
+MD5 53fb1d12c3e1754e080c680db4ee34ec pcmciautils-014-r1.ebuild 2106
+RMD160 f7f099da4fc9ce85651ee66d1ddf0d3aa973c897 pcmciautils-014-r1.ebuild 2106
+SHA256 c37459321fd53469224adb1267e0ad3f204401555d82daebc2654948d2309153 pcmciautils-014-r1.ebuild 2106
+MISC ChangeLog 4572 RMD160 796d875c436d00c1e63d06b97d2e6003b9f02faf SHA1 3656925d9a17cea2d96345c92e59d53d5eaafd51 SHA256 2bb00bb2b7613d24b5cab04354f152c6a594df784fdee5a811da956f1779f81a
+MD5 070098b786e0dc0d80c620d91f879651 ChangeLog 4572
+RMD160 796d875c436d00c1e63d06b97d2e6003b9f02faf ChangeLog 4572
+SHA256 2bb00bb2b7613d24b5cab04354f152c6a594df784fdee5a811da956f1779f81a ChangeLog 4572
MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 metadata.xml 159
SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f metadata.xml 159
-MD5 fc13ba1e8542a73a48c8385bd6e035a8 files/digest-pcmciautils-012 247
-RMD160 f8e52f8b3377692bd31c69a5ea762dff36800f26 files/digest-pcmciautils-012 247
-SHA256 669fda2de78530a1587652c559936ee44370bf49b6e175062ce714a9b4fb5908 files/digest-pcmciautils-012 247
-MD5 3a3c597e64ddbd1f010ade17d29885bc files/digest-pcmciautils-013 247
-RMD160 f49518f68e1c7d838ca13e1dbf68749b509ab051 files/digest-pcmciautils-013 247
-SHA256 21a6fe553bd8aa738f0c6164523de4989a1e4584497836edccec1a68f18ca931 files/digest-pcmciautils-013 247
-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
diff --git a/sys-apps/pcmciautils/files/digest-pcmciautils-012 b/sys-apps/pcmciautils/files/digest-pcmciautils-012
deleted file mode 100644
index cf009e43551d..000000000000
--- a/sys-apps/pcmciautils/files/digest-pcmciautils-012
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1a5cc640c389660cb23ed4aaf306cf82 pcmciautils-012.tar.bz2 41683
-RMD160 4078157573d99281a409782ff77b2769ca8fb4af pcmciautils-012.tar.bz2 41683
-SHA256 f85584c69468bb4a8b21f5971f5037760bb29b81dfb94b0635091949121e5e8e pcmciautils-012.tar.bz2 41683
diff --git a/sys-apps/pcmciautils/files/digest-pcmciautils-013 b/sys-apps/pcmciautils/files/digest-pcmciautils-013
deleted file mode 100644
index f89d07ca4adb..000000000000
--- a/sys-apps/pcmciautils/files/digest-pcmciautils-013
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5882b7c84f095a7492b1ebe7577dce5a pcmciautils-013.tar.bz2 42944
-RMD160 e5f01a509d7c5e5094032ad9c0fccebaeb0ec673 pcmciautils-013.tar.bz2 42944
-SHA256 7c1adf1a5ebeba124cef4102cbbf9ca65b8493ad6b8fcfb48091e27e983ffc41 pcmciautils-013.tar.bz2 42944
diff --git a/sys-apps/pcmciautils/files/digest-pcmciautils-014 b/sys-apps/pcmciautils/files/digest-pcmciautils-014
deleted file mode 100644
index 98da5be1679d..000000000000
--- a/sys-apps/pcmciautils/files/digest-pcmciautils-014
+++ /dev/null
@@ -1,3 +0,0 @@
-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/pcmciautils-012-pccardctl-uclibc.patch b/sys-apps/pcmciautils/files/pcmciautils-012-pccardctl-uclibc.patch
deleted file mode 100644
index b029e15b9498..000000000000
--- a/sys-apps/pcmciautils/files/pcmciautils-012-pccardctl-uclibc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/pccardctl.c.orig 2006-03-09 14:41:51 +0000
-+++ src/pccardctl.c 2006-03-09 14:42:04 +0000
-@@ -16,7 +16,6 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <string.h>
--#include <libintl.h>
- #include <locale.h>
-
- #include <sysfs/libsysfs.h>
diff --git a/sys-apps/pcmciautils/pcmciautils-012.ebuild b/sys-apps/pcmciautils/pcmciautils-012.ebuild
deleted file mode 100644
index 8db7b9f030de..000000000000
--- a/sys-apps/pcmciautils/pcmciautils-012.ebuild
+++ /dev/null
@@ -1,89 +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-012.ebuild,v 1.8 2006/03/26 23:24:12 morfic 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}
-
- cd ${S}
- epatch ${FILESDIR}/${P}-pccardctl-uclibc.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
-}
diff --git a/sys-apps/pcmciautils/pcmciautils-013.ebuild b/sys-apps/pcmciautils/pcmciautils-013.ebuild
deleted file mode 100644
index 2888f1fd9d6c..000000000000
--- a/sys-apps/pcmciautils/pcmciautils-013.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-013.ebuild,v 1.4 2006/08/19 14:20:26 vapier 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 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}
-
- 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
-}
diff --git a/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild b/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild
index 2f727edb0a05..e919d996c479 100644
--- a/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 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.5 2007/02/06 13:38:09 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild,v 1.6 2007/02/10 22:16:36 genstef Exp $
inherit eutils toolchain-funcs linux-info
@@ -13,11 +13,9 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 arm ppc sh x86"
-IUSE="debug static staticsocket udev"
+IUSE="debug static staticsocket"
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 )"
+ >=sys-apps/module-init-tools-3.2_pre4"
DEPEND="${RDEPEND}
dev-util/yacc
sys-devel/flex
@@ -59,11 +57,8 @@ src_unpack() {
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
+ # we always use udev
+ sed -i -e "s:^\(UDEV\) = .*:\1 = true:" ${S}/Makefile || die
}
src_compile() {
diff --git a/sys-apps/pcmciautils/pcmciautils-014.ebuild b/sys-apps/pcmciautils/pcmciautils-014.ebuild
deleted file mode 100644
index dac4804c806f..000000000000
--- a/sys-apps/pcmciautils/pcmciautils-014.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-014.ebuild,v 1.1 2006/06/01 11:52:41 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 ~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}
-
- 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
-}