summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/Manifest.gzbin50502 -> 50482 bytes
-rw-r--r--sys-apps/attr/Manifest2
-rw-r--r--sys-apps/attr/metadata.xml3
-rw-r--r--sys-apps/debianutils/Manifest4
-rw-r--r--sys-apps/debianutils/debianutils-4.9.ebuild (renamed from sys-apps/debianutils/debianutils-4.8.6.2.ebuild)0
-rw-r--r--sys-apps/dtc/Manifest2
-rw-r--r--sys-apps/dtc/metadata.xml3
-rw-r--r--sys-apps/etckeeper/Manifest3
-rw-r--r--sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild71
-rw-r--r--sys-apps/etckeeper/etckeeper-1.18.7.ebuild76
-rw-r--r--sys-apps/ethtool/Manifest2
-rw-r--r--sys-apps/ethtool/metadata.xml3
-rw-r--r--sys-apps/fwts/Manifest2
-rw-r--r--sys-apps/fwts/fwts-15.12.00.ebuild44
-rw-r--r--sys-apps/help2man/Manifest2
-rw-r--r--sys-apps/help2man/help2man-1.47.10.ebuild2
-rw-r--r--sys-apps/i2c-tools/Manifest4
-rw-r--r--sys-apps/i2c-tools/i2c-tools-4.0.ebuild2
-rw-r--r--sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild2
-rw-r--r--sys-apps/intel-performance-counter-monitor/Manifest2
-rw-r--r--sys-apps/intel-performance-counter-monitor/intel-performance-counter-monitor-2.8.ebuild49
-rw-r--r--sys-apps/iproute2/Manifest2
-rw-r--r--sys-apps/iproute2/metadata.xml3
-rw-r--r--sys-apps/keyutils/Manifest2
-rw-r--r--sys-apps/keyutils/keyutils-1.6.1.ebuild2
-rw-r--r--sys-apps/lm-sensors/Manifest (renamed from sys-apps/lm_sensors/Manifest)12
-rw-r--r--sys-apps/lm-sensors/files/fancontrol.confd (renamed from sys-apps/lm_sensors/files/fancontrol.confd)0
-rw-r--r--sys-apps/lm-sensors/files/fancontrol.initd (renamed from sys-apps/lm_sensors/files/fancontrol.initd)0
-rw-r--r--sys-apps/lm-sensors/files/fancontrol.service-r1 (renamed from sys-apps/lm_sensors/files/fancontrol.service-r1)0
-rw-r--r--sys-apps/lm-sensors/files/lm-sensors-3.4.0-sensors-detect-gentoo.patch (renamed from sys-apps/lm_sensors/files/lm_sensors-3.4.0-sensors-detect-gentoo.patch)0
-rw-r--r--sys-apps/lm-sensors/files/lm-sensors-3.5.0-sensors-detect-gentoo.patch (renamed from sys-apps/lm_sensors/files/lm_sensors-3.5.0-sensors-detect-gentoo.patch)0
-rw-r--r--sys-apps/lm-sensors/files/lm_sensors.confd (renamed from sys-apps/lm_sensors/files/lm_sensors.confd)0
-rw-r--r--sys-apps/lm-sensors/files/lm_sensors.initd (renamed from sys-apps/lm_sensors/files/lm_sensors.initd)0
-rw-r--r--sys-apps/lm-sensors/files/sensord.confd (renamed from sys-apps/lm_sensors/files/sensord.confd)0
-rw-r--r--sys-apps/lm-sensors/files/sensord.initd (renamed from sys-apps/lm_sensors/files/sensord.initd)0
-rw-r--r--sys-apps/lm-sensors/files/sensord.service-r1 (renamed from sys-apps/lm_sensors/files/sensord.service-r1)0
-rw-r--r--sys-apps/lm-sensors/lm-sensors-3.5.0.ebuild (renamed from sys-apps/lm_sensors/lm_sensors-3.5.0.ebuild)8
-rw-r--r--sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild (renamed from sys-apps/lm_sensors/lm_sensors-3.5.0_p20190505.ebuild)16
-rw-r--r--sys-apps/lm-sensors/metadata.xml (renamed from sys-apps/lm_sensors/metadata.xml)0
-rw-r--r--sys-apps/nvme-cli/Manifest2
-rw-r--r--sys-apps/nvme-cli/nvme-cli-1.9.ebuild32
-rw-r--r--sys-apps/pmount/Manifest2
-rw-r--r--sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild10
-rw-r--r--sys-apps/portage/Manifest2
-rw-r--r--sys-apps/portage/portage-2.3.76.ebuild261
-rw-r--r--sys-apps/qdirstat/Manifest2
-rw-r--r--sys-apps/qdirstat/metadata.xml7
-rw-r--r--sys-apps/smc-sum-driver/Manifest2
-rw-r--r--sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r3.ebuild (renamed from sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r2.ebuild)12
-rw-r--r--sys-apps/systemd/Manifest10
-rw-r--r--sys-apps/systemd/metadata.xml2
-rw-r--r--sys-apps/systemd/systemd-242-r7.ebuild2
-rw-r--r--sys-apps/systemd/systemd-243.ebuild (renamed from sys-apps/systemd/systemd-243_rc2-r1.ebuild)22
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild21
-rw-r--r--sys-apps/sysvinit/Manifest7
-rw-r--r--sys-apps/sysvinit/sysvinit-2.94.ebuild136
-rw-r--r--sys-apps/sysvinit/sysvinit-2.95.ebuild137
-rw-r--r--sys-apps/sysvinit/sysvinit-2.96.ebuild (renamed from sys-apps/sysvinit/sysvinit-2.96_beta.ebuild)0
-rw-r--r--sys-apps/uam/Manifest4
-rw-r--r--sys-apps/uam/uam-0.3.2-r1.ebuild14
-rw-r--r--sys-apps/uam/uam-9999.ebuild14
-rw-r--r--sys-apps/udevil/Manifest4
-rw-r--r--sys-apps/udevil/udevil-0.4.4-r1.ebuild72
-rw-r--r--sys-apps/udevil/udevil-0.4.4-r2.ebuild77
-rw-r--r--sys-apps/udevil/udevil-0.4.4-r3.ebuild12
65 files changed, 419 insertions, 770 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 0021593c3fce..79a15ab7b6e4 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 411c89adf57a..8b172fe71626 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -6,4 +6,4 @@ DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3
EBUILD attr-2.4.47-r2.ebuild 1723 BLAKE2B 4ba215c8b35326cb4a607fe63e23e14262ef345c1f28bc9ac3ed2b9db80450adc365be791ff7391bd607c7a3d9ea0e0d77a931aeceaf3b4c61a86277e5488789 SHA512 34c2badaa57b539b0009747354bc2ba23a8498e86e12b802fd6dfc6ac7bd5f424b544ae1783ce6361b2635880d7d11d1b7b09ee76ad65ad32675dba5137b588b
EBUILD attr-2.4.48-r2.ebuild 2109 BLAKE2B d871796b5945f20511d9916debec767436e249c68d41605a7203c4fb954992aec8f320f0607e5657308da881ab9b4d54351301ec51fab443469b8cebbab23e01 SHA512 28363d164d4ea15ed83c3b53e45060fbb415667fed8957be3e67f31def9d075353c8c943bd59fbb08f0949432c0561f0cac26b9707f61e22d53cdd192c43e175
EBUILD attr-2.4.48-r3.ebuild 2194 BLAKE2B 3e71d2333ce22d1c8e5d93daf29579fe77e677eba611301a68d4f6464330f55be574cb282f3b9517a71bb58a3be15d936c3260dae9d921fbbf92267271bff546 SHA512 4588c952bb83cba21e706e92402d9afd4cf2614f0bd2fad70496b3c650fdab0c4ebfe73613e059b6d2503d7daab97c9ddabefeb0214dded923cbadfaeb104775
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+MISC metadata.xml 336 BLAKE2B 228b1ca58194e3cb6b68721379b55f53c2676973b7fb626600ae4f1d5da4899d7d4dd6e5211704ff6f64f601fc456b4335c4f01233768d2512058ee63af60668 SHA512 0e68e3406c4e54082edd2b2be1fe8b5a2a73457331b133635c5b5ed9e0afb0fbeea2101ff17a0fae0be47c4e535af9cd084f1abc9c85fda05c18e2879a72d0bc
diff --git a/sys-apps/attr/metadata.xml b/sys-apps/attr/metadata.xml
index 56c124413057..b8a192ea806b 100644
--- a/sys-apps/attr/metadata.xml
+++ b/sys-apps/attr/metadata.xml
@@ -5,4 +5,7 @@
<email>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
+<upstream>
+ <remote-id type="cpe">cpe:/a:attr_project:attr</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 10cd8f05e08e..d6ec8d220356 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,8 +1,8 @@
AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3ecc7a1a8587af5d56ce3ffde76608ffc7d5cde099fede8b4da76247ccabd7060b0306d2311db716b12e0bd4fb6062ea782fd2dd3d SHA512 05ffb53243a178e91d67066a30039e9ccc21caabe7769e8920548c615b6d9d23959125f2fc9073cc70ba3f3502df7d780db59e4768e7add2682af98079bd6bd4
DIST debianutils_4.8.3.tar.xz 159292 BLAKE2B e655741f42594ff12b4f349331da57ec09073802c9778594619686c93fc3061cf5248ac8e9e2c1b391eb49dd572f3033b1db206ff43f373b17caf7f3c835111f SHA512 468b8f001c0338f166cbc2fe25079edc5feeaa38dce2f5c7e6724c691d6cb35f4843e987695e33ead557bb11887e78ff8a5e3e1f52a266a0f32fb978fa643897
-DIST debianutils_4.8.6.2.tar.xz 156704 BLAKE2B 9ab9625042e8167daa988fb161db0dad56327ce8acb29b774a771e988c2e49ed17fe7ef3ce594b9fab3ffdc0518864b83c9dead91603b92d6c297fe79529b8c4 SHA512 1110d0f42870848a8a29b7b52d304ed39ae7d08156da09268dada7464ae45abc1f35320a12f218f8ba9bb2f1d323737136c143ef17141feef1275056842789a2
DIST debianutils_4.8.6.3.tar.xz 156672 BLAKE2B bb87e04ca80a04c8841f04c877acedb0b953d815193069bb601d17907101bb6faf11bea99251a13a7c3b9ea6fa5d27daba264ea6924e542d9b574c87b3ffbebe SHA512 c38d1d351de69f270924f05755501d90cb7245c8a3154f91ea8e38978052ffe2ec016d4400c55e2f7d31358cfe134a40c5843a33836900d7e69cce9ee8ace98e
+DIST debianutils_4.9.tar.xz 157104 BLAKE2B 885f37b17eba7d20b2d76a0fb1afc6ccc2d9d4926754b9ce15928f3675eba4a38fec2e9b718d61684122f3c0dc17eba0aa06677e41ac641870ffc87442353951 SHA512 4e8726cf5744dca144535883c473a04884714afd50e501a140197fee9a9a78bd9596fcc1763e71b2baf6367bc38a8111016ab5ed35f4d4e98ccc78be697ca963
EBUILD debianutils-4.8.3.ebuild 935 BLAKE2B 19d3779d81f7e10dd3a034ff3e1f4a4c1b15210c923796afa0535a062d7006418e4ef69d5a46577a916605979c15124607bfc68569b7e1bfe137612c3b20098b SHA512 24cbab98f62055e1298a3dfa1f6de6e9f766e593713f496fae07b2351bac6f70aed1643c1c0bcf07747d034d35538c4ca324bd41efef2bc97dcafc6f795dd4ba
-EBUILD debianutils-4.8.6.2.ebuild 932 BLAKE2B c6e10818583aa4d62e14a21f7b0092cb0354b15a71cde9bd323bf13c3df87e9234c176ec33e4592edbb261cad08d4e1b08051a16cacd2d761ca12168f32c558d SHA512 19ae964bd4539dfecc182174312c9a10b47596386adf9632dd67aa3e16fab1a5704443496f75b2de91c99b6cae07a3054527b0246f8bfe8f4bb0c998fa3aaadb
EBUILD debianutils-4.8.6.3.ebuild 932 BLAKE2B c6e10818583aa4d62e14a21f7b0092cb0354b15a71cde9bd323bf13c3df87e9234c176ec33e4592edbb261cad08d4e1b08051a16cacd2d761ca12168f32c558d SHA512 19ae964bd4539dfecc182174312c9a10b47596386adf9632dd67aa3e16fab1a5704443496f75b2de91c99b6cae07a3054527b0246f8bfe8f4bb0c998fa3aaadb
+EBUILD debianutils-4.9.ebuild 932 BLAKE2B c6e10818583aa4d62e14a21f7b0092cb0354b15a71cde9bd323bf13c3df87e9234c176ec33e4592edbb261cad08d4e1b08051a16cacd2d761ca12168f32c558d SHA512 19ae964bd4539dfecc182174312c9a10b47596386adf9632dd67aa3e16fab1a5704443496f75b2de91c99b6cae07a3054527b0246f8bfe8f4bb0c998fa3aaadb
MISC metadata.xml 355 BLAKE2B 9f0e6370bbf41d0180e561b2a747f2d3b9e400ea2f9396c059f0b03ad5293032554135573e5fc02f4d91b68d41bdb6722946662eb1c94ac10b1e0384aaeeeeb3 SHA512 967535ef4f2ce2ae377f05548d1cd15589b6e9ceb0b76c49a3ceec1d464aaff2aea43c98be4d8ffd7a8566f77dbce41a75d4b5dc489bc03b4f7562af656b3f84
diff --git a/sys-apps/debianutils/debianutils-4.8.6.2.ebuild b/sys-apps/debianutils/debianutils-4.9.ebuild
index 2b96aa353477..2b96aa353477 100644
--- a/sys-apps/debianutils/debianutils-4.8.6.2.ebuild
+++ b/sys-apps/debianutils/debianutils-4.9.ebuild
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index 813576cba177..6a6fcaed590a 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -17,4 +17,4 @@ EBUILD dtc-1.4.4.ebuild 1121 BLAKE2B 0e6226dce63ed1b6bc6dd96deb179f8451564f99e6a
EBUILD dtc-1.4.6.ebuild 1217 BLAKE2B e82baa485e5139389f870dd2ecb83c6883af617585c2aa38bf6f1f26fd62c9f1c3c45888f1d305b53a3ba69a5e6c1511284289132499ea5a7b698286d156bcf2 SHA512 06acd8e5b7e8d26acfcc174d158f19a17fcf7f8fe5e5e597b309064773c9424d4032fdcca78eab02ccb3e8894d489ddd0ec8db88081f3645026b5488e7dc43ba
EBUILD dtc-1.5.0.ebuild 1235 BLAKE2B 3215b7aafb7834810c43bd0b00ab3ea325969bad2ae84a3898a11c7eb5509d8a8410afddc1005b67a705cc04077ba9f322363af89c73b021fd615c140a9b81a1 SHA512 cb46e8b8b461fd32eeec1335188e79958a5e2fd844b1c3163bd51b1f9b932207eeacf805b8edce4b5045488c823d99e9f6aeda635cb5f0fd91644ddfe4ec4a86
EBUILD dtc-9999.ebuild 1181 BLAKE2B 4ea4eb40173c5e481fe2d7e935df40e53cce6b79440bd0a12416e6e775e5d367401bc7e040230f43228d8e06a6c20dead191eb30da98454a751877304c011be7 SHA512 de6b2dbd04270c132fce691dec8a1dd7b25c75717c89075091a85d98c3c15f9b154568f4b7beb0d35cd60bd8e775c45a606c7aaf31570d899d64efc85bdfe83e
-MISC metadata.xml 335 BLAKE2B 123cf55da545acd9b0b568ca010eba5f7818f43bf020f412a479397f08cfb571f7cd83f4b8c63c97d3ab3216278b62e6eff03a8c349f3b6758b1a41d559787b4 SHA512 757b9539f0dd59ff4c25127df262c6f030c3e4ddf4a4044a77bb7e2ee126001adff606a683b3af24f11d23604919366fa42cb496941ed232a5169ed2eac7c631
+MISC metadata.xml 416 BLAKE2B 550a9af835cd395d8cc77230f5ee6e7dcd0ff70c3290af7771bb04e5c5c6a9b5508c634555a4444e6bdac9ad007ff2bed10a05dfee57db432eb1fcf15ef57022 SHA512 7d9e26636a6fb8c5bd06cc06c837b42643313be040b2a36ff09056d81a0e75608a4593f37bb7fb2471d5e4eec5db3bd12cb8f3ddce49a8036122c2c1d8fe5187
diff --git a/sys-apps/dtc/metadata.xml b/sys-apps/dtc/metadata.xml
index bc8ad1abc489..9d02ff2575d4 100644
--- a/sys-apps/dtc/metadata.xml
+++ b/sys-apps/dtc/metadata.xml
@@ -8,4 +8,7 @@
<email>ppc@gentoo.org</email>
<name>Gentoo Linux PowerPC Development</name>
</maintainer>
+<upstream>
+ <remote-id type="cpe">cpe:/a:dtc_project:dtc</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 80ef9a726146..f78f09bb3579 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -2,10 +2,7 @@ AUX 99etckeeper 60 BLAKE2B 65268cf8095ebe7e59f4986e44f5a4170bc66f70cbeb6ffc2b1ff
AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb5cc3d42a2b5365be292a3b674945e69cd1f4db2a63a362f6aa7fdec0f3a6cbb9187d40d143 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c
AUX etckeeper-1.18.6-gentoo.patch 2588 BLAKE2B 38f0b3cf6ecc2b47b59d6eee3d081f47e79cd0ebd4b3d0099a893257275fa8f7803da6b3aea7a90232632aa4106a2a8b9477bb9a78e200635958de7c8b3db93b SHA512 eb2d8f7eca7d5731518aec24c931aebe8a70f22a049d88f002d7649809762d82619b4c0bbc47a6207f2e018fc35bc497c30308adbfa7b62b4191f105cf5aeb40
DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0c87d9b1869beb6509f6b445996411d0116ecb2c4d407b3329a7b1a555f00077d20630fbbd45b2d75527d9d4c6ca SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c
-DIST etckeeper-1.18.7.tar.gz 77568 BLAKE2B 168b5b683c25a60c6626a678aed2f650106d4db554acbc239a2cd3c937f4b399ccca4f28fded30175c5787d8bd0907a25d62e6566e7902a2e914cd01513a8c2e SHA512 44b8f66b95663da1370943128bb5673e57bd7b9df7e727c93baea5dfc79852ebba9d0834827fed19722668849d3ed18b045db5cb42135e198576a2b839523d1a
DIST etckeeper-1.18.8.tar.gz 84964 BLAKE2B 0429efb61e3d23a897413e472a66216051324381c670cc4842526539d9d173ed1918822d31a04e7e3fa2da7a5a6c805781227677316b8802a770ddb19f576b31 SHA512 35607622d7533d9acb28af2320a571b66ac5a5e2dd44703ec542e0a95622b11a7709134f26d6dba6741b99247c00481172c2601109dc501630f02c25530a516c
-EBUILD etckeeper-1.18.6-r1.ebuild 1775 BLAKE2B 6b957febafaa09290c02a9946f9745ce28fbbd4652df0297ba10e3f10b6fc838ea819e672a72eb0870dce44293c184a294e5d0c6d4624b3ced129a5a9a7156b6 SHA512 e4fa61e5c49e2149adbc511466d995c03afc350df8ba5d767c493733e8a2ab4c24161a549e3628b33d2d808b1937678c6968e541362fac3ea3e23a4c9d0fc5b8
EBUILD etckeeper-1.18.6.ebuild 1718 BLAKE2B 79005365182bb210feefd82d5b5230097433922fed15cc5efdb3fb81109d2f3493aaf0283e4eaf0a0cce4fc3cd059cdd411a7f649fd699cd2dba7b72fb598954 SHA512 91f3da5f0d1022e47038d45820b6e3daba1739fc9dd650a576023b8da487270b2f4babbaac30be91e99cbddd8b68595e2c8998fdaded81bf520154b6d0c91795
-EBUILD etckeeper-1.18.7.ebuild 1866 BLAKE2B f04bba588be503ba8d6acd96aeee63a39c60fe9463477cee3f1d45fc6a70fb43c067996d22172521f1ec25118ec1fdbf8b53d06443c45b4e450fdfab000d63f7 SHA512 e2e44061b211a5278e0bcabcc42a88ba5c46f09fa02d40d10b84369430e4d27977237c900b26f615e297bc70f7c58061d7dd03d05a3b6fadfa2ff6d90d5ec045
EBUILD etckeeper-1.18.8.ebuild 1863 BLAKE2B 5d24b9337feaaba19b3b96d1999e7c6c8e763227d77db048a45add4ef750965386adb7667023eaf7427b250f7f80cb1551126abdf7be0a1a6ce47cfaa9f21828 SHA512 ca5bb103396b54d5d38124e267c22dbc0da2444b7ab85b6168be9289ce3ad08703c8bf15da3ab332c921c50a8d9262d4544973066eea8ab19999b74e72daa51b
MISC metadata.xml 778 BLAKE2B d3291ffd8dacecb55cbb2798c9bf98b8eb361bd0c82e2c440868757604edb98145ed04c3446ca92e9b18564a1a53f7b0fbbb94cf51adcf19ebcb9162086690f1 SHA512 49f78f732de99b82fad3f3ec6915d15f2050d9f6f1382a74221aa5608efc76b8e5e908d0f51a276afb8b28bec9d8291454695b3cd70314ad8836f444a03b2735
diff --git a/sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild b/sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild
deleted file mode 100644
index 60ffce7651d5..000000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 prefix python-r1
-
-DESCRIPTION="A collection of tools to let /etc be stored in a repository"
-HOMEPAGE="https://etckeeper.branchable.com/"
-SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-SLOT="0"
-IUSE="bazaar cron"
-REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
-
-VCS_DEPEND="dev-vcs/git
- dev-vcs/mercurial
- dev-vcs/darcs"
-DEPEND="bazaar? ( dev-vcs/bzr[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}
- app-portage/portage-utils
- cron? ( virtual/cron )
- bazaar? ( ${PYTHON_DEPS} )
- !bazaar? ( || ( ${VCS_DEPEND} ) )"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
- :
-}
-
-src_install(){
- emake DESTDIR="${ED}" install
-
- bzr_install() {
- "${EPYTHON}" ./${PN}-bzr/__init__.py install --root="${ED}" ||
- die "bzr support installation failed!"
- }
- use bazaar && python_foreach_impl bzr_install
-
- if use prefix; then
- doenvd "${FILESDIR}"/99${PN}
- eprefixify "${ED%/}"/etc/env.d/99${PN}
- fi
-
- newbashcomp bash_completion ${PN}
- dodoc doc/README.mdwn
- newdoc "${FILESDIR}"/bashrc-r1 bashrc.example
-
- if use cron ; then
- exeinto /etc/cron.daily
- newexe debian/cron.daily etckeeper
- fi
-}
-
-pkg_postinst(){
- elog "${PN} supports the following VCS: ${VCS_DEPEND}"
- elog " dev-vcs/bzr"
- elog "This ebuild just ensures at least one is installed!"
- elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
- elog
- elog "You may want to adjust your /etc/portage/bashrc"
- elog "see the example file in /usr/share/doc/${PF}/examples"
- elog
- elog "To initialise your etc-dir as a repository run:"
- elog "${PN} init -d /etc"
-}
diff --git a/sys-apps/etckeeper/etckeeper-1.18.7.ebuild b/sys-apps/etckeeper/etckeeper-1.18.7.ebuild
deleted file mode 100644
index 32667889cf27..000000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.7.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 prefix python-r1
-
-DESCRIPTION="A collection of tools to let /etc be stored in a repository"
-HOMEPAGE="https://etckeeper.branchable.com/"
-SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-SLOT="0"
-IUSE="bazaar cron test"
-REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
-
-VCS_DEPEND="dev-vcs/git
- dev-vcs/mercurial
- dev-vcs/darcs"
-DEPEND="bazaar? ( dev-vcs/bzr[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}
- app-portage/portage-utils
- cron? ( virtual/cron )
- bazaar? ( ${PYTHON_DEPS} )
- !bazaar? ( || ( ${VCS_DEPEND} ) )"
-DEPEND="${DEPEND}
- test? ( dev-util/bats )"
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.18.6-gentoo.patch )
-
-src_prepare() {
- default
- hprefixify *.d/* etckeeper
-}
-
-src_compile() {
- :
-}
-
-src_install(){
- emake DESTDIR="${ED}" install
-
- bzr_install() {
- "${EPYTHON}" ./${PN}-bzr/__init__.py install --root="${ED}" ||
- die "bzr support installation failed!"
- }
- use bazaar && python_foreach_impl bzr_install
-
- doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})"
-
- newbashcomp bash_completion ${PN}
- dodoc doc/README.mdwn
- newdoc "${FILESDIR}"/bashrc-r1 bashrc.example
-
- if use cron ; then
- exeinto /etc/cron.daily
- newexe debian/cron.daily etckeeper
- fi
-}
-
-pkg_postinst(){
- elog "${PN} supports the following VCS: ${VCS_DEPEND}"
- elog " dev-vcs/bzr"
- elog "This ebuild just ensures at least one is installed!"
- elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
- elog
- elog "You may want to adjust your /etc/portage/bashrc"
- elog "see the example file in /usr/share/doc/${PF}/examples"
- elog
- elog "To initialise your etc-dir as a repository run:"
- elog "${PN} init -d /etc"
-}
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 4cdd5beeb719..c6900cbdcb0f 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -4,4 +4,4 @@ DIST ethtool-5.2.tar.xz 237700 BLAKE2B df7cfd9deaa8000352138e9747fe3811fddab2f58
EBUILD ethtool-4.19.ebuild 448 BLAKE2B 4c01a965b0f8316cc6b6d81072fe252e630e059ecf231682c3093b79419e3db61da9949f47a6999e3e2ec823c626ba2874f60cc33ee1386c6cf8c3000d5fba9c SHA512 e510b9ddcd60ddcae090a406c008ac75ee613c6ebfa142ef511d9910997fafd6e705fe5b25d4842c3e3dcd724f43a5465bd62be2cfc20fdb62e30d5e9314a8b4
EBUILD ethtool-5.1.ebuild 458 BLAKE2B b3992a08d298c7d944f1803a3bdd326c070dfbcd64585d18e0214b0490060fe9a3827c237c922c9496579a1529644d8b9ce0170e474acdd4cca791a3ae4363e7 SHA512 fe34a2982e1103e13b1d72d3d9ac454d343ecd7c759b265aec0fc3c4b400eaf1fc7fa4fa428eec7a6a4fd7195fb3951971e63d7ad79beed3a0f90af448099fe7
EBUILD ethtool-5.2.ebuild 458 BLAKE2B b3992a08d298c7d944f1803a3bdd326c070dfbcd64585d18e0214b0490060fe9a3827c237c922c9496579a1529644d8b9ce0170e474acdd4cca791a3ae4363e7 SHA512 fe34a2982e1103e13b1d72d3d9ac454d343ecd7c759b265aec0fc3c4b400eaf1fc7fa4fa428eec7a6a4fd7195fb3951971e63d7ad79beed3a0f90af448099fe7
-MISC metadata.xml 814 BLAKE2B cb6f1a2aa029191f22615d83df4f166c7c53c70ac6486deadab63ea5a463b08ae9aa8392f0a2732b83efc2a476c2416cd94b2e47ed9b09097217da5746d110d2 SHA512 7ba75f7aa20f8cc48b91b7576449e416abfc412fe26670142d4ec1513b6a3939858b298ccdbf72c208c2d70b5c00eea88dc3c4201e2187b188ed4a9d33cf0272
+MISC metadata.xml 894 BLAKE2B f0d189f1c840c3f91e13aef4e6dff25c6ef17ab1b0f7f81f6c3ca4cf3d2fe650567689439050767f872cfdd10fbfce404a580dec5aec38676385851c5c613d6f SHA512 36ede687351bab379829a3872343eb73bb50a438465c0c951fbd172efcb8cc20e349b5b0ec8859f96effa7194b7c043424e4de56af1951a225fb393aefecd715
diff --git a/sys-apps/ethtool/metadata.xml b/sys-apps/ethtool/metadata.xml
index 0061d51971d3..760ac849b6bc 100644
--- a/sys-apps/ethtool/metadata.xml
+++ b/sys-apps/ethtool/metadata.xml
@@ -16,4 +16,7 @@
* Control receive queue selection for multiqueue devices
* Upgrade firmware in flash memory
</longdescription>
+<upstream>
+ <remote-id type="cpe">cpe:/a:kernel:ethtool</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/sys-apps/fwts/Manifest b/sys-apps/fwts/Manifest
index eb6bc980a8b3..537980f6b758 100644
--- a/sys-apps/fwts/Manifest
+++ b/sys-apps/fwts/Manifest
@@ -1,5 +1,3 @@
-DIST fwts_15.12.00.orig.tar.gz 3391289 BLAKE2B b91a00c1fc6ab04b34a4ade0d86fbc879a649b0f74d7a1285c746402aaedba55027c493ca8b29494d8f59b6583a470cba761e184bae4984c634e8a0f890b1098 SHA512 44fab3e665279562b865261e5998e820ba960688e13bac717c5bbdb59faa1e97fd1d85f7ba95b5c7a4623e48a657f13e1ad8c1355f37173534739f26e155f8be
DIST fwts_17.02.00.orig.tar.gz 3489625 BLAKE2B 04133b8fe251923b5cf4e146bd52d3d102c3080629a85c0205fd6aeb19b315f10657da28dc7de37ae4601599dc7033354268b88bb0768b56550fe1606bd000bf SHA512 1dcbd7f120b5c09127f1242d41d7cf5ec15e6b049fb0b0590fec221849c0195a18ee4b07b66c1de29cbb241ef39f6e11c26dcd2bc7c0a4c23bf2efaec5372b70
-EBUILD fwts-15.12.00.ebuild 1119 BLAKE2B f4c0e47632b8419aba6aa620d3a7575839ba0bcb0eb54b455134630265bf42c328f8173d0dd51c3318cf3cb905b069b91d202ef9b3d249b6cc78ebc97442ff04 SHA512 f1d554486a566ae9342d2b4c68728f04d0d3aa4e6452ea362a7badaf3802b2dcd6d3a4c0f0c5e10b46bd292f1e96979193115d7673393fd63218a849f5fee203
EBUILD fwts-17.02.00.ebuild 1128 BLAKE2B 9fd64caf9b310f9db9c9588e6bc652fcef6cb039cd05e10b0baf990a6d457d439967259f43ea660d53785a95eaa7119e52b490bb6c8336ca1bff513b47c9c001 SHA512 595c4a4d3434dc472ef019b71c33204cbb505ab1498ecc2812ef34aeefadaad0760acc0745d797769b86c31dc57e8804fa067e179f514a6cd711a902d91f3ee9
MISC metadata.xml 241 BLAKE2B f00f58ea265e1a7321a74a2e8a86824f7a1930a6e99162af446a1c1f831139711d626045b21215856a29e6ba4575bc38c7ab965ffb547757dbf4305235245039 SHA512 9a4d0499ef0c9cb67816755a3313bbba0b42f01b35d5d7da31dfe3e14a94fead3b8c202b95ffd4a9c5edbda7b046045b19095924b57a08cd97aacbda5bbd4550
diff --git a/sys-apps/fwts/fwts-15.12.00.ebuild b/sys-apps/fwts/fwts-15.12.00.ebuild
deleted file mode 100644
index 17321530bb08..000000000000
--- a/sys-apps/fwts/fwts-15.12.00.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-DESCRIPTION="Firmware Test Suite"
-HOMEPAGE="https://wiki.ubuntu.com/Kernel/Reference/fwts"
-SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=dev-libs/json-c-0.10-r1
- dev-libs/glib:2
- dev-libs/libpcre
- sys-apps/pciutils
- sys-power/iasl
- sys-power/pmtools
- sys-apps/dmidecode"
-DEPEND="${RDEPEND}
- sys-devel/libtool"
-
-S=${WORKDIR}
-
-src_prepare(){
- sed -i -e 's/-Wall -Werror/-Wall/' configure.ac {,src/,src/lib/src/}Makefile.am || die
- sed -i -e 's:/usr/bin/lspci:'$(type -p lspci)':' src/lib/include/fwts_binpaths.h || die
-
- # Fix json-c includes
- sed -e 's/^#include <json\//#include <json-c\//g' -i \
- configure.ac || die
- sed -e 's/^#include <json.h>/#include <json-c\/json.h>/' \
- -i src/lib/include/fwts_json.h \
- src/utilities/kernelscan.c || die
- sed -e 's/-ljson/-ljson-c/'\
- -i src/Makefile.am\
- src/lib/src/Makefile.am\
- src/utilities/Makefile.am || die
-
- eautoreconf
-}
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index a82d2b3177e4..27565ec910ba 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -2,7 +2,7 @@ AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2a
DIST help2man-1.47.10.tar.xz 202176 BLAKE2B 57c19072b1fb696b8ae1fc269d4c44672e692b45f1afe91871621dbed008298154d94813711b8ab89a9ad2e9fffa5ba1e738a613e5e50681b0abea4bfcc92677 SHA512 071383f38fb5264137200439a460e70298fc23d88069a96f150bf50a4e2a08d1d5d29555053b0ea36c809eec8484c4432b55d7d0bddd68f33b07b1abb97556ff
DIST help2man-1.47.11.tar.xz 202312 BLAKE2B 6baba7fb28f2b28aba8a05eb5df0a8596918767cf43d730052e0bae9293a4a27f207136c22cad246ca7220fb639fabce3bb135edf4e84f866f1ea9b0af26f41d SHA512 786a6bd4336c591cfeb0b4f2dc1429f6545e36514e7b238453c91368b8f531c46db2be025f02dc52e6dd8b971d6edbb4ff1a8e1b519f9253a3957ad7157790be
DIST help2man-1.47.6.tar.xz 192980 BLAKE2B ddf2b899e4479a45505aefaf3dabfceb1595128da35c000b81be79046aabceff58e1d605b2797880c5c652947d0fe59673eaf087de911152e79768c571037a73 SHA512 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942
-EBUILD help2man-1.47.10.ebuild 1048 BLAKE2B 5f081dd97a1766ac00b01e2b1387b1073b4e2db8d2c4bc8cc22a9e3dc1ace972df34c1565ec92b35120beca22be2a429cb20efdb0e1746bfeee9ee47bc67d187 SHA512 a6f1b0ecf2a132bbe734b13d6ed1baf02efc1dd7e727e36c5cd74b8e179aa746958f854e4821d57943a0d80d39da5e6a725468eb7eaad0341ca913bbfda76a03
+EBUILD help2man-1.47.10.ebuild 1045 BLAKE2B 90b70011d00c687128d269ce5444b895354ee40baf9bfb44febaef503c66b6c4491076fb6167e3b33e73d55c6d34898e4bab45c24e44294880957ac1aa885ce2 SHA512 02d51c1b77a3cb4dfa8b01b2e540d557b2ce5c5303c042e73399300586e652665bdc7a960d9431ead6093ab9ebc3b68fbcf890bccf51dcc6070011701f4080be
EBUILD help2man-1.47.11.ebuild 1100 BLAKE2B 70424da45e9d06d459ecfbe426c59b7d6bf8b3ce6f0bed3713ba1c7cff909610e9386684f1025b285bc34a203f54d81cb81bd1fadbc0c2a4be3cf114143d20a8 SHA512 aef361c7aa593641e5cdc420d8de89d00148f2b5d723ae6f7d562b101c1d9f46b4b23ffbe1dfbd16d5ab0f8b59ddea46df21a587c1456e4275fec8005e6ca6ac
EBUILD help2man-1.47.6.ebuild 1045 BLAKE2B 90b70011d00c687128d269ce5444b895354ee40baf9bfb44febaef503c66b6c4491076fb6167e3b33e73d55c6d34898e4bab45c24e44294880957ac1aa885ce2 SHA512 02d51c1b77a3cb4dfa8b01b2e540d557b2ce5c5303c042e73399300586e652665bdc7a960d9431ead6093ab9ebc3b68fbcf890bccf51dcc6070011701f4080be
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.10.ebuild b/sys-apps/help2man/help2man-1.47.10.ebuild
index 7621fc2ef6fd..38896f6a0d4d 100644
--- a/sys-apps/help2man/help2man-1.47.10.ebuild
+++ b/sys-apps/help2man/help2man-1.47.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
RDEPEND="dev-lang/perl
diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index 6aa3e37e76cf..63183d17bb03 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -1,5 +1,5 @@
DIST i2c-tools-4.0.tar.xz 79972 BLAKE2B 982e4139ed0e2111f9e082d0690fcc0f86f97a433e292e9464b41991f14a1f90147a3612172bad6880f0df6896612e1dea0ae7bf6f459758b2cff45fb35a5dc7 SHA512 ddf86c357c101388193581bc40285089e6ab5e8d870f8aa5d594acc7ecb8596fbd30501e147b88bdea0200b1be88bc0a374356c188d1bcb067bf8e254e3dc51e
DIST i2c-tools-4.1.tar.xz 83576 BLAKE2B 0a9ed3bb335b61f6c17a6b6c705502ff008b4fb8bab6a5fde63163a32528b5214d92affc4b8d6cca29676dc7ba82dfa84be5f14943b7e81c8612a7d9419ac628 SHA512 83262bcfd94c2adf74517cc50095dd78221fa4d16a62397245d4a538de7463272abf4f6727024be8ab1ca8ecbfe647af85ba2a553e5b5e68a53e50dfcad20248
-EBUILD i2c-tools-4.0.ebuild 1458 BLAKE2B 607926942381f1e86c38fa3c09cf4ca19a53c1a127790f290dd813a1d44b280c9ede663f03ab6d41daab25734fba8944724853924ced743c3327be068e3343b1 SHA512 54c1e5a50cc0cc04c260d2df23de514e1e2066df0d38ca0644098c4e9476745964721622a54c9c198617205bac333f2d9f2048fe81209798af67fc7e14032a70
-EBUILD i2c-tools-4.1-r1.ebuild 1984 BLAKE2B ecc259b77eb25618d51c9c8dd55a5e77590a1e349fd614a751e6f5d2359c577ba36388923742ac7c43f89208c58524f85bdf75952e198a957df30194f11a487a SHA512 b82f6116e7f14de8887cebf8befafdaf2ad776776b3b6695361c0dc02bc3ffebc54d7cf139c1017e5be3c7ab741da26919c0ee8d85616673dd725a2784a636ee
+EBUILD i2c-tools-4.0.ebuild 1458 BLAKE2B ca1012e7a8c01d614a1cd1d9d4842085e78611c4325dbfe46baedd8f80594e458d4628b97e26082df8eae3d8dda64e02ec3a463c070328212cf7655d2cf9003d SHA512 c8614ef33fca72d3f69eb687a15d62dcd9a23440ea976a73766a499abd7db9e316db11e508356a12a40eff40021aeca88a773ff70512cabcd87fa29823d538f9
+EBUILD i2c-tools-4.1-r1.ebuild 1984 BLAKE2B 996ddb5df273a1e1836bad0c4df5176b203ee11f6aa40d135542708d21bf13ac78e0e5b356e24c6451e37d397a6b9b3fabd102366bfdf8b8b454c0acff4b6e55 SHA512 cc57b871e0f9bed5aa2cc13187d043a982b240c0d59c319e1b499899c5e48d063331d11eb4e371ef01e36c4ba4bc16d7c4b39c0bab812770ef05a2285a5ae9ca
MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
index a8b6cc72dece..209116293998 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86"
IUSE="python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RDEPEND="!<sys-apps/lm_sensors-3
+RDEPEND="!<sys-apps/lm-sensors-3
python? ( ${PYTHON_DEPS} )"
DEPEND="${RDEPEND}"
diff --git a/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild b/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
index a90902efeea2..a2f0af908f46 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="perl python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RDEPEND="!<sys-apps/lm_sensors-3
+RDEPEND="!<sys-apps/lm-sensors-3
python? ( ${PYTHON_DEPS} )"
DEPEND="${RDEPEND}"
RDEPEND+="
diff --git a/sys-apps/intel-performance-counter-monitor/Manifest b/sys-apps/intel-performance-counter-monitor/Manifest
index 2539a6653b59..ebb9a122d1c4 100644
--- a/sys-apps/intel-performance-counter-monitor/Manifest
+++ b/sys-apps/intel-performance-counter-monitor/Manifest
@@ -1,5 +1,3 @@
DIST IntelPerformanceCounterMonitor-PCM-V2.10.zip 950922 BLAKE2B 3b3b0cf3e12e1f57241e25b13848253157624ac49c1aaec74a0ec8fd2cf92dffa56e5c25299189bd886cb069897dd5a7117a71b5189487be89ee704a377bbc03 SHA512 a9a219495d9e99f8a8ffdae729c56e565c63856b81d71d7d188db2543d8d656535bb88f5701351a41aee948aeeeae304951cdf99dac7e6628bd43ba79bda757a
-DIST IntelPerformanceCounterMonitorV2.8.zip 931374 BLAKE2B f5a2ab3a3e8982adc47031ab3dbe9fd425cfb60de95687833bb019752a2a4bbfc4acd52a025cd61e37b14e3535489a9d4eb3b2cb6e1aa6fdbf58ff1100d42ce2 SHA512 7dbba8c051663a315dcf79224502d76cb4217a483a4b322f0be938e06b988e290a83b345cb8c60645aceb8283555067c2db529179782432ff77fddd538ef8b8f
EBUILD intel-performance-counter-monitor-2.10.ebuild 1272 BLAKE2B 521cb60f84ed33c45db378a37269f8758673df9291eafc5ce09eb39a44ed938052f6070aaeb480f9f2fea79b582aeaf99377fc0dbfd31dcb67309b41acedeca7 SHA512 32228ee77fa382bdcd77bf5bfeaa68f098f056c4559d3ca76cfddbef86362c3a7a7ffbcaecca1b6077fa95e7f4d08b6363b96136be7aa1f9373873047e337782
-EBUILD intel-performance-counter-monitor-2.8.ebuild 1284 BLAKE2B 10db6775d9c07ca590a3126ca3769eeb0136341fccaed022d2aa39ea1dd538cdc942ed5770e6f46df9091d45e6dc6770bbdfe5196b7015a4f3c589eb196f6849 SHA512 5e08f4e52217543c767cbc7220824d681a546213242b315dc9eea7e7a953ce1721f2f27ef75f39c87bbbc0922a105c8c9a2b3cd0d480864654a78c260f01ddfb
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/intel-performance-counter-monitor/intel-performance-counter-monitor-2.8.ebuild b/sys-apps/intel-performance-counter-monitor/intel-performance-counter-monitor-2.8.ebuild
deleted file mode 100644
index ac520619c160..000000000000
--- a/sys-apps/intel-performance-counter-monitor/intel-performance-counter-monitor-2.8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator fcaps
-
-MY_PN="IntelPerformanceCounterMonitor"
-MY_PV="V2.8"
-MY_P="${MY_PN}${MY_PV}.zip"
-
-DESCRIPTION="Intel Performance Counter Monitor - A better way to measure CPU utilization"
-HOMEPAGE="https://software.intel.com/en-us/articles/intel-performance-counter-monitor-a-better-way-to-measure-cpu-utilization"
-SRC_URI="https://dev.gentoo.org/~dlan/distfiles/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=sys-devel/gcc-4:*"
-
-DEPEND="${RDEPEND}
- sys-apps/sed"
-
-CONFIG_CHECK="~X86_MSR ~PERF_EVENTS"
-ERROR_X86_MSR="Intel Performance Counter Monitor, requires X86_MSR to be set in kernel config."
-
-S="${WORKDIR}/IntelPerformanceCounterMonitor${MY_PV}"
-
-src_prepare() {
- sed -i 's/^#CXXFLAGS += -DPCM_USE_PERF/CXXFLAGS += -DPCM_USE_PERF/' Makefile || die
-}
-
-src_install() {
- exeinto /usr/bin
- newexe pcm.x pcm
- newexe pcm-memory.x pcm-memory
- newexe pcm-msr.x pcm-msr
- newexe pcm-numa.x pcm-numa
- newexe pcm-pcie.x pcm-pcie
- newexe pcm-power.x pcm-power
- newexe pcm-sensor.x pcm-sensor
- newexe pcm-tsx.x pcm-tsx
-}
-
-pkg_postinst() {
- fcaps CAP_SYS_RAWIO usr/bin/pcm
- fcaps CAP_SYS_RAWIO usr/bin/pcm-{memory,msr,numa,pcie,power,tsx}
-}
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 6915e4966333..fe59e37485de 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -11,4 +11,4 @@ EBUILD iproute2-4.19.0-r1.ebuild 4375 BLAKE2B 478751ceebaef4c53e975120662b7e5e35
EBUILD iproute2-5.1.0.ebuild 4425 BLAKE2B cd695ac496f8b0bb3e017b5b8d2f074902366fa3185db992070984a83300d72851cce584ad8446530d0f303358afe104ad41d640b1188a753aa25349ce267ecb SHA512 21fcf629dd959d8fea205fcb4fd0fcb1ffa1bfe249ddfc68247350a7c9ee5ec7cf9d6d1b36c0282ce0a5791c0f55ee594b465dfa944e05f7725bc00f5f480f7c
EBUILD iproute2-5.2.0-r1.ebuild 4425 BLAKE2B cd695ac496f8b0bb3e017b5b8d2f074902366fa3185db992070984a83300d72851cce584ad8446530d0f303358afe104ad41d640b1188a753aa25349ce267ecb SHA512 21fcf629dd959d8fea205fcb4fd0fcb1ffa1bfe249ddfc68247350a7c9ee5ec7cf9d6d1b36c0282ce0a5791c0f55ee594b465dfa944e05f7725bc00f5f480f7c
EBUILD iproute2-9999.ebuild 4380 BLAKE2B 37d298a23f7a6906fcfb6738f37b01af7adf62e51d78200dea1dc21c4fa5ba6d90774b53824c78e3ac8f465df5a4f7aa78cbc1fa501bd87c42da54eafe0bc285 SHA512 642d47e5287d3c5253ae2908ddb47041e398a7460896458f22ca5ad5371511696a05d8dd7f96b0d04bb99336c2cdf72b04ee7a3520ef133678a3fc8fe0b788f3
-MISC metadata.xml 581 BLAKE2B b63c391d8d9ba608c12ea74f0cdf0d4d762d18e5b62ab1e2489f34140def1691bc295d8d252ab984b313b6fb037cd4d5a74d992db7ca670557bd8458501f8c04 SHA512 607dd3006049664a4c780a65b187fb938cbf7c5e79b445eb4a69c3115af8fe6718ea227a68cfcf4b42fd92c3e760579a92b49a58415d01ccb0715fdf9c052a97
+MISC metadata.xml 672 BLAKE2B d27b6af84b177e8b12f64470dbac0e8fdcf45091681ced6d5ebd02414849c221e608a6a4bb8ce6aae305475e086cf140836b943a9e5380f10c368ac359397a98 SHA512 d71c5077fcf769520048a46b0fdd3563b974b65afdc68eb73fc0816d2c87dd9a73bca72e25d7e8f3c9f2ceb23c473bb92a1a92d8d5f43a7e15f965669226f0a2
diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml
index ad652efcf7e4..66ef219fafa3 100644
--- a/sys-apps/iproute2/metadata.xml
+++ b/sys-apps/iproute2/metadata.xml
@@ -11,4 +11,7 @@
<flag name="iptables">include support for iptables filtering</flag>
<flag name="minimal">only install ip and tc programs, without eBPF support</flag>
</use>
+<upstream>
+ <remote-id type="cpe">cpe:/a:iproute2_project:iproute2</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 3be371767dcf..c04104c3a6e6 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -16,6 +16,6 @@ DIST keyutils-1.6.1.tar.gz 119065 BLAKE2B b0c65d8a1ee8cab1ac712820a8bf073777eacd
DIST keyutils-1.6.tar.bz2 93973 BLAKE2B 250275852d13fb5f77786350e64175c9c0909d1a7e44750e44b09f79217acb9c40536bd61e15d1abdfe36b9e161832f4c59f11b73915d457356a273ad4999990 SHA512 ee50da165099ea26904066d24b27c5165cb1eb78df6768cba3a534aa318a5c8d926ec6e5322a38c8cedaa768cd79bdcb26ef918aa8447df2e5dfbbe7b8f200ff
EBUILD keyutils-1.5.11-r1.ebuild 3820 BLAKE2B d929dd8276d16e2f2cd38f6e815bf5fa63c43e20699ab69523d291ff88e2bac54386d7db45626564b50205f3e3943185a1066f9af1fc781bcef437f739cae244 SHA512 390277040f96c6ccd9b7d8a329e66c09fda691762e8c479e4f6c18cba6a02c718e139c9ea074ec678f4c7bc0e8b3f5d66e4a5eb758c93e02ecbb468e8cc3f6d4
EBUILD keyutils-1.5.9-r4.ebuild 2986 BLAKE2B 75f613871ba022cc24deebd12dea2cb0dee06db56477c96693c59b65fa4f63c33c212af624ac73bc4ad1c34aadc12783867821300cde0b2d49426e31401ac42f SHA512 bf13e04b7e089a1cedbd3a9f12a941066043352ad66128d6ba7a02149ff0e54b2030e81c93556f805fd2d5b286df121e20ecff7d06bd02d1a5852321b83558aa
-EBUILD keyutils-1.6.1.ebuild 3864 BLAKE2B 27e707f83a05bbb72cd6f27622ef72060edb69505026ed322e8c15d7ae58c134dc7470d16556c7f6218fd4974e191615291974fb0de7eab0b58d4f6adaed62a7 SHA512 4ff1350d32b0b4449aac6f49b2f582da39ea8866504f0cafb6c9611b33f2d47b02966cb21e0c8b96a924cce99e550a90f71d495505822ea63ebe6426306fd907
+EBUILD keyutils-1.6.1.ebuild 3859 BLAKE2B 004924233fcbb1fada034fbfe7a475189c32002677dd3f39f8169a27ee43573e35eab0ca8368af570ad387fa708e7dbe3f031e1254d23642e2a81f80fa9840aa SHA512 03f8a97f9a9b6ab10019cd6c4223f59f1d0c0dc3e72b8f848617a2e56b7c41cd9e35f933e5f041dbd8d90a9e62f9cb1d0c99e79b5c491bbee49202966110c585
EBUILD keyutils-1.6.ebuild 3805 BLAKE2B 9bfc8ac3ae965220f36b021b4dc2373e911387097aaa7f828334fa661964577a23bb6cf97818f7225f38de279d16b7d1fad8e96131482288e885e094e14d5402 SHA512 c35a43569ff5bfced26b1be0813d4f6420c12268af2be95294b5dbf53a0ca87887668f4aa8dc733d81ddc40f012cd179806c84697e82581f3f594ac4fd6b4018
MISC metadata.xml 424 BLAKE2B f4eb452bb90bf6b62f39d726bae137111c6fca619076888bb475bd2fb042e23db8f5d94240901d36a0c2f15a5774728429e2db2689dbad9ef4bb6d54b0a19b1f SHA512 211515865fbe17798b072bde0c699b67ec10e0716bad11224a3f1e00a729feea67b015cec4e8d870fa708179884176ee0799aee6d237cb4f2798f54a28c8042e
diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index 9bb0b02d6775..452097f30717 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/1.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="static static-libs test"
RDEPEND=""
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm-sensors/Manifest
index e5e4ff134f97..4c8e1205bc19 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -1,15 +1,15 @@
AUX fancontrol.confd 669 BLAKE2B cc297a5122d54f6104d840548480c6648fb31388a9c78a5e3a96ec91841c67d527a38e452ddaba5801c975fb23d9fab79aea46abbba0781ef2a8d8e9c6f1fed0 SHA512 06ec0b44e753bfa6a5ca461345e5857ac4d824cb3d9dd4955bbe884ff91d0184050476fe6da0ea8b0882243a51466af2d82540474581bd471f13c5977a0ec41a
AUX fancontrol.initd 603 BLAKE2B d5409d4141996adb8e5e9520075d42f79fcdcc017850c0d3d21cbf5736ea1d7da07921b035cbbb5a2c4a8490ddad3a108073fe154f170507249f3fc8f5e5b920 SHA512 3dad0939d679bfb2732bdbd8ff851298ed86e5fd83719eb5181f8cc3e7d84f7986a79a3438a8c3b6a6e3c8be1a3a9839769292d77e352c0167d4b16dd1f0d086
AUX fancontrol.service-r1 146 BLAKE2B 666a45c2e55dcf31470167ba9bb78e6205b3fcb47f66ae7b185d6651dba33f8a7699f800ecddaed070a8827d24893cc1971203b691f37515ea74125e889e8965 SHA512 eb1e22045a4adbcba398b77061d33b145614edf960c31aeb3c9a987553d6a0d8de332d4887e52ca2c6d6147d6e1a2b5e8bae41dca5f1c9d4fc2dc522c18459f8
-AUX lm_sensors-3.4.0-sensors-detect-gentoo.patch 12441 BLAKE2B f35efdf0f27b8aa64d5d0f8f088921225b9f991eb999d40f452afba4161ea7a38521346356f00c3136e6fb0d27d6508dd46fef385fb9e317157eb33bce8bdb8d SHA512 740c2fefa3c914fbb977e86b5b57cdbbcd06fc2d348ee42b5c678f164f15fb7a171979e5da5a1779c932ba39a535e37d0f7b7506c43966463115e0042dc9dc81
-AUX lm_sensors-3.5.0-sensors-detect-gentoo.patch 12593 BLAKE2B 21383c2d0a7dc2063f81ca7af15ee02dc94a3344f23da80433ab19fc7a5528cc516408ecadc46d0fd1f55799a305c0e509211476314ca0cdf05e3b8942059050 SHA512 0f1556cef3d1c19f4dd822afdf609390f82dbfda7e66070ca5b89b145c29669e05141f150b3b0d58c277c79c57f98659284953788db6334c27e17e3f39e23cdd
+AUX lm-sensors-3.4.0-sensors-detect-gentoo.patch 12441 BLAKE2B f35efdf0f27b8aa64d5d0f8f088921225b9f991eb999d40f452afba4161ea7a38521346356f00c3136e6fb0d27d6508dd46fef385fb9e317157eb33bce8bdb8d SHA512 740c2fefa3c914fbb977e86b5b57cdbbcd06fc2d348ee42b5c678f164f15fb7a171979e5da5a1779c932ba39a535e37d0f7b7506c43966463115e0042dc9dc81
+AUX lm-sensors-3.5.0-sensors-detect-gentoo.patch 12593 BLAKE2B 21383c2d0a7dc2063f81ca7af15ee02dc94a3344f23da80433ab19fc7a5528cc516408ecadc46d0fd1f55799a305c0e509211476314ca0cdf05e3b8942059050 SHA512 0f1556cef3d1c19f4dd822afdf609390f82dbfda7e66070ca5b89b145c29669e05141f150b3b0d58c277c79c57f98659284953788db6334c27e17e3f39e23cdd
AUX lm_sensors.confd 102 BLAKE2B 5d0771a2cac4869caee2d6ae3ac2cc2f60e64720ad587d4a89fa6dca7506325554b06d92cce42fc51b9af9c8715834d6d481f342cd6be57061c5234dfabd26d3 SHA512 a31220f4bf337de7b17158e00c64e662527abe11c5cc9f8401216f757dcde1c220527ad73f375c0de051030119daeba4cef6c5155f077447a9391e273cd65f50
AUX lm_sensors.initd 334 BLAKE2B 377cea5d1f0c2baf94a2a17dd870ae3ba545bb96453432808360d1ff0ffd92dfcb306364ffa579afdb6b02dda930c7288e5c1b32274893e8541777a62abe8c37 SHA512 5a3f3eb6ae2a97f0a3841a2544579733f6df4a89c3667e1920203a6b0d18f54eb0aa12b1fd0c0bbdc4f6a1535df8444ebeb9d6212cc8be8dc1cf25e204d009a0
AUX sensord.confd 695 BLAKE2B e435c63a48da41218b793f9beefd5f9d1702aa80a525ca378eeef36654933f0ec2042683e1b13bc48349eebc4d2dde26d20ac7e7681c01ceeb0b3b4e27576d2b SHA512 83c71b9aaae273daff62da31ae45ffa682460e4d4a8fbca54dfa83b1db58d4d042bba08eb62c62f4d8f6647d222ef5a11181a3fb7bedffbb4138ef02f6143535
AUX sensord.initd 574 BLAKE2B bbc4e39d6b906a0e7539c4521420b9da686722eb6d26d486c29554c2cdc1b8c45d770c5e587f707d4fad0e34e083b2388dda194908a78c89e3ad4606cd61e464 SHA512 69abc9a92bfffae59f17a93e4792fd1f6b64285271693a443e1007adb73f95cb62a8dbf318f407f60fb3e3573d0e7ea11357076f14dbb58a0964f7b0bfe30b4a
AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc095446e64de85d829f3d34802d4f762967cc503d527b8f28deaeaf3e0a93b3a4384b9c9b62a8b71d4dfe SHA512 83132636209f3e3717edad28ed230f767ee8bf00eabf3036238f64c370d1e42db1c14d1ed965c650da8aa3a6deb3ce7a0794425491ff7f8ce67e2fde934fc4fb
-DIST lm_sensors-3.5.0.tar.gz 267133 BLAKE2B f8fe8efe19cd17f2c828404bee7b2b285118279f06aaa2ebf831823d6767865a2b19da7bede1f3b43b2664ae3cec41b9e840be24fa673472fe577d38f602da4e SHA512 bea9b2ac01bc43622cafdce0b00ac3bb8cb2d818449c8b332ab51e7ad0022b66bcbf6ca1e99c8500bdc6092c5c1ef985bfe7cff05dbcf015bd3ccf58c00a72e1
-DIST lm_sensors-3.5.0_p20190505.tar.gz 269694 BLAKE2B 6d665b8cbf83b26786686c5000dcac139aac930f691bac9053173dfcb92b6320afeb2f9b5ba6305cba643ff8cde356ef9e6772948d0f618cb3f5a48b3b5396f2 SHA512 15e3c50a9f00d284995f1ae34ef38e1ce314acb0c15d4996002287fadcf89a6f066058838c74c2b2bbec2628a3e5b9e8e010b0f5139641ee5336ac061cb33353
-EBUILD lm_sensors-3.5.0.ebuild 6448 BLAKE2B ae7e54bae38d9374a65df2f2aeaf4dad562e91357a351789e985674101253cd6f150b4366c4491cf5dececf1ee561ddd2057ff6a915b9a22b3feb345addd7050 SHA512 a7fb2556fa53fb57ee9e34b60fe9375ad67b326b5f1fd23ff31a2f6c0b98f0c51a184bf7817fbf3d5b28b4cc67c1bf2caf5421a1052efb64df0d9c286d2ec07c
-EBUILD lm_sensors-3.5.0_p20190505.ebuild 6444 BLAKE2B 99e792e84bd2120bcc6e0f632b55c8a2dbc76dd9939e0af95237178aba79f268f3a65c32c793286040785f4f0b8f893a5b981afc61c5ccc29f9b09a06b4b238d SHA512 1ccbc2cfd2a6f2e524579e5438f03d70100863e244ef25c92e956232e7c2d1abc21de6d4e47a2056305c3f8b732d080de4ef790cee0480b99d021ae6c376cd1c
+DIST lm-sensors-3.5.0.tar.gz 267133 BLAKE2B f8fe8efe19cd17f2c828404bee7b2b285118279f06aaa2ebf831823d6767865a2b19da7bede1f3b43b2664ae3cec41b9e840be24fa673472fe577d38f602da4e SHA512 bea9b2ac01bc43622cafdce0b00ac3bb8cb2d818449c8b332ab51e7ad0022b66bcbf6ca1e99c8500bdc6092c5c1ef985bfe7cff05dbcf015bd3ccf58c00a72e1
+DIST lm-sensors-3.5.0_p20190505.tar.gz 269694 BLAKE2B 6d665b8cbf83b26786686c5000dcac139aac930f691bac9053173dfcb92b6320afeb2f9b5ba6305cba643ff8cde356ef9e6772948d0f618cb3f5a48b3b5396f2 SHA512 15e3c50a9f00d284995f1ae34ef38e1ce314acb0c15d4996002287fadcf89a6f066058838c74c2b2bbec2628a3e5b9e8e010b0f5139641ee5336ac061cb33353
+EBUILD lm-sensors-3.5.0.ebuild 6478 BLAKE2B 86a3662a799b7fc98c6f4e743bd2922067fe38105a000e0c081dc207711b1c23c72712645d7beb16f31087cd8e952a06cbefb85b1870440d1646dcf29e5dde79 SHA512 080128a13e5e32b88365eb091708d61b0cb1dc523740a3a22828ec34876977817b4f50363ef0f361d27b853a80004a8aa03566406a12eaf27c1c840de49ee735
+EBUILD lm-sensors-3.5.0_p20190505.ebuild 6445 BLAKE2B 3e11c346ac68bfbec68d63ae766a5737cd59721008b4e04bb80ed6d73b32b3db64a98e2fd1ede5c5b13d487131d74b984559599299614b6c3d10856b73b1e41b SHA512 1edbf8904e2d43ae0ecd72e1b3b93f19387c42bd7d8ed7e2de737f1406dee1243bce43cf4c37ed5e6c0d5992f5f05522a34429e82a608c9f3ee3fa203ffd3c94
MISC metadata.xml 943 BLAKE2B dec9c9764069667a9f5f5cd8359d0dc06020d6acbed972daab0b538b9f172f6d081a057cc6c55362de11c26857d1a885bb8a04e18dab1062370a8ddf0e25d7e8 SHA512 c32b85e2771b216861bf16d8c7ccfc8277b34c7ab712edaf487083f8d9e2a8e3707b65d1dd952e92d925fbefa87cf76799aa0b30f11ae8acfd4ffe27f2caf1f8
diff --git a/sys-apps/lm_sensors/files/fancontrol.confd b/sys-apps/lm-sensors/files/fancontrol.confd
index a7169583173e..a7169583173e 100644
--- a/sys-apps/lm_sensors/files/fancontrol.confd
+++ b/sys-apps/lm-sensors/files/fancontrol.confd
diff --git a/sys-apps/lm_sensors/files/fancontrol.initd b/sys-apps/lm-sensors/files/fancontrol.initd
index 0734668a4c0a..0734668a4c0a 100644
--- a/sys-apps/lm_sensors/files/fancontrol.initd
+++ b/sys-apps/lm-sensors/files/fancontrol.initd
diff --git a/sys-apps/lm_sensors/files/fancontrol.service-r1 b/sys-apps/lm-sensors/files/fancontrol.service-r1
index 7d4342c30171..7d4342c30171 100644
--- a/sys-apps/lm_sensors/files/fancontrol.service-r1
+++ b/sys-apps/lm-sensors/files/fancontrol.service-r1
diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.4.0-sensors-detect-gentoo.patch b/sys-apps/lm-sensors/files/lm-sensors-3.4.0-sensors-detect-gentoo.patch
index dd77d66c0855..dd77d66c0855 100644
--- a/sys-apps/lm_sensors/files/lm_sensors-3.4.0-sensors-detect-gentoo.patch
+++ b/sys-apps/lm-sensors/files/lm-sensors-3.4.0-sensors-detect-gentoo.patch
diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.5.0-sensors-detect-gentoo.patch b/sys-apps/lm-sensors/files/lm-sensors-3.5.0-sensors-detect-gentoo.patch
index 3fcd19c05c4f..3fcd19c05c4f 100644
--- a/sys-apps/lm_sensors/files/lm_sensors-3.5.0-sensors-detect-gentoo.patch
+++ b/sys-apps/lm-sensors/files/lm-sensors-3.5.0-sensors-detect-gentoo.patch
diff --git a/sys-apps/lm_sensors/files/lm_sensors.confd b/sys-apps/lm-sensors/files/lm_sensors.confd
index bae2ea0bbbec..bae2ea0bbbec 100644
--- a/sys-apps/lm_sensors/files/lm_sensors.confd
+++ b/sys-apps/lm-sensors/files/lm_sensors.confd
diff --git a/sys-apps/lm_sensors/files/lm_sensors.initd b/sys-apps/lm-sensors/files/lm_sensors.initd
index 4efc6c964040..4efc6c964040 100644
--- a/sys-apps/lm_sensors/files/lm_sensors.initd
+++ b/sys-apps/lm-sensors/files/lm_sensors.initd
diff --git a/sys-apps/lm_sensors/files/sensord.confd b/sys-apps/lm-sensors/files/sensord.confd
index a6f2f265c11f..a6f2f265c11f 100644
--- a/sys-apps/lm_sensors/files/sensord.confd
+++ b/sys-apps/lm-sensors/files/sensord.confd
diff --git a/sys-apps/lm_sensors/files/sensord.initd b/sys-apps/lm-sensors/files/sensord.initd
index fa958dbf4389..fa958dbf4389 100644
--- a/sys-apps/lm_sensors/files/sensord.initd
+++ b/sys-apps/lm-sensors/files/sensord.initd
diff --git a/sys-apps/lm_sensors/files/sensord.service-r1 b/sys-apps/lm-sensors/files/sensord.service-r1
index b7a1e1bc3bd0..b7a1e1bc3bd0 100644
--- a/sys-apps/lm_sensors/files/sensord.service-r1
+++ b/sys-apps/lm-sensors/files/sensord.service-r1
diff --git a/sys-apps/lm_sensors/lm_sensors-3.5.0.ebuild b/sys-apps/lm-sensors/lm-sensors-3.5.0.ebuild
index f5c4e1a4e7f1..5a11eb1e7cf8 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.5.0.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.5.0.ebuild
@@ -146,8 +146,8 @@ multilib_src_install() {
}
multilib_src_install_all() {
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ newinitd "${FILESDIR}"/lm_sensors.initd lm_sensors
+ newconfd "${FILESDIR}"/lm_sensors.confd lm_sensors
systemd_dounit prog/init/lm_sensors.service
newinitd "${FILESDIR}"/fancontrol.initd fancontrol
@@ -166,7 +166,7 @@ multilib_src_install_all() {
dodoc doc/developers/applications
if use contrib; then
- insinto /usr/share/${PN}
+ insinto /usr/share/lm_sensors
doins -r "${S}"/configs
fi
}
@@ -208,7 +208,7 @@ pkg_postinst() {
elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
elog "\"/etc/modules-load.d/lm_sensors.conf\"."
elog ""
- elog "You might want to add ${PN} to your default runlevel to make"
+ elog "You might want to add lm_sensors to your default runlevel to make"
elog "sure the sensors get initialized on the next startup."
elog ""
elog "Be warned, the probing of hardware in your system performed by"
diff --git a/sys-apps/lm_sensors/lm_sensors-3.5.0_p20190505.ebuild b/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild
index c63ff098149b..e2d8209c6ad9 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.5.0_p20190505.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild
@@ -8,15 +8,13 @@ inherit linux-info systemd toolchain-funcs multilib-minimal
DESCRIPTION="Hardware Monitoring user-space utilities"
HOMEPAGE="https://hwmon.wiki.kernel.org/ https://github.com/lm-sensors/lm-sensors"
-MY_PN="${PN/_/-}"
-
if [[ "${PV}" =~ .*_p[[:digit:]]{8}.* ]] ; then
COMMIT="2c8cca3d6cd60121b401734c1a24cfec7daed4fc"
- SRC_URI="https://github.com/lm-sensors/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${MY_PN}-${COMMIT}"
+ SRC_URI="https://github.com/lm-sensors/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}-${COMMIT}"
else
SRC_URI="https://github.com/lm-sensors/lm-sensors/archive/V$(ver_rs 1- -).tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN/_/-}-$(ver_rs 1- -)"
+ S="${WORKDIR}/${PN}-$(ver_rs 1- -)"
fi
LICENSE="GPL-2+ LGPL-2.1"
@@ -146,8 +144,8 @@ multilib_src_install() {
}
multilib_src_install_all() {
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ newinitd "${FILESDIR}"/lm_sensors.initd lm_sensors
+ newconfd "${FILESDIR}"/lm_sensors.confd lm_sensors
systemd_dounit prog/init/lm_sensors.service
newinitd "${FILESDIR}"/fancontrol.initd fancontrol
@@ -166,7 +164,7 @@ multilib_src_install_all() {
dodoc doc/developers/applications
if use contrib; then
- insinto /usr/share/${PN}
+ insinto /usr/share/lm_sensors
doins -r "${S}"/configs
fi
}
@@ -208,7 +206,7 @@ pkg_postinst() {
elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
elog "\"/etc/modules-load.d/lm_sensors.conf\"."
elog ""
- elog "You might want to add ${PN} to your default runlevel to make"
+ elog "You might want to add lm_sensors to your default runlevel to make"
elog "sure the sensors get initialized on the next startup."
elog ""
elog "Be warned, the probing of hardware in your system performed by"
diff --git a/sys-apps/lm_sensors/metadata.xml b/sys-apps/lm-sensors/metadata.xml
index 897d37da3562..897d37da3562 100644
--- a/sys-apps/lm_sensors/metadata.xml
+++ b/sys-apps/lm-sensors/metadata.xml
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index 99aec0026643..dcf389efcd2e 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -1,6 +1,8 @@
DIST nvme-cli-1.5.tar.gz 282891 BLAKE2B 31eb9f4acda978977b7de222e1d973aac4ea18a34eaa0ffea73f2603cc2b8936aecd23248c764d05af161943db06533faf881711f2f22ad539b7e7607d5f8652 SHA512 0fc3dafeba8f67c8f3a3f25aac3b454d9e3ebfb1c20d67f96009a4490f269f0fe3642de781cd161896300f91a1cc37bd8a4e61c77f35422ab134c747702ffaca
DIST nvme-cli-1.6.tar.gz 368461 BLAKE2B e40f4d76314860c966c3cb3de31e8d4a1bceab847b8950f0c99d47e00b8e8de077e91f6da9216ec10e939d37d34ab255b5cc3c641f3bbaf3ac8974f697051329 SHA512 05bcc539febd047f092a236ef2b2e9ad4e1df5d38bdc70416f80217425767f414e72294fda46868323cb7c77662d6000eaf16ebdaf74bdfad1baaed11b025d39
+DIST nvme-cli-1.9.tar.gz 440675 BLAKE2B 19d9f4982e6bf4d37bbced02aadd0f58e496901c1463c96596b289e23c4e5849bfed9a4129447588c9c8104d5b49fd0bf97ee6495907bf022487407f02d7c4ae SHA512 3565b33bc39bde4480bbde5d46d75ea6907c0921884e8f39029b746f8383d3630942e405c61bcc3654bac5646bc86479b4b790e1b823ec83650649621bab6dac
EBUILD nvme-cli-1.5.ebuild 566 BLAKE2B e723786af2108253b54742b752ea755b84964e2155e68a3500c90a8900a2cf80de952c3a212c3e0809009518b274158aace3afa9c7f2bf16d2e2b31321581c2f SHA512 3fb2c2818a77fe647dc8216004bc817ebcdefff99e18abffc62883d98d0448972975651eae704b945324bd809aaa6215d9803145955a971a15ae19357ca647ee
EBUILD nvme-cli-1.6-r1.ebuild 637 BLAKE2B a8b970784c99af27bcd317bd4b246d97593eb6e9db69a35d7e5e5c12d1baeefa9fcbfc94c3055150d45bbd408714d8f756d82f92496512870ccc45e51b7582f2 SHA512 3fe25b46e5fb9135b15847def70cc9c41860e0f0ad9682f434229b2eaef5672a5416a6743fe2e351f3ed9244b33536e1555da4eb7f1b653ee0fc974c3df2b859
EBUILD nvme-cli-1.6.ebuild 563 BLAKE2B 4494d38c8091d084bffc00ee18e1752cfc78f37f8b78684c738849aaadc93e9edc4cf8c1a3b13879dcc5bd86c9ed5053a72c6e7da367606605eadd7ea5c734fc SHA512 25a4590cc15ef4aff600cd0c18ec52e9bc7f043723ad569d7b1957b808e0d995abc5838f28b5af27350c38098c198274797b9eb6a059412ce86142b0ea18b75b
+EBUILD nvme-cli-1.9.ebuild 691 BLAKE2B a64c7181f53d1cf67620a5aa3126e6ae26136b15dad076face14095cb6d230cdeb853fe5fcf09121a9274c9301b31c69261bc1840e82e816483721cb7919ea85 SHA512 e13ee822fd979187fa0588d3f64df9083059831c75d31ae41861732ea8e9b611de5a92776a170f2b79eae31062ef3ea636c38ce057c38179deb68b147cdfce24
MISC metadata.xml 369 BLAKE2B 67a0c73fe0e2de97927a7c827bf4d216c7460c2ec4383c07e028c0b2d10e71a45559482bab635a6b9374fbec557ab83327baf041eb47bbc06c5e624bb29f6925 SHA512 d9439fc99f1bc5051b670e7d287185af8e7db4ba9045fd9a9aeb4c0f04a33716650d3a01f0ad8640e8b62db048a0f536fbd6145d5a7d79bb7aa524d63112db61
diff --git a/sys-apps/nvme-cli/nvme-cli-1.9.ebuild b/sys-apps/nvme-cli/nvme-cli-1.9.ebuild
new file mode 100644
index 000000000000..dab045a072bd
--- /dev/null
+++ b/sys-apps/nvme-cli/nvme-cli-1.9.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="NVM-Express user space tooling for Linux"
+HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="+uuid"
+
+RDEPEND="uuid? ( sys-apps/util-linux:= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ sed -e 's|^LIBUUID =|LIBUUID ?=|' \
+ -e 's|^install-hostparams:$|\0 install-etc|' \
+ -i Makefile || die
+}
+
+src_configure() {
+ tc-export CC
+ export PREFIX="${EPREFIX}/usr"
+ MAKEOPTS+=" LIBUUID=$(usex uuid 0 1)"
+}
diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest
index 9f0068208aa5..3d44f2201b30 100644
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -2,5 +2,5 @@ AUX pmount-0.9.19-testsuite-missing-dir.patch 1354 BLAKE2B cebe20a80f929f1104fc8
AUX pmount-0.9.99_alpha-locale-regex.patch 749 BLAKE2B d1e777c57ba8b261f6fdf461200a980149b417022dd0fb78cd1f366be2001850956fede8677859a952c9b961668488f8bb2ef0302816f72e41f71b0191d3b336 SHA512 9009544a6d424dc6449d8f1ba53521802741b904129e1f4cd729a1051735fda3d6fcfe85d5aa49f6fbc5df62abbcb21fd7ab578cee667efaf3e4c00dc1b8131c
AUX pmount.bash-completion 2935 BLAKE2B 8d89d6098764dbbbddcdc45e3aaac377eb71ead5ca0ea3f44b9eda1dbe1573e3cde154d51b9486903c6fe104948af1ad29031837375953239956651efff7dfad SHA512 b57a37afc2a124c6a4f19924a367d03b315e93575d0b152acde06e43c7dcd1b3d5df46c02d2e5ceef35911edb4f96d1d4113fb6d7cd1e9531fd9840c3729f924
DIST pmount_0.9.99-alpha.orig.tar.bz2 364282 BLAKE2B a023d75623374186fb2de07bf1a41b01b2fc2570f9560b8bddec04441ffd083c6a0ece32b53db4e6067d181269f74cb7044f2c60bffece4b0e4c8dba9f1611b5 SHA512 12105674f099afb82302c0960f4f50a4bc75382071940e897d9c65b57a0f4de1fafdaa2a4c05f0fa5cba55453ae0c21376b9891353cad1afa88e5fbd9f63d5e9
-EBUILD pmount-0.9.99_alpha-r5.ebuild 2044 BLAKE2B 51b599d98fd811ea7ae1417a220db540846a079174821d501a4906faf801cab783238a64d63d2f367a3fa1ed0c18594920c580c7fc4a0be2810555cf9f0c10d8 SHA512 7c09d021aeee9fe058d4f7cf2542b7fb4ab84cfe18e6af7bb9e69311f8c285e6f852928800d4197e00fc46dfd0315f8da62f19db88752d6cd58cb3f05ab4aea0
+EBUILD pmount-0.9.99_alpha-r5.ebuild 2025 BLAKE2B ef52d2965725324a5b98db6c6b8a2c061396f35b53f30dc5224d5d56fe8325811357c1de2be0518b5944a4dc3971e791c6fdc60f4d3ddc82876ad94dd2bff6f4 SHA512 65d58a6044be597ac0fe9fe893b411d8f8d82f0ead2eebb710c07e5ce582c673b321283ff01e330f679233fbb2e693576e1a64c79e34d2867873f034bfb089d7
MISC metadata.xml 321 BLAKE2B 014d83434739678d62884604e7e4e56cc52123ddd326250068ed4fd2f5db2b439a75e29c5dc3699599db3c640df414f9407cc772e302796a34eec58e21ebf1a2 SHA512 be1e96e34fcb9d2c433c6d67280840adb13b8771860e6314fff1b716814b120c4d31574333052e54fb788f76c8990d0bd1bdb4c725fde28b174bbd5a918bdc6e
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
index f035b7abd422..52df8b15b9ff 100644
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-inherit eutils user bash-completion-r1
+inherit eutils bash-completion-r1
DESCRIPTION="Policy based mounter that gives the ability to mount removable devices as a user"
HOMEPAGE="https://launchpad.net/pmount"
@@ -13,7 +13,9 @@ SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
IUSE="crypt"
-RDEPEND=">=sys-apps/util-linux-2.17.2
+RDEPEND="
+ acct-group/plugdev
+ >=sys-apps/util-linux-2.17.2
crypt? ( >=sys-fs/cryptsetup-1.0.6-r2 )"
DEPEND="${RDEPEND}
dev-util/intltool
@@ -21,10 +23,6 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${P/_/-}
-pkg_setup() {
- enewgroup plugdev
-}
-
src_prepare() {
# Restore default value from pmount <= 0.9.23 wrt #393633
sed -i -e '/^not_physically_logged_allow/s:=.*:= yes:' etc/pmount.conf || die
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7532b66b5149..d3cafe223ba8 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,9 +3,11 @@ AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906
DIST portage-2.3.66.tar.bz2 1023966 BLAKE2B dc378b714101b287fa33defeb778e586da83275cdc2d0bc7a98e9f2ea568568313d6a2767f693f3111fc41f0c6f07451315021186a1719bd52520da327c103d6 SHA512 f8642237e0127d9838c6e91430a19b8886295f8ce6b18cf915d6eb63204c7a8c65783f1554eec90b7ce7d0b613ef4206643eec8751b0594de1dcb4ede4491779
DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545cccca0f516a5724e331e SHA512 20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
DIST portage-2.3.75.tar.bz2 1032575 BLAKE2B c4f3e9a7e7056af19da6a56599fb79a26331d6ab88981f966b77e2d17ee5dac1a585f54b1185f64855c9c2af544684b759143f657a529878a4e6eb9df4757340 SHA512 06dabc9bff2992b197575ceab5b4f117aca01a10d2556bb006bb28bd4c1d99edfbff753e83aba706782da1e365b923e081ce2037053fed31e18baa5fab6da4a2
+DIST portage-2.3.76.tar.bz2 1033462 BLAKE2B 1be0641337cd7d2a55f8aaba6f84bbfa7182503050e669fb28cd00e4de13cce31ec6e33cc2794e372d1a67b7d2f27e6bb85969f720f2ed449c619598b708b903 SHA512 e7774cf89e3865cb1ca5465fc961b452cc8529ccf09e86b7ebd16cca049f1efb527dca9aba892392d5909283cf12930117b1d33fa58e1e429f4408cf50181921
DIST repoman-bug-685482-fbebef9677d6.patch 3350 BLAKE2B f715267e2731c1ec7c780aa9c6cffe1f848b3ad050273646579677a0522483df6fef844ffd87fb22f7dad53f1ec60221acd0d81a813569baf768ba62a6c1921c SHA512 0e44625aeec7c239d7db8fdcf6a13313f4a8c1275e0e474cc2f05e5476d86214881cec2917d816c8b63f69d508c0bfa69e6a8e05b614b405463c998a4fb7ce12
EBUILD portage-2.3.66-r1.ebuild 8243 BLAKE2B 2fb6301048727460fb3defc8ccde74b05807a0492ee7429924301e94f36d5b8d75336c721e82e41737f3ce257e24506a4894633639a96e28233d6244d17f1fd6 SHA512 58174afb4c008e0aa18616ea0d06297577f01344398fe7fbcb2ee0d80570258eba9010134dbd4ef3218d0f31652c1de09ad3c6b7fa43282116ee97a2f7d7c6b8
EBUILD portage-2.3.69.ebuild 8100 BLAKE2B 7f50fad1739d128b7437044bacb43338ee9638aeb79fad691824f0d4749a3432f7d62a1ba3ffbcd00f13eaa33e0089268d3c4d78628752861598a483ab3876b5 SHA512 8bc0ddfc45c8f2d63911be82d5cd38efd7a06697a08688624f86a7963c264d4f1cb9b1e7e8d0a45a321041556ecaad0ed4cfa2fefa13f24a867226c810016061
EBUILD portage-2.3.75-r1.ebuild 8385 BLAKE2B fa5c198d971d729af8931afb0dad6cf9dd8c2b8a180ef931fb3c99c05555cfbacf3307e4c068023b6bd719d7934b0410340872edc5f67b18c63a9e728815c705 SHA512 1e70cdf522ba87b0202b724734c6afeb2d910c617eef3d260fdb5d6ca5bf16e84a8482602db3d6fcaf3dd7bdb6e7ecf5b5fe17f82361b2d227181e6d82654153
+EBUILD portage-2.3.76.ebuild 8117 BLAKE2B a4d7360426ea26118e2f845d65a23de19c1e766f098094389a2ba7132d7d3b7c2eae03928fbfb837e578bd523ac74708d2d4c8591a930b9dc3e6f52c55c7a3b8 SHA512 ccc722d645070edce7a371b295888959241350161afd4be2c844115c8966afcc3274d1ae3034ba946020ce08ccbcf606469e78e34181c2a37a21c287ea5c2111
EBUILD portage-9999.ebuild 7909 BLAKE2B 1116fee5fe17096e2a5b33cce164c6dd8e1f7a8cb04716e0218d001df4a09e957541b8267f0bf92e2b7f80a868aa0aeb081a4f83d8fa9529e619e682b8f4b480 SHA512 8b0b42bf555c092fc43aedc3c38f9eb78f7ea77b315dda867aacaddae4f7eba05434accfad2aa91e4d1a31d9ebeb9453483d3a5d6e5cdb785bb4c30ef6aaaa79
MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.76.ebuild b/sys-apps/portage/portage-2.3.76.ebuild
new file mode 100644
index 000000000000..b45fedf35292
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.76.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+ pypy
+ python3_5 python3_6 python3_7
+ python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info systemd prefix
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+ >=app-arch/tar-1.27
+ dev-lang/python-exec:2
+ >=sys-apps/sed-4.0.5 sys-devel/patch
+ doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+ epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+ >=app-arch/tar-1.27
+ dev-lang/python-exec:2
+ !build? (
+ >=sys-apps/sed-4.0.5
+ app-shells/bash:0[readline]
+ >=app-admin/eselect-1.2
+ $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+ python{2_7,3_5} pypy)
+ rsync-verify? (
+ >=app-portage/gemato-14[${PYTHON_USEDEP}]
+ >=app-crypt/openpgp-keys-gentoo-release-20180706
+ >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+ )
+ )
+ elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+ elibc_musl? ( >=sys-apps/sandbox-2.2 )
+ elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+ kernel_linux? ( sys-apps/util-linux )
+ >=app-misc/pax-utils-0.1.17
+ selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+ xattr? ( kernel_linux? (
+ >=sys-apps/install-xattr-0.3
+ $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+ python2_7 pypy)
+ ) )
+ !<app-admin/logrotate-3.8.0
+ !<app-portage/gentoolkit-0.4.6
+ !<app-portage/repoman-2.3.10"
+PDEPEND="
+ !build? (
+ >=net-misc/rsync-2.6.4
+ userland_GNU? ( >=sys-apps/coreutils-6.4 )
+ )"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+ local x y
+ for x in ${@}; do
+ for y in ${SRC_ARCHIVES}; do
+ echo ${y}/${x}
+ done
+ done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+ $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_pretend() {
+ local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
+
+ check_extra_config
+}
+
+pkg_setup() {
+ use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ if use gentoo-dev; then
+ einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+ sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+ -i lib/_emerge/create_depgraph_params.py || \
+ die "failed to patch create_depgraph_params.py"
+
+ einfo "Enabling additional FEATURES for gentoo-dev..."
+ echo 'FEATURES="${FEATURES} strict-keepdir"' \
+ >> cnf/make.globals || die
+ fi
+
+ if use native-extensions; then
+ printf "[build_ext]\nportage-ext-modules=true\n" >> \
+ setup.cfg || die
+ fi
+
+ if ! use ipc ; then
+ einfo "Disabling ipc..."
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+ -i lib/_emerge/AbstractEbuildProcess.py || \
+ die "failed to patch AbstractEbuildProcess.py"
+ fi
+
+ if use xattr && use kernel_linux ; then
+ einfo "Adding FEATURES=xattr to make.globals ..."
+ echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+ || die "failed to append to make.globals"
+ fi
+
+ if use build || ! use rsync-verify; then
+ sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+ -e '/^sync-webrsync-verify-signature/s|yes|no|' \
+ -i cnf/repos.conf || die "sed failed"
+ fi
+
+ if [[ -n ${EPREFIX} ]] ; then
+ einfo "Setting portage.const.EPREFIX ..."
+ hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+ -w "/_BINARY/" lib/portage/const.py
+
+ einfo "Prefixing shebangs ..."
+ while read -r -d $'\0' ; do
+ local shebang=$(head -n1 "$REPLY")
+ if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+ die "sed failed"
+ fi
+ done < <(find . -type f ! -name etc-update -print0)
+
+ einfo "Adjusting make.globals, repos.conf and etc-update ..."
+ hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+ if use prefix-guest ; then
+ sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+ -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+ -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+ -i cnf/repos.conf || die "sed failed"
+ fi
+
+ einfo "Adding FEATURES=force-prefix to make.globals ..."
+ echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+ || die "failed to append to make.globals"
+ fi
+
+ cd "${S}/cnf" || die
+ if [ -f "make.conf.example.${ARCH}".diff ]; then
+ patch make.conf.example "make.conf.example.${ARCH}".diff || \
+ die "Failed to patch make.conf.example"
+ else
+ eerror ""
+ eerror "Portage does not have an arch-specific configuration for this arch."
+ eerror "Please notify the arch maintainer about this issue. Using generic."
+ eerror ""
+ fi
+}
+
+python_compile_all() {
+ local targets=()
+ use doc && targets+=( docbook )
+ use epydoc && targets+=( epydoc )
+
+ if [[ ${targets[@]} ]]; then
+ esetup.py "${targets[@]}"
+ fi
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install() {
+ # Install sbin scripts to bindir for python-exec linking
+ # they will be relocated in pkg_preinst()
+ distutils-r1_python_install \
+ --system-prefix="${EPREFIX}/usr" \
+ --bindir="$(python_get_scriptdir)" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+ --sbindir="$(python_get_scriptdir)" \
+ --sysconfdir="${EPREFIX}/etc" \
+ "${@}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ local targets=()
+ use doc && targets+=(
+ install_docbook
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+ )
+ use epydoc && targets+=(
+ install_epydoc
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+ )
+
+ # install docs
+ if [[ ${targets[@]} ]]; then
+ esetup.py "${targets[@]}"
+ fi
+
+ systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+ # Due to distutils/python-exec limitations
+ # these must be installed to /usr/bin.
+ local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+ einfo "Moving admin scripts to the correct directory"
+ dodir /usr/sbin
+ for target in ${sbin_relocations}; do
+ einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+ mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+ done
+}
+
+pkg_preinst() {
+ python_setup
+ python_export PYTHON_SITEDIR
+ [[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
+ env -u DISTDIR \
+ -u PORTAGE_OVERRIDE_EPREFIX \
+ -u PORTAGE_REPOSITORIES \
+ -u PORTDIR \
+ -u PORTDIR_OVERLAY \
+ PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
+ "${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+ # elog dir must exist to avoid logrotate error for bug #415911.
+ # This code runs in preinst in order to bypass the mapping of
+ # portage:portage to root:root which happens after src_install.
+ keepdir /var/log/portage/elog
+ # This is allowed to fail if the user/group are invalid for prefix users.
+ if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+ chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+ fi
+}
diff --git a/sys-apps/qdirstat/Manifest b/sys-apps/qdirstat/Manifest
index 8dac6d63c502..55e8a2140a6e 100644
--- a/sys-apps/qdirstat/Manifest
+++ b/sys-apps/qdirstat/Manifest
@@ -1,3 +1,3 @@
DIST qdirstat-1.4.tar.gz 2534241 BLAKE2B 70b84376a949ab3d74879bc78dac9d41c592ee9a4c60d27ad9d85ab09378f85a65209c78f7030f76e86e8e418803eef5ed1dadb07a1058ec38c13d753f6e3e61 SHA512 5711a78297f4224e4471ac14d8e42ee9ac746cc31315ff894dafa1db578eff4ff2a5c62edc525a49c523154a0de402f878200d96601c7924bf0273f0eac9ab74
EBUILD qdirstat-1.4.ebuild 750 BLAKE2B 59d9375f0252d35560bbbd3d9759b88afa67352ee7cb81695fa0bcd6c36f901a916ab5da7262f7b6c6ef9c1b1115eb3e28a2c564798ff630fe4579580949b532 SHA512 017e639e30a60f021541c547863bc2cdad0b70cb2b62981de9a2cc1a64c32a406f2b71691f0a59898d521ef128acb10d7a2e633a5bde16941711b01cf8aee75f
-MISC metadata.xml 817 BLAKE2B 8b85dcd0fa17063f62cdccae24736113e0f7d4a28f98ea5aaa0f5e7b174a0ea07ef360964c1e3126f21d606f2d325ee739d82f1cae18a59629b6fc22f029bed0 SHA512 df21f35f46599c1beca42e699889aa6d1aa1b6fb6bb03e7ebff87667fbf4a3b92bf8362858aa0f6aafe4d57b25c9d679a3cb59f6a1590bd98dbcb95d61c3efa9
+MISC metadata.xml 733 BLAKE2B aeee605c2acccc13fe411e1858852c1e4b789ba78776a8c2939d554ecfc11db75312258852b56c6d04370e70a34e29ac00a4b91328ddd179e5103ba508ecf489 SHA512 2ec50f52984c0c8ffa7300cbae7a13a36fb614f4daa424525154efcf0f023792a8497744490a55207bf5cd2b64acf08d44ea851920f7482e416eb0f7b067c548
diff --git a/sys-apps/qdirstat/metadata.xml b/sys-apps/qdirstat/metadata.xml
index 8439819f2f80..b811e95a6aec 100644
--- a/sys-apps/qdirstat/metadata.xml
+++ b/sys-apps/qdirstat/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>dracwyrm@gentoo.org</email>
- <name>Jonathan Scruggs</name>
- </maintainer>
+ <!-- maintainer-needed -->
<longdescription>
Qt-based directory statistics: KDirStat without any KDE -- from
the author of the original KDirStat.
diff --git a/sys-apps/smc-sum-driver/Manifest b/sys-apps/smc-sum-driver/Manifest
index a3743b577261..fa58f8edb0a4 100644
--- a/sys-apps/smc-sum-driver/Manifest
+++ b/sys-apps/smc-sum-driver/Manifest
@@ -1,4 +1,4 @@
AUX makefile 298 BLAKE2B 58431440f52821bf8f1a6070075eace33f173dc1cbe19722c033cc6525b2ae4a6890aec2870f68b282368c9722b87796a14b53d364ce3e7002dfac452480e74e SHA512 862b6a2ae684da3b864eacef8b645c27ef4a6ccc4f577ccc9c5d88cd0426ce66a6462bcaaf01bdd0082898f7e3801cd6a00bc1c702af83faf7ca31b9de1c14e9
DIST sum_driver_V1.6.0_20151201.tar.gz 1423921 BLAKE2B 76e2439148749b708a51e0d9c95545b53762f03793e6b2ea6e63e9f79aaad77432f728e94713e0cfd4085e8b090b6e0ff8e779e2627764e71794453cb7e02b49 SHA512 809fdf164e29aabde74306d966de7e07488d8dacc01963b56486477f23bdf3a469d059bc5d302aedbfd4b8dc854a82357747add2626cc22d0ab3898c7bc0a625
-EBUILD smc-sum-driver-1.6.0.20151201-r2.ebuild 854 BLAKE2B 1272340d41d5f6f2a9b00e15448481fe864287a8c16073e443b738420cd86f8aec21f3769df04d3e6e3228a6823932180c530b2cd657c12843b39ba9a28dd3c4 SHA512 e8d2463374e985c464f82d64b41a0a6aab337e20ad33021c627b63f70701256964a00e44186814fa1dd13e1ee93fa13670c2bd633b0297649f0084933b111f9e
+EBUILD smc-sum-driver-1.6.0.20151201-r3.ebuild 943 BLAKE2B 1c24eee001edb3e38528d07adc76ac7afa8b8e8fbcffb5c10c16f1b6b2f0997ad0c3c6f96ca614e2bfa14dfc4514d95836b1c9e62f767560087bf3d512ff2399 SHA512 cc243884ae3ab64d0eb6abcfed56c8f2ee852b13d24facdd5907139a961473a7a79f5a3f0ccf594c5ee691836259f8f03bff1b4f84effc00152115ed6e0a6ddf
MISC metadata.xml 602 BLAKE2B 6bb453de4cd9a7cd7f52648c2994ac056bb756a8851659bd4075341e5d97a6cd81d056ef54cd4315ae25d6821ac684bafaee12d7928d7a998724e87af57cf05f SHA512 27d229c5f3ea94fb7098f4659edf321b048ecdba0624a41cfc53cec5b3d3c975914fc599494ebb03ae5dc8ea29993a23e90a9b7be76505cb7dcdf8ab1e3d9b5e
diff --git a/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r2.ebuild b/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r3.ebuild
index 825bec7d32ea..c8dba118df71 100644
--- a/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r2.ebuild
+++ b/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -32,8 +32,14 @@ pkg_nofetch() {
}
src_prepare() {
+ default
+
# Install new Makefile to respect users CFLAGS and LDFLAGS
- cp "${FILESDIR}"/makefile Makefile
+ cp "${FILESDIR}"/makefile Makefile || die
+}
- default
+src_compile() {
+ BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
+
+ linux-mod_src_compile
}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 209000f8fd9b..e332aa540d33 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -11,9 +11,9 @@ AUX gentoo-generator-path-r1.patch 1037 BLAKE2B 5eb80521a6726c9b4693f9b0f56d3e68
AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
-DIST systemd-243-rc2.tar.gz 8239802 BLAKE2B 9ab6a12f6dff855265be381616601fb2caf79be810bba7f5c24fa6e91ae34d8d1ead0ae1b45c374e8c9752b883daba01863e5622ef1d34718e8390c0ad837cf0 SHA512 7e9b996c1eeb299fb971f2fd4a39fa62c7cc9178bacaaae6c168008dec438f392b949deb72d08f27060b3cde54b46b70f6a18b1bc70725a56ca2a28a1f96b6a1
+DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
EBUILD systemd-242-r6.ebuild 14156 BLAKE2B e3f993817df49534a0fa0960f7232ee6168330511bbba2deef09d58e0e3d1e6efa727bc5909151683b77604e51d872daf4d05346e5ef6e1daa3270e9b331d3ee SHA512 9a4e424d9cf0dffe5928d9238c6173d7376db0a7f4b9e547f49d939759c47d74e51ed00584ec0410c33474bae33f47b4f2053b204fe2c5236d2c3a0c10e0855a
-EBUILD systemd-242-r7.ebuild 14198 BLAKE2B 283552b4169b16da6b8fb30f1ae4d2a92198b06e415c78bd67f5e10b3b216042333c8e9256598784112fb77d888db864a0cfa5fd7ea4dcc5a66576f2eeebcdb1 SHA512 ad58cf819702049f283972cb422777ab087460a46e3b1cf4baa4db4b4ffd044e7d222198dc24cf86f0b5b51eacb35790c8ee9dd9c3d19725275bed29961ea8d0
-EBUILD systemd-243_rc2-r1.ebuild 13774 BLAKE2B f2e4e2d00e151684203b1029d60532204afaf0edd7583418ce639097ecc89a83848c81ac61b8809772d86974f3d078a713aca60869696f4dd22c3e4a962681ff SHA512 7da1b91da0f77f1da31f68f0b56f902dc3cbc128fe514c705c0576677f7911baebed8eeab3ee75bce791fac3b6d3ab9f7fed0bfbe013383f7fbf42b3205f0394
-EBUILD systemd-9999.ebuild 13737 BLAKE2B 1bfaba9766c5182b54dd9cceb42b21a8a3c0fbd215270b015c051b582e1b54dfec9a4c2efc3b0a839b210ccc3f193cfe88535447437d7dbcf181b0256080a521 SHA512 7aff86c80448ac59fdb2c7bee4774836a794f47fde879793e1cf67ad37cd046335831eb3beb3d81aa5d5f7b2f9115995e8d5658f32b97298a9d87c2d82e0750d
-MISC metadata.xml 2126 BLAKE2B 8478ef3f19109c9654e894b20148d06a38ae0ffc45d47425fd4275825ba2d28c1de8ebf2e0a67d30a1ce88df9cbf1a04ea3a57a2e37127378f6e3ee5f3efccfd SHA512 642f406a6aee2644920aefdfcd14fb956eab1de98054a9b68e0b4e5683b7ca9b7e3f6dbbfec0d5a21b2eb96fee3511deae0cb4cf69f799b20a04528151f51da8
+EBUILD systemd-242-r7.ebuild 14196 BLAKE2B 494abac3d6a55da39000cd4f5b56e749b52a1b33900d6da8306fba4048cbb4bb0faa9fc0549df3918b9e0775223616a3ba55021e89a79198bde22edea17e661a SHA512 607fff528417fbb69c0d6f6e47d46ce92b346365dc9f5a105b1de6d77ec61120de1ad26dfd905021208e5e621379e1e7b5169d83cc23d8664d51030a04e84c01
+EBUILD systemd-243.ebuild 14254 BLAKE2B 5abd2f9420fc33c4651f944cab9fed1f5bc109b3faf62e3e451ac4c072b572220f6d2ae49ee1ba553abac157b28ab296019eb3fc9ce63a723e2362741cd67573 SHA512 655c0da0e1d733324f023f17e4a509aea977f37f3e0765d9b4f36a38717530ca635d715d71452be3030d5064b3bd9e1fe686d33fe87a3dad42185166926344ed
+EBUILD systemd-9999.ebuild 14254 BLAKE2B 5abd2f9420fc33c4651f944cab9fed1f5bc109b3faf62e3e451ac4c072b572220f6d2ae49ee1ba553abac157b28ab296019eb3fc9ce63a723e2362741cd67573 SHA512 655c0da0e1d733324f023f17e4a509aea977f37f3e0765d9b4f36a38717530ca635d715d71452be3030d5064b3bd9e1fe686d33fe87a3dad42185166926344ed
+MISC metadata.xml 2144 BLAKE2B f98da35b929799e76331e0f4957f175db15fd8766542058520aeeb1cc762f46c4e3c4d40b1dd21da50a3416807359c383e323e17de175a1439d7faa4bb4be0af SHA512 6e5847187232637a1de5f0d8fad2d6ad0515d537206ea3a7bd2ccd9f17e67789f5c80ebf295554aa135325f2e4260217de6e9a6a7f21dd70945a94ebfc3bf0de
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 76658cc29c52..540f7dbef65c 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -11,7 +11,7 @@
<use>
<flag name="apparmor">Enable AppArmor support</flag>
<flag name="audit">Enable support for <pkg>sys-process/audit</pkg></flag>
- <flag name="cgroup-hybrid">Default to hybrid cgroup hierarchy instead of unified.</flag>
+ <flag name="cgroup-hybrid">Default to hybrid (legacy) cgroup hierarchy instead of unified (modern).</flag>
<flag name="curl">Enable support for uploading journals</flag>
<flag name="cryptsetup">Enable cryptsetup tools (includes unit generator for crypttab)</flag>
<flag name="dns-over-tls">Enable DNS-over-TLS support</flag>
diff --git a/sys-apps/systemd/systemd-242-r7.ebuild b/sys-apps/systemd/systemd-242-r7.ebuild
index 481f75192aa2..8708f9a869ec 100644
--- a/sys-apps/systemd/systemd-242-r7.ebuild
+++ b/sys-apps/systemd/systemd-242-r7.ebuild
@@ -11,7 +11,7 @@ else
MY_P=${PN}-${MY_PV}
S=${WORKDIR}/${MY_P}
SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
fi
PYTHON_COMPAT=( python{3_5,3_6,3_7} )
diff --git a/sys-apps/systemd/systemd-243_rc2-r1.ebuild b/sys-apps/systemd/systemd-243.ebuild
index 56cfe509a088..267a18fcc1cf 100644
--- a/sys-apps/systemd/systemd-243_rc2-r1.ebuild
+++ b/sys-apps/systemd/systemd-243.ebuild
@@ -185,7 +185,6 @@ src_prepare() {
# Add local patches here
PATCHES+=(
- "${FILESDIR}"/CVE-2019-15718.patch
)
if ! use vanilla; then
@@ -355,10 +354,7 @@ multilib_src_install_all() {
# Symlink /etc/sysctl.conf for easy migration.
dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
- local udevdir=/lib/udev
- use split-usr || udevdir=/usr/lib/udev
-
- rm -r "${ED}${udevdir}/hwdb.d" || die
+ rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
if use split-usr; then
# Avoid breaking boot/reboot
@@ -423,6 +419,22 @@ save_enabled_units() {
pkg_preinst() {
save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
+
+ if ! use split-usr; then
+ local dir
+ for dir in bin sbin lib; do
+ if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+ eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+ eerror "One of them should be a symbolic link to the other one."
+ FAIL=1
+ fi
+ done
+ if [[ ${FAIL} ]]; then
+ eerror "Migration to system layout with merged directories must be performed before"
+ eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+ die "System layout with split directories still used"
+ fi
+ fi
}
pkg_postinst() {
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index f00c416fa382..267a18fcc1cf 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -354,10 +354,7 @@ multilib_src_install_all() {
# Symlink /etc/sysctl.conf for easy migration.
dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
- local udevdir=/lib/udev
- use split-usr || udevdir=/usr/lib/udev
-
- rm -r "${ED}${udevdir}/hwdb.d" || die
+ rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
if use split-usr; then
# Avoid breaking boot/reboot
@@ -422,6 +419,22 @@ save_enabled_units() {
pkg_preinst() {
save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
+
+ if ! use split-usr; then
+ local dir
+ for dir in bin sbin lib; do
+ if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+ eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+ eerror "One of them should be a symbolic link to the other one."
+ FAIL=1
+ fi
+ done
+ if [[ ${FAIL} ]]; then
+ eerror "Migration to system layout with merged directories must be performed before"
+ eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+ die "System layout with split directories still used"
+ fi
+ fi
}
pkg_postinst() {
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 441c22b49014..5dc53b8179f6 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -8,12 +8,9 @@ AUX sysvinit-2.92_beta-shutdown-h.patch 2341 BLAKE2B 255f9831d59721fb3f59f6caeb9
AUX sysvinit-2.94_beta-shutdown-single.patch 1261 BLAKE2B 571b7cf40ccdbb27e65b31e507ea8331ae1e9b8b012570cdc4099a15c864f2abc92f84c44ef9dbd35dfe43c68e491d347266abaa0156536edae4c35231f17ccb SHA512 2f26201e8634b380dafdf42678cd0241a93f0e473f5c8680d4206d97dfe3510c2ceeb4cd066d1af3ae97fe411f7a5452a9586f8f5c5e65653bf9241fea1edaf0
AUX sysvinit-2.95_beta-shutdown-h.patch 2752 BLAKE2B a7174eaf34d5f9547d5d79c16bf2d8129e71c9564fc0b60e5adb3f2dda998dbdea7a3ee9fbfd3f7bc29ec977f8d47de4581d77abd6e1cdb6feeab9633946251e SHA512 682e6afd6443ffef2cbac9898eca42546b0614a82b2a0c370015cf5373229c00170a22adabf54d10a0f85da7b19de39334b05ef69874fa4003a9c74b7e416974
DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72
-DIST sysvinit-2.94.tar.xz 120900 BLAKE2B e45a95246325e93ef49f11573924216937e238761cb9f5979ae2b272838fb3280b1d12c9553992271f7926dc7c7bc18e352a8019a70f54c592971fe043453804 SHA512 8d3b7b777f7c37cf5eaf73d4cdfad8ac54c6115577052bd7ddf3588da8fb7d16b812ffaade0ce300c2c6b7d2acd6e7778130544befc171eab174ee8766b3ec50
DIST sysvinit-2.95.tar.xz 124576 BLAKE2B 1b0770e3bc7c5a32b8a634ab70d16854446816f9c22f57befb2602a8680d5d4a4adc51747b6199867ba73a3ac5118073a8bfa9ea4317de86b3b42867ae0cf6e7 SHA512 367990d166ec6dcc4de81e748f15035e2a4c2838da7336b064aeadac2db95ca77e8d11fb6aa7e7745874ef3e27118c9a68070062fffb16a886f32d6ab2529d28
-DIST sysvinit-2.96-beta.tar.xz 122212 BLAKE2B d819e0444b6d99129552b2ea6e1ab5b80d9b0967d68a53cd879995ca635ad54425a6a473fa2ea37ee43cd2f5bdfddffe1ad44f7115018ae3ec5925938ed1e72c SHA512 89116a473656033b974205f5eb296bc32fb558136511e087252248be8f444d0eebcb7c9473385913a00d15b9e5855068c1a8135d681114171728cd78ef278530
+DIST sysvinit-2.96.tar.xz 122164 BLAKE2B 10c28d3bb57fc744b66c3a7ac78912fb6a9d987e9f6f32f82953d23a9884020daa6fa8c7722e6d8145d9899f7f7dc623f69f885d3d8fbbcd313d0e69ffb66497 SHA512 1388398568ebfe53460796f8ab75a3ead6111612888ea36e8f1c0db4d41ef6f45fc217abb7804519ff1143a78d97c95b24e42c8c22c95a47b9436484bfb6f45d
EBUILD sysvinit-2.93.ebuild 3575 BLAKE2B f327a05eaa2e82baa05b0473f31591da2e61cff22db7fb1e3f8a6302990cc70df166484dc138bb03f8494a32a21c5af4ee4adeaff9f37e1edfa0db702bcfd57b SHA512 159ca13a88b9868ec717fa8d786322d04cc7f67ea3e3ec32e0369060a295a43a33fe6a19d5f3be1b8d30f8dfb659d596b5c0d01f49fd1fa28cce1a150decb900
-EBUILD sysvinit-2.94.ebuild 3817 BLAKE2B dcf4a1ce3f2eb774783e0d3bab5a189e45f43bafefb05c8f6d60f3f09639c691576447c0b6922c974ed8f0f5ab7ecbacba1b427dcb569470163658c64dadaa06 SHA512 7b60c4537ad8f1d4bd70a3c922a8778501b89343ab103f5413322745077ae8c85c16344773746a8e7ae3ef1d185420c26fd30598e33b5641d57563d32f9c7179
EBUILD sysvinit-2.95-r1.ebuild 3850 BLAKE2B 35c48ee36606087e84cfcb400bd79cb239546d0fdf37de2f1100947903d37520fed21e3997cfae398d88167132e341682feaa7e86a76719ef75c456bae650494 SHA512 24c2e92865047a41abe3a08e83f9a14445f9628e2730bd8f67475b182d79b94291abea92662ccf5343277e509d70b337f313bb5be93b1160c0c0a089ec23631e
-EBUILD sysvinit-2.95.ebuild 3812 BLAKE2B 945467b8f510628c055cfd83b9c5a36198b1aacdf5f05918a34b0478576c941eba6d690ba4523f10e729b5cdcd696643e01c8ceadf4374d49a371e1c5e090079 SHA512 5d0b8a20b6e2380e841cfa529ba867368db64725f776fafe3d4381ded00f3550906e6baa9a58b3eb065155d20f8c3376ab1ec0bac50f27dadc18b9ff9da71352
-EBUILD sysvinit-2.96_beta.ebuild 3850 BLAKE2B 35c48ee36606087e84cfcb400bd79cb239546d0fdf37de2f1100947903d37520fed21e3997cfae398d88167132e341682feaa7e86a76719ef75c456bae650494 SHA512 24c2e92865047a41abe3a08e83f9a14445f9628e2730bd8f67475b182d79b94291abea92662ccf5343277e509d70b337f313bb5be93b1160c0c0a089ec23631e
+EBUILD sysvinit-2.96.ebuild 3850 BLAKE2B 35c48ee36606087e84cfcb400bd79cb239546d0fdf37de2f1100947903d37520fed21e3997cfae398d88167132e341682feaa7e86a76719ef75c456bae650494 SHA512 24c2e92865047a41abe3a08e83f9a14445f9628e2730bd8f67475b182d79b94291abea92662ccf5343277e509d70b337f313bb5be93b1160c0c0a089ec23631e
MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/sysvinit/sysvinit-2.94.ebuild b/sys-apps/sysvinit/sysvinit-2.94.ebuild
deleted file mode 100644
index 51fe022e6ebd..000000000000
--- a/sys-apps/sysvinit/sysvinit-2.94.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
-SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ "${PV}" == *beta* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-IUSE="selinux ibm static kernel_FreeBSD"
-
-CDEPEND="
- selinux? (
- >=sys-libs/libselinux-1.28
- )"
-DEPEND="${CDEPEND}
- virtual/os-headers"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-shutdown )
- !<sys-apps/openrc-0.13
-"
-
-S="${WORKDIR}/${P/_*}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.86-kexec.patch" #80220
- "${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch" #158615
- "${FILESDIR}/${PN}-2.92_beta-shutdown-h.patch" #449354
-)
-
-src_prepare() {
- default
- sed -i \
- -e '/^CPPFLAGS =$/d' \
- -e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
- src/Makefile || die
-
- # last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
- sed -i -r \
- -e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
- -e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
- src/Makefile || die
-
- # pidof has moved to >=procps-3.3.9
- sed -i -r \
- -e '/\/bin\/pidof/d' \
- -e '/^MAN8/s:\<pidof.8\>::g' \
- src/Makefile || die
-
- # logsave is already in e2fsprogs
- sed -i -r \
- -e '/^(USR)?S?BIN/s:\<logsave\>::g' \
- -e '/^MAN8/s:\<logsave.8\>::g' \
- src/Makefile || die
-
- # Mung inittab for specific architectures
- cd "${WORKDIR}" || die
- cp "${FILESDIR}"/inittab-2.91 inittab || die "cp inittab"
- local insert=()
- use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
- use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
- use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
- use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
- use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
- if use ibm ; then
- insert+=(
- '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
- '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
- )
- fi
- (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab
- if use kernel_FreeBSD ; then
- sed -i \
- -e 's/linux/cons25/g' \
- -e 's/ttyS0/cuaa0/g' \
- -e 's/ttyS1/cuaa1/g' \
- inittab #121786
- fi
- if use x86 || use amd64 ; then
- sed -i \
- -e '/ttyS[01]/s:9600:115200:' \
- inittab
- fi
- if [[ ${#insert[@]} -gt 0 ]] ; then
- printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
- fi
-}
-
-src_compile() {
- tc-export CC
- append-lfs-flags
- export DISTRO= #381311
- export VERSION="${PV}"
- use static && append-ldflags -static
- emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
-}
-
-src_install() {
- emake -C src install ROOT="${D}"
- dodoc README doc/*
-
- insinto /etc
- doins "${WORKDIR}"/inittab
-
- # dead symlink
- rm "${ED%/}"/usr/bin/lastb || die
-
- newinitd "${FILESDIR}"/bootlogd.initd bootlogd
-}
-
-pkg_postinst() {
- # Reload init to fix unmounting problems of / on next reboot.
- # This is really needed, as without the new version of init cause init
- # not to quit properly on reboot, and causes a fsck of / on next reboot.
- if [[ ${ROOT} == / ]] ; then
- if [[ -e /dev/initctl && ! -e /run/initctl ]]; then
- ln -s /dev/initctl /run/initctl
- fi
- # Do not return an error if this fails
- /sbin/telinit U &>/dev/null
- fi
-
- elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
- elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-
- # Required for new bootlogd service
- if [[ ! -e "${EROOT%/}/var/log/boot" ]] ; then
- touch "${EROOT%/}/var/log/boot"
- fi
-}
diff --git a/sys-apps/sysvinit/sysvinit-2.95.ebuild b/sys-apps/sysvinit/sysvinit-2.95.ebuild
deleted file mode 100644
index f02f81e06455..000000000000
--- a/sys-apps/sysvinit/sysvinit-2.95.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
-SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ "${PV}" == *beta* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-IUSE="selinux ibm static kernel_FreeBSD"
-
-CDEPEND="
- selinux? (
- >=sys-libs/libselinux-1.28
- )"
-DEPEND="${CDEPEND}
- virtual/os-headers"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-shutdown )
- !<sys-apps/openrc-0.13
-"
-
-S="${WORKDIR}/${P/_*}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.86-kexec.patch" #80220
- "${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch" #158615
- "${FILESDIR}/${PN}-2.95_beta-shutdown-h.patch" #449354
-)
-
-src_prepare() {
- default
-
- sed -i \
- -e '/^CPPFLAGS =$/d' \
- -e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
- src/Makefile || die
-
- # last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
- sed -i -r \
- -e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
- -e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
- src/Makefile || die
-
- # pidof has moved to >=procps-3.3.9
- sed -i -r \
- -e '/\/bin\/pidof/d' \
- -e '/^MAN8/s:\<pidof.8\>::g' \
- src/Makefile || die
-
- # logsave is already in e2fsprogs
- sed -i -r \
- -e '/^(USR)?S?BIN/s:\<logsave\>::g' \
- -e '/^MAN8/s:\<logsave.8\>::g' \
- src/Makefile || die
-
- # Mung inittab for specific architectures
- cd "${WORKDIR}" || die
- cp "${FILESDIR}"/inittab-2.91 inittab || die "cp inittab"
- local insert=()
- use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
- use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
- use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
- use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
- use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
- if use ibm ; then
- insert+=(
- '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
- '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
- )
- fi
- (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab
- if use kernel_FreeBSD ; then
- sed -i \
- -e 's/linux/cons25/g' \
- -e 's/ttyS0/cuaa0/g' \
- -e 's/ttyS1/cuaa1/g' \
- inittab #121786
- fi
- if use x86 || use amd64 ; then
- sed -i \
- -e '/ttyS[01]/s:9600:115200:' \
- inittab
- fi
- if [[ ${#insert[@]} -gt 0 ]] ; then
- printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
- fi
-}
-
-src_compile() {
- tc-export CC
- append-lfs-flags
- export DISTRO= #381311
- export VERSION="${PV}"
- use static && append-ldflags -static
- emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
-}
-
-src_install() {
- emake -C src install ROOT="${D}"
- dodoc README doc/*
-
- insinto /etc
- doins "${WORKDIR}"/inittab
-
- # dead symlink
- rm "${ED}"/usr/bin/lastb || die
-
- newinitd "${FILESDIR}"/bootlogd.initd bootlogd
-}
-
-pkg_postinst() {
- # Reload init to fix unmounting problems of / on next reboot.
- # This is really needed, as without the new version of init cause init
- # not to quit properly on reboot, and causes a fsck of / on next reboot.
- if [[ ${ROOT} == / ]] ; then
- if [[ -e /dev/initctl && ! -e /run/initctl ]]; then
- ln -s /dev/initctl /run/initctl
- fi
- # Do not return an error if this fails
- /sbin/telinit U &>/dev/null
- fi
-
- elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
- elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-
- # Required for new bootlogd service
- if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
- touch "${EROOT}/var/log/boot"
- fi
-}
diff --git a/sys-apps/sysvinit/sysvinit-2.96_beta.ebuild b/sys-apps/sysvinit/sysvinit-2.96.ebuild
index 6dd6484ee442..6dd6484ee442 100644
--- a/sys-apps/sysvinit/sysvinit-2.96_beta.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.96.ebuild
diff --git a/sys-apps/uam/Manifest b/sys-apps/uam/Manifest
index e0ad8332aebc..b5448a7b8a88 100644
--- a/sys-apps/uam/Manifest
+++ b/sys-apps/uam/Manifest
@@ -1,4 +1,4 @@
DIST uam-0.3.2.tar.bz2 60508 BLAKE2B 35accde4ae392f33af0d1c0f30069975e30691927dff33ac754d00f1de7b30d1b789e9797637f9701913796b5993add4b2405294fa47b1fbd6f8d6e1946b1ad8 SHA512 4a4ee9286b3762227fc5a03a10998cb3b4a2f110cd648bb2ed45f400e31218a17d3929c83450e9190255bda1f22f4001a7f33842999b79c27aa12fc11f286273
-EBUILD uam-0.3.2-r1.ebuild 1475 BLAKE2B 9639fac307ee43155a8847d49cd1cae4cd1feae0535df422fc2f24114e56cc66a919249edbf4dfcecd59b1d690ab7b5c6590bb912dcb5534cd35670012370409 SHA512 fc315fe69d91a5c5d1b1c186322fbd19d381cacc5c6ec95bb2041e7a9f9b3498efa7f0fa599776923c57bd92835867f2d5fe53e02ee37454dcccedd1af655da1
-EBUILD uam-9999.ebuild 1509 BLAKE2B 8fee1d4104540955b2cd074fd902ed56ee2777f315e88850d096461bfd76c16f93963dcc8b0d60629fd0226e8c2b95bbbc73446c7afa7c9f572e82552022642d SHA512 d410de4ba3041a770b13edb3365b896e6548611748168f4031b89d090718c3e600cfe94c294c6e3842ca00cd1a1a10cc35fb8498c028018474e710253bd7d7a6
+EBUILD uam-0.3.2-r1.ebuild 1280 BLAKE2B f8e7a223e9441a100beec69b3397431aa2cec1f82ae57816c956cbdb8b2b0c774da17c39905892e28674b849cfd916a2a878281943e0523d1fcf4f3cbeeefadc SHA512 e0e6a2a988173a88b4d95fb77ddb3b215ce785670085eda00d5e889a876c360c049e3dcd1b39386ac1a0d05600469d63335c1d705ab43c981388d1bc31842eea
+EBUILD uam-9999.ebuild 1314 BLAKE2B 68fea581b335c0cbbd63d8662e7133d101a7d15a626209b55bb06cecb32ca4929c5c9557d3faa176d1e7746bc0482d66f02f0aae49932cdfada801b168a5dd5d SHA512 2a376133d0cf8413247b5435812fe98a8ecc52d069ff16696eeacbdec6451245afbf5f1f71b2a0aae98e1a6bad6b4ea533aa24ec5217e70dadfee1dfbee6536d
MISC metadata.xml 714 BLAKE2B fe8e8accd2c75c3aa51ce152676480d221a02e009db51874118ad939350c22c01bd171fe5d8628b626b0bf399df31b62f24303496768e214a0392979101ed128 SHA512 a344cc7080f63224d58604c26db1923afbe06b6bae3bd839f72e8f1cd8b6e41fc01e2eb46b135e8b8dfcb1217fc5ad507c0e86315c833a2d2b0541a6c3a53078
diff --git a/sys-apps/uam/uam-0.3.2-r1.ebuild b/sys-apps/uam/uam-0.3.2-r1.ebuild
index eddf29d0f8aa..e22ef2bb8000 100644
--- a/sys-apps/uam/uam-0.3.2-r1.ebuild
+++ b/sys-apps/uam/uam-0.3.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit udev user
+inherit udev
DESCRIPTION="Simple udev-based automounter for removable USB media"
HOMEPAGE="https://github.com/mgorny/uam/"
@@ -14,16 +14,12 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+RDEPEND="
+ acct-group/plugdev
+ virtual/udev"
+DEPEND="virtual/pkgconfig"
pkg_postinst() {
- # The plugdev group is created by pam, pmount and many other ebuilds
- # in gx86. As we don't want to depend on any of them (even pmount is
- # optional), we create it ourself too.
- enewgroup plugdev
-
elog "To be able to access uam-mounted filesystems, you have to be"
elog "a member of the 'plugdev' group."
elog
diff --git a/sys-apps/uam/uam-9999.ebuild b/sys-apps/uam/uam-9999.ebuild
index 4aa949336985..3a247b31bd2c 100644
--- a/sys-apps/uam/uam-9999.ebuild
+++ b/sys-apps/uam/uam-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit autotools git-r3 udev user
+inherit autotools git-r3 udev
DESCRIPTION="Simple udev-based automounter for removable USB media"
HOMEPAGE="https://github.com/mgorny/uam/"
@@ -15,9 +15,10 @@ SLOT="0"
KEYWORDS=""
IUSE=""
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+RDEPEND="
+ acct-group/plugdev
+ virtual/udev"
+DEPEND="virtual/pkgconfig"
src_prepare() {
default
@@ -25,11 +26,6 @@ src_prepare() {
}
pkg_postinst() {
- # The plugdev group is created by pam, pmount and many other ebuilds
- # in gx86. As we don't want to depend on any of them (even pmount is
- # optional), we create it ourself too.
- enewgroup plugdev
-
elog "To be able to access uam-mounted filesystems, you have to be"
elog "a member of the 'plugdev' group."
elog
diff --git a/sys-apps/udevil/Manifest b/sys-apps/udevil/Manifest
index a35f52f0376b..0ad31c28b155 100644
--- a/sys-apps/udevil/Manifest
+++ b/sys-apps/udevil/Manifest
@@ -2,7 +2,5 @@ AUX udevil-0.4.3-flags.patch 1051 BLAKE2B d9c6ad984ac5ef75f20226f7d2e2a3ce73126a
AUX udevil-0.4.4-include-sysmacros.patch 398 BLAKE2B 36369bc56a5d3b66dd455f8fc481481156a4fa2b005046e7718ca186a2c3a1b980456d0025ffe3e25db476c91b3011fa5a3a209f270847508e78aaf2081c1b2a SHA512 ce9070dcce7fb0117e50cda0f8b27f493a24f881a9e11fef2024ff3e3b70a1804bb7beef35c9935247baa1f74a499a0ad928a9ff7dbcc586b8c7ee26c5a57776
AUX udevil-0.4.4-stat.patch 234 BLAKE2B 834ac0c306e4f13cea623304637729e285ff5d286b40e6b4a05f8a8acbf4ce8ff95d6552b6274e01de22ebfc3ee683376decb2de2afa70b56d66bc944a325590 SHA512 92a9889e3c70e3b9b0bdd4f6470ba0368a69d42eb852f10bcf00bb1f06ae126ea1579cfaaff15127e359c790f0672c655b34efddb7c27fe88addee70ec4d7583
DIST udevil-0.4.4.tar.gz 477254 BLAKE2B 16a1980da8b3b98e36921c8e2fe6490c495066178dd928695a07eb8d5d7367cae49e314983f251a1ec684bd16a34286ea4ccc83329c9af0dd71af84c77ced20d SHA512 adce4916e06d1cc4965521abbcbc2901e53930691167f431cb18e28d3ef8bde740e95a6a5f40dfc58dfd7b4b661b4475d3dd2b6174a5d7a55ae7c65629b82327
-EBUILD udevil-0.4.4-r1.ebuild 1929 BLAKE2B 2aa9974037fc6a8e839a103c1a9f155236305de2521752b4570df6d251f1c1ae1f562e43ff4f056cf2a4f12436757a09e99fe11d9f31d8843ccc6922ac4c1af9 SHA512 d485071b991959dc45476bf9d0f54264c39386e8698e93beb3a0ac4eb8741937558e418a8c6353328bf9ab40d69fceee8f98afe48ab64eef777b3efcb5bceee3
-EBUILD udevil-0.4.4-r2.ebuild 1983 BLAKE2B f55a86aecb963c18879a78715dc1d91dea20474443ce1b221049cb6cc1a89771d7f1f1a336a5e2c82fec6b8cee3865a4f40ed1841ec6618d77cd97d711625971 SHA512 c744b083e8c0becbb09804c6e0c41704469f3a226588d4e36cd9aedbcca35bd51ee1ac2838a893879fa7b712e350154d680e8a291d5feccb5e637429506f4ff6
-EBUILD udevil-0.4.4-r3.ebuild 1981 BLAKE2B 41c282b74f6add017ea962267a8430115f0fc4776b9d39fde351351fa405bf054843a4c74384ee70e824c4ecc6fd18548ecd39e821ed90b51876566892fa43d0 SHA512 287d08a8535aa11394a26a4d6f995ad344cb1bbc2ed2c53781d6e2df5ede3a875d0ae301105e122bccedf1481cfd3872e3d99697d97571d2ac0c099545e0affe
+EBUILD udevil-0.4.4-r3.ebuild 1960 BLAKE2B a1aec5c2fd909c3b0361651bb39771bb88dcb939654af6a6e149b2407453e15693d19a15293a63400e9e7279c8dc056edf62f87c7494a8cd2554896de904c2ff SHA512 e1a6f76c8e7e1423288fb3c486bffbaf37b28ec3975e30c8d857f8f369cea6060c9f373358b9f4cf0b2c731efaf3a2254b8d71978715c3652d07c3cdbaa48489
MISC metadata.xml 250 BLAKE2B 0a529fe4be14917719f846d11e5d49e7129b42ec81e665a0895c29fe63ea1300d30a5e470b9c0c06f18d214a862cd02669c7e3f92f174aa21339b84e29dd3f14 SHA512 6b612fb510b795abda0fb36e0440a98c315e1d09b397e2865f8eea7b740763f93673a19cb356e8366ace8f00f1c4e2e4246d74d6c4fa87e3427300d33f975537
diff --git a/sys-apps/udevil/udevil-0.4.4-r1.ebuild b/sys-apps/udevil/udevil-0.4.4-r1.ebuild
deleted file mode 100644
index 73596bdd436e..000000000000
--- a/sys-apps/udevil/udevil-0.4.4-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools epatch user
-
-DESCRIPTION="mount and unmount removable devices without a password"
-HOMEPAGE="https://ignorantguru.github.com/udevil/"
-SRC_URI="https://github.com/IgnorantGuru/udevil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-shells/bash-4.0:*
- dev-libs/glib:2
- sys-apps/util-linux
- virtual/acl
- >=virtual/udev-143"
-DEPEND="${RDEPEND}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-
-pkg_setup(){
- enewgroup plugdev
-}
-
-src_prepare() {
- # This works for 0.4.4 too, no sense copying the patch
- epatch "${FILESDIR}"/${PN}-0.4.3-flags.patch
- epatch "${FILESDIR}"/${PN}-0.4.4-stat.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-setfacl-prog="$(type -P setfacl)" \
- --enable-systemd
-}
-
-src_install() {
- default
- fowners root:plugdev /usr/bin/udevil
- fperms 4754 /usr/bin/udevil
-}
-
-pkg_postinst() {
- einfo
- elog "Please add your user to the plugdev group"
- elog "to be able to use ${PN} as a user"
- elog
- elog "Optional dependencies:"
- elog " gnome-extra/zenity (devmon popups)"
- elog " net-fs/davfs2 (mount WebDAV resources)"
- elog " net-fs/cifs-utils (mounting samba shares)"
- elog " net-fs/curlftpfs (mounting ftp shares)"
- elog " net-fs/nfs-utils (mounting nfs shares)"
- elog " net-fs/sshfs (mounting sftp shares)"
- elog " virtual/eject (eject via devmon)"
- if ! has_version 'sys-fs/udisks' ; then
- elog
- elog "When using ${PN} without udisks, and without the udisks-daemon running,"
- elog "you may need to enable kernel polling for device media changes to be detected."
- elog "See https://ignorantguru.github.com/${PN}/#polling"
- has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
- kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
- einfo
- fi
-}
diff --git a/sys-apps/udevil/udevil-0.4.4-r2.ebuild b/sys-apps/udevil/udevil-0.4.4-r2.ebuild
deleted file mode 100644
index a75cf290506c..000000000000
--- a/sys-apps/udevil/udevil-0.4.4-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools user
-
-DESCRIPTION="mount and unmount removable devices without a password"
-HOMEPAGE="https://ignorantguru.github.com/udevil/"
-SRC_URI="https://github.com/IgnorantGuru/udevil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-shells/bash-4.0:*
- dev-libs/glib:2
- sys-apps/util-linux
- virtual/acl
- >=virtual/udev-143"
-DEPEND="${RDEPEND}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-
-pkg_setup(){
- enewgroup plugdev
-}
-
-PATCHES=(
- # This works for 0.4.4 too, no sense copying the patch
- "${FILESDIR}"/${PN}-0.4.3-flags.patch
- "${FILESDIR}"/${PN}-0.4.4-stat.patch
- "${FILESDIR}"/${PN}-0.4.4-include-sysmacros.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-setfacl-prog="$(type -P setfacl)" \
- --enable-systemd
-}
-
-src_install() {
- default
- fowners root:plugdev /usr/bin/udevil
- fperms 4754 /usr/bin/udevil
-}
-
-pkg_postinst() {
- einfo
- elog "Please add your user to the plugdev group"
- elog "to be able to use ${PN} as a user"
- elog
- elog "Optional dependencies:"
- elog " gnome-extra/zenity (devmon popups)"
- elog " net-fs/davfs2 (mount WebDAV resources)"
- elog " net-fs/cifs-utils (mounting samba shares)"
- elog " net-fs/curlftpfs (mounting ftp shares)"
- elog " net-fs/nfs-utils (mounting nfs shares)"
- elog " net-fs/sshfs (mounting sftp shares)"
- elog " virtual/eject (eject via devmon)"
- if ! has_version 'sys-fs/udisks' ; then
- elog
- elog "When using ${PN} without udisks, and without the udisks-daemon running,"
- elog "you may need to enable kernel polling for device media changes to be detected."
- elog "See https://ignorantguru.github.com/${PN}/#polling"
- has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
- kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
- einfo
- fi
-}
diff --git a/sys-apps/udevil/udevil-0.4.4-r3.ebuild b/sys-apps/udevil/udevil-0.4.4-r3.ebuild
index 0dede83db0ee..fdae0cfa0d3d 100644
--- a/sys-apps/udevil/udevil-0.4.4-r3.ebuild
+++ b/sys-apps/udevil/udevil-0.4.4-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit autotools user
+inherit autotools
DESCRIPTION="mount and unmount removable devices without a password"
HOMEPAGE="https://ignorantguru.github.com/udevil/"
@@ -14,7 +14,9 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
-RDEPEND=">=app-shells/bash-4.0:*
+RDEPEND="
+ acct-group/plugdev
+ >=app-shells/bash-4.0:*
dev-libs/glib:2
sys-apps/util-linux
virtual/acl
@@ -24,10 +26,6 @@ DEPEND="${RDEPEND}
sys-devel/gettext
virtual/pkgconfig"
-pkg_setup(){
- enewgroup plugdev
-}
-
PATCHES=(
# This works for 0.4.4 too, no sense copying the patch
"${FILESDIR}"/${PN}-0.4.3-flags.patch