From 143fc94af033cfdb26cdfd8f50e0bb4b7c57b359 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Tue, 24 Mar 2015 22:45:15 +0000 Subject: [PATCH] Version bump and clear out of old unstable versions. I'm taking over this package as I have the hardware. Closes bugs #523418, #519816 and #512842. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x9C6D7DE4 --- net-misc/r8168/ChangeLog | 15 ++++- net-misc/r8168/Manifest | 57 +++++++------------ .../r8168-8.029.00-linux-3.3-compat.patch | 44 -------------- .../files/r8168-8.035.00-build-3.8.patch | 47 --------------- net-misc/r8168/metadata.xml | 7 +-- net-misc/r8168/r8168-8.026.00.ebuild | 31 ---------- net-misc/r8168/r8168-8.027.00.ebuild | 32 ----------- net-misc/r8168/r8168-8.029.00.ebuild | 36 ------------ net-misc/r8168/r8168-8.030.00.ebuild | 32 ----------- net-misc/r8168/r8168-8.031.00.ebuild | 32 ----------- net-misc/r8168/r8168-8.032.00.ebuild | 32 ----------- net-misc/r8168/r8168-8.035.00-r1.ebuild | 36 ------------ net-misc/r8168/r8168-8.038.00.ebuild | 32 ----------- ...-8.035.00.ebuild => r8168-8.039.00.ebuild} | 8 +-- 14 files changed, 39 insertions(+), 402 deletions(-) delete mode 100644 net-misc/r8168/files/r8168-8.029.00-linux-3.3-compat.patch delete mode 100644 net-misc/r8168/files/r8168-8.035.00-build-3.8.patch delete mode 100644 net-misc/r8168/r8168-8.026.00.ebuild delete mode 100644 net-misc/r8168/r8168-8.027.00.ebuild delete mode 100644 net-misc/r8168/r8168-8.029.00.ebuild delete mode 100644 net-misc/r8168/r8168-8.030.00.ebuild delete mode 100644 net-misc/r8168/r8168-8.031.00.ebuild delete mode 100644 net-misc/r8168/r8168-8.032.00.ebuild delete mode 100644 net-misc/r8168/r8168-8.035.00-r1.ebuild delete mode 100644 net-misc/r8168/r8168-8.038.00.ebuild rename net-misc/r8168/{r8168-8.035.00.ebuild => r8168-8.039.00.ebuild} (67%) diff --git a/net-misc/r8168/ChangeLog b/net-misc/r8168/ChangeLog index 392a6dc1f061..e8fc1ee9147b 100644 --- a/net-misc/r8168/ChangeLog +++ b/net-misc/r8168/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for net-misc/r8168 -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/ChangeLog,v 1.16 2014/03/18 16:45:02 joker Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/ChangeLog,v 1.17 2015/03/24 22:44:54 chewi Exp $ + +*r8168-8.039.00 (24 Mar 2015) + + 24 Mar 2015; James Le Cuirot +r8168-8.039.00.ebuild, + -files/r8168-8.029.00-linux-3.3-compat.patch, + -files/r8168-8.035.00-build-3.8.patch, -r8168-8.026.00.ebuild, + -r8168-8.027.00.ebuild, -r8168-8.029.00.ebuild, -r8168-8.030.00.ebuild, + -r8168-8.031.00.ebuild, -r8168-8.032.00.ebuild, -r8168-8.035.00-r1.ebuild, + -r8168-8.035.00.ebuild, -r8168-8.038.00.ebuild, metadata.xml: + Version bump and clear out of old unstable versions. I'm taking over this + package as I have the hardware. Closes bugs #523418, #519816 and #512842. *r8168-8.038.00 (18 Mar 2014) diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest index ffc86dd293d2..745256312f9d 100644 --- a/net-misc/r8168/Manifest +++ b/net-misc/r8168/Manifest @@ -2,45 +2,28 @@ Hash: SHA256 AUX r8168-8.028.00-linux-3.3-compat.patch 724 SHA256 64d45a082464cfe170c82f6e35a501c8e84b69c83ccce6bcf48c312665c53b18 SHA512 8d42d14dd3b121a1dd2105ff9dde40d56e236066e519fa0677de72e3c19c4e2097239ffb3fc60beb456475c870743183620b6eff30a29ddf529ccdb51c4aac3e WHIRLPOOL 0c8a1df4e11e4ea0ca689fe15e2055233e87cf069b387d447287aa515c08bb26776f4313461dc89d7bf85b4d5ade6e74c49d864b8a43a73bc6df56927e6d8749 -AUX r8168-8.029.00-linux-3.3-compat.patch 1572 SHA256 035fa465ba9573536a588dd06f141c35d197d54e1d00f2c6dc22aa74ca813ab8 SHA512 bbce53be2e57bcc690db6920de55633332ad285525bf563fb30aa9b7d3791e0e09e9167b2ee524ca16e1ea642ddaa079c7ed7dd5d71b2499c1ae439034ae0e55 WHIRLPOOL 71ce7f63abe7170007a59836be1caf4d9555272bf7ac23863b11cadb425504641fbcb8c3ec6c4dbe649e1ad6b3050c66faa04cb25bdae0568b60ffb714a7bf50 -AUX r8168-8.035.00-build-3.8.patch 1105 SHA256 6a05ec35248f5d6ac905e77e302a82d287072cb6377b34eb960861dd5bff8cdf SHA512 697d2d98b02018b258a3831ebc1764f231a5706324f5f7a4f901f46b902c93ae674380e225e0a2980f4c66685d24927a86641e01220dc1851b7f80eb6478f8e3 WHIRLPOOL 9e0d9825bd269ee402c4beaa5e20c2e72cd7656d838c2a3318d3a4d7ccc5f606a648ae252f9d0f8aa64a9b9d231ac62c69cc40265aaf33839be2c9ea7d3cbb5e -DIST r8168-8.026.00.tar.bz2 62799 SHA256 e0a58706a956f22f6f44a617d218693888bfc5d3eba7197e61ed6cb75eebb425 -DIST r8168-8.027.00.tar.bz2 62916 SHA256 5bc3b44bd69a05e45ab13be727256a95adf18a658f726141283046b397dc22e2 DIST r8168-8.028.00.tar.bz2 63208 SHA256 c77873f43693eea5304e17e35ff3d6503f6581e358d28c38927573ea56f4d6a3 -DIST r8168-8.029.00.tar.bz2 63166 SHA256 211a2994c9caf57321dafdb3acdfaa877f0b3f447798dc2abd2e417db3b0e515 -DIST r8168-8.030.00.tar.bz2 67723 SHA256 1b2267703c83f1709cad115cc39b11e8c4b64e7944452c684ef2bd86c626d6c4 -DIST r8168-8.031.00.tar.bz2 68024 SHA256 5c617b3c08aca18d1eb24d33f77df40020eb64fb32c8e4008265e08b7ffe5779 SHA512 b7baa52836e53fb77d51999763d1812fa5b635fa63d3a6acbe07b7040f3a716afe23090fe40c544bd9ed751c1d1313c6a0bf67781e6333d54cc0456b81d11447 WHIRLPOOL 3fd3f12d18d922eed0e5e58d4da814edfecc21c089bf202bfec7977bc47fdd1d9b1f78829fc305b8be22ba0e6fd00417aee0b027024d170bcacf686ee334b84d -DIST r8168-8.032.00.tar.bz2 68503 SHA256 f24ed6ba1a0a6e8cae27c49b0bddbecbd430ad1d7ddd1c5d28f2091202aee9c3 SHA512 86a7fd306c1c2187c87ad7fe571e42fdf174eb8f7fe202504cacd5f087ed828f1cb8b032d40e18529ae2682f89c43826840c42eaef880f04b815962e324cd979 WHIRLPOOL fb43101906e76df240a3e2ebb3e512e750c50b8bfbc429348eb20f7fa1569f7c4422689f9ac3d066c5f5377cbd5f3fc942dcf5b439209825af8c0c980627d51e -DIST r8168-8.035.00.tar.bz2 69573 SHA256 b904d31fc9bd6c97cc34479a0eba0e3a9bba5351a43b56dd5fff6b7dc1a5df73 SHA512 2b256f13c91fdb197cc23b8173d8f462815f3c5e98a811ba2a63de503131638f9b9627bd6dcabad921416b4206f3732da41bf4b0e4eb4dc166f4ed034a0d483c WHIRLPOOL ad4d89a74979fcf5db5e6039a9db6f537055e49be12be593cb46962295de0b2a5d443afd4269be4f4eb68e230e169494197f6315643021c6acb2c06089de950e -DIST r8168-8.038.00.tar.bz2 74460 SHA256 1384bdf4d33b219f937bf1a600c72b22962baf7796e562b08e4da3c000f49072 SHA512 0a8af9ed1e2388b7e69210c3eadc6b187c63d942e46012bf7bed4bfdc3dbff79ce5cfe58aec1427b5194f0bf63557188609dfadbff1a09b3759b3313cda0102f WHIRLPOOL fb40c59f6abb857fb35c12f2913655d04bda06f601e87164be92e3ec68492d5ce03493f52fa8f6460a0f45f428983d4130d4d0c9f431da872b765e440e3c3600 -EBUILD r8168-8.026.00.ebuild 755 SHA256 de30b1c2b625f1fa62ca61dd8fb8f16e67d11bbe0105d874f69780a3c1924f8c SHA512 738b14b238cb6c6c23cb9974bd4a7ead16c499ab56b73f08052d25b6d13700b840883143eeef0ab19a93acd4efe13c015a82dc97961f8ca9eace822210d160bb WHIRLPOOL 3ddde7bf4f0a8009cfd229b49b3ac007ea28280600fe14a85c19fe795ed7fa4b026eb402c6cca301bb05466d122790d3f23420240ad2c4d2d1835304f7221980 -EBUILD r8168-8.027.00.ebuild 769 SHA256 7661048835463948249e3b862a075d40d2b9ad1dd866748f77c2a75ddad80159 SHA512 f85e137afbc148e30d56d260479b4521f1f207bb543cb3163c2354b1ecb60941c98bf6f6d1b649fcaf5be0b28ec89cc770f244c1e2ca3f5aea3342daafd4e875 WHIRLPOOL 0c04bd547f97b09ae18f25c9f7c509f4c984058c87d1b918159d99ca722f9814ab3b1ff13409194823b50e6eaaaa7fb8d7d5db69aa657d0737c8a1f40523bc1e +DIST r8168-8.039.00.tar.bz2 81132 SHA256 767d922270274e781d8d42493a0021db1cafcb0388ac62564d0c0c3d82703edd SHA512 30c1d7a96b048518f0755cd616e1b1f5c3c7d1343a903dd8169e6bcb145c0a3ac0d7bbcdee6d2a2dd8b76c69f807a56e4678c5e19a10da3f46fe70e0aa5f10d2 WHIRLPOOL 5423d86ddb733a0236fd3a38ac43dd371bbd9255480983fdb9f2bc023977b84367df2b93cf91851eeef3267fdef2cb389231a6522f23148e8739f8587ff9ed36 EBUILD r8168-8.028.00.ebuild 848 SHA256 b888bd28da9e6340360ab85122ca8d6da04badb8b20825b752ae1e8bf71e3d39 SHA512 d254ffa67f3691b3a48c86e0874f5311612c24d2e6d11b8c0531acdaa8eaa27137c7b5a95dec6dd9630d2c48ee1782a487a37065f3056ff5396b7b4bf97140c7 WHIRLPOOL 78be42d320afa0a4b858664b61780058d3473caa07d76386165523ddb34da338401313a437388cb82efc8dee365fcc118f64637c7f9284811a750b138555b659 -EBUILD r8168-8.029.00.ebuild 845 SHA256 0cf2c20a611e3f2f8b71fdf683189d71ed48b67752169fcec084e53260afb894 SHA512 0e60c22a83cff9b78b4fd019944fe80a5c4e0897f356192490c06573e590e43b682821a1f9645c3e76ff8b50aca088fc0fd82fc52caf0b705569ede30ae65a16 WHIRLPOOL 3053ee3f82a63d8e6802fb05c488f1dedd360ed17a20e6c09f14fcff8955aedbf28ce3dbc56eaa1316005445dafcab7dc15eef98328d26f9c1e85c8408d0cbf0 -EBUILD r8168-8.030.00.ebuild 776 SHA256 ce327b9f7d13d67259f02ad08261405a96ec2a858b072282fca7121b3d5fffac SHA512 ef240f62218401cc2905acf73cec410dc528018d3681d6c81b3b4c553b5a521761259380226a92ea0a9ffe4f4dfea2a9028a74e2e5687187d824bc55dbd234c4 WHIRLPOOL 009e2ea7249c5f0a3d54cfbf1147a02405672d7eb74bef93942c8ad2e8df93dbe970750f1795ff988a90122f8233c030e965f3e32f8f01c7680fe4d57006a179 -EBUILD r8168-8.031.00.ebuild 776 SHA256 3f28b30ce0b486892f57d81adbb47596bcb638700845d73a68e78f238adc6a2e SHA512 a954efd92665fc15d2d23876460ab4a67c8f9e1e54fb6a433c371b3d4d0c221c874ce23cc78eed01cf475448fa03b0d820194ae7b8b8436b9ea6b384845ab86e WHIRLPOOL 75f211c7db391a3c21e087d5f271d3858dbc43e64f57f3896ef629f9c30c7de03cfcf864aded21ad5249945320ccaf2d0fd2a483729f980b9bd551403bc6d570 -EBUILD r8168-8.032.00.ebuild 776 SHA256 740739fb8876e58bf3a2ba26f2855a01477bbb05015f2df30e9680c09d40ac70 SHA512 a3f30f51b76da2b1f7ab904e5cc7228e27a4bf9bb1af2529d34a75bf0f5484f39aef250401d263879f30b0a71ec8fac37a8835bcd96adc324049b223b1e8af7c WHIRLPOOL 3be4a3d30d3b09a88add1cd726effa04e9ec518545e0146f30419ff35f4bdfbafcba7b1e750acec735c25350e588f0c20ce8cfb4c9cd028dd93aa73007918717 -EBUILD r8168-8.035.00-r1.ebuild 841 SHA256 a05fceb585bc498f797b37139ea81a643b4536963544b3ce213d1d39681f8d0f SHA512 3aee133cefb23aea2faa72845e5cd6b211f5155457214be0b497eaad1443785f53f3715c1c20d0b3390ff3d89e06d3f17c865b9894b7f65a7f9695a562a859b9 WHIRLPOOL f0cb5ddb0f9c065dc184d275f8a5f372e2cee11e105ce2c0704895d72d4a8dbaa8cf870c023d5576698e8375081900ededfa490c2fb90329f3c14d505670c14a -EBUILD r8168-8.035.00.ebuild 776 SHA256 496dd3133bbd450e3a53665e4eef6d3035c6d287e10c3e1ad94c2a88889de0de SHA512 5d1e491d7bba0b6a3df58edba443120b26c189c90fdd146b4835670cfed98e5a170b75eb3e9cde6e93cf85dd778bfcb8c3e04747397d409b28aa86bfeac732b5 WHIRLPOOL 8cd9d11213231faac17f7c28f267fb27159a0a43a3856df63b19345399181f968ead1ccbf15f0b1e0b003cc80127347d8eca2ed709ac80afc57ee216c0d12189 -EBUILD r8168-8.038.00.ebuild 775 SHA256 63724c25dd4c81a8dd719d90b2203700bdd03c6c4570b0a31ed03b3b243bd1cb SHA512 43d6d357bf51bff363bfa95c7ed25eda5b56e93a6c37c18b37167cfad3869e5f8a30962e0e506e635c466804d8eca927bc2b537c102a6c92bbce2d14d1d1b76b WHIRLPOOL 72746feba34512afe03d0e2612e7b25724205e73e14db62ddab8fb8fbd6bcbe8460bc0188b633598104c7dda34941f3d6ff00b5b1cd4622952131c975cbfb2a8 -MISC ChangeLog 2693 SHA256 dccf04c1818d94648cb7c7c66fff7f1af7f2b6d4c630e91c9d47a2d099653682 SHA512 bc83defc189caef6f1d2729d921c6bcd2222c0c58e85e3bd48797c70767b14b9d6e7120f06cafe9a7169523e889626f5df5fb6a93a6becd5258064659689cddb WHIRLPOOL 1cfe17fba2c299f20f8115cc5adb35e47995cf6fc7356a7ff6c106ff422e4d49b77435a0056824afa58ce62e80b70b2020a734e9e8333a8e29e20c7447babb07 -MISC metadata.xml 550 SHA256 b3367babace2233dd0dd6b95de96a04e1cb1b840b6421aac9169183af528740a SHA512 1cd97ee916b0ce72cceb48e40091ad91c955dd2681410baadf8efa031bdb8eb7a2b93ac38d0d67bbca5b883b0282224110d17d081ed3907befb5d43cd448428e WHIRLPOOL 7a123bf1f0937d06e54a161f7b02d9f682ca45324e6dd5faf4e12b0e01b3e3e800adf0d2a02c3bbedc06b4cfd133065c0b3eab8baa254ee0fba3831a4d539588 +EBUILD r8168-8.039.00.ebuild 837 SHA256 976bdec8676d465654363e7314f62d54d9803c4a8232fd3f6d7c68bfdb887eeb SHA512 5ee2202b20c625b002812f9304de4780e41b46c6aa69187f3f93b67291cc85a5d429df9a13a62c87a0a49eaa7c4782a519228e17c1a34c913f03502a624574ae WHIRLPOOL cfd3b91d9f751666f92bc7aa77d886d0ea454c5d332bfe02b579645cb9cd642270771d2a5b270f6f240ca2a1287471e4231c16cdd469629a6ae6ebd4b6db2eab +MISC ChangeLog 3279 SHA256 ee0dc0c85912cda4179fa778ea729d7d3c38a6007921d830e23ab03283d4a450 SHA512 328bbdfe5a0667b18c71c79a087ac134b2c6e7fa264f72ede26a068695a2dfe9521aba8732f6fc2f666b3b80083b95a9ab92fb3a132ed47ab936d199e02aeecb WHIRLPOOL b8716999128bf8839683c673283d5166231bd45993a05d66f60a61158caf43b40cfd3e1a06a41e8f000e1fc6b2e5a4b756f8c2ff428fe4ffef49426ad9fb484c +MISC metadata.xml 470 SHA256 d33029ad508235cd26612cf55c82a7b6945d15d32dd103dc27375e95981d9f7f SHA512 c6c5592d0b00fa550f043fa4e3dc88d462a2e466d28ed34c846a226e702cbd6007a957cc16a26ede6854231b3b0d6221d69724a5e57c348e8d802789f8dab20b WHIRLPOOL 2524f8a8eb0ec80df589febbe2f17c9ec27b64d5efa8b78f86ab48dd276b5224586d36272b34d3e35f43f75af6dd812623c028463ba0c1a11c91b3f0c63ed60c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2.0 -iQJ8BAEBCABmBQJTKHgRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0ODVGNzIyN0VCNkRCNUU5MzkzNzY5ODAw -MTUxODYzQTY3NjUyOTAwAAoJEAFRhjpnZSkAJIcP/jYYXZKwfQaPO6LQP2gdSwbr -KuwFR3q8Bf0xtImXSDW3MMMgo/korHK3LieBV2qWNL6y2ZJRcamrfCQqE3qJctOd -vZS3JvJ5dDD0Uw3vyQ6SEycN/dFakJMbJwDskmMvjhfvj8hseSG3dEJnSngj7VRu -srCwxiws7LJCiPWiFUagLsMdRowpkvGU5miUBgDbFSyx/3D4i8venpzzt9u0YQPM -9g2lOTP24Of55mR94HV52ox1bqGHnf2PbzJeZNaQGOXD+zIQCm4El7jiysAsIE2X -uCndpMIJvSFllQAudFb+uDdCLtZZ3+kMxYkGOVRkYH2pC5bbHsd9/eshADm77v3L -zCjnva47yBF1euNbZMfS3FMoaLssT52ilfMsXXYAAlVJFZVm8dsxAY0ZD17Rzpnu -j1a7OUFtB+6q4UwUnQHBy71bhRsdPrzzNGBoUSXK5EpFhqXgOZOczwlhyg6XR4x2 -kf70BmhSTy6+rT3omsImPQaocrp/6HWkQ7id9cX4SJsrG7olLnlKoJK/bnlqAjXU -m8naggkvQhqyCkce9DnhCeRn0PYRnjRpGT/F/7XAsO6KxpoMy4V/D8FSk257Ep4g -A7S9rWlBImMJ1n8L1wf9ttQ3UVFCrDZCNBL3OLsgxz4ZLUXMANkNA6IlepqJCX+E -W/E8mPqFqg6tRO61NR9a -=mY2k +iQJ8BAEBCABmBQJVEej2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy +MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kOKoP/jAe93mvdGIVoWwkVlEnHxfl +M/HpeEiyfYsiLURThQKJKRzd7cdxuSAzSYf/ycafJGPUoydlI2kbOv70vZbYPWBF +RDVdIgvgaumjveFZRq46wKYyy4fPjp5Gkf7v6WUHn+FQ1giTCMY4zV72bSUrkDE/ +f4L6xuhb3PU4CPWt8Xo6M2AIf+XtwPKCpJqdAOsFHluBJ3n62sPfBrJYgDboRefH +bxQ8MTdzZFZnOdFQSaVGFN3ipMSvtwRl7lYTOYtVh7ds+2ZDn0t9fEKPPBqQ35mE +WZ+OiPrWgTi8gk0s+8+yoiaV9TPNeaGMA+b1pqiUKIpNbM8M6mf4qKUOYNFgUXjR +6rXyyppbq8e1ZH8WL8i54bhkwrhX37hd8M+JItY+z5M7R4t+8Rd3RrLekW6IE/Op +sg0LqQi/uDW8Luu1rbSoSbc7ZH1g9QhpDUzkGlPDL2i6PbE/8if4Vgx9tqnSwRaD +jeoft2pNOc2I9ck7BNNv2bSH3KVPaTjROvVYnBCGhHWqfitwIP7N0TignZ+L8neR +RL3uHjnPUFYFTqxdT9ulUQHskEwW4vqgsHYMIhp9c3syb0d6XoEszvkzXhpyLQt7 +dMDzaL7G2c3uKqyrdyYoW35iKP847C09JG1ulMBP02KLFnqFnK63fTVHZTN7gVUc +lSNyvMIPQV2uLa6S1uMn +=atba -----END PGP SIGNATURE----- diff --git a/net-misc/r8168/files/r8168-8.029.00-linux-3.3-compat.patch b/net-misc/r8168/files/r8168-8.029.00-linux-3.3-compat.patch deleted file mode 100644 index 8e0dff40574f..000000000000 --- a/net-misc/r8168/files/r8168-8.029.00-linux-3.3-compat.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/src/r8168_n.c b/src/r8168_n.c -index ef297ce..cd2780a 100755 ---- a/src/r8168_n.c -+++ b/src/r8168_n.c -@@ -1845,7 +1845,11 @@ rtl8168_rx_vlan_skb(struct rtl8168_private *tp, - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) -+static netdev_features_t rtl8168_fix_features(struct net_device *dev, netdev_features_t features) -+#else - static u32 rtl8168_fix_features(struct net_device *dev, u32 features) -+#endif - { - if (dev->mtu > MSSMask) - features &= ~NETIF_F_ALL_TSO; -@@ -1853,7 +1857,11 @@ static u32 rtl8168_fix_features(struct net_device *dev, u32 features) - return features; - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) -+static int rtl8168_set_features(struct net_device *dev, netdev_features_t features) -+#else - static int rtl8168_set_features(struct net_device *dev, u32 features) -+#endif - { - struct rtl8168_private *tp = netdev_priv(dev); - void __iomem *ioaddr = tp->mmio_addr; -@@ -2229,6 +2237,7 @@ static struct ethtool_ops rtl8168_ethtool_ops = { - .set_settings = rtl8168_set_settings, - .get_msglevel = rtl8168_get_msglevel, - .set_msglevel = rtl8168_set_msglevel, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) - .get_rx_csum = rtl8168_get_rx_csum, - .set_rx_csum = rtl8168_set_rx_csum, - .get_tx_csum = rtl8168_get_tx_csum, -@@ -2239,6 +2248,7 @@ static struct ethtool_ops rtl8168_ethtool_ops = { - .get_tso = ethtool_op_get_tso, - .set_tso = ethtool_op_set_tso, - #endif -+#endif - .get_regs = rtl8168_get_regs, - .get_wol = rtl8168_get_wol, - .set_wol = rtl8168_set_wol, \ No newline at end of file diff --git a/net-misc/r8168/files/r8168-8.035.00-build-3.8.patch b/net-misc/r8168/files/r8168-8.035.00-build-3.8.patch deleted file mode 100644 index 7865e8563921..000000000000 --- a/net-misc/r8168/files/r8168-8.035.00-build-3.8.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- src/r8168_n.c.orig 2013-02-20 05:14:51.408481092 +0000 -+++ src/r8168_n.c 2013-02-20 05:17:55.212379684 +0000 -@@ -14541,7 +14541,7 @@ - spin_unlock_irqrestore(&tp->phy_lock, flags); - } - --static int __devinit -+static int - rtl8168_init_board(struct pci_dev *pdev, - struct net_device **dev_out, - void __iomem **ioaddr_out) -@@ -14711,7 +14711,7 @@ - goto out; - } - --static void __devinit -+static void - rtl8168_init_sequence(struct rtl8168_private *tp) - { - void __iomem *ioaddr = tp->mmio_addr; -@@ -14964,7 +14964,7 @@ - }; - #endif - --static int __devinit -+static int - rtl8168_init_one(struct pci_dev *pdev, - const struct pci_device_id *ent) - { -@@ -15128,7 +15128,7 @@ - return 0; - } - --static void __devexit -+static void - rtl8168_remove_one(struct pci_dev *pdev) - { - struct net_device *dev = pci_get_drvdata(pdev); -@@ -17649,7 +17649,7 @@ - .name = MODULENAME, - .id_table = rtl8168_pci_tbl, - .probe = rtl8168_init_one, -- .remove = __devexit_p(rtl8168_remove_one), -+ .remove = rtl8168_remove_one, - #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,11) - .shutdown = rtl8168_shutdown, - #endif diff --git a/net-misc/r8168/metadata.xml b/net-misc/r8168/metadata.xml index 8280120121ca..04c256fd0ebc 100644 --- a/net-misc/r8168/metadata.xml +++ b/net-misc/r8168/metadata.xml @@ -2,13 +2,10 @@ - joker@gentoo.org - Christian Birchinger + chewi@gentoo.org + James Le Cuirot Official Realtek r8168 linux driver. The following cards are currently supported: RTL8111B RTL8168B RTL8111 RTL8168 RTL8111C RTL8111CP RTL8111D(L) RTL8168C RTL8111DP RTL8111E RTL8168E RTL8111F RTL8411 - - r8168 - diff --git a/net-misc/r8168/r8168-8.026.00.ebuild b/net-misc/r8168/r8168-8.026.00.ebuild deleted file mode 100644 index e95ca21e595c..000000000000 --- a/net-misc/r8168/r8168-8.026.00.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/r8168-8.026.00.ebuild,v 1.2 2011/12/12 01:28:09 joker Exp $ - -EAPI=4 - -inherit linux-mod - -DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" -HOMEPAGE="http://www.realtek.com.tw" -SRC_URI="http://r8168.googlecode.com/files/${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -KEYWORDS="~amd64 ~x86" - -MODULE_NAMES="r8168(net:${S}/src)" -BUILD_TARGETS="modules" -CONFIG_CHECK="!R8169" - -ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" -} - -src_install() { - linux-mod_src_install -} diff --git a/net-misc/r8168/r8168-8.027.00.ebuild b/net-misc/r8168/r8168-8.027.00.ebuild deleted file mode 100644 index e83317cac816..000000000000 --- a/net-misc/r8168/r8168-8.027.00.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/r8168-8.027.00.ebuild,v 1.1 2012/01/08 00:20:56 joker Exp $ - -EAPI=4 - -inherit linux-mod - -DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" -HOMEPAGE="http://www.realtek.com.tw" -SRC_URI="http://r8168.googlecode.com/files/${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -KEYWORDS="~amd64 ~x86" - -MODULE_NAMES="r8168(net:${S}/src)" -BUILD_TARGETS="modules" -CONFIG_CHECK="!R8169" - -ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" -} - -src_install() { - linux-mod_src_install - dodoc README -} diff --git a/net-misc/r8168/r8168-8.029.00.ebuild b/net-misc/r8168/r8168-8.029.00.ebuild deleted file mode 100644 index a55e157c998a..000000000000 --- a/net-misc/r8168/r8168-8.029.00.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/r8168-8.029.00.ebuild,v 1.1 2012/05/05 19:10:34 joker Exp $ - -EAPI=4 - -inherit linux-mod eutils - -DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" -HOMEPAGE="http://www.realtek.com.tw" -SRC_URI="http://r8168.googlecode.com/files/${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -KEYWORDS="~amd64 ~x86" - -MODULE_NAMES="r8168(net:${S}/src)" -BUILD_TARGETS="modules" -CONFIG_CHECK="!R8169" - -ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED" - -src_prepare() { - epatch "${FILESDIR}/${P}-linux-3.3-compat.patch" -} - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" -} - -src_install() { - linux-mod_src_install - dodoc README -} diff --git a/net-misc/r8168/r8168-8.030.00.ebuild b/net-misc/r8168/r8168-8.030.00.ebuild deleted file mode 100644 index 2fecbd13c775..000000000000 --- a/net-misc/r8168/r8168-8.030.00.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/r8168-8.030.00.ebuild,v 1.1 2012/05/18 19:38:12 joker Exp $ - -EAPI=4 - -inherit linux-mod eutils - -DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" -HOMEPAGE="http://www.realtek.com.tw" -SRC_URI="http://r8168.googlecode.com/files/${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -KEYWORDS="~amd64 ~x86" - -MODULE_NAMES="r8168(net:${S}/src)" -BUILD_TARGETS="modules" -CONFIG_CHECK="!R8169" - -ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" -} - -src_install() { - linux-mod_src_install - dodoc README -} diff --git a/net-misc/r8168/r8168-8.031.00.ebuild b/net-misc/r8168/r8168-8.031.00.ebuild deleted file mode 100644 index 3471f3bad8af..000000000000 --- a/net-misc/r8168/r8168-8.031.00.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/r8168-8.031.00.ebuild,v 1.1 2012/06/02 22:05:05 joker Exp $ - -EAPI=4 - -inherit linux-mod eutils - -DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" -HOMEPAGE="http://www.realtek.com.tw" -SRC_URI="http://r8168.googlecode.com/files/${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -KEYWORDS="~amd64 ~x86" - -MODULE_NAMES="r8168(net:${S}/src)" -BUILD_TARGETS="modules" -CONFIG_CHECK="!R8169" - -ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" -} - -src_install() { - linux-mod_src_install - dodoc README -} diff --git a/net-misc/r8168/r8168-8.032.00.ebuild b/net-misc/r8168/r8168-8.032.00.ebuild deleted file mode 100644 index fa389d10491d..000000000000 --- a/net-misc/r8168/r8168-8.032.00.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/r8168-8.032.00.ebuild,v 1.1 2012/08/25 18:20:28 joker Exp $ - -EAPI=4 - -inherit linux-mod eutils - -DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" -HOMEPAGE="http://www.realtek.com.tw" -SRC_URI="http://r8168.googlecode.com/files/${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -KEYWORDS="~amd64 ~x86" - -MODULE_NAMES="r8168(net:${S}/src)" -BUILD_TARGETS="modules" -CONFIG_CHECK="!R8169" - -ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" -} - -src_install() { - linux-mod_src_install - dodoc README -} diff --git a/net-misc/r8168/r8168-8.035.00-r1.ebuild b/net-misc/r8168/r8168-8.035.00-r1.ebuild deleted file mode 100644 index b9d74d7eda77..000000000000 --- a/net-misc/r8168/r8168-8.035.00-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/r8168-8.035.00-r1.ebuild,v 1.1 2013/03/06 21:37:48 joker Exp $ - -EAPI=4 - -inherit linux-mod eutils - -DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" -HOMEPAGE="http://www.realtek.com.tw" -SRC_URI="http://r8168.googlecode.com/files/${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -KEYWORDS="~amd64 ~x86" - -MODULE_NAMES="r8168(net:${S}/src)" -BUILD_TARGETS="modules" -CONFIG_CHECK="!R8169" - -ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED" - -src_prepare() { - epatch "${FILESDIR}/${P}-build-3.8.patch" -} - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" -} - -src_install() { - linux-mod_src_install - dodoc README -} diff --git a/net-misc/r8168/r8168-8.038.00.ebuild b/net-misc/r8168/r8168-8.038.00.ebuild deleted file mode 100644 index a1954b94a2db..000000000000 --- a/net-misc/r8168/r8168-8.038.00.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/r8168-8.038.00.ebuild,v 1.1 2014/03/18 16:45:02 joker Exp $ - -EAPI=4 - -inherit linux-mod eutils - -DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" -HOMEPAGE="http://www.realtek.com.tw" -SRC_URI="http://r8168dl.appspot.com/files/${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -KEYWORDS="~amd64 ~x86" - -MODULE_NAMES="r8168(net:${S}/src)" -BUILD_TARGETS="modules" -CONFIG_CHECK="!R8169" - -ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="KERNELDIR=${KV_DIR}" -} - -src_install() { - linux-mod_src_install - dodoc README -} diff --git a/net-misc/r8168/r8168-8.035.00.ebuild b/net-misc/r8168/r8168-8.039.00.ebuild similarity index 67% rename from net-misc/r8168/r8168-8.035.00.ebuild rename to net-misc/r8168/r8168-8.039.00.ebuild index a8329ab6d3e9..89a31e2ed750 100644 --- a/net-misc/r8168/r8168-8.035.00.ebuild +++ b/net-misc/r8168/r8168-8.039.00.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/r8168-8.035.00.ebuild,v 1.1 2013/01/12 14:48:24 joker Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/r8168-8.039.00.ebuild,v 1.1 2015/03/24 22:44:54 chewi Exp $ -EAPI=4 +EAPI=5 inherit linux-mod eutils DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs" HOMEPAGE="http://www.realtek.com.tw" -SRC_URI="http://r8168.googlecode.com/files/${P}.tar.bz2" +SRC_URI="http://12244.wpc.azureedge.net/8012244/drivers/rtdrivers/cn/nic/0001-r8168-8.039.00.tar.bz2 -> ${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" IUSE="" -- 2.26.2