Query udev.pc pkg-config file for udevdir value.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

4 files changed, 103 insertions, 25 deletions

diff --git a/net-wireless/spectools/ChangeLog b/net-wireless/spectools/ChangeLog
index 596fd3c69096..ed330933eda2 100644
--- a/net-wireless/spectools/ChangeLog
+++ b/net-wireless/spectools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/spectools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/ChangeLog,v 1.15 2012/07/06 21:14:42 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/ChangeLog,v 1.16 2012/08/12 08:43:43 ssuominen Exp $
+
+*spectools-2011.08.1-r2 (12 Aug 2012)
+
+  12 Aug 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +spectools-2011.08.1-r2.ebuild, spectools-9999.ebuild:
+  Query udev.pc pkg-config file for udevdir value.
 
   06 Jul 2012; Rick Farina <zerochaos@gentoo.org> spectools-9999.ebuild:
   fixing missing SRC_URI in live conditional
diff --git a/net-wireless/spectools/Manifest b/net-wireless/spectools/Manifest
index 78bfda3dd56a..95266da60826 100644
--- a/net-wireless/spectools/Manifest
+++ b/net-wireless/spectools/Manifest
@@ -1,34 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX spectools-2009.02.1-libusb-compat.patch 674 SHA256 68c255cc43fdd00951cea541ae5f9f9de57993a4c311dd5c85b1a20d874f2ea1 SHA512 ba140ab5a3ebff39a9351759975de40f3f802ee72130c123c5d140fede5e48df9efa2534231b4ccb8d8d2ee7d36f3aaeba3907dc40b3aa81999de76e45df21ad WHIRLPOOL 7006815dd97d1f142476dbcabff50a784d19d67a02f645383959fdcbcd171581bcc19862f753b584dd55820b54eda4acc642c432032188a2d53041e0f049215f
 AUX spectools-2009.02.1-udev-rules.patch 1757 SHA256 5207860a766f150057e57dd30f60abb71eda41d6d3a606df9f48e6a5dfd7564f SHA512 bfd9734c8b34545dcc6a5a253522c2918884bfec22050425bf854302779fde71ce70be0207f8bef022bd735ae1278e27cbbef00795c7e4e1abf4eec40dfec09a WHIRLPOOL 7a057aba923edab62bf6a474ce684e85469860deb648a445fd0bc031fa9cbff4663fa080e826a58cd10c84fcc6686c9ef6f622866392cfb9629631c884cf692d
-DIST spectools-2009-02-R1.tar.gz 183877 RMD160 54443a8b9c2b9ad84a47399f2ebc8a1bf16f6319 SHA1 a9b520dfc829c2b35c8f3bfe13ebfb1f98f203d5 SHA256 5b4d2dfe5bd1ff79b58ceec83aa9531866a06d7f60a3fd95eb5de7bbd96c48b5
-DIST spectools-2011-08-R1.tar.gz 196001 RMD160 0338651081eed465e83dc61bde4273a9d0c3df91 SHA1 971af469d05346f78a5499eac74d92e96dcb67db SHA256 ce981cd2b86c6246dc7cb9c0166b85e586e5f5835d3ed147e8901ef18f00220e
-DIST wispy-tools-2006-03-R1.tar.gz 135030 RMD160 ef1dcc7d17782828dec0a03bc551349d430d4828 SHA1 92b5ce07a89639143d6878f67a799cc18b982325 SHA256 8325850768e55a92b9c77de741c086ae52fad0cbc7d28d6e492e653b392db3f2
-DIST wispy-tools-2006-09-R1.tar.gz 135474 RMD160 13ec3cf3821e304a070fed9aa97a3a99efe2504f SHA1 daefbf18a2720cb407590224ae3a2167372a83d6 SHA256 41b25d1d63f01f596925dbd39389668b9d4169b28e5b8a2e00e0ac66574d330f
+DIST spectools-2009-02-R1.tar.gz 183877 SHA256 5b4d2dfe5bd1ff79b58ceec83aa9531866a06d7f60a3fd95eb5de7bbd96c48b5
+DIST spectools-2011-08-R1.tar.gz 196001 SHA256 ce981cd2b86c6246dc7cb9c0166b85e586e5f5835d3ed147e8901ef18f00220e SHA512 92c80b34049055cec6d677db165fb2d06d75fbff9f04d41ab81fa57900f639936e6a9a01f06165aea863b35760964016f0984f17816859d054bc9d14353e847b WHIRLPOOL 89af3aa1f1e4033de3051bc6dd5b2d6f013c1270d588768fcfc08830a420f3ab3507494b0f5575b830a9d88abc885600e551ad78bc9931ab5bd061e74d7d27c8
+DIST wispy-tools-2006-03-R1.tar.gz 135030 SHA256 8325850768e55a92b9c77de741c086ae52fad0cbc7d28d6e492e653b392db3f2
+DIST wispy-tools-2006-09-R1.tar.gz 135474 SHA256 41b25d1d63f01f596925dbd39389668b9d4169b28e5b8a2e00e0ac66574d330f
 EBUILD spectools-2006.03.1.ebuild 1200 SHA256 d733418f162cbc56be0e2c84bf8bccd060c4b6179c8c1bb425c05cb7e57533e2 SHA512 74d484f9f566b89fc3758cfc6b7454bba010195d45ab1bb61f79dba0bc431485dde45c54c422c5c098c7bb19ed79b352a908076a004f94062c93b1dc48dc9bf9 WHIRLPOOL 8d0fa119b907a7f1062739171281035d437a4787432f396cf3fe7351d482fe4e90405b4984fa70bd8dfb7c24666d4258f58a222b427a298309a5bba4bb8fb0df
 EBUILD spectools-2006.09.1.ebuild 1204 SHA256 ee40e1a609bbfe89672dd8252001fd11841d8d8d5b17eee2ef4a573fb67549fc SHA512 c21e2af4c91f67275ffdca5c80464ca15eb2f8174770bbb52501fbae234ec9c294934c0e58c439f4c91c77d3ee6168fe423f037eeef5e3098f108c2564b27103 WHIRLPOOL 9793a58e2961738efd3573ee7ece3d062f65584c31ee87ce1ed03dbf7bb4bc9f2b78bd79c83b62ce61247417df9cbb6043f6a495bfae8570251e317e12230a40
 EBUILD spectools-2009.02.1.ebuild 1658 SHA256 aa9cfb3fede2e213e7863125dd376064a3eff20a5da9702b2bd29507fefc6314 SHA512 1d62bc01c4bf0ee0f0f50fe9634b1a45a782859739e8ae7fd7145a7450cb4650ec8cf107b1d6e8d341579e3df6224c1850f6b336e26f26c86331b8c775b2f251 WHIRLPOOL db6c601007b1de0afa8a69e4a6bf9fa445e62d06943763cd9712f02d40f9d4d35a9657d6e76eebc54a7569c7b5329a4372b4ef95ca8d00b5839725ec830853cd
 EBUILD spectools-2011.08.1-r1.ebuild 1637 SHA256 fbc9115cf7f953cceefb0ac9479ee6f5dbb9d57c89f2e63665615d5e0f2b384c SHA512 93bec680248f1a8c7bf03e6b0cbe16bb824ce4122147693f28342c9c8c205093890c9812b5d8e45fb99f5a565ce235c891ef3f64400dd2f2846fd2153be12133 WHIRLPOOL 0fa4e1c1e3f10ae3edd3d85aa77a148fe867229bbf0a4f143c6713687f45f66f3fbcf1285311deaba04be0d41a274bf218b0d001ded70b15e98272ffea961154
+EBUILD spectools-2011.08.1-r2.ebuild 1772 SHA256 aff8a7cd6acc01af630fc3cee95fb0c63a525318addc1bdcb7d5a0c34817c00e SHA512 426004c02bd37ea6dd86924ee3295460c6fff2f4b70ed0c8513d189e4e0f05a1ffa2af7f200320156c203e443853ac86e23d048201ace2b464653b6186b18d42 WHIRLPOOL 3a856421c6b6d77047be53cc683eb466e3a3898807108873616e8680f7de45f6fb4b571dfaca0a192cc57d4d1850cb947ed7d63b169ecc6363e44833339c9b0f
 EBUILD spectools-2011.08.1.ebuild 1281 SHA256 63bc15d36105a30e78ac60056ae58b78a833b9be81e2a4565823483e46839d86 SHA512 074b8b3e35f668e4f668aadb35f6564dd9058b861489e023e19970e8fbf3f6b69acce4dbe68d90a53c02b663ff9416660f82ac09a027de37bab8bd33b183b9e1 WHIRLPOOL baf287361351324ff5d9a42a2b3702bf502d3ef29a0a3948810d9f720524681994370f01d2ee0e7b732978d2222ed3554fc44bd175a2e74bc9e4777bc40c6ef3
-EBUILD spectools-9999.ebuild 1656 SHA256 c9d89890d3d5045468ca01a91d63544256205962829038ee4b212aa0ecf832c4 SHA512 3d0499b76506dbe6db03c3ab1d03df7ffcac05a0338d370a96b03653431c8b5b8d7fbdac598741bdbe90a9d66415590635110aa981f8422aa765d97191d705bd WHIRLPOOL f33f5ba55f229b48a7dd0cc1212f898a3371ccbe519f989eabf032161c43ba02ed926b3976fbc6acc10fd936d12ba59745eb13c1a50fd5a5599dd9ca9276cec8
-MISC ChangeLog 2768 SHA256 324ab710f69891c184abb26f4fd15a24ab41bc1a4d39291ba577267220be27ac SHA512 2949518c1ebccbfb553c20595c209865996316433a4e1b9b162baf39a7de6016e8d2b42378d27e226c604bf3ea7056561a8f4d5a427850cdfc8192e4d027db9d WHIRLPOOL 1b65f57eb3999c21534dde6e8662357c5f0b55260ec967e876756288188bd27d678a6374ad729574e47d27a86ef06109f203e3e511e9b85944bd01ad94cad495
+EBUILD spectools-9999.ebuild 1785 SHA256 6103cd153ec69d87f5adae3023252472893965461e8e5a434b2e6b8838df1374 SHA512 a56692253896982d6082b4c25dee1ac0046707cc868ff258e74fc9a3ab1c6ec91fdd3513f0ad8d1945243cc9ec56cf255edef70932f558abaa54a5227b31b1cc WHIRLPOOL 82b16dd2c1d097f7ba6d2d6a7cbaf763f665ce10b41c558efbdd30680e9de05efe1dc5bb080e7f1b9326ddf014e8952e951be387004b371515005a4aecc5004a
+MISC ChangeLog 2970 SHA256 1f90be96a26b3a6512f4857130d2498caafcec8dccebd4e6577fa81fbf015f17 SHA512 9ce6ed9b8e33a015c04b35966962327bd02ce4c574fe1660eddd550c45ecfe7ea4197cfb4651fa8d2bffd2bcbb0209029adfa6f460773f8b720a6515fb13f533 WHIRLPOOL 7fcbf2a70094719e6811e6fb9c33e1c098bdf49ae40aaa86e16c8b82d8567851af9b3c8b959ae46cb6b83bb8d5e228ae66a2fbee34db7be09b3b9d9fe6595dfb
 MISC metadata.xml 907 SHA256 2dff6e0a8e306576f4e97d877d44aaf1d09e3033c153553414dba94451505411 SHA512 f533248444b9c08bf05284163241b39564cc72a89bd9b3b57d01e615d615c8b8d6391e155964bd1c35b5ec602dc3a36c99855d7ff9be1586522396d4bc71b2e1 WHIRLPOOL 9e9106d9368f2ef8e712a7bf87a90c2eef7f6b55f6fc602fa9f697c299744b75288d9c3c60b3e2155c64fb450f88e9d990809cba2be230595cafa9fb23637d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJP91VfAAoJEKXdFCfdEflKXo8P/0AkVH+flrmI2Mi86P8Hy5B4
-21/okXWv/PY0nH41HT11tHtKMSj1mgqTOGnCdk0b++GCMWGNgsZMRHqfbX2xpCDW
-LMNDqwrF8K49wamEwLnGe+tOlu+JikB0uo4pPp3QdNMlPJkeDA8ZADXWvrRmhnxc
-+2BQjHx1OLcY9rW4KUr7Jaliz5ht9tlPOlYfaJWcKwM6bER17CCBypO0Z6HMViir
-B6u+L6C9jm4kUfd9jJaxb4VNGl4RlpfyUqjGUV4jkBcaHYWKqiW+dcrqSV2ySA0X
-tGuYwbmMaXilAfVH6+YnI5lNE/NaEATjHRwUx1Znn3ydAAMrIcvy5OyAJRCkIpzV
-lTGn5/3lon+c4IV2zArIVcxhbhzQVteIXaQExBkkILi8KWHPHdgQrxN35yESv/zW
-5NDtZmctJxnqC+ve70W7d9b8WsmjtTfFP8qG7foS1CyAszc1MPecFiH5okDvarh/
-ch60dZ28KBNtfFG6qOlZiKMa31zVPy72Pi4TFbfzwn55pMBFfzvmKjrJJCK2Ejdg
-XiEJ8CvPCSgr6h7EHi82GVk++tA8CDk3CEv2F5CXEi73nrFnBln0UBZ///NaLLg9
-9cUZh06HQ+uY6ZqA63hmmOLHT7zqmEuiBqVtiSrh8B526HhIR3GcDa+hyjmdt+8/
-macu0n3BQaRBwnoMKUMi
-=+Som
+iQEcBAEBCAAGBQJQJ2ydAAoJEEdUh39IaPFNc8oIAJ4rWdzJ1qGIcwKG0OlaIPyF
+x6PIUE5yxQnuGeNeDe7WW1cxi0WBGaeNZSxIMYvSJ5Exw4FobhwlC7jalRKaNlp/
+QkfA6wWKzSgZlQR5krhdB+oWTHA9HYVvsXXk0FIRJR8+qe1caWn+9TencNFKeuZh
+yV8rV+84NPXpVyR0qHkWWX7aqomyItip7hiv9soVc90YYj3rW1YlRUfLwWtgRxuF
+5QW1ZLgD6d1rVuFb3eBMpyfkjspjyvOHA5y8RucC4GI4k9k8eFvf8D8dEAyqQlgW
+yMmn+he+ckRoM4iOICraa3WzD8wflpewY/JxaXBQ8g6AP+zDtn8HEyirfQEMi7k=
+=NU7L
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/spectools/spectools-2011.08.1-r2.ebuild b/net-wireless/spectools/spectools-2011.08.1-r2.ebuild
new file mode 100644
index 000000000000..03e193762154
--- /dev/null
+++ b/net-wireless/spectools/spectools-2011.08.1-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-2011.08.1-r2.ebuild,v 1.1 2012/08/12 08:43:43 ssuominen Exp $
+
+EAPI=4
+inherit toolchain-funcs
+
+MY_PN=${PN}
+MY_PV=${PV/\./-}
+MY_PV=${MY_PV/./-R}
+MY_P="${MY_PN}-${MY_PV}"
+S=${WORKDIR}/${MY_P}
+
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://www.kismetwireless.net/code/svn/tools/${PN}"
+		inherit subversion
+		KEYWORDS=""
+else
+		SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
+		KEYWORDS="~amd64 ~arm ~ppc ~x86"
+fi
+
+DESCRIPTION="Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware"
+HOMEPAGE="http://www.kismetwireless.net/spectools/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ncurses gtk"
+
+RDEPEND="virtual/libusb:0
+	ncurses? ( sys-libs/ncurses )
+	gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+# Upstream has still not migrated to the libusb-1 line.
+# Maemo: Add hildon and bbus
+
+# Please note that upstream removed the --with-gtk-version option
+# and GTK is now automagical. GTK1 support was also removed.
+src_compile() {
+	emake depend
+
+	emake spectool_net spectool_raw
+
+	if use ncurses; then
+		emake spectool_curses
+	fi
+
+	if use gtk; then
+		emake spectool_gtk
+	fi
+
+	#if use maemo; then
+	#	emake spectool_hildon usbcontrol \
+	#		|| die "emake spectool_hildon usbcontrol failed"
+	#fi
+}
+
+src_install() {
+	dobin spectool_net spectool_raw
+	use ncurses && dobin spectool_curses
+	use gtk && dobin spectool_gtk
+
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	insinto "${udevdir}"/rules.d
+	doins 99-wispy.rules
+	dodoc README
+
+	#if use maemo; then
+	#	dobin spectool_hildon
+	#	dosbin usbcontrol
+	#fi
+}
diff --git a/net-wireless/spectools/spectools-9999.ebuild b/net-wireless/spectools/spectools-9999.ebuild
index a7418ac350ae..ee2aa9076ee6 100644
--- a/net-wireless/spectools/spectools-9999.ebuild
+++ b/net-wireless/spectools/spectools-9999.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-9999.ebuild,v 1.5 2012/07/06 21:14:42 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-9999.ebuild,v 1.6 2012/08/12 08:43:43 ssuominen Exp $
 
 EAPI=4
+inherit toolchain-funcs
 
 MY_PN=${PN}
 MY_PV=${PV/\./-}
@@ -27,10 +28,11 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug ncurses gtk"
 
-DEPEND="${RDEPEND}"
 RDEPEND="virtual/libusb:0
 	ncurses? ( sys-libs/ncurses )
 	gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 # Upstream has still not migrated to the libusb-1 line.
 # Maemo: Add hildon and bbus
 
@@ -59,8 +61,9 @@ src_install() {
 	use ncurses && dobin spectool_curses
 	use gtk && dobin spectool_gtk
 
-	dodir /lib/udev/rules.d/
-	insinto /lib/udev/rules.d/
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	insinto "${udevdir}"/rules.d
 	doins 99-wispy.rules
 	dodoc README