old

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

6 files changed, 18 insertions, 216 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/Manifest b/sys-apps/pcmciautils/Manifest
index 96caf0748853..f98971789d48 100644
--- a/sys-apps/pcmciautils/Manifest
+++ b/sys-apps/pcmciautils/Manifest
@@ -1,28 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 014-udev-rules.patch 1407 SHA256 4b6279b097b2731bb51b23311edab6c8ecc10e156a1caca546b42c52f1ab3011 SHA512 0e54c70edf9dc15701d112d5fd70382233bc0e9f900d5f64a18e272b0384a2382de145671d524717f35cc1cf5cad1e69cfa5ebf0ed60f9cccdc233788e24077f WHIRLPOOL efc82aa925a685ec2ba5ec344caf6514645ec6381f8426a1f8787cdf254fb66328ada75672ed9ee3cd09b575fe99d66e14c73950a16ef5674ac1ab0f94ca9809
+AUX 014-udev-rules.patch 1023 SHA256 fc304cc8ead5e82ab99be3dd7609abff2c4f393d1da0e9b75f9c4ec8fffb13cb SHA512 ea555eeea79d2cca408bded2b4d92069676a63b4175c8d777f5867d216205a5b7d90a1964d81e4fb26f6e2fd84fb4b14cebc50dd4bc8e0ab3a592796606a88b1 WHIRLPOOL 511d7ea42e2e51f252bd9b46cd63762662f05795bf0adbec5a94fbb9c22d7de694951e7a46df671ee475a3316d16aaa7486999b225f7db01c2d97ecf3978ef86
 DIST pcmciautils-014.tar.bz2 42996 SHA256 6bef7c05ba9fad231fe7a188043c61c116c24bab5fa79d9d72c1d8e11ff38925
-DIST pcmciautils-015.tar.bz2 43239 SHA256 4847485c412b47e3d88fa83ef811229e0e7941217303bc8449c30a3dc2128b6e
-DIST pcmciautils-016.tar.bz2 43403 SHA256 60dc489d0cd95cdc04e78f76500cfd84ee04b3737b3642727f83cafc230425f8
-DIST pcmciautils-017.tar.bz2 43721 SHA256 2045f0e8f837f44aed72ac91c1a8cf3b899caf098a25d04f47982be6386bd4e1 SHA512 963ad6f61b7065650831ba1b77dbd9d777a1b338e9b511af90f557b45bdc5577277b89f0ae5e3c6c41b5ae0970a1e4247205866491fdb6e61d36541dec6de6f1 WHIRLPOOL 7902d31d416ee87a675f2bf7930a5b7280d8256b6156b032d778c24c768623302f543e7c0b1094f3a601fad702bc1b100ba0a9f4abed26e5b5d44d588d82b497
 DIST pcmciautils_018-8.debian.tar.gz 11213 SHA256 597879403120c4c258e5c064a2f695aad133529503d66aac0973a02e80756f36 SHA512 8a00d776e208b43d01fe22b9d4e889bc1b2c5982aa1bf225bdd613ffb0f5b37f5266ccc1cb91df9ac49c4ee3e3653ebb29807b61fff53c585e2cfed5aa2cd9e9 WHIRLPOOL 32083f28e4adbf0034df13bfde6936f885b54b22295e2603dc4992188d2ef9366dfc77358766d9cfb8eb31501c8949f1ba043e079d858f6822ac5cc7ad673296
 DIST pcmciautils_018.orig.tar.gz 48516 SHA256 b94b71347fa11b7c0eb8dae034b5f7f649b135ffacb80cf60572a5bcb118f095 SHA512 f0af1fc6155686ae61c1c85a6451b032088a3880dfbc05c1d1ed33ca8e975745f9d4bedb0f3ee0a1252461aa008bed8014c73ff850cddd89d930524a6d68d47d WHIRLPOOL c74aa10632748bbd28af892c767c59486ddf1cfa3e1c418e3c727a4867d8905af1770696b2ed9bd15c967fc911aad3b4494d923b42e768bd8c87a364e1aa0e77
 EBUILD pcmciautils-014-r1.ebuild 2098 SHA256 9e3dfa45df848eab05e50128a8122fb9a03c45ddd4ed27f2f55a03940f365796 SHA512 874eba113fed72e6b2bea610e453a6732d5edc9bad2e0d99272eb8ccd59ea026eb7fe079f07a66a910fd6a778cc338aa852ac8ba147eef07ce101b0f95cf53e1 WHIRLPOOL 43c75946ba50f6bf0e1b9ea94207c711c1cd95b4021c9fa7c4056ffe744ed16b41704b4207d7909ab86976de0fad1cf31a763f8abea81769e91cf6880ce487cb
-EBUILD pcmciautils-015.ebuild 1837 SHA256 5fb02b6d47a52b0da80f96ba0d5f6b37f9f14262e4d163aa04917b9b70b6d828 SHA512 eb375fa7b4a0e1e296fc66799e7a24768ff3327a0a4c17c7e638da069f0e9bec92a36af93148f82f566c946b1104dfe7b3a5e9c534f6cfdf96dca176c614e726 WHIRLPOOL ca265af906acb34273b64808541b14036ecab148b867d68321d4933e3157448e27064255e2542c8cda6a937c266094e0a4315f940f87b4d303877c83bca2fb1d
-EBUILD pcmciautils-016.ebuild 1834 SHA256 03f760fc3be1ec442990abb1cc9238cc54fdb44e82625c22bfb7fe8cf79b371b SHA512 15062fac896b6d198567c99076f1ca3f45b6b7715e370e9d89dd3e043f31ff90df2a7c510d32b4d54d00474fab6b6da29aabe2319df9697a2428633a93117442 WHIRLPOOL a4ceebedc64f164df461d87f09a48fb79c62d51b0c9745cedc135c9f0b05edc5434d0ed143990ec6571c75f92ec5c91ceac5a2d66a8de782b5d40aaeec06b82a
-EBUILD pcmciautils-017.ebuild 1790 SHA256 af4932da3572c428b2e3bdfe62dbde3883a6bccb3cf14cd958c04d282c075c3c SHA512 f336e94a7e7518b5195c8b20d6d9d6c7ac5e5aa7d2e0d96094736d45bf8702a01f6221c9ac1efcc767360723fb2fdbb84be0273afddb8cbd6e7870b1438beab5 WHIRLPOOL 8c46d6cf47e73f9ca442fe52e44653300d19fa825376460f6a40b25d4e350e35dc5ae7d9eefb4a8b7a605fc01b2541a74f7f71cc7313567121eeff9b708f780f
 EBUILD pcmciautils-018_p8.ebuild 1646 SHA256 72ea276f5a2ca26dcc3b85cbf20126b38095d9a808068c836f72a784013a5349 SHA512 75d2fc47d8c5dc9733c60f13febd22fa1bd649b8cd464210b0239bd7a25b7f5e321cd97cc6d7416b068299b69d509fb2ceee9088078de97e2cf0615659d13025 WHIRLPOOL 1e90fa6527ed794c28291d8d7f7a6fbc20e3b0f5d1063414c13b2e2717504f1839034f3c1a78f060c652c6aa6643a08d788cca77e9d97a5b114aa4b277688b20
-MISC ChangeLog 6316 SHA256 0759233532c80730145d737da80082eca458dadaafb7dddc1217be610f5662a9 SHA512 d635eedc3d75b142a4bb9254127d7a6f0fc73aa8c565d2e34d597480b6185458a77ab1f24098c97c8633027d9c075cd8763b883d6001b7efd9a0fde64241d7ff WHIRLPOOL 613142265cae5322d57db0bb3d1745189c61233b762ba01237ced4c34ed0cdb6df2814f1d053424341f631042ede9a39fad3ac8a0a011d5a49fbf3d53c724843
+MISC ChangeLog 6454 SHA256 ba14c2ccc7503c40091d9c34fc13fd8e01ebf57af7f550d1e89984be6cdb6e46 SHA512 9cca636fffcaa4a343b43eb9278b2af27085c8ce9aa7816f635feb8c3e3d7e8db4796b2401d813d08e892fdda6030251f250830045740ac820f9e37fe69969eb WHIRLPOOL da58872c12bb3437846135ae7da21ef1276bffbbcf7c61705996ee606ac2de199b995c9d662ecaa5aaa59b01441298078c48d8a8f9fc3d1296e957f4c52301a4
 MISC metadata.xml 237 SHA256 de403d080a625258cdaae03c523a71edf2292f3303a581060d7e75e46a4de144 SHA512 39922f003f71a828810529f17c7be457d9e5f91127f3ded98f70ec398709f9a344404ef1e2d522e2bf8b104e72df051e765ccfb5459b49681f41cb7d9441fc3a WHIRLPOOL 3ea91fba9973895c7e587d40ef4885bcc1100891c971d468a83d4cf16b3f0d4135fff6c64ca38462a9dfd920ad1ac3adf8e630cbf3190675b6e44f822e5d8ab4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQki3dAAoJEEdUh39IaPFNZd8IAJBcjPQ9N64+7f+mYenNLBj0
-UUyU7ye1lsKp1xhyHULOaqaP/sl1atBTMGn1U961kZ/11AdWLow3NGpNw3k3gnI9
-LnA26bytjXJTlU85nI1b6bpJs+64qRvF93UsdwgRy0afiU5XgZdi2STx2E351OMI
-iMnlDKJlOX/qYCDxkfN8jSByPyX3m8tnIX+20Ml11KQzZkrorY/clphoXe5Wa+1n
-cA8lJ5Nv95t4wroLIZ1FDaNjynb5QY1T2D54I9BN5SJLd9U2cHvmMWJa6YhUnehB
-FrYa5dBhLw7myLIsR/Gl27BryMDpqdtazjxpd2BfpJFgax/MzjXogqjcX/xgmW0=
-=Mh9Y
+iQEcBAEBCAAGBQJQkyWfAAoJEEdUh39IaPFNlEwH/1nx73IgiHpvg/7JIHDLlAfl
+NeKXH1ZOYjpPYpF35MO31XpNZ9yl6PkHnzdOkRGEhPDZCCWAMaDMDXAhaFyGyKK8
+v1u6CMG83nJpp8Ies1TIIRLKA7g1CUoaqXgXlWtylZk8N2jjBtk1m4jwjxSTQLYr
+uHGhjgHrFesBoVcHV+nI3qbaItqZBzxvi+gIrmDH956NT3CblHbiSb1JbJnllKmF
+RUl0mP2S0mQ1NotGmQmj2P/jn0KIgmnQ1H3yG8aMjxWJhijY51B7/k8/2tboqnn7
+VZIT8+QT2DraDilspU3OHn6/7kHTrjyWvTFVJp7ZO9cIEm5K+204J6tlVZJ5C98=
+=h3HE
 -----END PGP SIGNATURE-----
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"
-}