diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-02-16 20:57:10 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-02-16 20:57:10 +0000 |
| commit | 68701e4f90884625990bb48a394c838500cde64d (patch) | |
| tree | 34bf97569b24da1d71203b9ab5a01c1d6893e069 /dev-python/python-iwscan | |
| parent | Add fbosd and macosx specific useflags (diff) | |
| download | historical-68701e4f90884625990bb48a394c838500cde64d.tar.gz historical-68701e4f90884625990bb48a394c838500cde64d.tar.bz2 historical-68701e4f90884625990bb48a394c838500cde64d.zip | |
Fix building with >=net-wireless/wireless-tools-30_pre9 (bug #352635).
Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64
Diffstat (limited to 'dev-python/python-iwscan')
4 files changed, 34 insertions, 9 deletions
diff --git a/dev-python/python-iwscan/ChangeLog b/dev-python/python-iwscan/ChangeLog index 7b70132b491d..36ecca03d916 100644 --- a/dev-python/python-iwscan/ChangeLog +++ b/dev-python/python-iwscan/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/python-iwscan -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/python-iwscan/ChangeLog,v 1.12 2010/12/25 17:00:56 arfrever Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-iwscan/ChangeLog,v 1.13 2011/02/16 20:57:10 arfrever Exp $ + + 16 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + python-iwscan-20080402.ebuild, + +files/python-iwscan-20080402-wireless-tools-30.patch: + Fix building with >=net-wireless/wireless-tools-30_pre9 (bug #352635). 25 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> python-iwscan-20080402.ebuild: diff --git a/dev-python/python-iwscan/Manifest b/dev-python/python-iwscan/Manifest index 2151f0cceb12..0f9290997559 100644 --- a/dev-python/python-iwscan/Manifest +++ b/dev-python/python-iwscan/Manifest @@ -1,4 +1,5 @@ +AUX python-iwscan-20080402-wireless-tools-30.patch 366 RMD160 d49a4f692f73d59473a7facc37a6d9e853969bf6 SHA1 7e782ce214eaf6207a6f617feda4567b4c04e09b SHA256 fc33b141d7c5f389616f3a952b3f8dcd291c3a1a0da9d8406d69314b39f76dba DIST python-iwscan-20080402.tar.bz2 16891 RMD160 a77faf65a3d92c7843326db97bbe25f15a707298 SHA1 9c93953b9504d6f98fc52a3ee7fd97980d69e1af SHA256 1e534508597bd86cfab3f3d7b5e1f6d924812f374e3e26c1546c4ecbb07f8b8c -EBUILD python-iwscan-20080402.ebuild 629 RMD160 982a990b191021da22596587b20d169d21217885 SHA1 2076fbc9cac54cafd801346b0127c320e29f1339 SHA256 e454afaf42886708f145d62922ef2cf8a5963407c64be39edb35be43a65800b9 -MISC ChangeLog 1703 RMD160 1f08c911ca7d1f46d90d712b0cd03ae9f5773195 SHA1 ce5abbd304e2de3bf11c2acce8cafacd466501bf SHA256 410a35bf4e9f13982cf4114b3ffa7783289e78af81305479be4f8fa090536a7b +EBUILD python-iwscan-20080402.ebuild 766 RMD160 c4c8a9f22fd7146bc661bef89428cb934b136125 SHA1 99bd635f945107d9239ecc14eb476eab8d57473f SHA256 b7aa2e0a29aa9ba203bcefad50028f4e819a91ca7c55897b4353aa1cf0a75dc0 +MISC ChangeLog 1940 RMD160 ae65788ad1f235c012557b903a2b76dc0da69800 SHA1 16c55c12c44c1b7d2bdd9a15e158c0b72e6a666e SHA256 d494af18367ca2ab1a5e1085ded81b82181183c05ec41342300a6c75bfca9620 MISC metadata.xml 334 RMD160 02d1d1aff70b0b027d706866ddde41738f165f7c SHA1 5a28b07ea46e687795cc47fa6994d1768ea019fc SHA256 27efcdf03827f2a607a5ec483013adf5c2b5c429aa47a07f672cbbc8cbb6b003 diff --git a/dev-python/python-iwscan/files/python-iwscan-20080402-wireless-tools-30.patch b/dev-python/python-iwscan/files/python-iwscan-20080402-wireless-tools-30.patch new file mode 100644 index 000000000000..16a9dce1858f --- /dev/null +++ b/dev-python/python-iwscan/files/python-iwscan-20080402-wireless-tools-30.patch @@ -0,0 +1,14 @@ +--- pyiwscan.c ++++ pyiwscan.c +@@ -13,6 +13,11 @@ + #include <structmember.h> + #include <iwlib.h> + ++/* PROC_NET_WIRELESS is defined in iwlib-private.h since wireless-tools-30_pre9 */ ++#ifndef PROC_NET_WIRELESS ++#define PROC_NET_WIRELESS "/proc/net/wireless" ++#endif ++ + #define IWSCAN_VERSION_MAJOR 0 + #define IWSCAN_VERSION_MINOR 7 + #define IWSCAN_VERSION_MICRO 0 diff --git a/dev-python/python-iwscan/python-iwscan-20080402.ebuild b/dev-python/python-iwscan/python-iwscan-20080402.ebuild index 3d932d73d1ef..8c89d0241b76 100644 --- a/dev-python/python-iwscan/python-iwscan-20080402.ebuild +++ b/dev-python/python-iwscan/python-iwscan-20080402.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/python-iwscan/python-iwscan-20080402.ebuild,v 1.9 2010/12/25 17:00:56 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-iwscan/python-iwscan-20080402.ebuild,v 1.10 2011/02/16 20:57:10 arfrever Exp $ EAPI="3" PYTHON_DEPEND="2" SUPPORT_PYTHON_ABIS="1" RESTRICT_PYTHON_ABIS="3.* *-jython" -inherit distutils +inherit distutils eutils DESCRIPTION="A Python extension for iwscan access" HOMEPAGE="http://projects.otaku42.de/browser/python-iwscan" @@ -18,7 +18,12 @@ SLOT="0" KEYWORDS="amd64 ppc ppc64 x86" IUSE="" -DEPEND="" -RDEPEND="" +DEPEND="net-wireless/wireless-tools" +RDEPEND="${DEPEND}" PYTHON_CFLAGS=("2.* + -fno-strict-aliasing") + +src_prepare() { + distutils_src_prepare + epatch "${FILESDIR}/${P}-wireless-tools-30.patch" +} |