From 05e3b021238b94a6e0ad13bff1a25cd03cb75ea4 Mon Sep 17 00:00:00 2001 From: Christian Heim Date: Sat, 10 Feb 2007 12:06:00 +0000 Subject: [PATCH] Fixing compilation with kernel >= 2.6.19, thanks to Paul Healy in #164743. Package-Manager: portage-2.1.2-r9 --- net-wireless/wavemon/ChangeLog | 11 ++++- net-wireless/wavemon/Manifest | 35 ++++++++++----- .../wavemon/files/digest-wavemon-0.3.3 | 2 + .../wavemon/files/digest-wavemon-0.4.0b-r2 | 3 ++ .../files/wavemon-0.4.0b-includes.patch | 13 ++++++ net-wireless/wavemon/wavemon-0.4.0b-r2.ebuild | 44 +++++++++++++++++++ 6 files changed, 94 insertions(+), 14 deletions(-) create mode 100644 net-wireless/wavemon/files/digest-wavemon-0.4.0b-r2 create mode 100644 net-wireless/wavemon/files/wavemon-0.4.0b-includes.patch create mode 100644 net-wireless/wavemon/wavemon-0.4.0b-r2.ebuild diff --git a/net-wireless/wavemon/ChangeLog b/net-wireless/wavemon/ChangeLog index 06036b2e1af7..fbf89fdced78 100644 --- a/net-wireless/wavemon/ChangeLog +++ b/net-wireless/wavemon/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-wireless/wavemon -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wavemon/ChangeLog,v 1.19 2006/06/28 15:29:51 dang Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wavemon/ChangeLog,v 1.20 2007/02/10 12:06:00 phreak Exp $ + +*wavemon-0.4.0b-r2 (10 Feb 2007) + + 10 Feb 2007; Christian Heim + +files/wavemon-0.4.0b-includes.patch, +wavemon-0.4.0b-r2.ebuild: + Fixing compilation with kernel >= 2.6.19, thanks to Paul Healy in #164743. 28 Jun 2006; Daniel Gryniewicz wavemon-0.4.0b-r1.ebuild: Marked stable on amd64 per bug# 137977 diff --git a/net-wireless/wavemon/Manifest b/net-wireless/wavemon/Manifest index 03bdf77ae93d..5122cbea55c3 100644 --- a/net-wireless/wavemon/Manifest +++ b/net-wireless/wavemon/Manifest @@ -1,12 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX wavemon-0.4.0b-includes.patch 309 RMD160 8924078b63ce2e8a0ad84ad49ad1294ae68ed3ff SHA1 b1cbb02703557ab72c44cb395a4c97f3ebdcdb70 SHA256 d641dfbdb67eebb36c156538459b4bca0b9c6304cffb40367973d134d2c21e11 +MD5 3054f5d73005d48efa457a4a68c7ff33 files/wavemon-0.4.0b-includes.patch 309 +RMD160 8924078b63ce2e8a0ad84ad49ad1294ae68ed3ff files/wavemon-0.4.0b-includes.patch 309 +SHA256 d641dfbdb67eebb36c156538459b4bca0b9c6304cffb40367973d134d2c21e11 files/wavemon-0.4.0b-includes.patch 309 AUX wavemon-gcc-fixes.patch 2147 RMD160 2d9942022595c6ff0fe48bacee46316cf1d31538 SHA1 6cca474c91ad7528995f6e03e108dcd13ea7a75b SHA256 030d79e605d8217281b9cdeecaf241dc2bc9fa8b8c7acb518d4c7aca53db05bd MD5 c818e93801166a1257810f1ccd56001d files/wavemon-gcc-fixes.patch 2147 RMD160 2d9942022595c6ff0fe48bacee46316cf1d31538 files/wavemon-gcc-fixes.patch 2147 SHA256 030d79e605d8217281b9cdeecaf241dc2bc9fa8b8c7acb518d4c7aca53db05bd files/wavemon-gcc-fixes.patch 2147 DIST wavemon-0.4.0b.tar.gz 71540 RMD160 91ae1eab82de15b91863ea3e714c8f6f9b08bc0b SHA1 59629c71381c4c318685d66021065c7b7eaa50d2 SHA256 4e8dba564f22cdd593df541257b487cd03c599e4591c4a7eb692b015adc594cd -DIST wavemon-current.tar.gz 29662 +DIST wavemon-current.tar.gz 29662 RMD160 adaaae661f05c76309742d66c1345141a40a356c SHA1 8867d932ebde5defa10ea6ba94ebc1a47b317720 SHA256 f0cea97327e9f497b96875e9e33bb433c22acc2514f90977bd9fe0285152a21a EBUILD wavemon-0.3.3.ebuild 648 RMD160 727e4f6e5a60ae8c571365d4e5728fd697d9e0eb SHA1 f82ca6640d34bc55b1d8d36c880b0425ea7f235e SHA256 0878cb8a4252a002158cbf10d82ac866113c345372c7a0c9be1d6dc9b90dc0d7 MD5 b398ad3577a6f1965d14ffc7ba01c58f wavemon-0.3.3.ebuild 648 RMD160 727e4f6e5a60ae8c571365d4e5728fd697d9e0eb wavemon-0.3.3.ebuild 648 @@ -15,31 +19,38 @@ EBUILD wavemon-0.4.0b-r1.ebuild 1031 RMD160 2467fba52c08f909b541c3a4a19b50e0c691 MD5 28069a560d97d75e37f3195fa180573a wavemon-0.4.0b-r1.ebuild 1031 RMD160 2467fba52c08f909b541c3a4a19b50e0c6914363 wavemon-0.4.0b-r1.ebuild 1031 SHA256 9c64c64296d5c8f68e699db0239f59a6caa6a456f4e1bd77bbe3e152d16b4fa1 wavemon-0.4.0b-r1.ebuild 1031 +EBUILD wavemon-0.4.0b-r2.ebuild 1084 RMD160 b786627319f506b445f31988cb985267b81b5efb SHA1 ea55668c679ffbbabf93552a8525f4d3402856c1 SHA256 c488b68b2a812bd52bacca7ff86030fb6e6202c4bbbf8d8a1de7a114b2f8f886 +MD5 320910673f00bddf437839a6d68dd6f6 wavemon-0.4.0b-r2.ebuild 1084 +RMD160 b786627319f506b445f31988cb985267b81b5efb wavemon-0.4.0b-r2.ebuild 1084 +SHA256 c488b68b2a812bd52bacca7ff86030fb6e6202c4bbbf8d8a1de7a114b2f8f886 wavemon-0.4.0b-r2.ebuild 1084 EBUILD wavemon-0.4.0b.ebuild 872 RMD160 77d9f9dafef5f79620a3af825faecf8cc2cb5d81 SHA1 a5eccd64846ac676be676f1f30070673224a04f8 SHA256 605a47c2217d0ca056ac36adbf3e3e73475f130445a2747391404ce50dbd3a73 MD5 e9b0833f38c7197280c0fb4fa17f65f0 wavemon-0.4.0b.ebuild 872 RMD160 77d9f9dafef5f79620a3af825faecf8cc2cb5d81 wavemon-0.4.0b.ebuild 872 SHA256 605a47c2217d0ca056ac36adbf3e3e73475f130445a2747391404ce50dbd3a73 wavemon-0.4.0b.ebuild 872 -MISC ChangeLog 2369 RMD160 39aa01f77ae98bddada4308eb192e30f0bb95b5c SHA1 63e833befe39c39e2452e8cf41680e54ba186d53 SHA256 103bc4406b7f54adcfe4e77ccabb595ebbf681ce0ffb295588681c193beafef8 -MD5 e91002181c20b837c9800c120ac28078 ChangeLog 2369 -RMD160 39aa01f77ae98bddada4308eb192e30f0bb95b5c ChangeLog 2369 -SHA256 103bc4406b7f54adcfe4e77ccabb595ebbf681ce0ffb295588681c193beafef8 ChangeLog 2369 +MISC ChangeLog 2625 RMD160 956783088604323134f976d1e2fc804547b286e6 SHA1 2f7441011a9c2fbc60a6172bdfff19f7590e22ae SHA256 78faf65aa7f85d443734e7746fe63e02ff9838d762da951e918d30a639526b86 +MD5 8350cd5b6748fbff9df5e60f57ca0152 ChangeLog 2625 +RMD160 956783088604323134f976d1e2fc804547b286e6 ChangeLog 2625 +SHA256 78faf65aa7f85d443734e7746fe63e02ff9838d762da951e918d30a639526b86 ChangeLog 2625 MISC metadata.xml 252 RMD160 70c2f93d04f8660d7fd63dc3d926350968fbd85c SHA1 5c3966660a99fb3159f3ccc72350a37b5d5325ae SHA256 1ffeb3716a115b2efee6ea554844b00564c9db4e85758b5ce751939152a1a5ed MD5 32831d719499c83f7942f6432ef58278 metadata.xml 252 RMD160 70c2f93d04f8660d7fd63dc3d926350968fbd85c metadata.xml 252 SHA256 1ffeb3716a115b2efee6ea554844b00564c9db4e85758b5ce751939152a1a5ed metadata.xml 252 -MD5 74ff273e243d9bfc9a4e80c8a7e6eeaa files/digest-wavemon-0.3.3 66 -RMD160 d8a3568fb2a542664460f9618fe5e83ddcd799fb files/digest-wavemon-0.3.3 66 -SHA256 be5b752bccff8f172517e7e1506c48cfd6a826573a96e977a35849b4ad152068 files/digest-wavemon-0.3.3 66 +MD5 23613326389d9e617a6ba365f439d392 files/digest-wavemon-0.3.3 244 +RMD160 00945ce696d2888618f9ee155c1776d925e36ac1 files/digest-wavemon-0.3.3 244 +SHA256 ffea222a8af9733665e391308dbc4a975f89452cf3996233e00df4ad583a0a5f files/digest-wavemon-0.3.3 244 MD5 08b851b022c4fc3dda2288d0b542a7cc files/digest-wavemon-0.4.0b 241 RMD160 b48b80dc2d9086ed0ce0863b1523d0c21f94fb76 files/digest-wavemon-0.4.0b 241 SHA256 b4025c8ca28e303c2bbc95080078796e077a0e8d97ec7dd394f90dfcc41de56b files/digest-wavemon-0.4.0b 241 MD5 08b851b022c4fc3dda2288d0b542a7cc files/digest-wavemon-0.4.0b-r1 241 RMD160 b48b80dc2d9086ed0ce0863b1523d0c21f94fb76 files/digest-wavemon-0.4.0b-r1 241 SHA256 b4025c8ca28e303c2bbc95080078796e077a0e8d97ec7dd394f90dfcc41de56b files/digest-wavemon-0.4.0b-r1 241 +MD5 08b851b022c4fc3dda2288d0b542a7cc files/digest-wavemon-0.4.0b-r2 241 +RMD160 b48b80dc2d9086ed0ce0863b1523d0c21f94fb76 files/digest-wavemon-0.4.0b-r2 241 +SHA256 b4025c8ca28e303c2bbc95080078796e077a0e8d97ec7dd394f90dfcc41de56b files/digest-wavemon-0.4.0b-r2 241 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFEoqB1omPajV0RnrERAurDAJ9duMd8kstWKnJGy2NV8AUN3wsWaACeL9o7 -4DCRjVmeJo8Jf/AbIDxhd2Q= -=pTn7 +iD8DBQFFzbUxyuNVb5qfaOYRAs/yAJ9h2w2cxc4nWMuJtElZjZu0YlHbGQCguqAv +6SapJsMlNRsx+Q6Qr8/GBqo= +=HiZQ -----END PGP SIGNATURE----- diff --git a/net-wireless/wavemon/files/digest-wavemon-0.3.3 b/net-wireless/wavemon/files/digest-wavemon-0.3.3 index bddfe5b47b85..af3cbf4c000c 100644 --- a/net-wireless/wavemon/files/digest-wavemon-0.3.3 +++ b/net-wireless/wavemon/files/digest-wavemon-0.3.3 @@ -1 +1,3 @@ MD5 9bd4cc17c2a6491bb14d30f1c03adf49 wavemon-current.tar.gz 29662 +RMD160 adaaae661f05c76309742d66c1345141a40a356c wavemon-current.tar.gz 29662 +SHA256 f0cea97327e9f497b96875e9e33bb433c22acc2514f90977bd9fe0285152a21a wavemon-current.tar.gz 29662 diff --git a/net-wireless/wavemon/files/digest-wavemon-0.4.0b-r2 b/net-wireless/wavemon/files/digest-wavemon-0.4.0b-r2 new file mode 100644 index 000000000000..e1def3eb2d1a --- /dev/null +++ b/net-wireless/wavemon/files/digest-wavemon-0.4.0b-r2 @@ -0,0 +1,3 @@ +MD5 2baab37eb967fc38dc53f8e4f609daac wavemon-0.4.0b.tar.gz 71540 +RMD160 91ae1eab82de15b91863ea3e714c8f6f9b08bc0b wavemon-0.4.0b.tar.gz 71540 +SHA256 4e8dba564f22cdd593df541257b487cd03c599e4591c4a7eb692b015adc594cd wavemon-0.4.0b.tar.gz 71540 diff --git a/net-wireless/wavemon/files/wavemon-0.4.0b-includes.patch b/net-wireless/wavemon/files/wavemon-0.4.0b-includes.patch new file mode 100644 index 000000000000..dbc6faed8753 --- /dev/null +++ b/net-wireless/wavemon/files/wavemon-0.4.0b-includes.patch @@ -0,0 +1,13 @@ +Index: wavemon-0.4.0b/iw_if.h +=================================================================== +--- wavemon-0.4.0b.orig/iw_if.h ++++ wavemon-0.4.0b/iw_if.h +@@ -19,6 +19,8 @@ + */ + + #include ++#include ++#include + #include + + #define IW_STACKSIZE 1024 diff --git a/net-wireless/wavemon/wavemon-0.4.0b-r2.ebuild b/net-wireless/wavemon/wavemon-0.4.0b-r2.ebuild new file mode 100644 index 000000000000..a5fa6e773e26 --- /dev/null +++ b/net-wireless/wavemon/wavemon-0.4.0b-r2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wavemon/wavemon-0.4.0b-r2.ebuild,v 1.1 2007/02/10 12:06:00 phreak Exp $ + +inherit toolchain-funcs flag-o-matic eutils linux-info + +DESCRIPTION="Ncurses based monitor for IEEE 802.11 wireless LAN cards" +HOMEPAGE="http://www.janmorgenstern.de/projects-software.html" +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" + +IUSE="" +DEPEND="sys-libs/ncurses" + +src_unpack() { + unpack ${A} + + cd "${S}" + epatch "${FILESDIR}"/wavemon-gcc-fixes.patch + epatch "${FILESDIR}"/${P}-includes.patch + + append-flags "-I${KV_DIR}/include" + + sed -i \ + -e "s|^CFLAGS=\".*\"|CFLAGS=\"${CFLAGS}\"|" \ + "${S}"/configure +} + +src_compile() { + CC=$(tc-getCC) econf || die "econf failed" + emake || die "emake failed" +} + +src_install() { + dodir /usr/bin /usr/share/man/{man1,man5} + + make prefix="${D}"/usr mandir="${D}"/usr/share/man install \ + || die "make install failed" + + dodoc AUTHORS Changelog README TODO +} -- 2.26.2