old

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

5 files changed, 9 insertions, 201 deletions

diff --git a/sys-apps/pcmciautils/ChangeLog b/sys-apps/pcmciautils/ChangeLog
index 5f7bdb2c47b7..c53ec1d90625 100644
--- a/sys-apps/pcmciautils/ChangeLog
+++ b/sys-apps/pcmciautils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/pcmciautils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.41 2012/11/01 08:06:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.42 2012/11/02 01:49:52 ssuominen Exp $
+
+  02 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -pcmciautils-015.ebuild, -pcmciautils-016.ebuild, -pcmciautils-017.ebuild:
+  old
 
 *pcmciautils-018_p8 (01 Nov 2012)
 
diff --git a/sys-apps/pcmciautils/files/014-udev-rules.patch b/sys-apps/pcmciautils/files/014-udev-rules.patch
index 8c4347c16472..e4d911934cf3 100644
--- a/sys-apps/pcmciautils/files/014-udev-rules.patch
+++ b/sys-apps/pcmciautils/files/014-udev-rules.patch
@@ -1,6 +1,5 @@
-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
+--- udev/rules-base
++++ udev/rules-base
 @@ -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
@@ -16,9 +15,8 @@ diff -urN pcmciautils-014.orig/udev/rules-base pcmciautils-014/udev/rules-base
  		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
+--- udev/rules-modprobe
++++ udev/rules-modprobe
 @@ -1,3 +1,3 @@
  # modprobe $modalias loads all possibly appropriate modules
 -ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
diff --git a/sys-apps/pcmciautils/pcmciautils-015.ebuild b/sys-apps/pcmciautils/pcmciautils-015.ebuild
deleted file mode 100644
index 6a9c1a67bf60..000000000000
--- a/sys-apps/pcmciautils/pcmciautils-015.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-015.ebuild,v 1.4 2012/02/25 06:43:55 robbat2 Exp $
-
-inherit eutils flag-o-matic 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"
-
-RDEPEND=">=sys-fs/sysfsutils-1.2.0-r1
-	virtual/modutils"
-DEPEND="${RDEPEND}
-	dev-util/yacc
-	sys-devel/flex"
-
-CONFIG_CHECK="~PCMCIA"
-ERROR_PCMCIA="${P} requires 16-bit PCMCIA support (CONFIG_PCMCIA)"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	kernel_is lt 2 6 13 && ewarn "${P} requires at least kernel 2.6.13."
-}
-
-use_tf() { use $1 && echo true || echo false ; }
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e '/^DEBUG\>/s:=.*:= false:' \
-		-e '/^UDEV\>/s:=.*:= true:' \
-		-e '/CFLAGS/s:-fomit-frame-pointer::' \
-		-e '/^STATIC\>/s:=.*:= '$(use_tf static)':' \
-		-e '/^STARTUP\>/s:=.*:= '$(use_tf staticsocket)':' \
-		Makefile || die
-	use debug && append-flags -DDEBUG
-}
-
-src_compile() {
-	emake \
-		OPTIMIZATION="${CFLAGS} ${CPPFLAGS}" \
-		V="true" \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		STRIP="true" \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc doc/*.txt
-}
-
-pkg_postinst() {
-	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"
-}
diff --git a/sys-apps/pcmciautils/pcmciautils-016.ebuild b/sys-apps/pcmciautils/pcmciautils-016.ebuild
deleted file mode 100644
index 299204a5efda..000000000000
--- a/sys-apps/pcmciautils/pcmciautils-016.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-016.ebuild,v 1.2 2012/02/25 06:43:55 robbat2 Exp $
-
-inherit eutils flag-o-matic 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"
-
-RDEPEND=">=sys-fs/sysfsutils-1.3.0
-	virtual/modutils"
-DEPEND="${RDEPEND}
-	dev-util/yacc
-	sys-devel/flex"
-
-CONFIG_CHECK="~PCMCIA"
-ERROR_PCMCIA="${P} requires 16-bit PCMCIA support (CONFIG_PCMCIA)"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	kernel_is lt 2 6 13 && ewarn "${P} requires at least kernel 2.6.13."
-}
-
-use_tf() { use $1 && echo true || echo false ; }
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e '/^DEBUG\>/s:=.*:= false:' \
-		-e '/^UDEV\>/s:=.*:= true:' \
-		-e '/CFLAGS/s:-fomit-frame-pointer::' \
-		-e '/^STATIC\>/s:=.*:= '$(use_tf static)':' \
-		-e '/^STARTUP\>/s:=.*:= '$(use_tf staticsocket)':' \
-		Makefile || die
-	use debug && append-flags -DDEBUG
-}
-
-src_compile() {
-	emake \
-		OPTIMIZATION="${CFLAGS} ${CPPFLAGS}" \
-		V="true" \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		STRIP="true" \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc doc/*.txt
-}
-
-pkg_postinst() {
-	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"
-}
diff --git a/sys-apps/pcmciautils/pcmciautils-017.ebuild b/sys-apps/pcmciautils/pcmciautils-017.ebuild
deleted file mode 100644
index 61e3cfa6d019..000000000000
--- a/sys-apps/pcmciautils/pcmciautils-017.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-017.ebuild,v 1.4 2012/10/31 19:24:28 ssuominen Exp $
-
-EAPI=4
-inherit flag-o-matic linux-info toolchain-funcs udev
-
-DESCRIPTION="PCMCIA userspace utilities for Linux kernel 2.6.13 and beyond"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/pcmcia/"
-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"
-
-RDEPEND=">=sys-fs/sysfsutils-1.3.0
-	virtual/modutils"
-DEPEND="${RDEPEND}
-	virtual/yacc
-	sys-devel/flex"
-
-CONFIG_CHECK="~PCMCIA"
-ERROR_PCMCIA="${P} requires 16-bit PCMCIA support (CONFIG_PCMCIA)"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	kernel_is lt 2 6 13 && ewarn "${P} requires at least kernel 2.6.13."
-}
-
-use_tf() { use $1 && echo true || echo false ; }
-src_prepare() {
-	sed -i \
-		-e '/^DEBUG\>/s:=.*:= false:' \
-		-e '/^UDEV\>/s:=.*:= true:' \
-		-e '/CFLAGS/s:-fomit-frame-pointer::' \
-		-e '/^STATIC\>/s:=.*:= '$(use_tf static)':' \
-		-e '/^STARTUP\>/s:=.*:= '$(use_tf staticsocket)':' \
-		Makefile || die
-	use debug && append-flags -DDEBUG
-}
-
-src_compile() {
-	emake \
-		OPTIMIZATION="${CFLAGS} ${CPPFLAGS}" \
-		V=true \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		STRIP=true
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		udevdir="$(udev_get_udevdir)" \
-		install
-
-	dodoc doc/*.txt
-}
-
-pkg_postinst() {
-	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"
-}