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

Package-Manager: portage-2.2_rc42/cvs/Linux i686

5 files changed, 83 insertions, 21 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/Manifest b/sys-apps/pcmciautils/Manifest
index 2e3566955152..02bf2048132b 100644
--- a/sys-apps/pcmciautils/Manifest
+++ b/sys-apps/pcmciautils/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 014-udev-rules.patch 1407 RMD160 2b2ce5fa24a9ab863503861310588dccc2df85e6 SHA1 9f020424e92124eac807bfcc29c210f0d9072ed7 SHA256 4b6279b097b2731bb51b23311edab6c8ecc10e156a1caca546b42c52f1ab3011
 DIST pcmciautils-014.tar.bz2 42996 RMD160 61a264bdc08070735cee72fb7c5b91c7a35f6805 SHA1 24122b196ab9199e259ba35ffe243d9b2820446a SHA256 6bef7c05ba9fad231fe7a188043c61c116c24bab5fa79d9d72c1d8e11ff38925
 DIST pcmciautils-015.tar.bz2 43239 RMD160 5458a6c622b8039e04a630c6b3d06524af293e6d SHA1 6ecc69e0088c8b29111ca08749cf283582c70ed3 SHA256 4847485c412b47e3d88fa83ef811229e0e7941217303bc8449c30a3dc2128b6e
-EBUILD pcmciautils-014-r1.ebuild 2131 RMD160 b0e95660741d37ca7fc6db66981ec48b250ff829 SHA1 eaceaa215d7414351bfda1e68a2c0ea38ece518f SHA256 ed1309ef54acbef1c5a98a59ae35bbfd6fcb220ff9ffce310294b2338d95699d
-EBUILD pcmciautils-015.ebuild 1880 RMD160 d2ec9ad0c63b4f54f7c441a27969508949c1cc89 SHA1 5c5f57398a7e4f0954466e6f4d6c1a5be79a0888 SHA256 874744a0f503ccfa9314d87a0d8ba7855d4a1f51047fe458be5fc51ad81ac151
-MISC ChangeLog 5019 RMD160 462eb3727a9e616b92e72e8636a3db83d35c6309 SHA1 69d4343465f9c339af00b93adef12b43cb5dbc25 SHA256 d9154b8f3fc5d02046b0b4c929242e7a7ff493897759aba7dee0817ce0c03170
+DIST pcmciautils-016.tar.bz2 43403 RMD160 49d4625fbf7f41306017a0824b3adf723245004e SHA1 63a701081a98b6fe2392d0747afd0b24d139a3b9 SHA256 60dc489d0cd95cdc04e78f76500cfd84ee04b3737b3642727f83cafc230425f8
+EBUILD pcmciautils-014-r1.ebuild 2106 RMD160 b2e6e63d14a41c6955f398e5173ec8a978aeeda2 SHA1 51220182e39282d60bc40f4acc73f14c666285e7 SHA256 4e80d6fc843c0119bd8c0e246614a2234b950afdfee56e66ebc1ed78631443cc
+EBUILD pcmciautils-015.ebuild 1858 RMD160 4966fa15575ed94fb3378b067704771cd02d0013 SHA1 afd2b6b7dbd9260ebecf290531e6edb2876e36a5 SHA256 6324e3e9e54c3f44fc1e5f269d6d58adf568e664a9d221a58d9cc6cd9e5da0fd
+EBUILD pcmciautils-016.ebuild 1855 RMD160 95901175e43ba3dbb870adba00edbb5f4de05b63 SHA1 321a09dddd3f1d0a285e2768312a51c329bc63b8 SHA256 e0813f9b675f4bd5aaac440f785beda2dd2c8522c0cd735e9cbbce60030b830b
+MISC ChangeLog 5241 RMD160 10970ba255d003288c7bc675a15b6c4a04af48d8 SHA1 3a17cf1a509b7ce999eb9130dbf4d0aed892abaa SHA256 b94e7f5640a42f307c997131c03a708e34694a5548602fc936831eae5f592020
 MISC metadata.xml 237 RMD160 cb110ee49223c8235a949475e6b25892cb38954e SHA1 fde188c22aa1ebb8bb49e3f31272fdbb6523dfd5 SHA256 de403d080a625258cdaae03c523a71edf2292f3303a581060d7e75e46a4de144
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAki7elsACgkQ67wieSYcaxdPqgCcCuXrMGNnKK8kGxr4W+Aj7w3r
-zOcAn0Igg3dsd+KZnO/ck8iUGDyrlQsT
-=gqUX
------END PGP SIGNATURE-----
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"
+}