needs yacc (bug #239422) - version bump fixes bug #255317

(Portage version: 2.2_rc42/cvs/Linux i686)

4 files changed, 78 insertions, 8 deletions

diff --git a/sys-apps/pcmciautils/ChangeLog b/sys-apps/pcmciautils/ChangeLog
index 1b6428f769b7..08389044b6da 100644
--- a/sys-apps/pcmciautils/ChangeLog
+++ b/sys-apps/pcmciautils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/pcmciautils
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.35 2008/09/01 05:12:28 vapier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.36 2009/10/16 19:19:38 bangert Exp $
+
+*pcmciautils-016 (16 Oct 2009)
+
+  16 Oct 2009; Thilo Bangert <bangert@gentoo.org> pcmciautils-014-r1.ebuild,
+  pcmciautils-015.ebuild, +pcmciautils-016.ebuild:
+  needs yacc (bug #239422) - version bump fixes bug #255317
 
 *pcmciautils-015 (01 Sep 2008)
 
diff --git a/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild b/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild
index 1fa8b7a3d745..6af05a175e57 100644
--- a/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.8 2008/06/03 02:29:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild,v 1.9 2009/10/16 19:19:38 bangert Exp $
 
 inherit eutils toolchain-funcs linux-info
 
@@ -17,7 +17,7 @@ IUSE="debug static staticsocket"
 RDEPEND=">=sys-fs/sysfsutils-1.2.0-r1
 	>=sys-apps/module-init-tools-3.2_pre4"
 DEPEND="${RDEPEND}
-	|| ( dev-util/yacc sys-devel/bison )
+	dev-util/yacc
 	sys-devel/flex
 	sys-apps/sed"
 
diff --git a/sys-apps/pcmciautils/pcmciautils-015.ebuild b/sys-apps/pcmciautils/pcmciautils-015.ebuild
index c5bb25ca49e5..5f93282c2908 100644
--- a/sys-apps/pcmciautils/pcmciautils-015.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-015.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.2 2008/09/01 05:15:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-015.ebuild,v 1.3 2009/10/16 19:19:38 bangert Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -16,7 +16,7 @@ IUSE="debug static staticsocket"
 RDEPEND=">=sys-fs/sysfsutils-1.2.0-r1
 	>=sys-apps/module-init-tools-3.2_pre4"
 DEPEND="${RDEPEND}
-	|| ( dev-util/yacc sys-devel/bison )
+	dev-util/yacc
 	sys-devel/flex"
 
 CONFIG_CHECK="~PCMCIA"
diff --git a/sys-apps/pcmciautils/pcmciautils-016.ebuild b/sys-apps/pcmciautils/pcmciautils-016.ebuild
new file mode 100644
index 000000000000..62b7df29107f
--- /dev/null
+++ b/sys-apps/pcmciautils/pcmciautils-016.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2009 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.1 2009/10/16 19:19:38 bangert 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
+	>=sys-apps/module-init-tools-3.2_pre4"
+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"
+}