Applied a patch to make it compile on kernel 2.4, thanks to Nico Baggus for bug 155604.

Package-Manager: portage-2.1.2_rc2

diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 5504726436ec9d78b09c5d74c7b3dc9680d68bd9..d0c8d870dac498ad9c4c413d455c67ccdd3fc1ff 100644 (file)
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,10 +1,40 @@
-MD5 dfb200a04089984c84f6c1845f7a3eea ChangeLog 1976
+AUX iperf.confd 308 RMD160 fcaf0a1be69f6265465abab1d0ef664c29923fca SHA1 21532c86c19942030d1b329da136f6cefe1be381 SHA256 11dfe3580458416c9a71b516655df0968f277197f090212d378efe62aacaef9f
+MD5 fb3cd54b7325d842e3118e6d41503ac0 files/iperf.confd 308
+RMD160 fcaf0a1be69f6265465abab1d0ef664c29923fca files/iperf.confd 308
+SHA256 11dfe3580458416c9a71b516655df0968f277197f090212d378efe62aacaef9f files/iperf.confd 308
+AUX iperf.initd 521 RMD160 05539f95e98815fcd6348b0ed785961ec174b04b SHA1 57265f028c655c2e676559a192376a8ac910643e SHA256 929f5f87ccff042d6b14a4cf4880218fea802cd1b2f66f9bdda8dfac3052c7d7
+MD5 670817398ac2d9dc91ce1ae301e62ee1 files/iperf.initd 521
+RMD160 05539f95e98815fcd6348b0ed785961ec174b04b files/iperf.initd 521
+SHA256 929f5f87ccff042d6b14a4cf4880218fea802cd1b2f66f9bdda8dfac3052c7d7 files/iperf.initd 521
+DIST iperf-1.7.0-source.tar.gz 182773
+DIST iperf-2.0.1.tar.gz 220446
+DIST iperf-2.0.2.tar.gz 233595
+EBUILD iperf-1.7.0.ebuild 945 RMD160 e336945d6bee2484288e1217d28383fdd48f51de SHA1 0c54cdabc39d7f8f03e574763230bd1078a484e5 SHA256 2ce82fa6e5d3880f73359801bf659f33a71c6751543c81ab01d014213c9f8c9f
 MD5 d86d58b1bf956b911e93a1eb419d6d8c iperf-1.7.0.ebuild 945
+RMD160 e336945d6bee2484288e1217d28383fdd48f51de iperf-1.7.0.ebuild 945
+SHA256 2ce82fa6e5d3880f73359801bf659f33a71c6751543c81ab01d014213c9f8c9f iperf-1.7.0.ebuild 945
+EBUILD iperf-2.0.1.ebuild 959 RMD160 0bc73aa792c474ed875088d747e27149a9e6898b SHA1 c158253fb3cc037ee2066030e6e10a14c6ded22d SHA256 35edea9925f7e15317b6a1be7d0419f9e8b48af642731c2b54fda12467f809ed
 MD5 c3fc52c5ffa9cc958946dc05d544ab2b iperf-2.0.1.ebuild 959
-MD5 b1383a0b0061257658c30b808affb071 iperf-2.0.2.ebuild 964
+RMD160 0bc73aa792c474ed875088d747e27149a9e6898b iperf-2.0.1.ebuild 959
+SHA256 35edea9925f7e15317b6a1be7d0419f9e8b48af642731c2b54fda12467f809ed iperf-2.0.1.ebuild 959
+EBUILD iperf-2.0.2.ebuild 968 RMD160 05472246d3947b7a291d45f6b2f48c236664bc34 SHA1 d7f05158a8aba8b31e449705c4d82179e077f962 SHA256 732ce90410474b156e50328359566054ca31e32bd12dad5056b859c353e0d6be
+MD5 6876b56a6e2bb527ec6162a7cf09835d iperf-2.0.2.ebuild 968
+RMD160 05472246d3947b7a291d45f6b2f48c236664bc34 iperf-2.0.2.ebuild 968
+SHA256 732ce90410474b156e50328359566054ca31e32bd12dad5056b859c353e0d6be iperf-2.0.2.ebuild 968
+MISC ChangeLog 2062 RMD160 f2ebf90e58f13832c685c43ad5c824505a12489f SHA1 b728bccd4d39ca34788b7835428f0b65b99d4b23 SHA256 952f70a60dc3f31334671c20a8376164b0d46cf7d7b59d1348f4bbf506485a60
+MD5 e41eda6b7c0f4c09e64d6363ca2a3248 ChangeLog 2062
+RMD160 f2ebf90e58f13832c685c43ad5c824505a12489f ChangeLog 2062
+SHA256 952f70a60dc3f31334671c20a8376164b0d46cf7d7b59d1348f4bbf506485a60 ChangeLog 2062
+MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
 MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b metadata.xml 159
+SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 metadata.xml 159
 MD5 8d7742f71fada23db6fa1398664a3c2e files/digest-iperf-1.7.0 70
+RMD160 5c454b36e49893633bbc5bc51f145eba20c7665e files/digest-iperf-1.7.0 70
+SHA256 d15d5ed432f8e5626ee29add517fb680c425149fc60163024de988c32c1a4471 files/digest-iperf-1.7.0 70
 MD5 99a03cce31fe2b9ff92f82359c48eae5 files/digest-iperf-2.0.1 63
+RMD160 b5f081142daeba54f3edb7c4d4b095adb8856a8f files/digest-iperf-2.0.1 63
+SHA256 7f97fd0ca2f7694cc1241e310844823fb3b2a330ecb9db47f3c01a8c9c98da30 files/digest-iperf-2.0.1 63
 MD5 d0b327d4891d45777215270af6210cf1 files/digest-iperf-2.0.2 63
-MD5 fb3cd54b7325d842e3118e6d41503ac0 files/iperf.confd 308
-MD5 670817398ac2d9dc91ce1ae301e62ee1 files/iperf.initd 521
+RMD160 35c93f842b15081e593ca348acd9836d6b54dcf7 files/digest-iperf-2.0.2 63
+SHA256 2073982baa3411c46c263f1d1ef0e3dc286e130796d62cc3c0389da793f36551 files/digest-iperf-2.0.2 63

diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
index ef34cbbf45452b460858cb44a907a6e30fae374e..f77f9e5f7cdb3a85859eebd81f3d4f87f16607e1 100644 (file)
--- a/net-misc/zaptel/ChangeLog
+++ b/net-misc/zaptel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/zaptel
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.84 2006/11/17 18:20:35 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.85 2006/11/19 16:50:09 drizzt Exp $
+
+  19 Nov 2006; Timothy Redaelli <drizzt@gentoo.org> zaptel-1.2.11.ebuild:
+  Applied a patch to make it compile on kernel 2.4, thanks to Nico Baggus for
+  bug 155604.
 
 *zaptel-1.2.11 (17 Nov 2006)
 

diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest
index 1e2a5812e9e88444588cc06e704980d352c387dd..70ae1a522218afd98e1908b2e8fbc6706a46e834 100644 (file)
--- a/net-misc/zaptel/Manifest
+++ b/net-misc/zaptel/Manifest
@@ -89,18 +89,18 @@ EBUILD zaptel-1.2.10.ebuild 8582 RMD160 a4547a159b07ac039081d686777ea8ec927542c3
 MD5 666bb17698ac00689d63042a4d0937da zaptel-1.2.10.ebuild 8582
 RMD160 a4547a159b07ac039081d686777ea8ec927542c3 zaptel-1.2.10.ebuild 8582
 SHA256 7f6265635c0f97b7cd6a2cda017b1691038308d4c56f2e114f97098234e2ca3a zaptel-1.2.10.ebuild 8582
-EBUILD zaptel-1.2.11.ebuild 8756 RMD160 a3621d88c3826cf8a4ea1bcc0764b6256f9647ee SHA1 eebbbc7096d6457982e5258e0eea1f3317edd650 SHA256 ba3413e8eaf0b875a1c52cad084ad44cbd4cf5a751aa5f94e05ca0a7c4196eb9
-MD5 58d2dfa8557fbc8cc3a66a89f1e14c20 zaptel-1.2.11.ebuild 8756
-RMD160 a3621d88c3826cf8a4ea1bcc0764b6256f9647ee zaptel-1.2.11.ebuild 8756
-SHA256 ba3413e8eaf0b875a1c52cad084ad44cbd4cf5a751aa5f94e05ca0a7c4196eb9 zaptel-1.2.11.ebuild 8756
+EBUILD zaptel-1.2.11.ebuild 9001 RMD160 c20e06a9c716f68a839b7d29686a7f2e58b3778f SHA1 ae5c4991c6d0a944a7f7f2db41674bfa45f47d7d SHA256 fd632ae7f751b1ff3935bd1f49acb36f8cff440c4de4b66a560e254a0b4310a7
+MD5 39bddcd1abb9631eb7aa31942cdf8177 zaptel-1.2.11.ebuild 9001
+RMD160 c20e06a9c716f68a839b7d29686a7f2e58b3778f zaptel-1.2.11.ebuild 9001
+SHA256 fd632ae7f751b1ff3935bd1f49acb36f8cff440c4de4b66a560e254a0b4310a7 zaptel-1.2.11.ebuild 9001
 EBUILD zaptel-1.2.9.1.ebuild 8574 RMD160 cd382f76b994968506eff1b47adb7f3f89711acb SHA1 624312f6d96de7031fcc49013469fac286472232 SHA256 e601e9db582419d90e015a40500ba4473cbf0f00bc9fadf89ce8acc08536c8af
 MD5 855074ab185dd77d5d0851657c61f313 zaptel-1.2.9.1.ebuild 8574
 RMD160 cd382f76b994968506eff1b47adb7f3f89711acb zaptel-1.2.9.1.ebuild 8574
 SHA256 e601e9db582419d90e015a40500ba4473cbf0f00bc9fadf89ce8acc08536c8af zaptel-1.2.9.1.ebuild 8574
-MISC ChangeLog 16568 RMD160 4544ad69ad2c02a807256932df60259b8f970b29 SHA1 8f1705e9156c83986d8e337e55389093758fa06e SHA256 13b9db66fba147168de0a44c46da5db6c374405ca47a2b384c37883281893c33
-MD5 bcaf5a1f058fe24c15bef15a7cc8bded ChangeLog 16568
-RMD160 4544ad69ad2c02a807256932df60259b8f970b29 ChangeLog 16568
-SHA256 13b9db66fba147168de0a44c46da5db6c374405ca47a2b384c37883281893c33 ChangeLog 16568
+MISC ChangeLog 16733 RMD160 4a4425f87761fe43dfdb4dc5a9321a2555a07f18 SHA1 fd5c10e87e9f18527a8fb162253dc78e32b95b5f SHA256 abc2e9d04e201648f408401593595cc31f865b5d6f170724e8a6c4b6f5782a93
+MD5 ae5d1fc3500ceaa3b37f7ef463ea5844 ChangeLog 16733
+RMD160 4a4425f87761fe43dfdb4dc5a9321a2555a07f18 ChangeLog 16733
+SHA256 abc2e9d04e201648f408401593595cc31f865b5d6f170724e8a6c4b6f5782a93 ChangeLog 16733
 MISC metadata.xml 382 RMD160 315172442a4bfaa87b855d4c421b22a2527e97b2 SHA1 7b95f41def10946742929592db1d76b7e3bb0a19 SHA256 f79d5cd273e9ecc2181e60ea226a7cb0128011d877fc7531b2df30bd5fd9ae20
 MD5 f3d5d5b8a638e7a9a83fe0eb0d94282c metadata.xml 382
 RMD160 315172442a4bfaa87b855d4c421b22a2527e97b2 metadata.xml 382
@@ -118,9 +118,9 @@ MD5 1e13a9665022158b1d78f47b331688ed files/digest-zaptel-1.2.9.1 798
 RMD160 f10faf8fefa2221dfa0fd8e8a85b658a095d803c files/digest-zaptel-1.2.9.1 798
 SHA256 367d7228a51892a9ad986338a37a3355564b2fc324af014a65f7af78bf676b3d files/digest-zaptel-1.2.9.1 798
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFXf5BKRy60XGEcJIRAiYWAJ9elK4e6oH+au9YLmcU52W7kY6V6wCgp8jZ
-vTMnEqjHg+UDDCf8PnyMNn0=
-=8nlF
+iD8DBQFFYIs1GDyatLGpTbYRAoA5AJ9WBuf7wpW0enQdxjHRZcYuKpAWWwCfZAMc
+5kbPLzasPfQ5+DBwxqAJ14k=
+=9+ZE
 -----END PGP SIGNATURE-----

diff --git a/net-misc/zaptel/zaptel-1.2.11.ebuild b/net-misc/zaptel/zaptel-1.2.11.ebuild
index 4b3f22c9c737fd0edb447b350e981af47f13cd79..aba34c901218c1a942edce2f0bd4f930ebf1099b 100644 (file)
--- a/net-misc/zaptel/zaptel-1.2.11.ebuild
+++ b/net-misc/zaptel/zaptel-1.2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.11.ebuild,v 1.1 2006/11/17 18:20:35 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.11.ebuild,v 1.2 2006/11/19 16:50:09 drizzt Exp $
 
 inherit toolchain-funcs eutils linux-mod
 
@@ -83,11 +83,20 @@ pkg_setup() {
        einfo "Running pre-flight checks..."
 
        # basic zaptel checks
-       if ! linux_chkconfig_present CRC_CCITT; then
-               echo
-               eerror "Your kernel lacks CRC_CCIT support!"
-               eerror "Enable CONFIG_CRC_CCIT!"
-               result=$((result+1))
+       if kernel_is 2 4 ; then
+               if ! linux_chkconfig_present CRC32; then
+                       echo
+                       eerror "Your kernel lacks CRC32 support!"
+                       eerror "Enable CONFIG_CRC32!"
+                       result=$((result+1))
+               fi
+       else
+               if ! linux_chkconfig_present CRC_CCITT; then
+                       echo
+                       eerror "Your kernel lacks CRC_CCIT support!"
+                       eerror "Enable CONFIG_CRC_CCIT!"
+                       result=$((result+1))
+               fi
        fi
 
        # check if multiple echo cancellers have been selected
@@ -257,6 +266,7 @@ src_compile() {
 }
 
 src_install() {
+       kernel_is 2 4 && cp /etc/modules.conf ${D}/etc
        make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
             KVERS=${KV_FULL} KSRC=/usr/src/linux install || die