Update to python-any-r1. Respect $EPREFIX. Fix path to regulatory.bin. Move binaries from /sbin to /usr/sbin #463808 by Michał Górny.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 87 insertions, 11 deletions

diff --git a/net-wireless/crda/ChangeLog b/net-wireless/crda/ChangeLog
index b4ca9a4b7900..60c3f528244e 100644
--- a/net-wireless/crda/ChangeLog
+++ b/net-wireless/crda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/crda
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.56 2013/01/28 07:35:43 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.57 2014/02/12 21:01:37 vapier Exp $
+
+*crda-1.1.3-r1 (12 Feb 2014)
+
+  12 Feb 2014; Mike Frysinger <vapier@gentoo.org> +crda-1.1.3-r1.ebuild:
+  Update to python-any-r1.  Respect $EPREFIX.  Fix path to regulatory.bin.  Move
+  binaries from /sbin to /usr/sbin #463808 by Michał Górny.
 
   28 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> crda-1.1.3.ebuild:
   Migrate to udev.eclass for correct fallback rules.d directory and remove
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index 8067139870e8..e34695445e5b 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -7,17 +7,24 @@ DIST crda-1.1.2.tar.bz2 21754 SHA256 e469348a5d0bb933df31995869130f68901de9be02e
 DIST crda-1.1.3.tar.bz2 38697 SHA256 aa8a7fe92f0765986c421a5b6768a185375ac210393df0605ee132f6754825f0 SHA512 4ec37d3d51f5988af79c2eaadc1bce344f20d4d9833533838d308533ee02cb12d5ed193391679ae1231c8afe61b21defdb368614a6238f99fdc5824f6819cfed WHIRLPOOL bbcb31277b664243f9e494c494152cf0ebcb187360ba48aa07c8e96c83dd91098bc49f1edf0b196a9bf4071565ac389b2907fcc73e348780aa890e066895c282
 EBUILD crda-1.1.2-r3.ebuild 1301 SHA256 bfc792182017e7b8b0ffd4aad46082e5ae462fef050a4eea55d22534a4f1efff SHA512 5dfaaf826823149b64f20fc0f12d3ecdc95ed9567242d99e9b79918baa94484c36746d3ccae72f1e9397c5d71801ee8e0593ec5a570e21e4ac0fb199d49774bb WHIRLPOOL 50dd40bfa6b75191b76040e59419a99b0e023f24bdf305647161bed9e6b910363d136153663f7b0700379a13d44ae342e415566626e58251b3c32ba59e5ea75b
 EBUILD crda-1.1.2-r4.ebuild 1429 SHA256 f77b1d4ccff18571da6fa4cda8d048d5e1cbf7a4dc88774afd93e3a782c992f9 SHA512 32e1f2dd2eca8d178ec1fcb4dd4e6d9c58f34b06b60523df850e61b0819224d5c2b094bd55df37a0d499b305c107d689f5f6694101a96859c270c9fe435ff064 WHIRLPOOL fdd098845c029cde9596975d138141ec254b9291c63473acf27c26789b3c5fee0e59f8e9e14c4a100678718f97ec177143d8841e8f19aa10de8b5a5a746c0c0c
+EBUILD crda-1.1.3-r1.ebuild 1614 SHA256 f210f65b7e71d343d3e69267b1d18c3e643e936ec6c18b1ac319ff1a5c08fe5b SHA512 b876cb65be9efc3854bdca1b9a88947e23db7223869b8bca6f1336f10774a5e7292e9987579ce21c1cabbf4606340bfc1166e9e92076faa4858ba575b102764d WHIRLPOOL c0a5ef9ccfc128f6355428566267a64e63c55e21af650415d3975636cfeb2d323cb05e46c45dc1afa6cd7e1704c86e15f6bc3ccde5066ad667bb6a80a446f46d
 EBUILD crda-1.1.3.ebuild 1368 SHA256 9b11af8c84f1fc904c2ac9959b1a0671d974e22aaee0888a06f306e4d88ab63d SHA512 9796ffaefc382ae41404132679e38f3fbbfcbbd223c33e464defb0eb12c42f21c1b43da039b0f0c58d8c2f3c526a821bc34a1b15d191ddcfd17d9b1c73a72ce8 WHIRLPOOL 7bc5c0da4976386b2ed7ccf580c02b3dd20db5fea3a3d6350e2e786a0812f5e9fe630a06387bfbb6b068e0e2e8d418fe06cdf9b36ba9cf8512830f224ac9990a
-MISC ChangeLog 8571 SHA256 f1bb8e818df4be25c88b87c7ad17698e8713840f68017c0d1dd6e0f64c4f99ca SHA512 10fcdba932caefdfa27dcc5530811e27c2c7368a8255a72b4b1dbae020007b50d6fa87ba2f643a84a60e68c38eb29cd2f5c8bf81c69ef89cb1402bc58c1864c9 WHIRLPOOL 069b7c74a90531ab56512c8c5a0a08ee90c59155305578a11cac0f7c9558695d92b6cce8b2b498e58e06f793da9cca6e872bfa3079ee09a906645837cddac5d5
+MISC ChangeLog 8815 SHA256 03499432465140b5d1707c93f18720608173ac693ad549f3163f46b069dfec21 SHA512 f8dd696cac2131613ac1bc03bc0dc8182a446133de0ce7b755c2728a2bab66b0760873b26828afd3eb8846c4678edeb8934e66c487c5f1387be7c749146e2333 WHIRLPOOL 2781d1e1fb01da673fdd117c8599642125f56fa7fa55d45958673c202f0af757b6638b60e6370edc647761a1d0278869d79f337456ab3a760418bdcf8a1803a8
 MISC metadata.xml 423 SHA256 a2bf4db1a40a535e8239fceeb01e7433b04ab0be4046a4f358303fc7e057cc87 SHA512 cedd6c72d6e7af630a04cac09a9ffd41e48d01ecfc2bb5e3c0a7af05de31f41d5b88f675b8204bb7fca2ea4ffada0b454c6f47337ce1dc13aeb87875861819c6 WHIRLPOOL 1301cb831507d985158de92f230e60e528e91529ba659508e34d4846c78e9c80963271356164e087098396624ccbd564d4055be07beb32848d9d088680272b67
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRBiovAAoJEEdUh39IaPFNJV0IAJ5vMyPYgCpMQAnU1o25k2ay
-mrIf9ci/3WCpoak79d2+rIG52E7uzFIEEQddxK81fegs4WquugUU16q46TBTThAs
-q1Tn67m1ZLdnlh+RnedCNIwdNhUkW6O80V7M2EpPHMnqGZyaaNHSQcBEKABpUHmL
-U7sE/VHFsTm8eieeAIJjZPNM23u7ON7t8WECsky/y7oyGfw9p/Fj7kNI7r7iPLzl
-K8XiFHUbydLIPV+8mig8uozjWN8BTTD6IDfkIKerK0R1fg2gBDvW9ZwYD8QR1WO/
-C/q5KUwmcuFCygMnJ2m+KcDKoIcPJrNrRwEQ59wli75x8s4bnJURgznUEk5W9Bk=
-=eR/v
+iQIcBAEBCAAGBQJS++E2AAoJEPGu1DbS6WIAUV0P/0VWpk6qn45sTDUVAWM7lJUh
+4DWg/iuwsKiZary0SW6H5i92NO9T+/0DGVfomCIGXeqlcoLQRyB38TByym2Cg246
+gwvohkhZUYJ9Is+2wAe8lqBfiUoI5AzXLPNVUhWAzZNiQRvPpsNhCCnNMhWoPndw
+tNZU9RJFN5byPqJUMMMqzvC2DxT9DZkwD9DKf6V50MvL+h2ZHV9mtbEzZYISsMwQ
+gpAH5Nk9jwwu/BgjS1BMFzfr/ZVGGwcTY2A+gKVNpwg+5MvQKmoirlFktb1HiUtu
+1HRIygi0Nj6XYnaL5ZIshg3/f0v+5eAugqmh5JuNsHXtsmg0YzPS4DBFr4IrK6jh
+MNKGAkA8jUf4kBhzkpkzcKN81QgoHTj4JL5TrVryURADEcllBXxV9T+3wVcpQzyT
+XE2crHzeUuTLl4Xm7guc4wkCJtl937e5GVtgBKAejysrYn7KR/GQ4uL4fREx5Ha5
+KUH6xgxks2l85C6v1Dtk+LyOdMhnMXeqanY3FVskDRUyLcF8or6hMabY2KMNmBUd
+oyeByUTLZcuBRTfC+7l35QOHZ8Z7UMSqUpsbK0fcFxHxyQtqwH8XzW3N3HtErkXA
+Y2thhBPsJZd6OKfRjepAYS3IRQ35al8pr36bin/lWmseZ2fNd3ZQMLqtbzp3LpIl
+POjM9sVMppJtqtoxxgji
+=S+0N
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/crda/crda-1.1.3-r1.ebuild b/net-wireless/crda/crda-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..00790046d1e6
--- /dev/null
+++ b/net-wireless/crda/crda-1.1.3-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.1.3-r1.ebuild,v 1.1 2014/02/12 21:01:37 vapier Exp $
+
+EAPI=4
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+inherit eutils toolchain-funcs python-any-r1 udev
+
+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="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/openssl:0
+	dev-libs/libnl:3
+	net-wireless/wireless-regdb"
+DEPEND="${RDEPEND}
+	dev-python/m2crypto
+	=dev-lang/python-2*
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-missing-include.patch
+	sed -i \
+		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+		Makefile || die
+}
+
+_emake() {
+	# The source hardcodes /usr/lib/crda/ paths (ignoring all make vars
+	# that look like it should change it).  We want to use /usr/lib/
+	# anyways as this file is not ABI specific and we want to share it
+	# among all ABIs rather than pointlessly duplicate it.
+	#
+	# The trailing slash on SBINDIR is required by the source.
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		SBINDIR='$(PREFIX)/sbin/' \
+		UDEV_RULE_DIR="$(udev_get_udevdir)/rules.d" \
+		REG_BIN=/usr/lib/crda/regulatory.bin \
+		USE_OPENSSL=1 \
+		CC="$(tc-getCC)" \
+		V=1 \
+		"$@"
+}
+
+src_compile() {
+	_emake all_noverify
+}
+
+src_test() {
+	_emake verify
+}
+
+src_install() {
+	_emake DESTDIR="${D}" install
+	keepdir /etc/wireless-regdb/pubkeys
+}