Fixing multilib problem and removing old versions.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux i686

6 files changed, 21 insertions, 104 deletions

diff --git a/net-wireless/crda/ChangeLog b/net-wireless/crda/ChangeLog
index 67703f0ba124..f9940cdf57fc 100644
--- a/net-wireless/crda/ChangeLog
+++ b/net-wireless/crda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/crda
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.29 2011/11/07 21:07:54 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.30 2011/11/12 09:46:20 gurligebis Exp $
+
+*crda-1.1.2-r2 (12 Nov 2011)
+
+  12 Nov 2011; <gurligebis@gentoo.org> -crda-1.0.2.ebuild, -crda-1.1.2.ebuild,
+  -crda-1.1.2-r1.ebuild, +crda-1.1.2-r2.ebuild:
+  Fixing multilib problem and removing old versions.
 
 *crda-1.1.2-r1 (07 Nov 2011)
 
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index a9ba6e121432..9a0107b8e15f 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -3,18 +3,15 @@ Hash: SHA1
 
 AUX libnl31-support.diff 1963 RMD160 3fe1689a9c9e91d63a97c8f0c5719ccdb30cdfa9 SHA1 efe57db6c0583433a93624624b69ae5151101e38 SHA256 5a2fce22089b49733cd2315840d2812e4590e12d987086a04dcb69d6d9fcbac7
 DIST crda-1.0.1.tar.bz2 21013 RMD160 9fd99a0cac4e09926b9a97ded4f3f6e3f27298b2 SHA1 5574374fed2de53a0bee49702d6e7448c0c1bf5c SHA256 6b0cfb4d0340b6e239488a46ce92c8d26cec84fe0da06d4c7b7327bf0e932f1f
-DIST crda-1.0.2.tar.bz2 21270 RMD160 1724426caa3903fedd6727ccfd624d87290f391b SHA1 77d403d97fd7e7647778f8c121a1cb46dc47bb77 SHA256 b26f7af080925bc03a5782578291b614fbcb47563bc2f9d9363cf12825772459
 DIST crda-1.1.2.tar.bz2 21754 RMD160 b36254bead7c1561646430f945ca484d301c082c SHA1 a180b8cd2b3f37a157ca27da3fc603795e618906 SHA256 e469348a5d0bb933df31995869130f68901de9be02e666437f52125698851864
 EBUILD crda-1.0.1-r1.ebuild 979 RMD160 3f8352b066e9c0b32b173a25c838ac628bd4a6dc SHA1 3d2de561b02e7be68c4a50f34a780d5148b5dab5 SHA256 e5620fd9078b9b8e80e84518d6210b0de645567c1e64093c9c2542ebf08bbfe3
-EBUILD crda-1.0.2.ebuild 980 RMD160 7e2c757d4f11a4564a07432c663db9f6019d57b8 SHA1 dc59c4501ea3bac766d6a1ae8032135dd48cf3a8 SHA256 b3bf772200e0c4c706faccf53c2e687f7e1757b201a25fcd08b23ff889467f08
-EBUILD crda-1.1.2-r1.ebuild 1114 RMD160 ef460af5aa709f6f10baffae6c3551e27ad3e147 SHA1 98f3a30e6743209c087be38417a7aaf0d02299c2 SHA256 7047bc88e9d69377bb2b21fcc0a54be06ce1d6037c13d1ef43709697cd4f31f9
-EBUILD crda-1.1.2.ebuild 979 RMD160 914a6e99bec28247fb884e868cd5773e8026a30b SHA1 7175c44495b8774ac93ee328022470a18a9fd6f9 SHA256 27432be5b8d4f1c66d0311fa264e36a0ce57f4b8eed33c9057d96620766b251c
-MISC ChangeLog 5066 RMD160 70f65b54798ff737af0f51eabe97715ad1a99382 SHA1 78e5482445da10c873b0d2f5158eac7048f8b3c9 SHA256 edabaaf3ef1ac74cebcb9c8eb0735476b3970f692529b858e66978518d5920d2
+EBUILD crda-1.1.2-r2.ebuild 1208 RMD160 5f41f35e903e8fa684c2bc05c6ebedf93f4220ff SHA1 598c6ad679b15a844f42e6c935dd664f5721266e SHA256 6fbcc208e62992c6fbd9aea5bd4fcb86a54b12b50d33097fae6f75bbbf56a63a
+MISC ChangeLog 5277 RMD160 304d95579f5c0fae72e17b8f4d017b6166f22dfe SHA1 9b38420f313715d8ebf29f4c75f684191484fa55 SHA256 fee5b899bf257419ceac87397dbff6eb79b5c48e42ab889f6dfd0ab43a59c593
 MISC metadata.xml 350 RMD160 f6595505b25e3a4f18c8a80bf2c43a39e9ed3217 SHA1 056be77ff0338c0c07de32cde88815054eec1999 SHA256 fed024e4a74466ff8ac845800a5b1290825fbcee9bdba8f7f3ebc39236e63cb3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk64SLQACgkQsR7PQhRXYEnG4wCfZpPcFHgSgGQ93HU3evWzEpz0
-qKgAmwQ65E8uhAa+qwpYOW3X3yVUz5Wj
-=dK1J
+iEYEARECAAYFAk6+QFgACgkQsR7PQhRXYEmkCgCeKU7wDJ9kErmh8hn6tiixF6H3
+LkoAn2ttEGHA4cOmNn+64R2SKnTsL+DR
+=sgom
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/crda/crda-1.0.2.ebuild b/net-wireless/crda/crda-1.0.2.ebuild
deleted file mode 100644
index 9e35117c3139..000000000000
--- a/net-wireless/crda/crda-1.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.0.2.ebuild,v 1.2 2011/10/27 16:07:00 jer Exp $
-
-EAPI="1"
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks."
-HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://wireless.kernel.org/download/crda/${P}.tar.bz2"
-LICENSE="as-is"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-RDEPEND="dev-libs/libgcrypt
-	dev-libs/libnl:1.1
-	net-wireless/wireless-regdb"
-DEPEND="${RDEPEND}
-	dev-python/m2crypto"
-
-src_unpack() {
-	unpack ${A}
-
-	##Make sure we install the rules where udev rules go...
-	sed -i -e "/^UDEV_RULE_DIR/s:lib:$(get_libdir):" "${S}"/Makefile || die \
-	"Makefile sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "Compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/net-wireless/crda/crda-1.1.2-r1.ebuild b/net-wireless/crda/crda-1.1.2-r2.ebuild
index c1a1a5eab1bf..983f0b31ad53 100644
--- a/net-wireless/crda/crda-1.1.2-r1.ebuild
+++ b/net-wireless/crda/crda-1.1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.1.2-r1.ebuild,v 1.1 2011/11/07 21:07:54 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.1.2-r2.ebuild,v 1.1 2011/11/12 09:46:20 gurligebis Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
@@ -31,7 +31,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake UDEV_RULE_DIR=/etc/udev/rules.d/ USE_OPENSSL=1 CC="$(tc-getCC)" all_noverify
+	emake UDEV_RULE_DIR=/etc/udev/rules.d/ REG_BIN=/usr/$(get_libdir)/crda/regulatory.bin USE_OPENSSL=1 CC="$(tc-getCC)" all_noverify
 }
 
 src_test() {
@@ -39,6 +39,6 @@ src_test() {
 }
 
 src_install() {
-	emake UDEV_RULE_DIR=/etc/udev/rules.d/ USE_OPENSSL=1 DESTDIR="${D}" install
+	emake UDEV_RULE_DIR=/etc/udev/rules.d/ REG_BIN=/usr/$(get_libdir)/crda/regulatory.bin USE_OPENSSL=1 DESTDIR="${D}" install
 	keepdir /etc/wireless-regdb/pubkeys
 }
diff --git a/net-wireless/crda/crda-1.1.2.ebuild b/net-wireless/crda/crda-1.1.2.ebuild
deleted file mode 100644
index 44de826a5753..000000000000
--- a/net-wireless/crda/crda-1.1.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.1.2.ebuild,v 1.7 2011/10/30 16:47:07 ssuominen Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks."
-HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libgcrypt
-	dev-libs/libnl:1.1
-	net-wireless/wireless-regdb"
-DEPEND="${RDEPEND}
-	dev-python/m2crypto"
-RDEPEND="${RDEPEND}
-	>=sys-fs/udev-152"
-
-src_prepare() {
-	epatch "${FILESDIR}"/libnl31-support.diff
-
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" all_noverify
-}
-
-src_test() {
-	emake CC="$(tc-getCC)" verify
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index 3daa7d426107..d80e815841dc 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -2,21 +2,15 @@
 Hash: SHA1
 
 DIST wireless-regdb-2009.01.15.tar.bz2 9951 RMD160 99d9980323b109a1737ae335fe2ec55068079f0b SHA1 8166b53bde7c9708417f1bb7da18cba68aa00fa4 SHA256 5272fa06f4ca30a8f87bfe6268920ab75cf1fb27c2fd1d27d324201b079f24ad
-DIST wireless-regdb-2009.11.04.tar.bz2 12734 RMD160 b96b1a7d0b0ea2c6ac4d865f7fc2c132441569cd SHA1 c490f2ae0e8262057825a613699016eb040367cd SHA256 0d0ff432d3188595a096cc097df13212c1f6022f2ffece0e4123392f88e02ae6
-DIST wireless-regdb-2009.11.25.tar.bz2 12844 RMD160 a129a77e700b42de339e6c1891d51e729349fbe0 SHA1 c8afeffc4ad4f292d43551ce1c5c20e8aa559c34 SHA256 b9d569a41f66323339b7aa203db6e2d8f39c98192f134b5eef2135cf09cd943f
-DIST wireless-regdb-2010.11.24.tar.bz2 13213 RMD160 2d4d4a5e969e2602914708bb9f6ec485df47f0a5 SHA1 3c24c4ba247308b442c2eceab644e78d67638a2d SHA256 77b33ac88baef36839e777d5e235be160f5c90dfcb058f4e7707f1873d9c73d3
 DIST wireless-regdb-2011.04.28.tar.bz2 13189 RMD160 6e02872b15a664a916c517999d1d6d72596b0b23 SHA1 d45ba854cf111a7ea4c21fbda9b996f0e8942ceb SHA256 ed1c3e134e34ba5f93594f6f76b90861fe8d24359c064839a2bb78736416642b
 EBUILD wireless-regdb-20090115.ebuild 821 RMD160 c9dd829855d8a201f16c8c856b43e7ed72cb8be5 SHA1 b94788fc59a4cb673b01b0a8db395533c93d3c6c SHA256 03fe0c3342021008394d2098211ace03f7ff378eeef254d78f5d95ed6f1e9fd3
-EBUILD wireless-regdb-20091104.ebuild 914 RMD160 f11929427c6b4ec20101a60e01956e39bbefb64c SHA1 2d87ca977b40f8efa9f1b5f24743bd225f9ca838 SHA256 8efa8be7a2d7a9292768701da747f8c8a9e64744a020fff5c73da298960fe80d
-EBUILD wireless-regdb-20091125.ebuild 914 RMD160 18da5ced24e9a689c30c91d7c6275b23b15dec29 SHA1 dc9ff0ec7be97e75c243703c345f71896869e378 SHA256 686ee167c67510ff554104dc57eb9c787def8d2eb7c4ba9c45145c41f5515596
-EBUILD wireless-regdb-20101124.ebuild 914 RMD160 50ee2faa0450cac644dba747ddc22fedbce0873c SHA1 128dd5d34da8f1e1e6d87caf56d144783017f9d1 SHA256 d8acdaebc050bbfcdf80a6f91044a3719a551e5b76e16139a58b47814c24eef2
-EBUILD wireless-regdb-20110428.ebuild 920 RMD160 9e6b479b474b547dc2049f1a4f840dae9650b3b1 SHA1 2fa5ed2c7dbe73c1b5b15f4ef028088e826150ca SHA256 0c771be95d65687f85a3284f312173c5eda71711c408b85b9b2d45a92f3ccc27
-MISC ChangeLog 4177 RMD160 2bf42e27e9536dd32c951b37f347ac2a283a10af SHA1 9e586fda812ae1b1c469463e8b6f60a9e65c6e30 SHA256 06fa99fc925e3eab455e43ee001050cf26d62ca615836991dd9b971405d2edf5
+EBUILD wireless-regdb-20110428-r1.ebuild 923 RMD160 f56c2d69aa0a4eb9766156a011ed82206172caee SHA1 b679e766454114711eeb953c7177e22ff8da099a SHA256 ded6e92ed7e94cb22ad4c4aee2478ba6ee9d2e8e4b8b90634f29a9e1d236eb33
+MISC ChangeLog 4494 RMD160 d118e5cfbfc3f0de03149c14860e93615a441f7e SHA1 0f38f501c222c47adf079d758b7ef4517a2a31cc SHA256 3425b8755f741e9e8208206f4cbf4bab142ee30ca7071378c8bcb4920f215f87
 MISC metadata.xml 357 RMD160 7ec597f707ae2ee3be0895f1e57a1c2bbc250f9d SHA1 da505f17ba3475703d672f12b7897916afd31611 SHA256 6ef3de26d9002828f3271b93f94aba4945b5aa287f3fbe1a0aea330c6f5a0195
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5mZokACgkQTVUdg23rv50OgQCbBRuZjjyw86HnJZe4VI+unrL4
-2CIAn1G0qCwo+xZgYG/+J2ozMt0R07i1
-=UhhN
+iEYEARECAAYFAk6+QSAACgkQsR7PQhRXYEmVnACdEj5dyK/PLCYdw2h1CpdAY2zP
+ijQAn1b+5arcgWjZc2mzNROm6hpPdV8z
+=atgy
 -----END PGP SIGNATURE-----