[gentoo-commits] repo/proj/guru:master commit in: www-apps/jackett-bin/

2021-01-17 Thread Andrew Ammerlaan
commit: 99f3e24fbe472446ab652ca4792f81f73de54511
Author: Aisha Tammy  aisha  cc>
AuthorDate: Sat Jan 16 17:04:29 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 16 17:04:59 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=99f3e24f

www-apps/jackett-bin: version bump to 0.17.284

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Aisha Tammy  aisha.cc>

 www-apps/jackett-bin/Manifest|  3 ++
 www-apps/jackett-bin/jackett-bin-0.17.284.ebuild | 36 
 2 files changed, 39 insertions(+)

diff --git a/www-apps/jackett-bin/Manifest b/www-apps/jackett-bin/Manifest
index 8ec5ed4b..3471e6a9 100644
--- a/www-apps/jackett-bin/Manifest
+++ b/www-apps/jackett-bin/Manifest
@@ -1,3 +1,6 @@
 DIST jackett-bin-0.17.261-amd64.tar.gz 44619870 BLAKE2B 
35e65b09786d0561b3e1ec76a237704d8ba08ea9576540f4c9403360163cddc9ef19eb397a5d22666d626cffb3d0756d6190fa11a27c154ca0cd400d87aacfec
 SHA512 
e03ab868d3e6d759ab14b45a22a07060db7838a845385aa5a29ded8cae7b5646e24171d2f4c237aa1e6729880cb650268d0ff12020f43ad1ed6f6ae8486efea3
 DIST jackett-bin-0.17.261-arm.tar.gz 42508290 BLAKE2B 
3b30bd5cde813f2bdbfe13bd7564784330bddbe643f9e21e9c986f03ae63fad6eed7306f538524435112c652c98d4ecc88c290e640cb2f894a41fdce4ae09a75
 SHA512 
98b1597c0a1b386d25f8a37fe3a820dd5ab0c868c2ceca98e3f1e5b8edbb427e2756b5fc85a66b004d08fe70a4bb64fa229dd62f0ce1ff8c8832c30cf78299cb
 DIST jackett-bin-0.17.261-arm64.tar.gz 41869597 BLAKE2B 
64aea9431841a2667670d6046d7f39826315d969fef2cb7cb5e77ad7f0a6500ad36d927b0e7466fb0175d2a479ad0a9d35dafedbaa96505539123c8c9b7f4f4b
 SHA512 
8be922ee105b0bcc1c8a77ee64c3cac51023a5b8372d39b51c8ad760fe8b0f07c2a7c695ef47c23ef548af0203ac951fbea5519f4ec2cc01fcbf5d16fbbcea33
+DIST jackett-bin-0.17.284-amd64.tar.gz 44618787 BLAKE2B 
cfc15de6713d6b547fc8618deefdefb9e38e4b630df5c17ca7e77e3889e5ff854a30ce03ded042a7b020e996fd92729d922cb4417ad70a6df3f4db384ecfce8a
 SHA512 
1795d1337fa319edcd8745e4c644c95e7efb5fce3ec5217a1bbfbb835f1e5d29643ba5fbb1c206b042f6e6e6b2571a8b920dda20f6ca162ea0b2459510875352
+DIST jackett-bin-0.17.284-arm.tar.gz 42503546 BLAKE2B 
156411086dbc6ec64b066e320cdf62e72e046d74bbfe933525c6470d1decb08c15d5af66775de474105a3fb418066df67dc51299f98a3b711bd9bc78abd59c3d
 SHA512 
685cbbf4b07fc30f8e1a406ae29393f844f97fe38c148d80b5a9d173c71204400bd1e0bc76f8dbc5fbba7257d5271651582ed437c2b6ec89237171bb1f425387
+DIST jackett-bin-0.17.284-arm64.tar.gz 41869541 BLAKE2B 
a5b37d39ef155f485c93ec0db7830dcabf57a9a890e287d659f3153146edd601d2c2d023648732ed996f39e136abab3dce121b566618c875c2f921f46750bac2
 SHA512 
ce8d5d71faaec142e76cf836ef5dff94e46dfbce77bab5a12519706a09bc421658dd308f616ee1aa4654b7af3d52804dbb4002ec46402a53914e4c66ddc5e3fe

diff --git a/www-apps/jackett-bin/jackett-bin-0.17.284.ebuild 
b/www-apps/jackett-bin/jackett-bin-0.17.284.ebuild
new file mode 100644
index ..b2966ed1
--- /dev/null
+++ b/www-apps/jackett-bin/jackett-bin-0.17.284.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="API Support for your favorite torrent trackers"
+HOMEPAGE="https://github.com/Jackett/Jackett;
+SRC_URI="
+   amd64? ( 
https://github.com/Jackett/Jackett/releases/download/v${PV}/Jackett.Binaries.LinuxAMDx64.tar.gz
 -> ${P}-amd64.tar.gz )
+   arm? ( 
https://github.com/Jackett/Jackett/releases/download/v${PV}/Jackett.Binaries.LinuxARM32.tar.gz
 -> ${P}-arm.tar.gz )
+   arm64? ( 
https://github.com/Jackett/Jackett/releases/download/v${PV}/Jackett.Binaries.LinuxARM64.tar.gz
 -> ${P}-arm64.tar.gz )
+"
+
+KEYWORDS="~amd64 ~arm ~arm64"
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT="strip"
+
+RDEPEND="
+   app-crypt/mit-krb5
+   dev-libs/icu
+   dev-util/lttng-ust
+"
+
+QA_PREBUILT="*"
+S="${WORKDIR}"/Jackett
+
+src_install() {
+   dodir /opt/jackett
+   cp -a "${S}"/. "${ED}"/opt/jackett || die
+   newinitd "${FILESDIR}"/jackett.initd jackett
+   systemd_dounit "${FILESDIR}"/jackett.service
+   doenvd "${FILESDIR}"/99jackett
+}



[gentoo-commits] repo/proj/guru:master commit in: sys-apps/dust/

2021-01-17 Thread Andrew Ammerlaan
commit: 9e2a3a7b5249df9adb0150a78e6c4ec400225253
Author: YOSHIOKA Takuma  hard-wi  red>
AuthorDate: Sun Jan 17 05:50:09 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun Jan 17 05:50:09 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9e2a3a7b

sys-apps/dust: version bump 0.5.4

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: YOSHIOKA Takuma  hard-wi.red>

 sys-apps/dust/Manifest  | 32 +++
 sys-apps/dust/dust-0.5.4.ebuild | 89 +
 2 files changed, 121 insertions(+)

diff --git a/sys-apps/dust/Manifest b/sys-apps/dust/Manifest
index 3c268950..5329bc38 100644
--- a/sys-apps/dust/Manifest
+++ b/sys-apps/dust/Manifest
@@ -1,53 +1,85 @@
 DIST aho-corasick-0.7.13.crate 111381 BLAKE2B 
08efdd762a12cbafabfb6c1c6f8b87465b337ea006d48e612c5275f796e4d62aa0a595bcda783f7a58b1e2655b9b35333033806215518f097b6671888d152e0f
 SHA512 
9bd3c12559d6bdb1ce798a62c59a202771b48125afb6e1b5be76cad13d750d9bedd7acd77d69557e34a698b17ed7da6832a7813d48ee2627f4a2abd5e04263e6
+DIST aho-corasick-0.7.15.crate 113071 BLAKE2B 
a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e
 SHA512 
e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 
9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4
 SHA512 
a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B 
f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791
 SHA512 
b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST assert_cmd-1.0.1.crate 24575 BLAKE2B 
e204b79da44a27b9c70be8dbf53356714ac994b4e5daced1b4f570c9e6c4a422572e825a54387df25292bd27e9ae11fa57d803bcfe4643382a2f739859dd42fd
 SHA512 
969e1f6ba28edc0d4d25a10390f8e94578562602d303e9a9e402f29655cb9d67edc1040b283e1bc9fb4a88a5817814d88e85b77944204288aabcfb6da69bbdbf
+DIST assert_cmd-1.0.2.crate 25037 BLAKE2B 
b7fe731a66ce7270b165e30da774420ff17f29a881e738b8b8a9ed37170edc6d0c27f1b052553c408c93b832f879742123b1585abccfde9c7e4b5830d0f327a6
 SHA512 
1d17d4ac5748a3a44ed25c8788f17bb5edcc15ce0e3f2232dfcb0c88cf735406e1048752473ae76fb033aad6d544c142c699c49e0398d2625e59b36526417f7a
 DIST atty-0.2.14.crate 5470 BLAKE2B 
2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab
 SHA512 
d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.0.crate 12870 BLAKE2B 
79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260
 SHA512 
451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
+DIST autocfg-1.0.1.crate 12908 BLAKE2B 
40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a
 SHA512 
630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 
0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b
 SHA512 
ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST bstr-0.2.13.crate 345445 BLAKE2B 
9a17fa04d55e5d053b115aef2a075b58cab0fb84c574df61eec7c3ab6f06e17d156991b1c070ad357599de5455af78982eecb8632336d53792958800ecafe839
 SHA512 
f1f778262269dfea6ba1cf953a5177107c2e1e838248a67588283ee11efa81adfa30498c7cfb20422e0955544a07d2a8f86c4eefc78e9f407a92be9591e26fe5
+DIST bstr-0.2.14.crate 345490 BLAKE2B 
96095cf4d70d88cd5cb4a61bd0e72a673933c7d1d95b713bd44375e739037ae12451602fa539ebf98e73d39a6786728ad145e882117b98108d945ba96b810e83
 SHA512 
de62c0f31ad672f90a8038fa163c7cdaf474b35ec24592aee5549af7c76d43e6ed00f8d7237e15ab27576c27a7232033a217955de6a0a3b40c83661b3a7e1e8a
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 
063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8
 SHA512 
9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B 
e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b
 SHA512 

[gentoo-commits] repo/proj/guru:master commit in: www-apps/jackett-bin/

2021-01-17 Thread Andrew Ammerlaan
commit: cf0cbe206f827154ce292fd6f67d9392b052d27d
Author: Aisha Tammy  aisha  cc>
AuthorDate: Sun Jan 17 13:22:10 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun Jan 17 13:22:10 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cf0cbe20

www-apps/jackett-bin: version bump to 0.17.294

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Aisha Tammy  aisha.cc>

 www-apps/jackett-bin/Manifest|  3 ++
 www-apps/jackett-bin/jackett-bin-0.17.294.ebuild | 36 
 2 files changed, 39 insertions(+)

diff --git a/www-apps/jackett-bin/Manifest b/www-apps/jackett-bin/Manifest
index 19a7a032..f9cc0f74 100644
--- a/www-apps/jackett-bin/Manifest
+++ b/www-apps/jackett-bin/Manifest
@@ -1,3 +1,6 @@
 DIST jackett-bin-0.17.284-amd64.tar.gz 44618787 BLAKE2B 
cfc15de6713d6b547fc8618deefdefb9e38e4b630df5c17ca7e77e3889e5ff854a30ce03ded042a7b020e996fd92729d922cb4417ad70a6df3f4db384ecfce8a
 SHA512 
1795d1337fa319edcd8745e4c644c95e7efb5fce3ec5217a1bbfbb835f1e5d29643ba5fbb1c206b042f6e6e6b2571a8b920dda20f6ca162ea0b2459510875352
 DIST jackett-bin-0.17.284-arm.tar.gz 42503546 BLAKE2B 
156411086dbc6ec64b066e320cdf62e72e046d74bbfe933525c6470d1decb08c15d5af66775de474105a3fb418066df67dc51299f98a3b711bd9bc78abd59c3d
 SHA512 
685cbbf4b07fc30f8e1a406ae29393f844f97fe38c148d80b5a9d173c71204400bd1e0bc76f8dbc5fbba7257d5271651582ed437c2b6ec89237171bb1f425387
 DIST jackett-bin-0.17.284-arm64.tar.gz 41869541 BLAKE2B 
a5b37d39ef155f485c93ec0db7830dcabf57a9a890e287d659f3153146edd601d2c2d023648732ed996f39e136abab3dce121b566618c875c2f921f46750bac2
 SHA512 
ce8d5d71faaec142e76cf836ef5dff94e46dfbce77bab5a12519706a09bc421658dd308f616ee1aa4654b7af3d52804dbb4002ec46402a53914e4c66ddc5e3fe
+DIST jackett-bin-0.17.294-amd64.tar.gz 44583457 BLAKE2B 
5ba8e70a53ff4c35e87d63037f65cca6b74df8024c1bfd9efb95f655136ee0f9fd916836f163ed4cfdd8bda51c0b117cde0d5c4af60dc3f9807f325646027057
 SHA512 
6c5fb01a0807ff315dad021fcba005b9829c634f54b7d74004846b5a63626a8edd233217820971d9824abc35d826feb5125fa3472a599956269678d748e83d74
+DIST jackett-bin-0.17.294-arm.tar.gz 42461074 BLAKE2B 
33731e9b31c41410a6aac7f16de3f837e28b1d0885834beed9a40ac78c310f1dc0f720e1a0b93c8eddc03a20c8982991a97f49c3868b66690ef742aacece74de
 SHA512 
e962cfa17d9f482e1851e340380649b0d86b488b5c4646455b416a6d11ed7abaac9d15e57351e30c536da956643552bafc16bd7a439a41f23385c1f964754211
+DIST jackett-bin-0.17.294-arm64.tar.gz 41829676 BLAKE2B 
b142f8b3c150053ce0dbcff80e1596b63c561c231d8feda37bff3f466893456c03fe343ae6f3dde57af39cb55a780f955a9e739afc2d8672c71f371f4274b91c
 SHA512 
42e64ea82192f0f7053d312697540b68d11eb8238dd836e0402f26af090f1c198509f03f3d030d3432d6f8a3f44e4b0acc20113f8a5af7ba3096444d08f4d801

diff --git a/www-apps/jackett-bin/jackett-bin-0.17.294.ebuild 
b/www-apps/jackett-bin/jackett-bin-0.17.294.ebuild
new file mode 100644
index ..b2966ed1
--- /dev/null
+++ b/www-apps/jackett-bin/jackett-bin-0.17.294.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="API Support for your favorite torrent trackers"
+HOMEPAGE="https://github.com/Jackett/Jackett;
+SRC_URI="
+   amd64? ( 
https://github.com/Jackett/Jackett/releases/download/v${PV}/Jackett.Binaries.LinuxAMDx64.tar.gz
 -> ${P}-amd64.tar.gz )
+   arm? ( 
https://github.com/Jackett/Jackett/releases/download/v${PV}/Jackett.Binaries.LinuxARM32.tar.gz
 -> ${P}-arm.tar.gz )
+   arm64? ( 
https://github.com/Jackett/Jackett/releases/download/v${PV}/Jackett.Binaries.LinuxARM64.tar.gz
 -> ${P}-arm64.tar.gz )
+"
+
+KEYWORDS="~amd64 ~arm ~arm64"
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT="strip"
+
+RDEPEND="
+   app-crypt/mit-krb5
+   dev-libs/icu
+   dev-util/lttng-ust
+"
+
+QA_PREBUILT="*"
+S="${WORKDIR}"/Jackett
+
+src_install() {
+   dodir /opt/jackett
+   cp -a "${S}"/. "${ED}"/opt/jackett || die
+   newinitd "${FILESDIR}"/jackett.initd jackett
+   systemd_dounit "${FILESDIR}"/jackett.service
+   doenvd "${FILESDIR}"/99jackett
+}



[gentoo-commits] repo/proj/guru:master commit in: net-misc/xmrig-mo/, net-misc/xmrig/

2021-01-17 Thread Andrew Ammerlaan
commit: cdd395846e2eade8e815b030158109f91c2d5dc7
Author: Theo Anderson  posteo  de>
AuthorDate: Sun Jan 17 07:51:06 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun Jan 17 07:51:06 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cdd39584

net-misc/xmrig{,-mo}: bump to 6.7.2

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Theo Anderson  posteo.de>

 net-misc/xmrig-mo/Manifest  |  1 +
 net-misc/xmrig-mo/xmrig-mo-6.7.2.ebuild | 56 +
 net-misc/xmrig/Manifest |  1 +
 net-misc/xmrig/xmrig-6.7.2.ebuild   | 51 ++
 4 files changed, 109 insertions(+)

diff --git a/net-misc/xmrig-mo/Manifest b/net-misc/xmrig-mo/Manifest
index 7ba493cc..0dc28c90 100644
--- a/net-misc/xmrig-mo/Manifest
+++ b/net-misc/xmrig-mo/Manifest
@@ -1 +1,2 @@
 DIST xmrig-mo-6.7.0-mo1.tar.gz 1665109 BLAKE2B 
50c7be4cc8c96df068692d02c7af4a0af9ee8d7b1be25199766970d95dbdc324945db2ba03fe5997ee8919ad55e10796d30f37d0d6e7cdad127040c5b4d8e038
 SHA512 
c4410935809b052210fbc1feacebc059e0c0b9951d1a38fe614dafd2c9385e439816662a18c568bba0e3cdf8cb6273131e54cc2032522dbe44d08f2337c02d14
+DIST xmrig-mo-6.7.2-mo1.tar.gz 1665361 BLAKE2B 
0f2571f6b7f6946af20d132b4c1f97bad6ff841f1d71e6c36617fa99a8ebe4afcc09333db9a3c64abf15574fbf78ea94bd2f62adee7d9ca0aa3d005e944cbda0
 SHA512 
9f9383bfe92f7b39ed1f83f30461c25d8a76a2ae89a2bcd6b9633febcaf20e833a098d9859f92132620fd43338e532e09293f65677dba11ab03c36a0160cc945

diff --git a/net-misc/xmrig-mo/xmrig-mo-6.7.2.ebuild 
b/net-misc/xmrig-mo/xmrig-mo-6.7.2.ebuild
new file mode 100644
index ..d1085fc5
--- /dev/null
+++ b/net-misc/xmrig-mo/xmrig-mo-6.7.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake optfeature
+
+MO_PV="mo1"
+DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT and Argon2 miner for the 
MoneroOcean pool"
+HOMEPAGE="https://moneroocean.stream/ https://github.com/MoneroOcean/xmrig;
+SRC_URI="https://github.com/MoneroOcean/xmrig/archive/v${PV}-${MO_PV}.tar.gz 
-> ${P}-${MO_PV}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ssl"
+
+DEPEND="
+   dev-libs/libuv:=
+   sys-apps/hwloc:=
+   ssl? ( dev-libs/openssl:= )
+"
+
+S="${WORKDIR}/xmrig-${PV}-${MO_PV}"
+
+src_prepare() {
+   cmake_src_prepare
+   sed -i '/notls/d' cmake/OpenSSL.cmake || die
+   sed -i 's/1;/0;/g' src/donate.h || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   # TODO: Create expanded USE flag for all of the PoW algos.
+   -DWITH_TLS=$(usex ssl)
+   # TODO: opencl USE flag.
+   -DWITH_OPENCL=OFF
+   # TODO: cuda USE flag.
+   -DWITH_CUDA=OFF
+   )
+
+   cmake_src_configure
+}
+
+src_install() {
+   newbin "${BUILD_DIR}/xmrig" xmrig-mo
+   dodoc -r doc/*.md
+   einstalldocs
+}
+
+pkg_postinst() {
+   elog "Increase the vm.nr_hugepages sysctl value so that XMRig can 
allocate with huge pages."
+   elog "XMRig-MoneroOcean has been installed as /usr/bin/xmrig-mo"
+   elog "in order to differentiate between the original XMRig"
+   optfeature "CPU specific performance tweaks" sys-apps/msr-tools
+}

diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index 8d76a8bc..d127cfb9 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -1 +1,2 @@
 DIST xmrig-6.7.0.tar.gz 1570428 BLAKE2B 
744266679f37a1bb0453f224b907f7c4db8be42cd6948ccb1b0ad4a499d4345b26b7f15a2f662741222570d13c9eea2353fd9e05a9734c0f3a2c7d0068827e10
 SHA512 
3d57b78392c95417f37a4c1c5e434e06aafa1bd7658b945768c90de69b0ff8e347f68e96523312d6b4261321b3f06026504314caf73404a294beb01875dbe1d6
+DIST xmrig-6.7.2.tar.gz 1570717 BLAKE2B 
2b04a67a9beb78918e40d02e8d093d4d7ec720af8bc5126c2b6e0db8a77a4605e51a2f330431ce49e3bec15a4aabefd960d224019918a768aae72eabf88c1b6a
 SHA512 
517983d67bda3692e45cae664a717bb491492f127acd47635fb4d58dbfb02516669a6340a0845d9ca2de461666def208422a02ee97fcaaf7c674e11ae4a027c6

diff --git a/net-misc/xmrig/xmrig-6.7.2.ebuild 
b/net-misc/xmrig/xmrig-6.7.2.ebuild
new file mode 100644
index ..62d0c96c
--- /dev/null
+++ b/net-misc/xmrig/xmrig-6.7.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake optfeature
+
+DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
+HOMEPAGE="https://github.com/xmrig/xmrig;
+SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ssl"
+
+DEPEND="
+   dev-libs/libuv:=
+   sys-apps/hwloc:=
+   ssl? ( dev-libs/openssl:= )
+"
+
+src_prepare() {
+   cmake_src_prepare
+   sed -i '/notls/d' cmake/OpenSSL.cmake || die
+   sed -i 's/1;/0;/g' 

[gentoo-commits] repo/proj/guru:master commit in: www-apps/jackett-bin/

2021-01-17 Thread Andrew Ammerlaan
commit: f8ec2045e8652d941839a9f081044076d952d89c
Author: Aisha Tammy  aisha  cc>
AuthorDate: Sun Jan 17 13:22:41 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun Jan 17 13:22:41 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f8ec2045

www-apps/jackett-bin: drop old version

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Aisha Tammy  aisha.cc>

 www-apps/jackett-bin/Manifest|  3 --
 www-apps/jackett-bin/jackett-bin-0.17.284.ebuild | 36 
 2 files changed, 39 deletions(-)

diff --git a/www-apps/jackett-bin/Manifest b/www-apps/jackett-bin/Manifest
index f9cc0f74..5f4d6739 100644
--- a/www-apps/jackett-bin/Manifest
+++ b/www-apps/jackett-bin/Manifest
@@ -1,6 +1,3 @@
-DIST jackett-bin-0.17.284-amd64.tar.gz 44618787 BLAKE2B 
cfc15de6713d6b547fc8618deefdefb9e38e4b630df5c17ca7e77e3889e5ff854a30ce03ded042a7b020e996fd92729d922cb4417ad70a6df3f4db384ecfce8a
 SHA512 
1795d1337fa319edcd8745e4c644c95e7efb5fce3ec5217a1bbfbb835f1e5d29643ba5fbb1c206b042f6e6e6b2571a8b920dda20f6ca162ea0b2459510875352
-DIST jackett-bin-0.17.284-arm.tar.gz 42503546 BLAKE2B 
156411086dbc6ec64b066e320cdf62e72e046d74bbfe933525c6470d1decb08c15d5af66775de474105a3fb418066df67dc51299f98a3b711bd9bc78abd59c3d
 SHA512 
685cbbf4b07fc30f8e1a406ae29393f844f97fe38c148d80b5a9d173c71204400bd1e0bc76f8dbc5fbba7257d5271651582ed437c2b6ec89237171bb1f425387
-DIST jackett-bin-0.17.284-arm64.tar.gz 41869541 BLAKE2B 
a5b37d39ef155f485c93ec0db7830dcabf57a9a890e287d659f3153146edd601d2c2d023648732ed996f39e136abab3dce121b566618c875c2f921f46750bac2
 SHA512 
ce8d5d71faaec142e76cf836ef5dff94e46dfbce77bab5a12519706a09bc421658dd308f616ee1aa4654b7af3d52804dbb4002ec46402a53914e4c66ddc5e3fe
 DIST jackett-bin-0.17.294-amd64.tar.gz 44583457 BLAKE2B 
5ba8e70a53ff4c35e87d63037f65cca6b74df8024c1bfd9efb95f655136ee0f9fd916836f163ed4cfdd8bda51c0b117cde0d5c4af60dc3f9807f325646027057
 SHA512 
6c5fb01a0807ff315dad021fcba005b9829c634f54b7d74004846b5a63626a8edd233217820971d9824abc35d826feb5125fa3472a599956269678d748e83d74
 DIST jackett-bin-0.17.294-arm.tar.gz 42461074 BLAKE2B 
33731e9b31c41410a6aac7f16de3f837e28b1d0885834beed9a40ac78c310f1dc0f720e1a0b93c8eddc03a20c8982991a97f49c3868b66690ef742aacece74de
 SHA512 
e962cfa17d9f482e1851e340380649b0d86b488b5c4646455b416a6d11ed7abaac9d15e57351e30c536da956643552bafc16bd7a439a41f23385c1f964754211
 DIST jackett-bin-0.17.294-arm64.tar.gz 41829676 BLAKE2B 
b142f8b3c150053ce0dbcff80e1596b63c561c231d8feda37bff3f466893456c03fe343ae6f3dde57af39cb55a780f955a9e739afc2d8672c71f371f4274b91c
 SHA512 
42e64ea82192f0f7053d312697540b68d11eb8238dd836e0402f26af090f1c198509f03f3d030d3432d6f8a3f44e4b0acc20113f8a5af7ba3096444d08f4d801

diff --git a/www-apps/jackett-bin/jackett-bin-0.17.284.ebuild 
b/www-apps/jackett-bin/jackett-bin-0.17.284.ebuild
deleted file mode 100644
index b2966ed1..
--- a/www-apps/jackett-bin/jackett-bin-0.17.284.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="API Support for your favorite torrent trackers"
-HOMEPAGE="https://github.com/Jackett/Jackett;
-SRC_URI="
-   amd64? ( 
https://github.com/Jackett/Jackett/releases/download/v${PV}/Jackett.Binaries.LinuxAMDx64.tar.gz
 -> ${P}-amd64.tar.gz )
-   arm? ( 
https://github.com/Jackett/Jackett/releases/download/v${PV}/Jackett.Binaries.LinuxARM32.tar.gz
 -> ${P}-arm.tar.gz )
-   arm64? ( 
https://github.com/Jackett/Jackett/releases/download/v${PV}/Jackett.Binaries.LinuxARM64.tar.gz
 -> ${P}-arm64.tar.gz )
-"
-
-KEYWORDS="~amd64 ~arm ~arm64"
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT="strip"
-
-RDEPEND="
-   app-crypt/mit-krb5
-   dev-libs/icu
-   dev-util/lttng-ust
-"
-
-QA_PREBUILT="*"
-S="${WORKDIR}"/Jackett
-
-src_install() {
-   dodir /opt/jackett
-   cp -a "${S}"/. "${ED}"/opt/jackett || die
-   newinitd "${FILESDIR}"/jackett.initd jackett
-   systemd_dounit "${FILESDIR}"/jackett.service
-   doenvd "${FILESDIR}"/99jackett
-}



[gentoo-commits] repo/proj/guru:master commit in: www-apps/jackett-bin/

2021-01-17 Thread Andrew Ammerlaan
commit: b61c643df9c6b5a03f0e380654d354434bce3945
Author: Aisha Tammy  aisha  cc>
AuthorDate: Sat Jan 16 17:04:51 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Jan 16 17:04:59 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b61c643d

www-apps/jackett-bin: drop old version

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Aisha Tammy  aisha.cc>

 www-apps/jackett-bin/Manifest|  3 --
 www-apps/jackett-bin/jackett-bin-0.17.261.ebuild | 36 
 2 files changed, 39 deletions(-)

diff --git a/www-apps/jackett-bin/Manifest b/www-apps/jackett-bin/Manifest
index 3471e6a9..19a7a032 100644
--- a/www-apps/jackett-bin/Manifest
+++ b/www-apps/jackett-bin/Manifest
@@ -1,6 +1,3 @@
-DIST jackett-bin-0.17.261-amd64.tar.gz 44619870 BLAKE2B 
35e65b09786d0561b3e1ec76a237704d8ba08ea9576540f4c9403360163cddc9ef19eb397a5d22666d626cffb3d0756d6190fa11a27c154ca0cd400d87aacfec
 SHA512 
e03ab868d3e6d759ab14b45a22a07060db7838a845385aa5a29ded8cae7b5646e24171d2f4c237aa1e6729880cb650268d0ff12020f43ad1ed6f6ae8486efea3
-DIST jackett-bin-0.17.261-arm.tar.gz 42508290 BLAKE2B 
3b30bd5cde813f2bdbfe13bd7564784330bddbe643f9e21e9c986f03ae63fad6eed7306f538524435112c652c98d4ecc88c290e640cb2f894a41fdce4ae09a75
 SHA512 
98b1597c0a1b386d25f8a37fe3a820dd5ab0c868c2ceca98e3f1e5b8edbb427e2756b5fc85a66b004d08fe70a4bb64fa229dd62f0ce1ff8c8832c30cf78299cb
-DIST jackett-bin-0.17.261-arm64.tar.gz 41869597 BLAKE2B 
64aea9431841a2667670d6046d7f39826315d969fef2cb7cb5e77ad7f0a6500ad36d927b0e7466fb0175d2a479ad0a9d35dafedbaa96505539123c8c9b7f4f4b
 SHA512 
8be922ee105b0bcc1c8a77ee64c3cac51023a5b8372d39b51c8ad760fe8b0f07c2a7c695ef47c23ef548af0203ac951fbea5519f4ec2cc01fcbf5d16fbbcea33
 DIST jackett-bin-0.17.284-amd64.tar.gz 44618787 BLAKE2B 
cfc15de6713d6b547fc8618deefdefb9e38e4b630df5c17ca7e77e3889e5ff854a30ce03ded042a7b020e996fd92729d922cb4417ad70a6df3f4db384ecfce8a
 SHA512 
1795d1337fa319edcd8745e4c644c95e7efb5fce3ec5217a1bbfbb835f1e5d29643ba5fbb1c206b042f6e6e6b2571a8b920dda20f6ca162ea0b2459510875352
 DIST jackett-bin-0.17.284-arm.tar.gz 42503546 BLAKE2B 
156411086dbc6ec64b066e320cdf62e72e046d74bbfe933525c6470d1decb08c15d5af66775de474105a3fb418066df67dc51299f98a3b711bd9bc78abd59c3d
 SHA512 
685cbbf4b07fc30f8e1a406ae29393f844f97fe38c148d80b5a9d173c71204400bd1e0bc76f8dbc5fbba7257d5271651582ed437c2b6ec89237171bb1f425387
 DIST jackett-bin-0.17.284-arm64.tar.gz 41869541 BLAKE2B 
a5b37d39ef155f485c93ec0db7830dcabf57a9a890e287d659f3153146edd601d2c2d023648732ed996f39e136abab3dce121b566618c875c2f921f46750bac2
 SHA512 
ce8d5d71faaec142e76cf836ef5dff94e46dfbce77bab5a12519706a09bc421658dd308f616ee1aa4654b7af3d52804dbb4002ec46402a53914e4c66ddc5e3fe

diff --git a/www-apps/jackett-bin/jackett-bin-0.17.261.ebuild 
b/www-apps/jackett-bin/jackett-bin-0.17.261.ebuild
deleted file mode 100644
index b2966ed1..
--- a/www-apps/jackett-bin/jackett-bin-0.17.261.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="API Support for your favorite torrent trackers"
-HOMEPAGE="https://github.com/Jackett/Jackett;
-SRC_URI="
-   amd64? ( 
https://github.com/Jackett/Jackett/releases/download/v${PV}/Jackett.Binaries.LinuxAMDx64.tar.gz
 -> ${P}-amd64.tar.gz )
-   arm? ( 
https://github.com/Jackett/Jackett/releases/download/v${PV}/Jackett.Binaries.LinuxARM32.tar.gz
 -> ${P}-arm.tar.gz )
-   arm64? ( 
https://github.com/Jackett/Jackett/releases/download/v${PV}/Jackett.Binaries.LinuxARM64.tar.gz
 -> ${P}-arm64.tar.gz )
-"
-
-KEYWORDS="~amd64 ~arm ~arm64"
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT="strip"
-
-RDEPEND="
-   app-crypt/mit-krb5
-   dev-libs/icu
-   dev-util/lttng-ust
-"
-
-QA_PREBUILT="*"
-S="${WORKDIR}"/Jackett
-
-src_install() {
-   dodir /opt/jackett
-   cp -a "${S}"/. "${ED}"/opt/jackett || die
-   newinitd "${FILESDIR}"/jackett.initd jackett
-   systemd_dounit "${FILESDIR}"/jackett.service
-   doenvd "${FILESDIR}"/99jackett
-}



[gentoo-commits] repo/proj/guru:master commit in: games-action/multimc/

2021-01-17 Thread Andrew Ammerlaan
commit: 51694690a985718881fc7799c492d289d62c23ea
Author: Theo Anderson  posteo  de>
AuthorDate: Sun Jan 17 10:45:07 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun Jan 17 10:45:07 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=51694690

games-action/multimc: fix build with clang (-Werror)

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Theo Anderson  posteo.de>

 games-action/multimc/multimc-0.6.11.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/games-action/multimc/multimc-0.6.11.ebuild 
b/games-action/multimc/multimc-0.6.11.ebuild
index 4596aa60..6ed40831 100644
--- a/games-action/multimc/multimc-0.6.11.ebuild
+++ b/games-action/multimc/multimc-0.6.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -53,6 +53,11 @@ src_unpack() {
mv "${WORKDIR}/quazip-${QUAZIP_VER}" "${S}/libraries/quazip" || die
 }
 
+src_prepare() {
+   cmake_src_prepare
+   sed -r -i 's/-Werror([a-z=-]+)?//g' CMakeLists.txt || die
+}
+
 src_configure() {
local mycmakeargs=(
-DMultiMC_LAYOUT=lin-system



[gentoo-commits] repo/proj/guru:master commit in: app-admin/krapplet/

2021-01-17 Thread Andrew Ammerlaan
commit: fda0861b6017361402a1bdc127ce3dea8bdae06a
Author: Johannes Willem Fernhout  fernhout  info>
AuthorDate: Sun Jan 17 11:10:37 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun Jan 17 11:36:58 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fda0861b

app-admin/krapplet: Version bump

Bug fix and documentation update

Signed-off-by: Johannes Willem Fernhout  fernhout.info>

 app-admin/krapplet/Manifest  |  1 +
 app-admin/krapplet/krapplet-0.2.0.ebuild | 30 ++
 2 files changed, 31 insertions(+)

diff --git a/app-admin/krapplet/Manifest b/app-admin/krapplet/Manifest
index 6030395f..5656c5f6 100644
--- a/app-admin/krapplet/Manifest
+++ b/app-admin/krapplet/Manifest
@@ -1 +1,2 @@
 DIST krapplet-0.1.0.tar.gz 30262 BLAKE2B 
26e6f08f6fb2dc6ebde9a328eb0a7c016debeec472fd89c02c2a1e8b86eb96834d731911a13d690f2a6c0754a109456eb645538472d1ba3e17f725e185598971
 SHA512 
dbc23cf44e059a57cd026ffa21a98cc10bf188da66c23f10a719740f8b470c8372f0298c0d4b9c6085bca8e54ad66784dc480ebfd2d8a6813a682ee8ac968c14
+DIST krapplet-0.2.0.tar.gz 35908 BLAKE2B 
264050b1803f3985b6fa98ba67370d9306c15a1545239fa366eef5966224c8b143b66fe9d6a814bcf82e29a1aa4154c998747515764a71fd249ae9254a34681e
 SHA512 
34466d94666b374050bdf990444e7cf31a89f18c2f573b978745e448fe899615addc498d629994ee68082f6dc80798c8e4697c261adbe4aaade000a7dae7cf40

diff --git a/app-admin/krapplet/krapplet-0.2.0.ebuild 
b/app-admin/krapplet/krapplet-0.2.0.ebuild
new file mode 100644
index ..73ea8d49
--- /dev/null
+++ b/app-admin/krapplet/krapplet-0.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="Krapplet (keyring applet): a password manager based on 
gnome-keyring."
+HOMEPAGE="https://gitlab.com/hfernh/krapplet https://pypi.org/project/krapplet;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+BDEPEND=${RDEPEND}
+
+# Upstream does not provide any test suite.
+RESTRICT="test"
+
+RDEPEND="
+   x11-libs/gtk+:3
+   dev-libs/glib
+   dev-libs/gobject-introspection
+   dev-python/secretstorage"
+
+DEPEND="${RDEPEND}"



[gentoo-commits] repo/proj/guru:master commit in: net-misc/xmrig/, net-misc/xmrig-mo/

2021-01-17 Thread Andrew Ammerlaan
commit: faf2d00179eb055d83de6f4d129f829b87a7b9f5
Author: Theo Anderson  posteo  de>
AuthorDate: Sun Jan 17 07:51:31 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun Jan 17 07:51:31 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=faf2d001

net-misc/xmrig{,-mo}: drop old

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Theo Anderson  posteo.de>

 net-misc/xmrig-mo/Manifest  |  1 -
 net-misc/xmrig-mo/xmrig-mo-6.7.0.ebuild | 59 -
 net-misc/xmrig/Manifest |  1 -
 net-misc/xmrig/xmrig-6.7.0.ebuild   | 54 --
 4 files changed, 115 deletions(-)

diff --git a/net-misc/xmrig-mo/Manifest b/net-misc/xmrig-mo/Manifest
index 0dc28c90..485fdc26 100644
--- a/net-misc/xmrig-mo/Manifest
+++ b/net-misc/xmrig-mo/Manifest
@@ -1,2 +1 @@
-DIST xmrig-mo-6.7.0-mo1.tar.gz 1665109 BLAKE2B 
50c7be4cc8c96df068692d02c7af4a0af9ee8d7b1be25199766970d95dbdc324945db2ba03fe5997ee8919ad55e10796d30f37d0d6e7cdad127040c5b4d8e038
 SHA512 
c4410935809b052210fbc1feacebc059e0c0b9951d1a38fe614dafd2c9385e439816662a18c568bba0e3cdf8cb6273131e54cc2032522dbe44d08f2337c02d14
 DIST xmrig-mo-6.7.2-mo1.tar.gz 1665361 BLAKE2B 
0f2571f6b7f6946af20d132b4c1f97bad6ff841f1d71e6c36617fa99a8ebe4afcc09333db9a3c64abf15574fbf78ea94bd2f62adee7d9ca0aa3d005e944cbda0
 SHA512 
9f9383bfe92f7b39ed1f83f30461c25d8a76a2ae89a2bcd6b9633febcaf20e833a098d9859f92132620fd43338e532e09293f65677dba11ab03c36a0160cc945

diff --git a/net-misc/xmrig-mo/xmrig-mo-6.7.0.ebuild 
b/net-misc/xmrig-mo/xmrig-mo-6.7.0.ebuild
deleted file mode 100644
index 2121bc7a..
--- a/net-misc/xmrig-mo/xmrig-mo-6.7.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature
-
-MO_PV="mo1"
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT and Argon2 miner for the 
MoneroOcean pool"
-HOMEPAGE="https://moneroocean.stream/ https://github.com/MoneroOcean/xmrig;
-SRC_URI="https://github.com/MoneroOcean/xmrig/archive/v${PV}-${MO_PV}.tar.gz 
-> ${P}-${MO_PV}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="libressl +ssl"
-
-DEPEND="
-   dev-libs/libuv:=
-   sys-apps/hwloc:=
-   ssl? (
-   !libressl? ( dev-libs/openssl:= )
-   libressl? ( dev-libs/libressl:= )
-   )
-"
-
-S="${WORKDIR}/xmrig-${PV}-${MO_PV}"
-
-src_prepare() {
-   cmake_src_prepare
-   sed -i '/notls/d' cmake/OpenSSL.cmake || die
-   sed -i 's/1;/0;/g' src/donate.h || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   # TODO: Create expanded USE flag for all of the PoW algos.
-   -DWITH_TLS=$(usex ssl)
-   # TODO: opencl USE flag.
-   -DWITH_OPENCL=OFF
-   # TODO: cuda USE flag.
-   -DWITH_CUDA=OFF
-   )
-
-   cmake_src_configure
-}
-
-src_install() {
-   newbin "${BUILD_DIR}/xmrig" xmrig-mo
-   dodoc -r doc/*.md
-   einstalldocs
-}
-
-pkg_postinst() {
-   elog "Increase the vm.nr_hugepages sysctl value so that XMRig can 
allocate with huge pages."
-   elog "XMRig-MoneroOcean has been installed as /usr/bin/xmrig-mo"
-   elog "in order to differentiate between the original XMRig"
-   optfeature "CPU specific performance tweaks" sys-apps/msr-tools
-}

diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index d127cfb9..0e0a0191 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -1,2 +1 @@
-DIST xmrig-6.7.0.tar.gz 1570428 BLAKE2B 
744266679f37a1bb0453f224b907f7c4db8be42cd6948ccb1b0ad4a499d4345b26b7f15a2f662741222570d13c9eea2353fd9e05a9734c0f3a2c7d0068827e10
 SHA512 
3d57b78392c95417f37a4c1c5e434e06aafa1bd7658b945768c90de69b0ff8e347f68e96523312d6b4261321b3f06026504314caf73404a294beb01875dbe1d6
 DIST xmrig-6.7.2.tar.gz 1570717 BLAKE2B 
2b04a67a9beb78918e40d02e8d093d4d7ec720af8bc5126c2b6e0db8a77a4605e51a2f330431ce49e3bec15a4aabefd960d224019918a768aae72eabf88c1b6a
 SHA512 
517983d67bda3692e45cae664a717bb491492f127acd47635fb4d58dbfb02516669a6340a0845d9ca2de461666def208422a02ee97fcaaf7c674e11ae4a027c6

diff --git a/net-misc/xmrig/xmrig-6.7.0.ebuild 
b/net-misc/xmrig/xmrig-6.7.0.ebuild
deleted file mode 100644
index 70142047..
--- a/net-misc/xmrig/xmrig-6.7.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://github.com/xmrig/xmrig;
-SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="libressl +ssl"
-
-DEPEND="
-   dev-libs/libuv:=
-   sys-apps/hwloc:=
-   ssl? (
-   !libressl? ( 

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/rubygems/

2021-01-17 Thread Hans de Graaff
commit: 52b2a1d6f15e45f29b52dd600d37b1a77024d911
Author: Hans de Graaff  gentoo  org>
AuthorDate: Mon Jan 18 06:39:32 2021 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Mon Jan 18 06:39:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52b2a1d6

dev-ruby/rubygems: add 3.2.5

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-ruby/rubygems/Manifest  |   1 +
 dev-ruby/rubygems/rubygems-3.2.5.ebuild | 107 
 2 files changed, 108 insertions(+)

diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 763a3b631bd..a86ddb05aca 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -8,3 +8,4 @@ DIST rubygems-3.1.5.tgz 995812 BLAKE2B 
43471515e4da8a6fe47a419f67f26efc9855334d4
 DIST rubygems-3.2.0.tgz 982282 BLAKE2B 
2895cee1d2bc4e59073cc1e3e96a7958d079da5d7a7d2eed392e6bd2fac457a738518f30365d5601511998997f578b3ce9ed65c5e41cdc80138d0ebb07df3548
 SHA512 
a3d0b9a577a88d8fa27d3bbdfd4bb78e419549c579dc1add4f80e4abd017cc64c441eb7ad260705cbae672937c07fdc0c76f8751bd942fea5a97953f01052f28
 DIST rubygems-3.2.3.tgz 984126 BLAKE2B 
3a1447738333cc27be3bbc30080b2e39be7557d9dbd9949fea21b0e6ca7c4ef3f062b5a2cd4c8004150f9dc548fe3c8e2cb174854c2d4ed7115f377662673398
 SHA512 
2910739e3bf3fbfdb98e71bfe97d5761ff6a6910e72004af4c3c3c050df80160c704318c62501b7283086ca3c2342cc9c8bb2ed406d5c582cb0f9d989c841c32
 DIST rubygems-3.2.4.tgz 982062 BLAKE2B 
d74479b4798ccaf03a8940a6f76dc8f5fa28226ce29062b48e725ea47033a4f0a8d5e36df96aec97cff0b0a4eef8beb8ff14e6ac4df4596f170111e89c26841d
 SHA512 
18f4cc79eb3ed5a48b760a6b7a1b4283d8ff7c929f712152eab6a7a389dcc9a969ec77891ee518c033546cef6584865beef4f8f33ea06172eea3ce4e172c1531
+DIST rubygems-3.2.5.tgz 982720 BLAKE2B 
027343c37a9be7bc3ef1f12a2851ed1605ed5c0a55e9c23c5f42ebf92f101e2693da725ccc749ec7f48c507eb57e39d3ca91201e5f447779e373ff70d8a5273a
 SHA512 
a12dcad3d1698fea790a4669a3183fb81958c97c702988e1ddda1f33ab953517950a38e382b366c6ecaaed3d7954190339a87c8dab77c5285ce74a858da55a39

diff --git a/dev-ruby/rubygems/rubygems-3.2.5.ebuild 
b/dev-ruby/rubygems/rubygems-3.2.5.ebuild
new file mode 100644
index 000..7b3fb4d23fd
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.2.5.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/;
+LICENSE="GPL-2 || ( Ruby MIT )"
+
+SRC_URI="https://rubygems.org/rubygems/${P}.tgz;
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+   test? (
+   dev-ruby/json
+   dev-ruby/minitest:5
+   dev-ruby/rake
+   dev-ruby/rdoc
+   dev-ruby/webrick
+   )"
+
+all_ruby_prepare() {
+
+   mkdir -p lib/rubygems/defaults || die
+   cp "${FILESDIR}/gentoo-defaults-4.rb" 
lib/rubygems/defaults/operating_system.rb || die
+
+   eprefixify lib/rubygems/defaults/operating_system.rb
+
+   # Disable broken tests when changing default values:
+   sed -i -e '/test_default_path/,/^  end/ s:^:#:' 
test/rubygems/test_gem.rb || die
+   # Avoid test that won't work as json is also installed as plain ruby 
code
+   sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/askip "gentoo"' 
test/rubygems/test_require.rb || die
+
+   # Avoid test that requires additional utility scripts
+   rm -f test/test_changelog_generator.rb || die
+
+   # Update manifest after changing files to avoid a test failure
+   if use test; then
+   rake update_manifest || die
+   fi
+}
+
+each_ruby_compile() {
+   # Not really a build but...
+   sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+   # Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+   #unset RUBYOPT
+
+   if [[ "${EUID}" -ne "0" ]]; then
+   RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} 
--disable-gems -I.:lib:test:bundler/lib \
+   -e 'require "rubygems"; gem "minitest", "~>5.0"; 
Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+   else
+   ewarn "The userpriv feature must be enabled to run tests, bug 
408951."
+   eerror "Testsuite will not be run."
+   fi
+}
+
+each_ruby_install() {
+   # Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+   unset RUBYOPT
+   export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+   pushd lib &>/dev/null
+   doruby -r *
+ 

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/ruby-gettext/

2021-01-17 Thread Hans de Graaff
commit: c72f2ca5568b897fac24f7e3b94ded815e14
Author: Hans de Graaff  gentoo  org>
AuthorDate: Mon Jan 18 06:12:18 2021 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Mon Jan 18 06:12:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c72f2ca5

dev-ruby/ruby-gettext: add 3.3.7

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-ruby/ruby-gettext/Manifest  |  1 +
 dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild | 67 +
 2 files changed, 68 insertions(+)

diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index d93c23c9936..473048cb8c3 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,3 +1,4 @@
 DIST gettext-3.2.9.gem 285696 BLAKE2B 
a7bc40b2102f5b937d5f0e407dbaa23ead1da59eb9284c10a249c59548d0e2ad5fcd56b8855439893d2d31b57e0109bb6a9d5cc2d24075f5e360dc16b9291137
 SHA512 
21496c38cfc16a2b280f30bb94ff4560007eaa7f02c2341cb26aca2969a663c0863cdb650b4eadfd262d8585111dfb572e2ebc66a7a879045de50bf9da80a501
 DIST gettext-3.3.5.gem 290816 BLAKE2B 
74434c3feaedc16a17ee530669dacbc4b32ae0be95eb903ce89131619e862e1c823351653ce3c5f95f0882c183e3b2fe87b423a245aa2d8803688ce7e6afb5f7
 SHA512 
6777b96dd73b3d454c0a14a40d2ac0eac52894fa58067ba9ec976627c96efc98b294b1498bed965d0426bcaa1b371dcde5745101e05e21e408397b4e8d31894b
 DIST gettext-3.3.6.gem 291840 BLAKE2B 
5ca1a48582cb46e96fd672d9dc9e65ef3d5171560cc82fae147669023dafef761b67a68f31eb32fe1e433d918efe2c4c6983c32d8985093a3f090ab718703fe4
 SHA512 
ed03d370c03fe7502360aeac33f924c7463d7cde6bcde85c66befe8560b221a00f995ba6208ee14d1ca9cbaad6bd37aa7d0085ed75557f5b07724468de4433a8
+DIST gettext-3.3.7.gem 292352 BLAKE2B 
76232148ec89720553e7f260c7222b8c5f9eccf0dd0b0b3afa776d9fe6dc6205b21f7853fd1a1edb6e28208ebbd56e327d160af179a4b7c7aaab12965243b806
 SHA512 
6e7906d68b3e834e1a9d69cea26a61ffed07abd035c9a8ffc3456bc2fdcb9495700c2aaa4d099cf75f88dc6916899510208012e02d1d4f15de3d5148251b4233

diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild 
b/dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild
new file mode 100644
index 000..fb6b697eafd
--- /dev/null
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_NAME="${PN/ruby-/}"
+RUBY_FAKEGEM_VERSION="${PV%_*}"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locale po"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Native Language Support Library and Tools modeled after GNU 
gettext package"
+HOMEPAGE="https://ruby-gettext.github.io/;
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+SLOT="0"
+LICENSE="|| ( Ruby LGPL-3+ )"
+
+ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+   dev-ruby/racc"
+ruby_add_bdepend "test? (
+   dev-ruby/test-unit:2
+   dev-ruby/test-unit-rr )"
+
+RDEPEND+=" sys-devel/gettext"
+DEPEND+=" sys-devel/gettext"
+
+all_ruby_prepare() {
+   # Fix broken racc invocation
+   sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
+
+   # Avoid bundler dependency
+   sed -i -e '/bundler/,/helper.install/ s:^:#:' \
+   -e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
+
+   # Avoid dependency on developer-specific tools.
+   sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
+
+   # Avoid tests failing due to a missing test file.
+   #sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
+
+   # Avoid SAFE mode test that fails on ruby 2.6
+   sed -i -e '/test_safe_mode/aomit' test/test_gettext.rb || die
+}
+
+each_ruby_test() {
+   # Upstream tries to daisy-chain rake calls but they fail badly
+   # with our setup, so run it manually.
+   ${RUBY} test/run-test.rb || die "tests failed"
+}
+
+all_ruby_install() {
+   all_fakegem_install
+
+   dodoc -r samples
+}



[gentoo-commits] repo/gentoo:master commit in: net-fs/openafs/

2021-01-17 Thread Sam James
commit: c9401b1e7cf020e15d94c3d5cede4595162cd423
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 05:10:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 05:10:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9401b1e

net-fs/openafs: Stabilize 1.8.7 x86, #765574

Signed-off-by: Sam James  gentoo.org>

 net-fs/openafs/openafs-1.8.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/openafs/openafs-1.8.7.ebuild 
b/net-fs/openafs/openafs-1.8.7.ebuild
index 9772a65a676..d7b1f8f077d 100644
--- a/net-fs/openafs/openafs-1.8.7.ebuild
+++ b/net-fs/openafs/openafs-1.8.7.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei
 ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write"



[gentoo-commits] repo/gentoo:master commit in: x11-misc/clipmenu/

2021-01-17 Thread Sam James
commit: 7540810d7b835082d35fbe83ad150c965566ad5a
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 05:10:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 05:10:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7540810d

x11-misc/clipmenu: Stabilize 6.2.0 x86, #765613

Signed-off-by: Sam James  gentoo.org>

 x11-misc/clipmenu/clipmenu-6.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/clipmenu/clipmenu-6.2.0.ebuild 
b/x11-misc/clipmenu/clipmenu-6.2.0.ebuild
index 8fcd737ce56..5ae7092c8f4 100644
--- a/x11-misc/clipmenu/clipmenu-6.2.0.ebuild
+++ b/x11-misc/clipmenu/clipmenu-6.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cdown/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-misc/clipmenu/

2021-01-17 Thread Sam James
commit: 3ae1aced862386f385df53d98307bda5437c27ab
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 05:10:25 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 05:10:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ae1aced

x11-misc/clipmenu: Stabilize 6.2.0 amd64, #765613

Signed-off-by: Sam James  gentoo.org>

 x11-misc/clipmenu/clipmenu-6.2.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/clipmenu/clipmenu-6.2.0.ebuild 
b/x11-misc/clipmenu/clipmenu-6.2.0.ebuild
index cc2eeecc541..8fcd737ce56 100644
--- a/x11-misc/clipmenu/clipmenu-6.2.0.ebuild
+++ b/x11-misc/clipmenu/clipmenu-6.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cdown/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-irc/irker/

2021-01-17 Thread Sam James
commit: e3ebd420ffa2ffd9c7a2635f94d84026fa5bf149
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 04:48:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 04:48:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3ebd420

net-irc/irker: Keyword 2.19 sparc

Package-Manager: Portage-3.0.12.0.2-prefix, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-irc/irker/irker-2.19.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-irc/irker/irker-2.19.ebuild b/net-irc/irker/irker-2.19.ebuild
index 11787ff9011..53daad84021 100644
--- a/net-irc/irker/irker-2.19.ebuild
+++ b/net-irc/irker/irker-2.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz;
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # Dependency notes:



[gentoo-commits] repo/gentoo:master commit in: dev-python/redis-py/

2021-01-17 Thread Sam James
commit: fef25d993bc2ffceee0d07cea46e3548202b97ef
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 04:42:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 04:43:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fef25d99

dev-python/redis-py: Keyword 3.5.3 sparc

Package-Manager: Portage-3.0.12.0.2-prefix, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 dev-python/redis-py/redis-py-3.5.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/redis-py/redis-py-3.5.3.ebuild 
b/dev-python/redis-py/redis-py-3.5.3.ebuild
index 38013b4188f..d48be99f69b 100644
--- a/dev-python/redis-py/redis-py-3.5.3.ebuild
+++ b/dev-python/redis-py/redis-py-3.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: net-dns/pdnsd/

2021-01-17 Thread Sam James
commit: 0bbf6ba320a9c2b6ff4aaf9c2d69eb16bcd7f039
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 04:40:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 04:40:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bbf6ba3

net-dns/pdnsd: Stabilize 1.2.9a-r2 arm, #757159

Signed-off-by: Sam James  gentoo.org>

 net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild 
b/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild
index f54480728ab..965c903688f 100644
--- a/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="http://members.home.nl/p.a.rombouts/pdnsd/releases/${P}-par.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 ~sparc x86"
 IUSE="debug ipv6 +urandom test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/targets/, catalyst/base/

2021-01-17 Thread Matt Turner
commit: 4f90499b7b8adf0da6cee086ea8baffd40b167d7
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jan 18 03:15:02 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jan 18 03:49:48 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4f90499b

catalyst: Deduplicate prepare_sequence assignments

Signed-off-by: Matt Turner  gentoo.org>

 catalyst/base/stagebase.py| 13 ++---
 catalyst/targets/embedded.py  |  6 --
 catalyst/targets/livecd_stage1.py |  6 --
 catalyst/targets/livecd_stage2.py |  6 --
 catalyst/targets/netboot.py   |  6 --
 catalyst/targets/stage4.py|  6 --
 6 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 753f378e..fa9f1f64 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -67,7 +67,12 @@ class StageBase(TargetBase, ClearBase, GenBase):
 "portage_overlay",
 "portage_prefix",
 ])
-self.prepare_sequence = []
+self.prepare_sequence = [
+self.unpack,
+self.config_profile_link,
+self.setup_confdir,
+self.portage_overlay,
+]
 self.build_sequence = []
 self.finish_sequence = []
 
@@ -481,12 +486,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
 
 def set_action_sequence(self):
 """Set basic stage1, 2, 3 action sequences"""
-self.prepare_sequence.extend([
-self.unpack,
-self.config_profile_link,
-self.setup_confdir,
-self.portage_overlay,
-])
 self.build_sequence.extend([
 self.bind,
 self.chroot_setup,

diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
index 7d328808..83b17ad2 100644
--- a/catalyst/targets/embedded.py
+++ b/catalyst/targets/embedded.py
@@ -41,12 +41,6 @@ class embedded(StageBase):
 StageBase.__init__(self, spec, addlargs)
 
 def set_action_sequence(self):
-self.prepare_sequence.extend([
-self.unpack,
-self.config_profile_link,
-self.setup_confdir,
-self.portage_overlay,
-])
 self.build_sequence.extend([
 self.bind,
 self.chroot_setup,

diff --git a/catalyst/targets/livecd_stage1.py 
b/catalyst/targets/livecd_stage1.py
index eb6bb0f0..9fe95a00 100644
--- a/catalyst/targets/livecd_stage1.py
+++ b/catalyst/targets/livecd_stage1.py
@@ -23,12 +23,6 @@ class livecd_stage1(StageBase):
 StageBase.__init__(self, spec, addlargs)
 
 def set_action_sequence(self):
-self.prepare_sequence.extend([
-self.unpack,
-self.config_profile_link,
-self.setup_confdir,
-self.portage_overlay,
-])
 self.build_sequence.extend([
 self.bind,
 self.chroot_setup,

diff --git a/catalyst/targets/livecd_stage2.py 
b/catalyst/targets/livecd_stage2.py
index 5fecff85..ab8f4a0e 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -86,12 +86,6 @@ class livecd_stage2(StageBase):
 print_traceback=True)
 
 def set_action_sequence(self):
-self.prepare_sequence.extend([
-self.unpack,
-self.config_profile_link,
-self.setup_confdir,
-self.portage_overlay,
-])
 self.build_sequence.extend([
 self.bind,
 self.chroot_setup,

diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py
index 9a7e59e5..cb5e7ae4 100644
--- a/catalyst/targets/netboot.py
+++ b/catalyst/targets/netboot.py
@@ -158,12 +158,6 @@ class netboot(StageBase):
 self.resume.enable("empty")
 
 def set_action_sequence(self):
-self.prepare_sequence.extend([
-self.unpack,
-self.config_profile_link,
-self.setup_confdir,
-self.portage_overlay,
-])
 self.build_sequence.extend([
 self.bind,
 self.chroot_setup,

diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py
index 997139a5..9e53f070 100644
--- a/catalyst/targets/stage4.py
+++ b/catalyst/targets/stage4.py
@@ -39,12 +39,6 @@ class stage4(StageBase):
 self.settings["cleanables"].remove('/etc/resolv.conf')
 
 def set_action_sequence(self):
-self.prepare_sequence.extend([
-self.unpack,
-self.config_profile_link,
-self.setup_confdir,
-self.portage_overlay,
-])
 self.build_sequence.extend([
 self.bind,
 self.chroot_setup,



[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/, catalyst/targets/

2021-01-17 Thread Matt Turner
commit: a5f2e195d83f815e303f7bae3f0bb3591369d944
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 17 23:53:21 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jan 18 03:49:48 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a5f2e195

catalyst: Store references to functions

... rather than their names. This makes it possible for tooling to
understand the code structure better.

Signed-off-by: Matt Turner  gentoo.org>

 catalyst/base/stagebase.py| 41 +-
 catalyst/targets/embedded.py  | 34 ++---
 catalyst/targets/livecd_stage1.py | 18 +++
 catalyst/targets/livecd_stage2.py | 46 +++
 catalyst/targets/netboot.py   | 34 ++---
 catalyst/targets/stage1.py| 12 +-
 catalyst/targets/stage4.py| 36 +++---
 7 files changed, 111 insertions(+), 110 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index ed4d1227..ae13e35f 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -475,39 +475,39 @@ class StageBase(TargetBase, ClearBase, GenBase):
 Or it calls the normal set_action_sequence() for the target stage.
 """
 if "purgeonly" in self.settings["options"]:
-self.build_sequence.append("remove_chroot")
+self.build_sequence.append(self.remove_chroot)
 return
 self.set_action_sequence()
 
 def set_action_sequence(self):
 """Set basic stage1, 2, 3 action sequences"""
 self.prepare_sequence.extend([
-"unpack",
-"setup_confdir",
-"portage_overlay",
+self.unpack,
+self.setup_confdir,
+self.portage_overlay,
 ])
 self.build_sequence.extend([
-"bind",
-"chroot_setup",
-"setup_environment",
-"run_local",
-"preclean",
+self.bind,
+self.chroot_setup,
+self.setup_environment,
+self.run_local,
+self.preclean,
 ])
 self.finish_sequence.extend([
-"clean",
+self.clean,
 ])
 self.set_completion_action_sequences()
 
 def set_completion_action_sequences(self):
 if "fetch" not in self.settings["options"]:
-self.finish_sequence.append("capture")
+self.finish_sequence.append(self.capture)
 if "keepwork" in self.settings["options"]:
-self.finish_sequence.append("clear_autoresume")
+self.finish_sequence.append(self.clear_autoresume)
 elif "seedcache" in self.settings["options"]:
-self.finish_sequence.append("remove_autoresume")
+self.finish_sequence.append(self.remove_autoresume)
 else:
-self.finish_sequence.append("remove_autoresume")
-self.finish_sequence.append("remove_chroot")
+self.finish_sequence.append(self.remove_autoresume)
+self.finish_sequence.append(self.remove_chroot)
 
 def set_use(self):
 use = self.settings["spec_prefix"] + "/use"
@@ -1308,12 +1308,13 @@ class StageBase(TargetBase, ClearBase, GenBase):
 
 log.debug('setup_environment(); env = %r', self.env)
 
-def run_sequence(self, sequence):
+@staticmethod
+def run_sequence(sequence):
 for func in sequence:
 log.notice('--- Running action sequence: %s', func)
 sys.stdout.flush()
 try:
-getattr(self, func)()
+func()
 except LockInUse:
 log.error('Unable to aquire the lock...')
 return False
@@ -1342,14 +1343,14 @@ class StageBase(TargetBase, ClearBase, GenBase):
 log.info('StageBase: run() purge')
 self.purge()
 
-if not self.run_sequence(self.prepare_sequence):
+if not run_sequence(self.prepare_sequence):
 return False
 
 with namespace(mount=True):
-if not self.run_sequence(self.build_sequence):
+if not run_sequence(self.build_sequence):
 return False
 
-if not self.run_sequence(self.finish_sequence):
+if not run_sequence(self.finish_sequence):
 return False
 
 return True

diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
index 918b36bf..7d328808 100644
--- a/catalyst/targets/embedded.py
+++ b/catalyst/targets/embedded.py
@@ -42,27 +42,27 @@ class embedded(StageBase):
 
 def set_action_sequence(self):
 self.prepare_sequence.extend([
-"unpack",
-"config_profile_link",
-"setup_confdir",
-"portage_overlay",
+self.unpack,
+self.config_profile_link,
+self.setup_confdir,
+

[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/, targets/support/

2021-01-17 Thread Matt Turner
commit: e55b5bce1dfd69e767cd17c961267e9bc113ea47
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jan 18 03:09:30 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jan 18 03:49:48 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e55b5bce

catalyst: Call config_profile_link for all targets

This reverts the following two commits, which have no documented
rationale.

Revert "Set the profile by calling eselect."

This reverts commit 90c03f9dc255ba89849e46490f9ead7ab3921950.

Revert "Drop config_profile_link from the action_sequence for the generic 
stage."

This reverts commit 3bd10159bf7cfe14b6d8a8218b94eca73be4c997.

Doing so improves the code in two ways:

   1) it makes prepare_sequence identical across all targets, which will
  allow me to deduplicate some code
   2) it no longer calls eselect profile each time chroot-functions.sh
  is sourced (even for those targets that were still calling
  config_profile_link)

Signed-off-by: Matt Turner  gentoo.org>

 catalyst/base/stagebase.py  | 1 +
 targets/support/chroot-functions.sh | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index ae13e35f..753f378e 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -483,6 +483,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
 """Set basic stage1, 2, 3 action sequences"""
 self.prepare_sequence.extend([
 self.unpack,
+self.config_profile_link,
 self.setup_confdir,
 self.portage_overlay,
 ])

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 2aec018e..88465c31 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Set the profile
-eselect profile set ${clst_target_profile}
-
 # Trap these signals and kill ourselves if received
 # Force ourselves to die if any of these signals are received
 # most likely our controlling terminal is gone



[gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/support/, doc/, catalyst/targets/, targets/stage1/

2021-01-17 Thread Matt Turner
commit: 5ae9e8dc9beb04587a92e9ffdb4b5f2073dca17a
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Jan 16 16:28:59 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jan 18 03:49:48 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5ae9e8dc

catalyst: Remove update_seed

Signed-off-by: Matt Turner  gentoo.org>

 catalyst/targets/stage1.py  |  2 --
 doc/catalyst-spec.5.txt | 10 --
 targets/stage1/chroot.sh| 34 --
 targets/support/chroot-functions.sh |  2 +-
 4 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py
index 5a154e76..f7c723ee 100644
--- a/catalyst/targets/stage1.py
+++ b/catalyst/targets/stage1.py
@@ -16,8 +16,6 @@ class stage1(StageBase):
 required_values = frozenset()
 valid_values = required_values | frozenset([
 "chost",
-"update_seed",
-"update_seed_command",
 ])
 
 def __init__(self, spec, addlargs):

diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
index 4c1df857..47a62709 100644
--- a/doc/catalyst-spec.5.txt
+++ b/doc/catalyst-spec.5.txt
@@ -116,16 +116,6 @@ releases, we use a default README.txt, and this will be 
used on your
 CD if you do not provide one yourself.  We do not use this for the
 official releases.  This setting is supported by the livecd targets.
 
-*update_seed*::
-This is an optional setting supported by stage1 to tell catalyst if
-it should update the seed stage or not (valid values: `yes no`).
-
-*update_seed_command*::
-This is an optional command to pass to emerge for updating the seed
-stage (example: `--update dev-libs/mpfr dev-libs/mpc dev-libs/gmp`)
-If not specified, catalyst will update gcc deps.
-This setting requires enabling update_seed.
-
 Compilation
 ~~~
 

diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index f5002d75..e6ace213 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -24,32 +24,14 @@ BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
 
 FEATURES="${FEATURES} nodoc noman noinfo"
 
-# We need to ensure the base stage3 has USE="bindist"
-# if BINDIST is set to avoid issues with openssl / openssh
-[ -e ${clst_make_conf} ] && echo "USE=\"${BINDIST} ${USE}\"" >> 
${clst_make_conf}
-
-# Update stage3
-if [ -n "${clst_update_seed}" ]; then
-   if [ "${clst_update_seed}" == "yes" ]; then
-   echo "Updating seed stage..."
-   if [ -n "${clst_update_seed_command}" ]; then
-   ROOT=/ run_merge --buildpkg=n 
"${clst_update_seed_command}"
-   else
-   ROOT=/ run_merge --buildpkg=n 
--ignore-built-slot-operator-deps y @changed-subslot
-   fi
-   elif [ "${clst_update_seed}" != "no" ]; then
-   echo "Invalid setting for update_seed: ${clst_update_seed}"
-   exit 1
-   fi
-
-   # reset emerge options for the target
-   clst_update_seed=no setup_emerge_opts
-else
-   echo "Skipping seed stage update..."
-fi
-
-# Clear USE
-[ -e ${clst_make_conf} ] && sed -i -e "/^USE=\"${BINDIST} ${USE}\"/d" 
${clst_make_conf}
+# Update seed stage
+echo "Updating seed stage"
+(
+   # Don't build or use binpkgs
+   clst_PKGCACHE= setup_emerge_opts
+
+   ROOT=/ run_merge --buildpkg n --ignore-built-slot-operator-deps y 
@changed-subslot
+)
 
 export ROOT="${clst_root_path}"
 mkdir -p "$ROOT"

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 88465c31..94d7c938 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -136,7 +136,7 @@ setup_emerge_opts() {
emerge_opts+=(--load-average "${clst_load_average}")
fi
 
-   if [ -n "${clst_PKGCACHE}" ] && [ -z "${clst_update_seed}" -o 
"${clst_update_seed}" = "no" ]
+   if [ -n "${clst_PKGCACHE}" ]
then
emerge_opts+=(--usepkg --buildpkg --binpkg-respect-use=y 
--newuse)
bootstrap_opts+=(-r)



[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/targets/, catalyst/base/

2021-01-17 Thread Matt Turner
commit: e8574605f16ec995dafef34004d92ea03c870399
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jan 18 03:20:41 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jan 18 03:49:48 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e8574605

catalyst: Deduplicate the common build_sequence steps

This will also provide a nice spot to add a function to all targets'
build_sequence.

Signed-off-by: Matt Turner  gentoo.org>

 catalyst/base/stagebase.py| 11 ++-
 catalyst/targets/embedded.py  |  3 ---
 catalyst/targets/livecd_stage1.py |  3 ---
 catalyst/targets/livecd_stage2.py |  3 ---
 catalyst/targets/netboot.py   |  3 ---
 catalyst/targets/stage4.py|  3 ---
 6 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index fa9f1f64..d3048d31 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -73,7 +73,11 @@ class StageBase(TargetBase, ClearBase, GenBase):
 self.setup_confdir,
 self.portage_overlay,
 ]
-self.build_sequence = []
+self.build_sequence = [
+self.bind,
+self.chroot_setup,
+self.setup_environment,
+]
 self.finish_sequence = []
 
 self.set_valid_build_kernel_vars(addlargs)
@@ -480,16 +484,13 @@ class StageBase(TargetBase, ClearBase, GenBase):
 Or it calls the normal set_action_sequence() for the target stage.
 """
 if "purgeonly" in self.settings["options"]:
-self.build_sequence.append(self.remove_chroot)
+self.build_sequence = [self.remove_chroot]
 return
 self.set_action_sequence()
 
 def set_action_sequence(self):
 """Set basic stage1, 2, 3 action sequences"""
 self.build_sequence.extend([
-self.bind,
-self.chroot_setup,
-self.setup_environment,
 self.run_local,
 self.preclean,
 ])

diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
index 83b17ad2..b677b226 100644
--- a/catalyst/targets/embedded.py
+++ b/catalyst/targets/embedded.py
@@ -42,9 +42,6 @@ class embedded(StageBase):
 
 def set_action_sequence(self):
 self.build_sequence.extend([
-self.bind,
-self.chroot_setup,
-self.setup_environment,
 self.build_kernel,
 self.build_packages,
 self.root_overlay,

diff --git a/catalyst/targets/livecd_stage1.py 
b/catalyst/targets/livecd_stage1.py
index 9fe95a00..dbfa54ed 100644
--- a/catalyst/targets/livecd_stage1.py
+++ b/catalyst/targets/livecd_stage1.py
@@ -24,9 +24,6 @@ class livecd_stage1(StageBase):
 
 def set_action_sequence(self):
 self.build_sequence.extend([
-self.bind,
-self.chroot_setup,
-self.setup_environment,
 self.build_packages,
 ])
 self.finish_sequence.extend([

diff --git a/catalyst/targets/livecd_stage2.py 
b/catalyst/targets/livecd_stage2.py
index ab8f4a0e..e90e9f53 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -87,9 +87,6 @@ class livecd_stage2(StageBase):
 
 def set_action_sequence(self):
 self.build_sequence.extend([
-self.bind,
-self.chroot_setup,
-self.setup_environment,
 self.run_local,
 self.build_kernel
 ])

diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py
index cb5e7ae4..a2a9fcb3 100644
--- a/catalyst/targets/netboot.py
+++ b/catalyst/targets/netboot.py
@@ -159,9 +159,6 @@ class netboot(StageBase):
 
 def set_action_sequence(self):
 self.build_sequence.extend([
-self.bind,
-self.chroot_setup,
-self.setup_environment,
 self.build_packages,
 self.root_overlay,
 self.copy_files_to_image,

diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py
index 9e53f070..f8383f75 100644
--- a/catalyst/targets/stage4.py
+++ b/catalyst/targets/stage4.py
@@ -40,9 +40,6 @@ class stage4(StageBase):
 
 def set_action_sequence(self):
 self.build_sequence.extend([
-self.bind,
-self.chroot_setup,
-self.setup_environment,
 self.build_packages,
 self.build_kernel,
 self.bootloader,



[gentoo-commits] repo/gentoo:master commit in: app-emulation/winetricks/

2021-01-17 Thread Nick Sarnie
commit: 118022571ded64900f704adc183ddc6140776c32
Author: Nick Sarnie  gentoo  org>
AuthorDate: Mon Jan 18 03:40:25 2021 +
Commit: Nick Sarnie  gentoo  org>
CommitDate: Mon Jan 18 03:41:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11802257

app-emulation/winetricks: Sync with ::wine

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Nick Sarnie  gentoo.org>

 app-emulation/winetricks/Manifest|  1 +
 ...winetricks-.ebuild => winetricks-20201206.ebuild} | 12 +---
 app-emulation/winetricks/winetricks-.ebuild  | 12 +---
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/app-emulation/winetricks/Manifest 
b/app-emulation/winetricks/Manifest
index 2848d25aae0..c534cd48a6c 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,2 +1,3 @@
 DIST winetricks-20200412.tar.gz 684548 BLAKE2B 
e29eba0c73ec0649523dac0f0efd145a5c9fe60d94ae98bc55ec430f511cc5bdf3149d87289973a85a373f2f91c3bd5521470853e06f5ec4af83fc810aa4fdc5
 SHA512 
d6ca5628b7d296b3168ef088ca0b03aff8b73da8a139061ca64fac0685ec29bf2b7e075b89226f8ce3af511947eac45d4c72cfb1199e6b72666fc67547b77588
+DIST winetricks-20201206.tar.gz 690966 BLAKE2B 
8304d64657fdd921974f0c326bb4e0e1d859a69e573a7387c945c7dbfd20540621cc9c89718069b569309ac2358872083d651d29ddce616d1c2cf9a12ed39943
 SHA512 
6965bea9bc8bb212fe2b851a53dd144c52b37466cd0d6d6a933e4e0c16b202647f1b19804159642ce9fda566872ca51e8326e8716fafdea43cd09f24ed6b4a25
 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 
54a4502f6e8ef15d21b02c43e3ce599e32d476c2559246064de14cc4ce2243ff11dde681d24c8a7f4913c3d7a10b855bda47e8fb8ecad31e00d839705416be6f
 SHA512 
59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a

diff --git a/app-emulation/winetricks/winetricks-.ebuild 
b/app-emulation/winetricks/winetricks-20201206.ebuild
similarity index 89%
copy from app-emulation/winetricks/winetricks-.ebuild
copy to app-emulation/winetricks/winetricks-20201206.ebuild
index 3b4cea7a055..89dcbb57c97 100644
--- a/app-emulation/winetricks/winetricks-.ebuild
+++ b/app-emulation/winetricks/winetricks-20201206.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop xdg
+inherit xdg
 
 if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git;
@@ -84,10 +84,8 @@ src_test() {
 src_install() {
default
 
-   if use gtk || use kde; then
-   cd "${WORKDIR}/${wtg}" || die
-   domenu winetricks.desktop
-   insinto /usr/share/icons/hicolor/scalable/apps
-   doins wine-winetricks.svg
+   if ! use gtk && ! use kde; then
+   rm -r "${ED}"/usr/share/applications || die
+   rm -r "${ED}"/usr/share/icons || die
fi
 }

diff --git a/app-emulation/winetricks/winetricks-.ebuild 
b/app-emulation/winetricks/winetricks-.ebuild
index 3b4cea7a055..89dcbb57c97 100644
--- a/app-emulation/winetricks/winetricks-.ebuild
+++ b/app-emulation/winetricks/winetricks-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop xdg
+inherit xdg
 
 if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git;
@@ -84,10 +84,8 @@ src_test() {
 src_install() {
default
 
-   if use gtk || use kde; then
-   cd "${WORKDIR}/${wtg}" || die
-   domenu winetricks.desktop
-   insinto /usr/share/icons/hicolor/scalable/apps
-   doins wine-winetricks.svg
+   if ! use gtk && ! use kde; then
+   rm -r "${ED}"/usr/share/applications || die
+   rm -r "${ED}"/usr/share/icons || die
fi
 }



[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/targets/, catalyst/base/

2021-01-17 Thread Matt Turner
commit: f5a3b566042ea4bf65e0ddada96b083504d68bc1
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jan 18 03:20:41 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jan 18 03:31:42 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f5a3b566

catalyst: Deduplicate the common build_sequence steps

This will also provide a nice spot to add a function to all targets'
build_sequence.

Signed-off-by: Matt Turner  gentoo.org>

 catalyst/base/stagebase.py| 11 ++-
 catalyst/targets/embedded.py  |  3 ---
 catalyst/targets/livecd_stage1.py |  3 ---
 catalyst/targets/livecd_stage2.py |  3 ---
 catalyst/targets/netboot.py   |  3 ---
 catalyst/targets/stage4.py|  3 ---
 6 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 1aab4d95..552a6658 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -73,7 +73,11 @@ class StageBase(TargetBase, ClearBase, GenBase):
 self.setup_confdir,
 self.portage_overlay,
 ]
-self.build_sequence = []
+self.build_sequence = [
+self.bind,
+self.chroot_setup,
+self.setup_environment,
+]
 self.finish_sequence = []
 
 self.set_valid_build_kernel_vars(addlargs)
@@ -480,16 +484,13 @@ class StageBase(TargetBase, ClearBase, GenBase):
 Or it calls the normal set_action_sequence() for the target stage.
 """
 if "purgeonly" in self.settings["options"]:
-self.build_sequence.append(self.remove_chroot)
+self.build_sequence = [self.remove_chroot]
 return
 self.set_action_sequence()
 
 def set_action_sequence(self):
 """Set basic stage1, 2, 3 action sequences"""
 self.build_sequence.extend([
-self.bind,
-self.chroot_setup,
-self.setup_environment,
 self.run_local,
 self.preclean,
 ])

diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
index 83b17ad2..b677b226 100644
--- a/catalyst/targets/embedded.py
+++ b/catalyst/targets/embedded.py
@@ -42,9 +42,6 @@ class embedded(StageBase):
 
 def set_action_sequence(self):
 self.build_sequence.extend([
-self.bind,
-self.chroot_setup,
-self.setup_environment,
 self.build_kernel,
 self.build_packages,
 self.root_overlay,

diff --git a/catalyst/targets/livecd_stage1.py 
b/catalyst/targets/livecd_stage1.py
index 9fe95a00..dbfa54ed 100644
--- a/catalyst/targets/livecd_stage1.py
+++ b/catalyst/targets/livecd_stage1.py
@@ -24,9 +24,6 @@ class livecd_stage1(StageBase):
 
 def set_action_sequence(self):
 self.build_sequence.extend([
-self.bind,
-self.chroot_setup,
-self.setup_environment,
 self.build_packages,
 ])
 self.finish_sequence.extend([

diff --git a/catalyst/targets/livecd_stage2.py 
b/catalyst/targets/livecd_stage2.py
index ab8f4a0e..e90e9f53 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -87,9 +87,6 @@ class livecd_stage2(StageBase):
 
 def set_action_sequence(self):
 self.build_sequence.extend([
-self.bind,
-self.chroot_setup,
-self.setup_environment,
 self.run_local,
 self.build_kernel
 ])

diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py
index cb5e7ae4..a2a9fcb3 100644
--- a/catalyst/targets/netboot.py
+++ b/catalyst/targets/netboot.py
@@ -159,9 +159,6 @@ class netboot(StageBase):
 
 def set_action_sequence(self):
 self.build_sequence.extend([
-self.bind,
-self.chroot_setup,
-self.setup_environment,
 self.build_packages,
 self.root_overlay,
 self.copy_files_to_image,

diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py
index 9e53f070..f8383f75 100644
--- a/catalyst/targets/stage4.py
+++ b/catalyst/targets/stage4.py
@@ -40,9 +40,6 @@ class stage4(StageBase):
 
 def set_action_sequence(self):
 self.build_sequence.extend([
-self.bind,
-self.chroot_setup,
-self.setup_environment,
 self.build_packages,
 self.build_kernel,
 self.bootloader,



[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/targets/, targets/stage1/, targets/support/, doc/

2021-01-17 Thread Matt Turner
commit: f2b996f7fe005704c51fde56738870d776cf6119
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Jan 16 16:28:59 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jan 18 03:32:47 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f2b996f7

catalyst: Remove update_seed

Signed-off-by: Matt Turner  gentoo.org>

 catalyst/targets/stage1.py  |  2 --
 doc/catalyst-spec.5.txt | 10 --
 targets/stage1/chroot.sh| 34 --
 targets/support/chroot-functions.sh |  2 +-
 4 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py
index 5a154e76..f7c723ee 100644
--- a/catalyst/targets/stage1.py
+++ b/catalyst/targets/stage1.py
@@ -16,8 +16,6 @@ class stage1(StageBase):
 required_values = frozenset()
 valid_values = required_values | frozenset([
 "chost",
-"update_seed",
-"update_seed_command",
 ])
 
 def __init__(self, spec, addlargs):

diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
index 4c1df857..47a62709 100644
--- a/doc/catalyst-spec.5.txt
+++ b/doc/catalyst-spec.5.txt
@@ -116,16 +116,6 @@ releases, we use a default README.txt, and this will be 
used on your
 CD if you do not provide one yourself.  We do not use this for the
 official releases.  This setting is supported by the livecd targets.
 
-*update_seed*::
-This is an optional setting supported by stage1 to tell catalyst if
-it should update the seed stage or not (valid values: `yes no`).
-
-*update_seed_command*::
-This is an optional command to pass to emerge for updating the seed
-stage (example: `--update dev-libs/mpfr dev-libs/mpc dev-libs/gmp`)
-If not specified, catalyst will update gcc deps.
-This setting requires enabling update_seed.
-
 Compilation
 ~~~
 

diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index f5002d75..e6ace213 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -24,32 +24,14 @@ BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
 
 FEATURES="${FEATURES} nodoc noman noinfo"
 
-# We need to ensure the base stage3 has USE="bindist"
-# if BINDIST is set to avoid issues with openssl / openssh
-[ -e ${clst_make_conf} ] && echo "USE=\"${BINDIST} ${USE}\"" >> 
${clst_make_conf}
-
-# Update stage3
-if [ -n "${clst_update_seed}" ]; then
-   if [ "${clst_update_seed}" == "yes" ]; then
-   echo "Updating seed stage..."
-   if [ -n "${clst_update_seed_command}" ]; then
-   ROOT=/ run_merge --buildpkg=n 
"${clst_update_seed_command}"
-   else
-   ROOT=/ run_merge --buildpkg=n 
--ignore-built-slot-operator-deps y @changed-subslot
-   fi
-   elif [ "${clst_update_seed}" != "no" ]; then
-   echo "Invalid setting for update_seed: ${clst_update_seed}"
-   exit 1
-   fi
-
-   # reset emerge options for the target
-   clst_update_seed=no setup_emerge_opts
-else
-   echo "Skipping seed stage update..."
-fi
-
-# Clear USE
-[ -e ${clst_make_conf} ] && sed -i -e "/^USE=\"${BINDIST} ${USE}\"/d" 
${clst_make_conf}
+# Update seed stage
+echo "Updating seed stage"
+(
+   # Don't build or use binpkgs
+   clst_PKGCACHE= setup_emerge_opts
+
+   ROOT=/ run_merge --buildpkg n --ignore-built-slot-operator-deps y 
@changed-subslot
+)
 
 export ROOT="${clst_root_path}"
 mkdir -p "$ROOT"

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 88465c31..94d7c938 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -136,7 +136,7 @@ setup_emerge_opts() {
emerge_opts+=(--load-average "${clst_load_average}")
fi
 
-   if [ -n "${clst_PKGCACHE}" ] && [ -z "${clst_update_seed}" -o 
"${clst_update_seed}" = "no" ]
+   if [ -n "${clst_PKGCACHE}" ]
then
emerge_opts+=(--usepkg --buildpkg --binpkg-respect-use=y 
--newuse)
bootstrap_opts+=(-r)



[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/targets/, catalyst/base/

2021-01-17 Thread Matt Turner
commit: b3ebb48647737eb74eb9773d9231f38a8635e4b4
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jan 18 03:15:02 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jan 18 03:31:42 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b3ebb486

catalyst: Deduplicate prepare_sequence assignments

Signed-off-by: Matt Turner  gentoo.org>

 catalyst/base/stagebase.py| 13 ++---
 catalyst/targets/embedded.py  |  6 --
 catalyst/targets/livecd_stage1.py |  6 --
 catalyst/targets/livecd_stage2.py |  6 --
 catalyst/targets/netboot.py   |  6 --
 catalyst/targets/stage4.py|  6 --
 6 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 5115d029..1aab4d95 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -67,7 +67,12 @@ class StageBase(TargetBase, ClearBase, GenBase):
 "portage_overlay",
 "portage_prefix",
 ])
-self.prepare_sequence = []
+self.prepare_sequence = [
+self.unpack,
+self.config_profile_link,
+self.setup_confdir,
+self.portage_overlay,
+]
 self.build_sequence = []
 self.finish_sequence = []
 
@@ -481,12 +486,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
 
 def set_action_sequence(self):
 """Set basic stage1, 2, 3 action sequences"""
-self.prepare_sequence.extend([
-self.unpack,
-self.config_profile_link,
-self.setup_confdir,
-self.portage_overlay,
-])
 self.build_sequence.extend([
 self.bind,
 self.chroot_setup,

diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
index 7d328808..83b17ad2 100644
--- a/catalyst/targets/embedded.py
+++ b/catalyst/targets/embedded.py
@@ -41,12 +41,6 @@ class embedded(StageBase):
 StageBase.__init__(self, spec, addlargs)
 
 def set_action_sequence(self):
-self.prepare_sequence.extend([
-self.unpack,
-self.config_profile_link,
-self.setup_confdir,
-self.portage_overlay,
-])
 self.build_sequence.extend([
 self.bind,
 self.chroot_setup,

diff --git a/catalyst/targets/livecd_stage1.py 
b/catalyst/targets/livecd_stage1.py
index eb6bb0f0..9fe95a00 100644
--- a/catalyst/targets/livecd_stage1.py
+++ b/catalyst/targets/livecd_stage1.py
@@ -23,12 +23,6 @@ class livecd_stage1(StageBase):
 StageBase.__init__(self, spec, addlargs)
 
 def set_action_sequence(self):
-self.prepare_sequence.extend([
-self.unpack,
-self.config_profile_link,
-self.setup_confdir,
-self.portage_overlay,
-])
 self.build_sequence.extend([
 self.bind,
 self.chroot_setup,

diff --git a/catalyst/targets/livecd_stage2.py 
b/catalyst/targets/livecd_stage2.py
index 5fecff85..ab8f4a0e 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -86,12 +86,6 @@ class livecd_stage2(StageBase):
 print_traceback=True)
 
 def set_action_sequence(self):
-self.prepare_sequence.extend([
-self.unpack,
-self.config_profile_link,
-self.setup_confdir,
-self.portage_overlay,
-])
 self.build_sequence.extend([
 self.bind,
 self.chroot_setup,

diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py
index 9a7e59e5..cb5e7ae4 100644
--- a/catalyst/targets/netboot.py
+++ b/catalyst/targets/netboot.py
@@ -158,12 +158,6 @@ class netboot(StageBase):
 self.resume.enable("empty")
 
 def set_action_sequence(self):
-self.prepare_sequence.extend([
-self.unpack,
-self.config_profile_link,
-self.setup_confdir,
-self.portage_overlay,
-])
 self.build_sequence.extend([
 self.bind,
 self.chroot_setup,

diff --git a/catalyst/targets/stage4.py b/catalyst/targets/stage4.py
index 997139a5..9e53f070 100644
--- a/catalyst/targets/stage4.py
+++ b/catalyst/targets/stage4.py
@@ -39,12 +39,6 @@ class stage4(StageBase):
 self.settings["cleanables"].remove('/etc/resolv.conf')
 
 def set_action_sequence(self):
-self.prepare_sequence.extend([
-self.unpack,
-self.config_profile_link,
-self.setup_confdir,
-self.portage_overlay,
-])
 self.build_sequence.extend([
 self.bind,
 self.chroot_setup,



[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/, catalyst/targets/

2021-01-17 Thread Matt Turner
commit: 4362ffbf257f7d9a05ad81e46b522670e82ad78d
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 17 23:53:21 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jan 18 03:27:41 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4362ffbf

catalyst: Store references to functions

... rather than their names. This makes it possible for tooling to
understand the code structure better.

Signed-off-by: Matt Turner  gentoo.org>

 catalyst/base/stagebase.py| 41 +-
 catalyst/targets/embedded.py  | 34 ++---
 catalyst/targets/livecd_stage1.py | 18 +++
 catalyst/targets/livecd_stage2.py | 46 +++
 catalyst/targets/netboot.py   | 34 ++---
 catalyst/targets/stage1.py| 12 +-
 catalyst/targets/stage4.py| 36 +++---
 7 files changed, 111 insertions(+), 110 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 8d8d01d1..79f00149 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -475,39 +475,39 @@ class StageBase(TargetBase, ClearBase, GenBase):
 Or it calls the normal set_action_sequence() for the target stage.
 """
 if "purgeonly" in self.settings["options"]:
-self.build_sequence.append("remove_chroot")
+self.build_sequence.append(self.remove_chroot)
 return
 self.set_action_sequence()
 
 def set_action_sequence(self):
 """Set basic stage1, 2, 3 action sequences"""
 self.prepare_sequence.extend([
-"unpack",
-"setup_confdir",
-"portage_overlay",
+self.unpack,
+self.setup_confdir,
+self.portage_overlay,
 ])
 self.build_sequence.extend([
-"bind",
-"chroot_setup",
-"setup_environment",
-"run_local",
-"preclean",
+self.bind,
+self.chroot_setup,
+self.setup_environment,
+self.run_local,
+self.preclean,
 ])
 self.finish_sequence.extend([
-"clean",
+self.clean,
 ])
 self.set_completion_action_sequences()
 
 def set_completion_action_sequences(self):
 if "fetch" not in self.settings["options"]:
-self.finish_sequence.append("capture")
+self.finish_sequence.append(self.capture)
 if "keepwork" in self.settings["options"]:
-self.finish_sequence.append("clear_autoresume")
+self.finish_sequence.append(self.clear_autoresume)
 elif "seedcache" in self.settings["options"]:
-self.finish_sequence.append("remove_autoresume")
+self.finish_sequence.append(self.remove_autoresume)
 else:
-self.finish_sequence.append("remove_autoresume")
-self.finish_sequence.append("remove_chroot")
+self.finish_sequence.append(self.remove_autoresume)
+self.finish_sequence.append(self.remove_chroot)
 
 def set_use(self):
 use = self.settings["spec_prefix"] + "/use"
@@ -1308,12 +1308,13 @@ class StageBase(TargetBase, ClearBase, GenBase):
 
 log.debug('setup_environment(); env = %r', self.env)
 
-def run_sequence(self, sequence):
+@staticmethod
+def run_sequence(sequence):
 for func in sequence:
 log.notice('--- Running action sequence: %s', func)
 sys.stdout.flush()
 try:
-getattr(self, func)()
+func()
 except LockInUse:
 log.error('Unable to aquire the lock...')
 return False
@@ -1342,14 +1343,14 @@ class StageBase(TargetBase, ClearBase, GenBase):
 log.info('StageBase: run() purge')
 self.purge()
 
-if not self.run_sequence(self.prepare_sequence):
+if not run_sequence(self.prepare_sequence):
 return False
 
 with namespace(mount=True):
-if not self.run_sequence(self.build_sequence):
+if not run_sequence(self.build_sequence):
 return False
 
-if not self.run_sequence(self.finish_sequence):
+if not run_sequence(self.finish_sequence):
 return False
 
 return True

diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
index 918b36bf..7d328808 100644
--- a/catalyst/targets/embedded.py
+++ b/catalyst/targets/embedded.py
@@ -42,27 +42,27 @@ class embedded(StageBase):
 
 def set_action_sequence(self):
 self.prepare_sequence.extend([
-"unpack",
-"config_profile_link",
-"setup_confdir",
-"portage_overlay",
+self.unpack,
+self.config_profile_link,
+self.setup_confdir,
+

[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/, targets/support/

2021-01-17 Thread Matt Turner
commit: 88f38bc955b664741b2473a4316c0b55d622b8ad
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jan 18 03:09:30 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jan 18 03:27:41 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=88f38bc9

catalyst: Call config_profile_link for all targets

This reverts the following two commits, which have no documented
rationale.

Revert "Set the profile by calling eselect."

This reverts commit 90c03f9dc255ba89849e46490f9ead7ab3921950.

Revert "Drop config_profile_link from the action_sequence for the generic 
stage."

This reverts commit 3bd10159bf7cfe14b6d8a8218b94eca73be4c997.

Doing so improves the code in two ways:

   1) it makes prepare_sequence identical across all targets, which will
  allow me to deduplicate some code
   2) it no longer calls eselect profile each time chroot-functions.sh
  is sourced (even for those targets that were still calling
  config_profile_link)

Signed-off-by: Matt Turner  gentoo.org>

 catalyst/base/stagebase.py  | 1 +
 targets/support/chroot-functions.sh | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 79f00149..5115d029 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -483,6 +483,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
 """Set basic stage1, 2, 3 action sequences"""
 self.prepare_sequence.extend([
 self.unpack,
+self.config_profile_link,
 self.setup_confdir,
 self.portage_overlay,
 ])

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 2aec018e..88465c31 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Set the profile
-eselect profile set ${clst_target_profile}
-
 # Trap these signals and kill ourselves if received
 # Force ourselves to die if any of these signals are received
 # most likely our controlling terminal is gone



[gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/

2021-01-17 Thread Matt Turner
commit: 70386eefc69376babaeb965395ec43e6f6996399
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 17 23:29:05 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jan 18 03:27:41 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=70386eef

targets: Update the @changed-subslot set by default

In portage commit 1789fdf2ee81 (Add @changed-subslot package set) I
added this: the set of upgradable packages for which the highest visible
version has a different subslot than the currently installed version.

Updating the entire stage is expensive and unnecessary (since we're
going to build the latest packages in stage1 and then rebuild everything
in stage3).

What we definitely do need to update in the original stage3 however, is
any package that would trigger a subslot rebuild.

For example: gcc links with libmpfr.so from dev-libs/mpfr. mpfr's SONAME
changes from libmpfr.so.4 (SLOT="0/4") to libmpfr.so.6 (SLOT="0/6"). If
the seed stage's dev-libs/mpfr is not updated before emerging gcc, gcc
will link with libmpfr.so.4, but the latest version of dev-libs/mpfr
will be built and libmpfr.so.6 included into the stage1. Since the old
libmpfr.so.4 is not included in the stage1, gcc will not work, breaking
subsequent stage builds.

Our current options to update the seed are too large a hammer (e.g.,
"--update --deep --newuse @world" or "--update --deep --newuse
--complete-graph --rebuild-if-new-ver gcc") and spend too much time
updating seed stages for no gain beyond updating only packages for whom
the subslot has changed.

Bug: https://bugs.gentoo.org/739004
Signed-off-by: Matt Turner  gentoo.org>

 targets/stage1/chroot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index 50afef4a..f5002d75 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -35,7 +35,7 @@ if [ -n "${clst_update_seed}" ]; then
if [ -n "${clst_update_seed_command}" ]; then
ROOT=/ run_merge --buildpkg=n 
"${clst_update_seed_command}"
else
-   ROOT=/ run_merge --update --deep --newuse 
--complete-graph --rebuild-if-new-ver gcc
+   ROOT=/ run_merge --buildpkg=n 
--ignore-built-slot-operator-deps y @changed-subslot
fi
elif [ "${clst_update_seed}" != "no" ]; then
echo "Invalid setting for update_seed: ${clst_update_seed}"



[gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage3/, targets/stage2/, targets/stage4/

2021-01-17 Thread Matt Turner
commit: 988687c88d449845483f7d33b0851b6240b3085c
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jan 18 00:23:14 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jan 18 03:27:41 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=988687c8

targets: Remove some obvious comments

Signed-off-by: Matt Turner  gentoo.org>

 targets/stage2/controller.sh | 2 --
 targets/stage3/controller.sh | 2 --
 targets/stage4/controller.sh | 2 --
 3 files changed, 6 deletions(-)

diff --git a/targets/stage2/controller.sh b/targets/stage2/controller.sh
index fa5592e1..8ee51a5b 100755
--- a/targets/stage2/controller.sh
+++ b/targets/stage2/controller.sh
@@ -2,8 +2,6 @@
 
 source ${clst_shdir}/support/functions.sh
 
-# Only put commands in this section that you want every target to execute.
-# This is a global default file and will affect every target
 case $1 in
run)
shift

diff --git a/targets/stage3/controller.sh b/targets/stage3/controller.sh
index f4a3c7a1..63f245a8 100755
--- a/targets/stage3/controller.sh
+++ b/targets/stage3/controller.sh
@@ -2,8 +2,6 @@
 
 source ${clst_shdir}/support/functions.sh
 
-# Only put commands in this section that you want every target to execute.
-# This is a global default file and will affect every target
 case $1 in
run)
shift

diff --git a/targets/stage4/controller.sh b/targets/stage4/controller.sh
index ee078f60..0c40145e 100755
--- a/targets/stage4/controller.sh
+++ b/targets/stage4/controller.sh
@@ -2,8 +2,6 @@
 
 source ${clst_shdir}/support/functions.sh
 
-# Only put commands in this section that you want every target to execute.
-# This is a global default file and will affect every target
 case $1 in
pre-kmerge)
# Sets up the build environment before any kernels are compiled



[gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/, targets/stage3/, targets/embedded/, targets/stage2/, ...

2021-01-17 Thread Matt Turner
commit: 3918b483a6b16d11c7dc4b273f6fe133d346bd18
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jan 18 00:22:22 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jan 18 03:27:09 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3918b483

targets: Remove unused 'enter' command

Doesn't appear to have ever been wired up. I'm going to add something
like what I think this was, but without the duplication.

Signed-off-by: Matt Turner  gentoo.org>

 targets/embedded/controller.sh | 3 ---
 targets/stage1/controller.sh   | 3 ---
 targets/stage2/controller.sh   | 4 
 targets/stage3/controller.sh   | 4 
 targets/stage4/controller.sh   | 4 
 5 files changed, 18 deletions(-)

diff --git a/targets/embedded/controller.sh b/targets/embedded/controller.sh
index 48867897..c2e5994c 100755
--- a/targets/embedded/controller.sh
+++ b/targets/embedded/controller.sh
@@ -3,9 +3,6 @@
 source ${clst_shdir}/support/functions.sh
 
 case ${1} in
-   enter)
-   ;;
-
build_packages)
shift
export clst_packages="$*"

diff --git a/targets/stage1/controller.sh b/targets/stage1/controller.sh
index ab127114..0db1614d 100755
--- a/targets/stage1/controller.sh
+++ b/targets/stage1/controller.sh
@@ -3,9 +3,6 @@
 source "${clst_shdir}/support/functions.sh"
 
 case "$1" in
-   enter)
-   ;;
-
run)
cp "${clst_shdir}/stage1/build.py" "${clst_chroot_path}/tmp"
 

diff --git a/targets/stage2/controller.sh b/targets/stage2/controller.sh
index efa57648..fa5592e1 100755
--- a/targets/stage2/controller.sh
+++ b/targets/stage2/controller.sh
@@ -5,10 +5,6 @@ source ${clst_shdir}/support/functions.sh
 # Only put commands in this section that you want every target to execute.
 # This is a global default file and will affect every target
 case $1 in
-   enter)
-   ${clst_CHROOT} ${clst_chroot_path}
-   ;;
-
run)
shift
export clst_packages="$*"

diff --git a/targets/stage3/controller.sh b/targets/stage3/controller.sh
index f1ca6883..f4a3c7a1 100755
--- a/targets/stage3/controller.sh
+++ b/targets/stage3/controller.sh
@@ -5,10 +5,6 @@ source ${clst_shdir}/support/functions.sh
 # Only put commands in this section that you want every target to execute.
 # This is a global default file and will affect every target
 case $1 in
-   enter)
-   ${clst_CHROOT} ${clst_chroot_path}
-   ;;
-
run)
shift
export clst_packages="$*"

diff --git a/targets/stage4/controller.sh b/targets/stage4/controller.sh
index ba0774d1..ee078f60 100755
--- a/targets/stage4/controller.sh
+++ b/targets/stage4/controller.sh
@@ -5,10 +5,6 @@ source ${clst_shdir}/support/functions.sh
 # Only put commands in this section that you want every target to execute.
 # This is a global default file and will affect every target
 case $1 in
-   enter)
-   ${clst_CHROOT} ${clst_chroot_path}
-   ;;
-
pre-kmerge)
# Sets up the build environment before any kernels are compiled
exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh



[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/

2021-01-17 Thread Matt Turner
commit: f140497351d9e4323853ddb15f904092e574c11b
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Jan 16 22:04:26 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jan 18 03:27:41 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f1404973

catalyst: Make arch_dir a Path

Signed-off-by: Matt Turner  gentoo.org>

 catalyst/base/stagebase.py | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index ed4d1227..8d8d01d1 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -90,14 +90,14 @@ class StageBase(TargetBase, ClearBase, GenBase):
 build = platform.machine()
 self.settings["buildarch"] = build
 
-arch_dir = normpath(self.settings['sharedir'] + '/arch/')
+arch_dir = Path(self.settings['sharedir']) / 'arch'
 
 log.debug("Searching arch definitions...")
-for x in [x for x in os.listdir(arch_dir) if x.endswith('.toml')]:
+for x in [x for x in arch_dir.iterdir() if x.suffix == 'toml']:
 log.debug("\tTrying %s", x)
-name = x[:-len('.toml')]
+name = x.stem
 
-with open(arch_dir + x) as file:
+with x.open() as file:
 arch_config = toml.load(file)
 
 # Search for a subarchitecture in each arch in the arch_config



[gentoo-commits] repo/gentoo:master commit in: dev-db/redis/

2021-01-17 Thread Sam James
commit: 8d70cc2305a73fe396e24df001ad967b979aacbe
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 03:33:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 03:34:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d70cc23

dev-db/redis: Keyword 6.0.9{,-r100} sparc

Package-Manager: Portage-3.0.12.0.2-prefix, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 dev-db/redis/redis-6.0.9-r100.ebuild | 2 +-
 dev-db/redis/redis-6.0.9.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/redis/redis-6.0.9-r100.ebuild 
b/dev-db/redis/redis-6.0.9-r100.ebuild
index 53ee073cd46..289257d6730 100644
--- a/dev-db/redis/redis-6.0.9-r100.ebuild
+++ b/dev-db/redis/redis-6.0.9-r100.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://redis.io;
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz;
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~x86-solaris"
 IUSE="+jemalloc tcmalloc test"
 RESTRICT="!test? ( test )"
 SLOT="0"

diff --git a/dev-db/redis/redis-6.0.9.ebuild b/dev-db/redis/redis-6.0.9.ebuild
index 7d33e4f13ef..f24b4fcfe9b 100644
--- a/dev-db/redis/redis-6.0.9.ebuild
+++ b/dev-db/redis/redis-6.0.9.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://redis.io;
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz;
 
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux 
~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux 
~x86-solaris"
 IUSE="+jemalloc luajit tcmalloc test"
 RESTRICT="!test? ( test )"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: app-crypt/heimdal/

2021-01-17 Thread Sam James
commit: 0c7d3ee5fc58e80ea9f258057ac6648cb1308c42
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 03:32:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 03:32:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c7d3ee5

app-crypt/heimdal: Stabilize 7.7.0-r1 amd64, #762223

Signed-off-by: Sam James  gentoo.org>

 app-crypt/heimdal/heimdal-7.7.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild 
b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
index 0dbea843f38..e4429e9372f 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc 
~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc 
~x86"
 IUSE="afs +berkdb caps gdbm hdb-ldap libressl +lmdb otp selinux ssl 
static-libs test X"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/python-bugzilla/

2021-01-17 Thread Sam James
commit: 6bfb9794fedde27ed746f31e35b5bb5e3193da77
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 03:23:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 03:31:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bfb9794

dev-python/python-bugzilla: Keyword 3.0.2 sparc

Package-Manager: Portage-3.0.12.0.2-prefix, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild 
b/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
index 3a1e491a2fe..fcb4d29b7df 100644
--- a/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
+++ b/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ DESCRIPTION="A python module for interacting with Bugzilla 
over XMLRPC"
 HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla;
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 LICENSE="GPL-2+"
 SLOT="0"
 



[gentoo-commits] repo/gentoo:master commit in: net-mail/imapsync/

2021-01-17 Thread Sam James
commit: 0fcd13dd0a3e1a100381123a75753dede7d4fe93
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 03:21:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 03:30:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fcd13dd

net-mail/imapsync: bump to 1.977

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-mail/imapsync/Manifest  |  1 +
 net-mail/imapsync/imapsync-1.977.ebuild | 84 +
 2 files changed, 85 insertions(+)

diff --git a/net-mail/imapsync/Manifest b/net-mail/imapsync/Manifest
index 406d2d7a76f..2db9f5643e0 100644
--- a/net-mail/imapsync/Manifest
+++ b/net-mail/imapsync/Manifest
@@ -1 +1,2 @@
 DIST imapsync-1.882.tar.gz 1557501 BLAKE2B 
92f37d0c6c64569016a15d71d1b95ca08e4a8bb2402a5151f1429260fb37db47ebfc273e2bb73b06ba77974100780924fa3f256565fcd3e77cbff4c7bbf7b56e
 SHA512 
3953cb29b210c283be3fe72f1e1537594415bd5457b469b801625d6c857b982d2b2b3da9528dd1e6ccc6831c022ce495f7a5eaaea04d228bca374f185344f455
+DIST imapsync-1.977.tar.gz 1814568 BLAKE2B 
ccbe678f331a59b2ee50150b4e6dd3b2a7fb7750f204f3d67c90beed600b83b38a712bfa723dc0a73d21fb9bc03a5013f287469afa1164962cfb0f2923d93910
 SHA512 
b9810d53f5dc4e0a350e18dff03563c38cd64cff45ad741e77211a22ab49695de14bc4f09df6cf5fde7f3025f1f54d614f7c79ece1bda9f4c0052e5f38dedfd9

diff --git a/net-mail/imapsync/imapsync-1.977.ebuild 
b/net-mail/imapsync/imapsync-1.977.ebuild
new file mode 100644
index 000..86eee1532aa
--- /dev/null
+++ b/net-mail/imapsync/imapsync-1.977.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tool for incremental and recursive IMAP transfers between 
mailboxes"
+HOMEPAGE="http://ks.lamiral.info/imapsync/ 
https://github.com/imapsync/imapsync;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+#IUSE="test" # not fully supported yet
+
+RDEPEND="
+   dev-perl/App-cpanminus
+   dev-perl/Authen-NTLM
+   dev-perl/CGI
+   dev-perl/Crypt-OpenSSL-RSA
+   dev-perl/Data-Uniqid
+   dev-perl/Digest-HMAC
+   dev-perl/Dist-CheckConflicts
+   dev-perl/Encode-IMAPUTF7
+   dev-perl/File-Copy-Recursive
+   dev-perl/File-Tail
+   dev-perl/IO-Socket-INET6
+   dev-perl/IO-Socket-SSL
+   dev-perl/IO-Tee
+   dev-perl/JSON
+   dev-perl/libwww-perl
+   dev-perl/Mail-IMAPClient
+   dev-perl/Module-Implementation
+   dev-perl/Module-Runtime
+   dev-perl/Module-ScanDeps
+   dev-perl/Net-SSLeay
+   dev-perl/Package-Stash
+   dev-perl/Package-Stash-XS
+   dev-perl/PAR
+   dev-perl/Parse-RecDescent
+   dev-perl/Readonly
+   dev-perl/Readonly-XS
+   dev-perl/Regexp-Common
+   dev-perl/Sys-MemInfo
+   dev-perl/TermReadKey
+   dev-perl/Try-Tiny
+   dev-perl/Unicode-String
+   dev-perl/URI
+   virtual/perl-Compress-Raw-Zlib
+   virtual/perl-Data-Dumper
+   virtual/perl-Digest
+   virtual/perl-Digest-MD5
+   virtual/perl-Digest-SHA
+   virtual/perl-Encode
+   virtual/perl-MIME-Base64
+   "
+   # Not yet in tree:
+   # HTML::Entities
+   # JSON::WebToken
+   # JSON::WebToken::Crypt::RSA
+DEPEND="${RDEPEND}"
+   #test? (
+   #   virtual/perl-Test
+   #   dev-perl/Test-Deep
+   #   dev-perl/Test-Fatal
+   #   dev-perl/Test-MockObject
+   #   dev-perl/Test-Pod
+   #   dev-perl/Test-Requires
+   #   dev-perl/Test-Warn
+   #   dev-perl/Test-NoWarnings
+   #)"
+   # Not yet in tree:
+   # test? ( Test::Mock::Guard )
+
+RESTRICT="test"
+
+src_prepare() {
+   sed -e "s/^install: testp/install:/" \
+   -e "/^DO_IT/,/^$/d" \
+   -i "${S}"/Makefile || die
+
+   default
+}
+
+src_compile() { :; }



[gentoo-commits] repo/gentoo:master commit in: app-admin/sudo/

2021-01-17 Thread Sam James
commit: 9f1a5e2a753621a97ad753d562c63f2005f1957d
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 02:55:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 02:55:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f1a5e2a

app-admin/sudo: Stabilize 1.9.5_p1 ppc64, #764986

Signed-off-by: Sam James  gentoo.org>

 app-admin/sudo/sudo-1.9.5_p1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/sudo/sudo-1.9.5_p1.ebuild 
b/app-admin/sudo/sudo-1.9.5_p1.ebuild
index c64235904df..53eee6aee83 100644
--- a/app-admin/sudo/sudo-1.9.5_p1.ebuild
+++ b/app-admin/sudo/sudo-1.9.5_p1.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz;
if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc 
~ppc64 ~s390 sparc x86 ~sparc-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc 
ppc64 ~s390 sparc x86 ~sparc-solaris"
fi
 fi
 



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xosview/

2021-01-17 Thread Sam James
commit: fec99c232aca061c060013ebc33a857ab745c872
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 02:55:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 02:55:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fec99c23

x11-misc/xosview: Stabilize 1.22 ppc64, #765532

Signed-off-by: Sam James  gentoo.org>

 x11-misc/xosview/xosview-1.22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xosview/xosview-1.22.ebuild 
b/x11-misc/xosview/xosview-1.22.ebuild
index 52abed1bf65..e47a5770c69 100644
--- a/x11-misc/xosview/xosview-1.22.ebuild
+++ b/x11-misc/xosview/xosview-1.22.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz;
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="suid"
 
 COMMON_DEPS="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: media-video/gxine/

2021-01-17 Thread Sam James
commit: 812520fb1c6083d1d13ff548249d1be1897f9c5b
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 02:55:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 02:55:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=812520fb

media-video/gxine: Stabilize 0.5.909-r1 ppc, #764281

Signed-off-by: Sam James  gentoo.org>

 media-video/gxine/gxine-0.5.909-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gxine/gxine-0.5.909-r1.ebuild 
b/media-video/gxine/gxine-0.5.909-r1.ebuild
index c029855ac4d..7d68ece3cc0 100644
--- a/media-video/gxine/gxine-0.5.909-r1.ebuild
+++ b/media-video/gxine/gxine-0.5.909-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="l10n_cs l10n_de lirc nls udev xinerama"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-ruby/redcarpet/

2021-01-17 Thread Sam James
commit: 4d50c69821d5a94067164f6cc6e47fe66b242fcf
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 02:55:10 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 02:55:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d50c698

dev-ruby/redcarpet: Stabilize 3.5.1 ppc, #765013

Signed-off-by: Sam James  gentoo.org>

 dev-ruby/redcarpet/redcarpet-3.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-ruby/redcarpet/redcarpet-3.5.1.ebuild 
b/dev-ruby/redcarpet/redcarpet-3.5.1.ebuild
index 6133615221b..23db100e992 100644
--- a/dev-ruby/redcarpet/redcarpet-3.5.1.ebuild
+++ b/dev-ruby/redcarpet/redcarpet-3.5.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/vmg/redcarpet;
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~x86"
 IUSE=""
 
 all_ruby_prepare() {



[gentoo-commits] repo/gentoo:master commit in: app-admin/sudo/

2021-01-17 Thread Sam James
commit: 8e6f6ec96f00e6bc10944755dcae2741c953126e
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 02:55:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 02:55:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e6f6ec9

app-admin/sudo: Stabilize 1.9.5_p1 ppc, #764986

Signed-off-by: Sam James  gentoo.org>

 app-admin/sudo/sudo-1.9.5_p1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/sudo/sudo-1.9.5_p1.ebuild 
b/app-admin/sudo/sudo-1.9.5_p1.ebuild
index 4bb085b6b84..c64235904df 100644
--- a/app-admin/sudo/sudo-1.9.5_p1.ebuild
+++ b/app-admin/sudo/sudo-1.9.5_p1.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz;
if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc 
~ppc64 ~s390 sparc x86 ~sparc-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc 
~ppc64 ~s390 sparc x86 ~sparc-solaris"
fi
 fi
 



[gentoo-commits] repo/gentoo:master commit in: net-dns/pdnsd/

2021-01-17 Thread Sam James
commit: f81e5898d1bb23f320996a75cd112bb059f6c572
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 02:54:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 02:54:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f81e5898

net-dns/pdnsd: Stabilize 1.2.9a-r2 amd64, #757159

Signed-off-by: Sam James  gentoo.org>

 net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild 
b/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild
index 9312b04d90c..f54480728ab 100644
--- a/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.2.9a-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="http://members.home.nl/p.a.rombouts/pdnsd/releases/${P}-par.tar.gz;
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ppc ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~s390 ~sparc x86"
 IUSE="debug ipv6 +urandom test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: media-video/gxine/

2021-01-17 Thread Sam James
commit: 5b2b0e019b81d8f2e6e9115718168ff293e2e392
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 02:54:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 02:54:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b2b0e01

media-video/gxine: Stabilize 0.5.909-r1 amd64, #764281

Signed-off-by: Sam James  gentoo.org>

 media-video/gxine/gxine-0.5.909-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gxine/gxine-0.5.909-r1.ebuild 
b/media-video/gxine/gxine-0.5.909-r1.ebuild
index 43780582b43..c029855ac4d 100644
--- a/media-video/gxine/gxine-0.5.909-r1.ebuild
+++ b/media-video/gxine/gxine-0.5.909-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="l10n_cs l10n_de lirc nls udev xinerama"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-python/pygments/

2021-01-17 Thread Sam James
commit: e42e1072824ae6bdf472a666305f6dc615568585
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 02:53:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 02:53:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e42e1072

dev-python/pygments: Stabilize 2.7.4 ALLARCHES, #765112

Signed-off-by: Sam James  gentoo.org>

 dev-python/pygments/pygments-2.7.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pygments/pygments-2.7.4.ebuild 
b/dev-python/pygments/pygments-2.7.4.ebuild
index 20b5e4dc643..e80a67cac2a 100644
--- a/dev-python/pygments/pygments-2.7.4.ebuild
+++ b/dev-python/pygments/pygments-2.7.4.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
test? (



[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-guest-additions/

2021-01-17 Thread Sam James
commit: a48a1283bb2f5878a5dbf12c7f22d7ae584a36b3
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 02:53:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 02:53:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a48a1283

app-emulation/virtualbox-guest-additions: Stabilize 6.1.16-r1 x86, #750782

Signed-off-by: Sam James  gentoo.org>

 .../virtualbox-guest-additions-6.1.16-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild
 
b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild
index 113acb8e12c..5000d477eb1 100644
--- 
a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild
+++ 
b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 # automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist



[gentoo-commits] repo/proj/wine:master commit in: app-emulation/winetricks/

2021-01-17 Thread Jimi Huotari
commit: 8f430c78960ce512620a821ca98a4af12339e595
Author: Jimi Huotari  gentoo  org>
AuthorDate: Sun Jan 17 21:35:03 2021 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Mon Jan 18 02:24:47 2021 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=8f430c78

app-emulation/winetricks: add version 20201206

Bug: https://bugs.gentoo.org/764527
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Jimi Huotari  gentoo.org>

 app-emulation/winetricks/Manifest  |  1 +
 .../winetricks/winetricks-20201206.ebuild  | 91 ++
 2 files changed, 92 insertions(+)

diff --git a/app-emulation/winetricks/Manifest 
b/app-emulation/winetricks/Manifest
index 2848d25..c534cd4 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,2 +1,3 @@
 DIST winetricks-20200412.tar.gz 684548 BLAKE2B 
e29eba0c73ec0649523dac0f0efd145a5c9fe60d94ae98bc55ec430f511cc5bdf3149d87289973a85a373f2f91c3bd5521470853e06f5ec4af83fc810aa4fdc5
 SHA512 
d6ca5628b7d296b3168ef088ca0b03aff8b73da8a139061ca64fac0685ec29bf2b7e075b89226f8ce3af511947eac45d4c72cfb1199e6b72666fc67547b77588
+DIST winetricks-20201206.tar.gz 690966 BLAKE2B 
8304d64657fdd921974f0c326bb4e0e1d859a69e573a7387c945c7dbfd20540621cc9c89718069b569309ac2358872083d651d29ddce616d1c2cf9a12ed39943
 SHA512 
6965bea9bc8bb212fe2b851a53dd144c52b37466cd0d6d6a933e4e0c16b202647f1b19804159642ce9fda566872ca51e8326e8716fafdea43cd09f24ed6b4a25
 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 
54a4502f6e8ef15d21b02c43e3ce599e32d476c2559246064de14cc4ce2243ff11dde681d24c8a7f4913c3d7a10b855bda47e8fb8ecad31e00d839705416be6f
 SHA512 
59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a

diff --git a/app-emulation/winetricks/winetricks-20201206.ebuild 
b/app-emulation/winetricks/winetricks-20201206.ebuild
new file mode 100644
index 000..89dcbb5
--- /dev/null
+++ b/app-emulation/winetricks/winetricks-20201206.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git;
+   inherit git-r3
+   SRC_URI=""
+else
+   SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+wtg="winetricks-gentoo-2012.11.24"
+
+SRC_URI="${SRC_URI}
+   gtk? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
+   kde? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
+"
+
+DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
+HOMEPAGE="https://github.com/Winetricks/winetricks 
https://wiki.winehq.org/Winetricks;
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="gtk kde rar test"
+RESTRICT="!test? ( test )"
+
+# dev-util/shellcheck is not available for x86
+RESTRICT+=" x86? ( test )"
+
+BDEPEND="
+   test? (
+   dev-python/bashate
+   dev-util/checkbashisms
+   || (
+   dev-util/shellcheck-bin
+   dev-util/shellcheck
+   )
+   )
+"
+DEPEND=""
+RDEPEND="${DEPEND}
+   app-arch/cabextract
+   app-arch/p7zip
+   app-arch/unzip
+   net-misc/wget
+   virtual/wine
+   x11-misc/xdg-utils
+   gtk? ( gnome-extra/zenity )
+   kde? ( kde-apps/kdialog )
+   rar? ( app-arch/unrar )
+"
+
+# Test targets include syntax checks only, not the "heavy duty" tests
+# that would require a lot of disk space, as well as network access.
+
+# This uses a non-standard "Wine" category, which is provided by
+# '/etc/xdg/menus/applications-merged/wine.menu' from the
+# 'app-emulation/wine-desktop-common' package.
+# https://bugs.gentoo.org/451552
+QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
+
+src_unpack() {
+   if [[ ${PV} == "" ]]; then
+   git-r3_src_unpack
+
+   if use gtk || use kde; then
+   unpack ${wtg}.tar.bz2
+   fi
+
+   else
+   default
+   fi
+}
+
+src_test() {
+   ./tests/shell-checks || die "Test(s) failed."
+}
+
+src_install() {
+   default
+
+   if ! use gtk && ! use kde; then
+   rm -r "${ED}"/usr/share/applications || die
+   rm -r "${ED}"/usr/share/icons || die
+   fi
+}



[gentoo-commits] repo/proj/wine:master commit in: app-emulation/winetricks/

2021-01-17 Thread Jimi Huotari
commit: 3469965598ae6ee79fb864ea8d86e6c6a0b005d2
Author: Jimi Huotari  gentoo  org>
AuthorDate: Mon Jan 18 01:05:10 2021 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Mon Jan 18 02:19:40 2021 +
URL:https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=34699655

app-emulation/winetricks: fix conditions for desktop and icon files

Also remove inheriting 'desktop' since it's no longer used.

Bug: https://bugs.gentoo.org/749029
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Jimi Huotari  gentoo.org>

 app-emulation/winetricks/winetricks-.ebuild | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app-emulation/winetricks/winetricks-.ebuild 
b/app-emulation/winetricks/winetricks-.ebuild
index 3b4cea7..89dcbb5 100644
--- a/app-emulation/winetricks/winetricks-.ebuild
+++ b/app-emulation/winetricks/winetricks-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop xdg
+inherit xdg
 
 if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git;
@@ -84,10 +84,8 @@ src_test() {
 src_install() {
default
 
-   if use gtk || use kde; then
-   cd "${WORKDIR}/${wtg}" || die
-   domenu winetricks.desktop
-   insinto /usr/share/icons/hicolor/scalable/apps
-   doins wine-winetricks.svg
+   if ! use gtk && ! use kde; then
+   rm -r "${ED}"/usr/share/applications || die
+   rm -r "${ED}"/usr/share/icons || die
fi
 }



[gentoo-commits] repo/gentoo:master commit in: media-video/gxine/

2021-01-17 Thread Sam James
commit: 1ca13bd84ab8f2234836a547cfb6bd16cd2705a3
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 01:51:52 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 01:51:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ca13bd8

media-video/gxine: Stabilize 0.5.909-r1 x86, #764281

Signed-off-by: Sam James  gentoo.org>

 media-video/gxine/gxine-0.5.909-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/gxine/gxine-0.5.909-r1.ebuild 
b/media-video/gxine/gxine-0.5.909-r1.ebuild
index 5c596580769..43780582b43 100644
--- a/media-video/gxine/gxine-0.5.909-r1.ebuild
+++ b/media-video/gxine/gxine-0.5.909-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 IUSE="l10n_cs l10n_de lirc nls udev xinerama"
 
 DEPEND="



[gentoo-commits] proj/musl:master commit in: sys-libs/libblockdev/files/, sys-libs/libblockdev/

2021-01-17 Thread Jory Pratt
commit: ec4ed1857ef605593c4d89e144b2f17cd465d44c
Author: Jory Pratt  gentoo  org>
AuthorDate: Mon Jan 18 01:44:12 2021 +
Commit: Jory Pratt  gentoo  org>
CommitDate: Mon Jan 18 01:45:04 2021 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=ec4ed185

sys-libs/libblockdev: remove obsolete package, fixed upstream and already 
stable in ::gentoo

Signed-off-by: Jory Pratt  gentoo.org>

 sys-libs/libblockdev/Manifest  |   2 -
 .../libblockdev/files/libblockdev-fix-clang.patch  | 111 -
 .../libblockdev/files/libblockdev-fix-musl.patch   |  40 
 sys-libs/libblockdev/libblockdev-2.13.ebuild   |  85 
 sys-libs/libblockdev/libblockdev-2.14-r1.ebuild|  85 
 sys-libs/libblockdev/metadata.xml  |  18 
 6 files changed, 341 deletions(-)

diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
deleted file mode 100644
index ea88f6a..000
--- a/sys-libs/libblockdev/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST libblockdev-2.13-1.tar.gz 269162 SHA256 
0eca9236ec47dad64729b602d6658ff48034bf95f749296df1aa23e733abf5df SHA512 
eaa0751691008f2cb3c4cdbf00af8f3653b7e309a02ccb700528601ccfa0cca7631e6072e2a25d9da3862b0638dac08b0ac739b1ae4702b9b263fb58f73d10c9
 WHIRLPOOL 
311ccc4a65963f0457d519e8858d3d0e8a286d3343efb8819b2ffd1d1d01057b6ca2f6926472cc11b2b6f918cf8644654c328c074e63fddbe2447f62f02fc7fb
-DIST libblockdev-2.14-1.tar.gz 274241 BLAKE2B 
64c4c2a298ed95ed24a79716ccef5930f4276faaca02acf883c386b85a662d3fa1dc6f30e00d99bd835832e3c65acb89b445eff6fb35f9090dc949efde737d1a
 SHA512 
fb80e840ed2f247912da93a6cc0cb1846be73dcc16b917f5231f5d7a87eaa7b43d07d5b2110038dd783fefa7ef7df0893785a60079ed02567f1e08bfcbd82343

diff --git a/sys-libs/libblockdev/files/libblockdev-fix-clang.patch 
b/sys-libs/libblockdev/files/libblockdev-fix-clang.patch
deleted file mode 100644
index 3818936..000
--- a/sys-libs/libblockdev/files/libblockdev-fix-clang.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 9b4a7a4d0653b627d747e00d6b3ada2990caa1d3 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia 
-Date: Wed, 9 Aug 2017 13:57:57 +0800
-Subject: [PATCH] fix a clang compiling issue
-
-[snip]
-../../../git/src/plugins/fs.c:2617:26: error: missing field 'start'
-initializer [-Werror,-Wmissing-field-initializers]
-PedGeometry geom = {0};
- ^
-../../../git/src/plugins/fs.c:2618:30: error: missing field 'start'
-initializer [-Werror,-Wmissing-field-initializers]
-PedGeometry new_geom = {0};
-[snip]
-
-Fix typo s/enum libvk_packet_format format/enum libvk_secret secret_type/
-
-Upstream-Status: Submitted 
[https://github.com/storaged-project/libblockdev/pull/266]
-
-Signed-off-by: Hongxu Jia 

- src/plugins/crypto.c | 6 +++---
- src/plugins/fs.c | 4 ++--
- src/plugins/part.c   | 4 ++--
- src/utils/exec.c | 2 +-
- 4 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/plugins/crypto.c b/src/plugins/crypto.c
-index 8fbce4f..7ee7cdc 100644
 a/src/plugins/crypto.c
-+++ b/src/plugins/crypto.c
-@@ -881,7 +881,7 @@ gboolean bd_crypto_tc_open (const gchar *device, const 
gchar *name, const guint8
- gint ret = 0;
- guint64 progress_id = 0;
- gchar *msg = NULL;
--struct crypt_params_tcrypt params = {0};
-+struct crypt_params_tcrypt params = {NULL,0,NULL,0,NULL,NULL,NULL,0,0};
- 
- msg = g_strdup_printf ("Started opening '%s' TrueCrypt/VeraCrypt device", 
device);
- progress_id = bd_utils_report_started (msg);
-@@ -999,7 +999,7 @@ static gchar *replace_char (gchar *str, gchar orig, gchar 
new) {
- return str;
- }
- 
--static gboolean write_escrow_data_file (struct libvk_volume *volume, struct 
libvk_ui *ui, enum libvk_packet_format format, const gchar *out_path,
-+static gboolean write_escrow_data_file (struct libvk_volume *volume, struct 
libvk_ui *ui, enum libvk_secret secret_type, const gchar *out_path,
- CERTCertificate *cert, GError 
**error) {
- gpointer packet_data = NULL;
- gsize packet_data_size = 0;
-@@ -1008,7 +1008,7 @@ static gboolean write_escrow_data_file (struct 
libvk_volume *volume, struct libv
- gsize bytes_written = 0;
- GError *tmp_error = NULL;
- 
--packet_data = libvk_volume_create_packet_asymmetric_with_format (volume, 
_data_size, format, cert,
-+packet_data = libvk_volume_create_packet_asymmetric_with_format (volume, 
_data_size, secret_type, cert,
-  ui, 
LIBVK_PACKET_FORMAT_ASYMMETRIC_WRAP_SECRET_ONLY, error);
- 
- if (!packet_data) {
-diff --git a/src/plugins/fs.c b/src/plugins/fs.c
-index c4b6ac8..647096d 100644
 a/src/plugins/fs.c
-+++ b/src/plugins/fs.c
-@@ -2614,8 +2614,8 @@ BDFSVfatInfo* bd_fs_vfat_get_info (const gchar *device, 
GError **error) {
-  */
- gboolean bd_fs_vfat_resize (const gchar *device, guint64 new_size, GError 
**error) {
- PedDevice *ped_dev = 

[gentoo-commits] proj/musl:master commit in: media-tv/kodi/

2021-01-17 Thread Jory Pratt
commit: 0d073cf57f8d9b42c14bc13704c519d0516292a1
Author: Jory Pratt  gentoo  org>
AuthorDate: Mon Jan 18 00:49:32 2021 +
Commit: Jory Pratt  gentoo  org>
CommitDate: Mon Jan 18 00:49:32 2021 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=0d073cf5

media-tv/kodi: Version bump, sync with tree

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Jory Pratt  gentoo.org>

 media-tv/kodi/Manifest | 2 +-
 media-tv/kodi/{kodi-19.0_beta2.ebuild => kodi-19.0_rc1.ebuild} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index a232ce8..7c14777 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,5 +1,5 @@
 DIST ffmpeg-kodi-4.3.1-Matrix-Beta1.tar.gz 13477440 BLAKE2B 
49415f76fd2a888b0efadb19597bd89db65c3d9e1224ab529ff0d73ab5734a23982b4d4905ddeb105ce59a816c4642cdb9f5568b0c39c29f5fb9431f9623d4ec
 SHA512 
ce43390e816dabeed4ca231f5f7adade6c721c38e17996a57810fb6025ea49b812133c2a6e29aac7c674d4e4af3a21dbd7e605d85fb966935a01bda983b884ac
-DIST kodi-19.0b2.tar.gz 52329859 BLAKE2B 
79b9606b48d1a4a2a2ad7c2799bddf539edd04e1954892299507f245fd1c1db057dc22f753877fd0ba56f414c1addb32168c73328d5cf62dec1428941eebb590
 SHA512 
0f6598c90fbe0a1e2bee2bea5c6fe3d6579e7b0bd58c68590023629f92dd35d092b4de9b697759558ceb381f558cc53d8a74a412567b14683847b3c5e3d6a314
+DIST kodi-19.0RC1.tar.gz 52332966 BLAKE2B 
305793e2a5f16f07853a82e8f1953a56baa4159c9eee762aee40e8b6692c317cb83e7713d99cbb767cff0c1ac2a2d8bfc3837525d8ad4c854f114f900ebdb294
 SHA512 
c00d73d46f949eace856f762f9bd2b854e4c8db271366a54c26e18a9b960e04b26f2d4344656be18c79cfa42dfdffc6cd75e4df941268ca9bcfa17f4a987fc81
 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 
283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da
 SHA512 
5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
 DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 
7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355
 SHA512 
11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 
0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c
 SHA512 
b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7

diff --git a/media-tv/kodi/kodi-19.0_beta2.ebuild 
b/media-tv/kodi/kodi-19.0_rc1.ebuild
similarity index 99%
rename from media-tv/kodi/kodi-19.0_beta2.ebuild
rename to media-tv/kodi/kodi-19.0_rc1.ebuild
index 98f4f67..d190d9d 100644
--- a/media-tv/kodi/kodi-19.0_beta2.ebuild
+++ b/media-tv/kodi/kodi-19.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ else
MY_PV=${PV/_p/_r}
MY_PV=${MY_PV/_alpha/a}
MY_PV=${MY_PV/_beta/b}
-   MY_PV=${MY_PV/_rc/rc}
+   MY_PV=${MY_PV/_rc/RC}
MY_P="${PN}-${MY_PV}"
SRC_URI+=" 
https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> 
${MY_P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"



[gentoo-commits] repo/gentoo:master commit in: net-print/cups-bjnp/

2021-01-17 Thread Sam James
commit: 7d898bda0474d490b7b2835801c2def0338aed32
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 01:41:26 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 01:41:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d898bda

net-print/cups-bjnp: Stabilize 2.0.3 x86, #763306

Signed-off-by: Sam James  gentoo.org>

 net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild 
b/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild
index 0970debdc57..61304607638 100644
--- a/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild
+++ b/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 DEPEND="net-print/cups"
 RDEPEND="${DEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/

2021-01-17 Thread Sam James
commit: e2a69f8ef53a5a44487242c539037cdd25edf00c
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 01:41:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 01:41:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2a69f8e

dev-lang/erlang: Stabilize 23.2 x86, #765733

Signed-off-by: Sam James  gentoo.org>

 dev-lang/erlang/erlang-23.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/erlang/erlang-23.2.ebuild 
b/dev-lang/erlang/erlang-23.2.ebuild
index e266bd5246c..7fff9ff592a 100644
--- a/dev-lang/erlang/erlang-23.2.ebuild
+++ b/dev-lang/erlang/erlang-23.2.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-print/cnijfilter2/

2021-01-17 Thread Sam James
commit: c725cbd6a2818ef65bf91873ab867e5355a674dd
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 01:41:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 01:41:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c725cbd6

net-print/cnijfilter2: Stabilize 5.90 x86, #764143

Signed-off-by: Sam James  gentoo.org>

 net-print/cnijfilter2/cnijfilter2-5.90.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cnijfilter2/cnijfilter2-5.90.ebuild 
b/net-print/cnijfilter2/cnijfilter2-5.90.ebuild
index 1266a9798fb..e687d7cce0c 100644
--- a/net-print/cnijfilter2/cnijfilter2-5.90.ebuild
+++ b/net-print/cnijfilter2/cnijfilter2-5.90.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://dev.gentoo.org/~tupone/distfiles/${MY_P}.tar.gz;
 
 LICENSE="Canon-IJ"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="virtual/libusb:1



[gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/

2021-01-17 Thread Sam James
commit: 6b398faa387ae803bd878188463df10454cae235
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 01:41:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 01:41:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b398faa

x11-wm/awesome: Stabilize 4.3-r2 x86, #763861

Signed-off-by: Sam James  gentoo.org>

 x11-wm/awesome/awesome-4.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/awesome/awesome-4.3-r2.ebuild 
b/x11-wm/awesome/awesome-4.3-r2.ebuild
index 5f074a00458..e1fb5c5c454 100644
--- a/x11-wm/awesome/awesome-4.3-r2.ebuild
+++ b/x11-wm/awesome/awesome-4.3-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git;
 else

SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz;
-   KEYWORDS="amd64 ~arm ppc ~ppc64 ~x86"
+   KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="A dynamic floating and tiling window manager"



[gentoo-commits] repo/gentoo:master commit in: net-print/cups-bjnp/

2021-01-17 Thread Sam James
commit: e778851fb71df4f27e77bea205c71ea873136631
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 01:40:57 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 01:40:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e778851f

net-print/cups-bjnp: Stabilize 2.0.3 amd64, #763306

Signed-off-by: Sam James  gentoo.org>

 net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild 
b/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild
index fd3217e0a0f..0970debdc57 100644
--- a/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild
+++ b/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 
 DEPEND="net-print/cups"
 RDEPEND="${DEPEND}"



[gentoo-commits] repo/gentoo:master commit in: net-print/cnijfilter2/

2021-01-17 Thread Sam James
commit: 84a2c693bb335fc12b5ede8f9e7b82c1791ac96c
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 01:40:54 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 01:40:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84a2c693

net-print/cnijfilter2: Stabilize 5.90 amd64, #764143

Signed-off-by: Sam James  gentoo.org>

 net-print/cnijfilter2/cnijfilter2-5.90.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cnijfilter2/cnijfilter2-5.90.ebuild 
b/net-print/cnijfilter2/cnijfilter2-5.90.ebuild
index 870bdbc7e93..1266a9798fb 100644
--- a/net-print/cnijfilter2/cnijfilter2-5.90.ebuild
+++ b/net-print/cnijfilter2/cnijfilter2-5.90.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://dev.gentoo.org/~tupone/distfiles/${MY_P}.tar.gz;
 
 LICENSE="Canon-IJ"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/libusb:1



[gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/

2021-01-17 Thread Sam James
commit: e62f36594d748d569633e99df15c97f4a6eb7c85
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 01:40:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 01:40:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e62f3659

x11-wm/awesome: Stabilize 4.3-r2 ppc, #763861

Signed-off-by: Sam James  gentoo.org>

 x11-wm/awesome/awesome-4.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/awesome/awesome-4.3-r2.ebuild 
b/x11-wm/awesome/awesome-4.3-r2.ebuild
index 2cc93d53b2e..5f074a00458 100644
--- a/x11-wm/awesome/awesome-4.3-r2.ebuild
+++ b/x11-wm/awesome/awesome-4.3-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git;
 else

SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz;
-   KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+   KEYWORDS="amd64 ~arm ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="A dynamic floating and tiling window manager"



[gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/

2021-01-17 Thread Andreas Sturmlechner
commit: ef8a0d0a16f761255e647f0291d162396fa4bcf8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan 16 21:25:27 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan 18 01:20:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef8a0d0a

app-office/skrooge: 2.24.6 version bump

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/skrooge/Manifest  |  1 +
 app-office/skrooge/skrooge-2.24.6.ebuild | 98 
 2 files changed, 99 insertions(+)

diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 3bb459ae092..509ca76b950 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,2 +1,3 @@
 DIST skrooge-2.23.0.tar.xz 22403128 BLAKE2B 
e8b4e33e80f307f2c7e6c984199c116aee1d7cabe0ac4ee9461ba10289adc0a15ba5e5d8efb93d49ec8f22104462d572a8ee52b08df84d0379fa77ce56a4ddc9
 SHA512 
4592deb159aa310f36f8950cf0a65d811624b40dc8b05cdefc271b95885bc6db5ac15f7b4c5299b1468ac92b7e560636bf95ddd6d31340993d9184ba0b150a76
 DIST skrooge-2.24.0.tar.xz 22184092 BLAKE2B 
84d14fa35665fc1d5326e6212e56569f095b0a22ff2b3df752a8f456e34442edb639c2855b4f1a54cd639c2f9041e8a5e2ccfdf488876ce25dd48f0b0e0721c1
 SHA512 
e48ad9e657e4f15ab10db38cf1944cfe5a1fe73fa4623ec288b8749de746fc64ccc2534dc2bc7c379db0632107eba17ffc6a39e50de8e52a6800bb86b2ef234d
+DIST skrooge-2.24.6.tar.xz 22187100 BLAKE2B 
8657397c1faef949e4d2aa5a23b35433695329e9b00e62f11e4b60b78b3d0e92c32ff93219a4931b9baa08ae1bbdc18285728c97b0d49ca71bad37ee37b01a83
 SHA512 
a253bdcd966dbb3b0b2b078a88b8de7e9fbdf7700ce91850c0a174c3bb2f56aa04a00250e8164a5e9387699b4a6162052edb4a064293360a3b5ef62c350912df

diff --git a/app-office/skrooge/skrooge-2.24.6.ebuild 
b/app-office/skrooge/skrooge-2.24.6.ebuild
new file mode 100644
index 000..cf20ef1b659
--- /dev/null
+++ b/app-office/skrooge/skrooge-2.24.6.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
+HOMEPAGE="https://skrooge.org/;
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities kde ofx"
+
+BDEPEND="
+   dev-libs/libxslt
+   virtual/pkgconfig
+"
+COMMON_DEPEND="
+   >=app-crypt/qca-2.3.0:2
+   dev-db/sqlcipher
+   dev-libs/grantlee:5
+   >=dev-qt/qtconcurrent-${QTMIN}:5
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtnetwork-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtscript-${QTMIN}:5
+   >=dev-qt/qtsql-${QTMIN}:5=
+   >=dev-qt/qtsvg-${QTMIN}:5
+   >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kdbusaddons-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kitemviews-${KFMIN}:5
+   >=kde-frameworks/knewstuff-${KFMIN}:5
+   >=kde-frameworks/knotifications-${KFMIN}:5
+   >=kde-frameworks/knotifyconfig-${KFMIN}:5
+   >=kde-frameworks/kparts-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwallet-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+   kde? ( >=kde-frameworks/krunner-${KFMIN}:5 )
+   ofx? ( dev-libs/libofx:= )
+"
+DEPEND="${COMMON_DEPEND}
+   >=kde-frameworks/kguiaddons-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+   >=dev-qt/qtquickcontrols-${QTMIN}:5
+"
+
+# hangs + installs files (also requires KF5DesignerPlugin)
+RESTRICT+=" test"
+
+src_configure() {
+   local mycmakeargs=(
+   -DSKG_WEBENGINE=ON
+   -DSKG_DESIGNER=OFF
+   $(cmake_use_find_package activities KF5Activities)
+   $(cmake_use_find_package kde KF5Runner)
+   $(cmake_use_find_package ofx LibOfx)
+   -DSKG_BUILD_TEST=$(usex test)
+   )
+
+   ecm_src_configure
+}
+
+src_test() {
+   local mycmakeargs=(
+   -DSKG_BUILD_TEST=ON
+   

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libical/

2021-01-17 Thread Andreas Sturmlechner
commit: aa0bfb476b213a314d8306ef4283f453f8c59a62
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 17 20:32:24 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan 18 01:20:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa0bfb47

dev-libs/libical: 3.0.9 version bump

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-libs/libical/Manifest |   1 +
 dev-libs/libical/libical-3.0.9.ebuild | 104 ++
 2 files changed, 105 insertions(+)

diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 481d2c743b1..4766dbe8f81 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1 +1,2 @@
 DIST libical-3.0.8.tar.gz 881462 BLAKE2B 
e31dd1c823be033abbecd0373af784f1f57e533df56ca91ea467deb02cdda2a719f22882195b639182b85fcf4e59d56229dbf601d2c909c2c91b355c32022622
 SHA512 
ce015e6d4c1c7cb4af7b45748ce8251c663f80f6a4357ddff6a97796642619abe882f4cadeca10cabeb1b25577869f436da15bca882e032eb3ff0475f6010d8b
+DIST libical-3.0.9.tar.gz 886500 BLAKE2B 
66810ce13d70f9f1da62ff4d4c9dbff4953a644e939f55770cd4ca367293125b47590297b64a4b755cfb11315dfb4e77ad926390cde1c2d16847d24561288750
 SHA512 
4a9894d82776437cb2ef16df70bffb52da7b4fd57b52a4f6941430b3b1f9830829f0775fb495411f67393581bda1304b54c9f0031bc3d4ada56d2204900cb268

diff --git a/dev-libs/libical/libical-3.0.9.ebuild 
b/dev-libs/libical/libical-3.0.9.ebuild
new file mode 100644
index 000..9ab9acb8a1b
--- /dev/null
+++ b/dev-libs/libical/libical-3.0.9.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+VALA_USE_DEPEND="vapigen"
+inherit cmake python-any-r1 vala
+
+DESCRIPTION="An implementation of basic iCAL protocols"
+HOMEPAGE="https://github.com/libical/libical;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+
+LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="berkdb doc examples +glib +introspection static-libs test vala"
+
+REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+   dev-lang/perl
+   virtual/pkgconfig
+   doc? ( app-doc/doxygen )
+   introspection? ( dev-libs/gobject-introspection )
+   test? ( ${PYTHON_DEPS} )
+   vala? ( $(vala_depend) )
+"
+COMMON_DEPEND="
+   dev-libs/icu:=
+   berkdb? ( sys-libs/db:= )
+   glib? ( dev-libs/glib:2 )
+"
+DEPEND="${COMMON_DEPEND}
+   glib? ( dev-libs/libxml2:2 )
+"
+RDEPEND="${COMMON_DEPEND}
+   sys-libs/timezone-data
+"
+
+DOCS=(
+   AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
+   doc/{AddingOrModifyingComponents,UsingLibical}.txt
+)
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.0.4-tests.patch"
+   "${FILESDIR}/${PN}-3.0.5-pkgconfig-libdir.patch"
+)
+
+pkg_setup() {
+   use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+   cmake_src_prepare
+   use examples || cmake_comment_add_subdirectory examples
+   use vala && vala_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake_use_find_package berkdb BDB)
+   -DICAL_BUILD_DOCS=$(usex doc)
+   -DICAL_GLIB=$(usex glib)
+   -DGOBJECT_INTROSPECTION=$(usex introspection)
+   -DSHARED_ONLY=$(usex !static-libs)
+   -DLIBICAL_BUILD_TESTING=$(usex test)
+   -DICAL_GLIB_VAPI=$(usex vala)
+   )
+   if use vala; then
+   mycmakeargs+=(
+   -DVALAC="${VALAC}"
+   -DVAPIGEN="${VAPIGEN}"
+   )
+   fi
+   cmake_src_configure
+}
+
+src_compile() {
+   cmake_src_compile
+   use doc && cmake_src_compile docs
+}
+
+src_test() {
+   local myctestargs=(
+   -E "(icalrecurtest|icalrecurtest-r)" # bug 660282
+   )
+
+   cmake_src_test
+}
+
+src_install() {
+   use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
+
+   cmake_src_install
+
+   if use examples; then
+   rm examples/CMakeLists.txt || die
+   dodoc -r examples
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: net-libs/libquotient/

2021-01-17 Thread Andreas Sturmlechner
commit: 319e9ed98f374d5357dbed6c4646b9fc0f803dbb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan 16 20:25:36 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan 18 01:20:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=319e9ed9

net-libs/libquotient: 0.6.4 version bump

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-libs/libquotient/Manifest |  1 +
 net-libs/libquotient/libquotient-0.6.4.ebuild | 39 +++
 2 files changed, 40 insertions(+)

diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest
index 6e04ad57d67..eca3bedcf5c 100644
--- a/net-libs/libquotient/Manifest
+++ b/net-libs/libquotient/Manifest
@@ -1 +1,2 @@
 DIST libquotient-0.6.3.tar.gz 559142 BLAKE2B 
77ba0583a90e9d29d44ce9a70909d6b51462a1f16dbc2e9d321eb9d638329af41fe7b0c4f7569e5d46f3a9c12d32b1ef0b926c5e285bc3ed9b70ba6d4dbe8024
 SHA512 
a81d88b00edc2af8ad9a6a297f1d65ef5d96fb305f503b46f29381df1bb007b42e44b207fb649316c38c977a5b03c93f884407dccdc48ab066af6b004dd9a9d6
+DIST libquotient-0.6.4.tar.gz 559830 BLAKE2B 
23a2d5bed5a5bcd30ffa00465291f5670d187d44991fe424bce5a2ce1ffc9d4fc09b0cc1e44e7b2b2470f82f6a3bcf4be2d6d9185d2952761a9a94d6f4fae2ce
 SHA512 
6f505a697b6bd123004fe4ea6788ed985dafd965c5768cc838be98d6b27f65d5fb04c02d41c6a9ca2ce622acbd49264a9a14a99a087126d2852a926184ce

diff --git a/net-libs/libquotient/libquotient-0.6.4.ebuild 
b/net-libs/libquotient/libquotient-0.6.4.ebuild
new file mode 100644
index 000..0474fff2b60
--- /dev/null
+++ b/net-libs/libquotient/libquotient-0.6.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Qt5-based SDK to develop applications for Matrix"
+HOMEPAGE="https://github.com/quotient-im/libQuotient;
+SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}/libQuotient-${PV}"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtmultimedia:5
+   dev-qt/qtnetwork:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   # downstream patches
+   "${FILESDIR}"/${PN}-0.6.3-no-android.patch
+   "${FILESDIR}"/${PN}-0.6.3-no-tests.patch
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DQuotient_INSTALL_TESTS=OFF
+   -DQuotient_ENABLE_E2EE=OFF # TODO: libolm, libqtolm not packaged
+   -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON # no thanks.
+   )
+   cmake_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/flatpak/

2021-01-17 Thread Zac Medico
commit: d665f32741098e4fc8d7f7a6c04f473e24b9cf9e
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Jan 18 01:13:09 2021 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Jan 18 01:13:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d665f327

sys-apps/flatpak: Remove vulnerable version 1.9.2

Bug: https://bugs.gentoo.org/765457
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Zac Medico  gentoo.org>

 sys-apps/flatpak/Manifest |   1 -
 sys-apps/flatpak/flatpak-1.9.2.ebuild | 101 --
 2 files changed, 102 deletions(-)

diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index ef9a926f745..793b47e999f 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,3 +1,2 @@
 DIST flatpak-1.10.0.tar.xz 1504300 BLAKE2B 
213fb5449b075250cbec9f43ea5b02afae809b8e58d3be0afd39a70d78431f7efc7912462ce46061a53aa4dc2ef8f5e9504cdaffe4b39d2f53292736442ceb3d
 SHA512 
8eaabd66cbd26f5288fb72cddcd195ea4702243e9f5ceff425836b5f305e2b7a4172e67d30cc0e74ad97937c007e8f4ab81080a7ada3f528d05f74845c923aeb
 DIST flatpak-1.8.5.tar.xz 1430600 BLAKE2B 
dfa589073d3147725144c6c9c8f720a8b32918a6687a28af0f0284063e07278ece2ef191343b603e541401a5816ec095dbf3570ab7f27bba186ac416a359fbce
 SHA512 
bdd330376e3d9ce184717692ee12f2b1ccbf1400411133ac955ea21c2d5e04ea7af9709a61ae897eae17fe258e40048576c2d829290721f349de7e6d74a9de71
-DIST flatpak-1.9.2.tar.xz 1490540 BLAKE2B 
23e5c4cefaadebb1e9fd599ba8e372ddef9e7e241b186032a142f60bc07b243926d3fb514cc62e90437d2e8ddb17098476b4d73913c2ad656b2719268705057a
 SHA512 
ab4feb6c10161a1bd92e428623772c4217ce3700db412c6280de3415247ffd39eb800dc917937529a82328d778e089f45bd0a8b48fdd7e0c8bf34c494dcb085b

diff --git a/sys-apps/flatpak/flatpak-1.9.2.ebuild 
b/sys-apps/flatpak/flatpak-1.9.2.ebuild
deleted file mode 100644
index be7b57cfebd..000
--- a/sys-apps/flatpak/flatpak-1.9.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools linux-info python-any-r1
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz;
-DESCRIPTION="Linux application sandboxing and distribution framework"
-HOMEPAGE="https://flatpak.org/;
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86"
-IUSE="doc gtk kde introspection policykit seccomp systemd"
-RESTRICT+=" test"
-
-RDEPEND="
-   acct-group/flatpak
-   acct-user/flatpak
-   >=app-arch/libarchive-2.8:=
-   app-arch/zstd:=
-   >=app-crypt/gpgme-1.1.8:=
-   >=dev-libs/appstream-glib-0.5.10:=
-   >=dev-libs/glib-2.56:2=
-   >=dev-libs/libxml2-2.4:=
-   dev-libs/json-glib:=
-   dev-libs/libassuan:=
-   >=dev-util/ostree-2020.8:=[gpg(+)]
-   || (
-   dev-util/ostree[curl]
-   dev-util/ostree[soup]
-   )
-   >=gnome-base/dconf-0.26:=
-   >=net-libs/libsoup-2.4:=
-   sys-apps/bubblewrap
-   sys-apps/dbus
-   >=sys-fs/fuse-2.9.9:0=
-   sys-apps/xdg-dbus-proxy
-   x11-apps/xauth
-   x11-libs/gdk-pixbuf:2=
-   x11-libs/libXau:=
-   policykit? ( >=sys-auth/polkit-0.98:= )
-   seccomp? ( sys-libs/libseccomp:= )
-   systemd? ( sys-apps/systemd:= )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-   >=sys-devel/automake-1.13.4
-   >=sys-devel/gettext-0.18.2
-   virtual/pkgconfig
-   dev-util/gdbus-codegen
-   sys-devel/bison
-   introspection? ( >=dev-libs/gobject-introspection-1.40 )
-   doc? (
-   >=dev-util/gtk-doc-1.20
-   dev-libs/libxslt
-   )
-   $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
-"
-
-PDEPEND="
-   gtk? ( sys-apps/xdg-desktop-portal-gtk )
-   kde? ( kde-plasma/xdg-desktop-portal-kde )
-"
-
-python_check_deps() {
-   has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-   local CONFIG_CHECK="~USER_NS"
-   linux-info_pkg_setup
-   python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   default
-   # This line fails because locales are in /usr/lib/locale/locale-archive.
-   sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh 
|| die
-}
-
-src_configure() {
-   local myeconfargs=(
-   --enable-sandboxed-triggers
-   --enable-xauth
-   --localstatedir="${EPREFIX}"/var
-   --with-system-bubblewrap
-   --with-system-dbus-proxy
-   $(use_enable doc documentation)
-   $(use_enable doc gtk-doc)
-   $(use_enable introspection)
-   $(use_enable policykit system-helper)
-   $(use_enable seccomp)
-   $(use_with systemd)
-   )
-
-   econf "${myeconfargs[@]}"
-}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/libpod/

2021-01-17 Thread Zac Medico
commit: 0a6f8cad8951ed1797669a704ff196643a161dad
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Jan 18 00:35:25 2021 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Jan 18 01:11:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a6f8cad

app-emulation/libpod: Remove old version 2.1.0

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/libpod/Manifest|   1 -
 app-emulation/libpod/libpod-2.1.0.ebuild | 154 ---
 2 files changed, 155 deletions(-)

diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index 62494a75e86..41fac527191 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -1,2 +1 @@
-DIST podman-2.1.0.tar.gz 9444707 BLAKE2B 
62dacd316a8d6ae8aab0523338d818c69cf1228120e828a89301c9fdbb98082b85328c03c61f9f2a36c7a50105ce5fd025ad2b0e9ba2705c86b0d7e263fc92a6
 SHA512 
eb9b0cb184138af022e6d8e145fc6c4188c75c0695e0c6e62d54112a6b143424dd0caf9686f83637d08ff1fdbc24afca564c89f8cb4ab68b8f8d07345856398e
 DIST podman-2.2.1.tar.gz 9653842 BLAKE2B 
4e86903fc8fb51b9b1aa2b46704c1828b4ea11b738eccf198260c678b175e0a8699120e0280a2803f7898c9b28040a75d489ccd09ebd9c1f45d10a86e2a26c8f
 SHA512 
4c6eda9320daf18b5f0e892c0f3019a5658d983936c25a195bcb1fbc28c18a9a65e87043faddeb47e9f62c9b445efc2906a2b7ccedca877941fadb21b1b68367

diff --git a/app-emulation/libpod/libpod-2.1.0.ebuild 
b/app-emulation/libpod/libpod-2.1.0.ebuild
deleted file mode 100644
index 8335388f9f6..000
--- a/app-emulation/libpod/libpod-2.1.0.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="d8868746fd3f45b9bfd79e37bf2aa0c7103245fd"
-
-inherit bash-completion-r1 flag-o-matic go-module
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/podman/;
-MY_PN=podman
-MY_P=${MY_PN}-${PV}
-SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> 
${MY_P}.tar.gz"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64"
-IUSE="apparmor btrfs +fuse +rootless selinux"
-RESTRICT="test"
-
-COMMON_DEPEND="
-   app-crypt/gpgme:=
-   >=app-emulation/conmon-2.0.0
-   || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
-   dev-libs/libassuan:=
-   dev-libs/libgpg-error:=
-   >=net-misc/cni-plugins-0.8.6
-   sys-fs/lvm2
-   sys-libs/libseccomp:=
-
-   apparmor? ( sys-libs/libapparmor )
-   btrfs? ( sys-fs/btrfs-progs )
-   rootless? ( app-emulation/slirp4netns )
-   selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
-   ${COMMON_DEPEND}
-   dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
-   fuse? ( sys-fs/fuse-overlayfs )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-   default
-
-   # Disable installation of python modules here, since those are
-   # installed by separate ebuilds.
-   local makefile_sed_args=(
-   -e '/^GIT_.*/d'
-   -e 's/$(GO) build/$(GO) build -v -work -x/'
-   -e 's/^\(install:.*\) install\.python$/\1/'
-   -e 's|^pkg/varlink/iopodman.go: .gopathok 
pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: 
pkg/varlink/io.podman.varlink|'
-   )
-
-   has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 
's:GO111MODULE=off:GO111MODULE=on:')
-
-   sed "${makefile_sed_args[@]}" -i Makefile || die
-
-   sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
-   -i hack/get_release_info.sh || die
-}
-
-src_compile() {
-   # Filter unsupported linker flags
-   filter-flags '-Wl,*'
-
-   [[ -f hack/apparmor_tag.sh ]] || die
-   if use apparmor; then
-   echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
-   else
-   echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
-   fi
-
-   [[ -f hack/btrfs_installed_tag.sh ]] || die
-   if use btrfs; then
-   echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
-   else
-   echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-   hack/btrfs_installed_tag.sh || die
-   fi
-
-   [[ -f hack/selinux_tag.sh ]] || die
-   if use selinux; then
-   echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
-   else
-   echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
-   fi
-
-   # Avoid this error when generating pkg/varlink/iopodman.go:
-   # cannot find package "github.com/varlink/go/varlink/idl"
-   mkdir -p _output || die
-   ln -snf ../vendor _output/src || die
-   GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || 
die
-   rm _output/src || die
-
-   export -n GOCACHE GOPATH XDG_CACHE_HOME
-   

[gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/

2021-01-17 Thread Sam James
commit: 6f598b997c21f8c9a93bbc02f9719321fe9012dd
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 00:48:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 00:48:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f598b99

x11-wm/awesome: Stabilize 4.3-r2 amd64, #763861

Signed-off-by: Sam James  gentoo.org>

 x11-wm/awesome/awesome-4.3-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/awesome/awesome-4.3-r2.ebuild 
b/x11-wm/awesome/awesome-4.3-r2.ebuild
index 206d64b0eb2..2cc93d53b2e 100644
--- a/x11-wm/awesome/awesome-4.3-r2.ebuild
+++ b/x11-wm/awesome/awesome-4.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git;
 else

SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz;
-   KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+   KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="A dynamic floating and tiling window manager"



[gentoo-commits] repo/gentoo:master commit in: x11-misc/i3blocks/

2021-01-17 Thread Sam James
commit: 057eefcab67d066f28f6bd87fb185d54223d01f8
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 00:48:07 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 00:48:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=057eefca

x11-misc/i3blocks: Stabilize 1.5 amd64, #765550

Signed-off-by: Sam James  gentoo.org>

 x11-misc/i3blocks/i3blocks-1.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/i3blocks/i3blocks-1.5.ebuild 
b/x11-misc/i3blocks/i3blocks-1.5.ebuild
index 2f997a98be4..9922b9524a9 100644
--- a/x11-misc/i3blocks/i3blocks-1.5.ebuild
+++ b/x11-misc/i3blocks/i3blocks-1.5.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} =  ]]; then
EGIT_REPO_URI="https://github.com/vivien/${PN};
 else
SRC_URI="https://github.com/vivien/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 x86"
+   KEYWORDS="amd64 ~arm64 x86"
 fi
 
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: x11-misc/i3status/

2021-01-17 Thread Sam James
commit: 1dfed03227d9b8d811fd25e4d811e94f98813273
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 00:48:10 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 00:48:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dfed032

x11-misc/i3status: Stabilize 2.13-r1 amd64, #765727

Signed-off-by: Sam James  gentoo.org>

 x11-misc/i3status/i3status-2.13-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/i3status/i3status-2.13-r1.ebuild 
b/x11-misc/i3status/i3status-2.13-r1.ebuild
index 2fcbbaebeb3..eeae885823e 100644
--- a/x11-misc/i3status/i3status-2.13-r1.ebuild
+++ b/x11-misc/i3status/i3status-2.13-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="pulseaudio"
 
 BDEPEND="virtual/pkgconfig"



[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/

2021-01-17 Thread Sam James
commit: 0db1d8bdcd759b37b1e6190eaee89ac963c14149
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 00:40:07 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 00:46:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0db1d8bd

app-text/mupdf: security cleanup

Bug: https://bugs.gentoo.org/747151
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 app-text/mupdf/Manifest|   1 -
 app-text/mupdf/mupdf-1.17.0.ebuild | 144 -
 2 files changed, 145 deletions(-)

diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index e0a595dc861..acda2b0eb4e 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,2 +1 @@
-DIST mupdf-1.17.0-source.tar.xz 48559964 BLAKE2B 
f46b09a6d288054da79bea356df4d7d98fe2759cf82bea1f0df2e961b94acebbab58826f7a731c4c68e8b086fd9367fddcabea6c7d2838f25ed84ddc1a0c2bd9
 SHA512 
39188e6ce3eaefb525b2c32767c4bf52ed881b41889edef086aa64bfe1c38e6f3cb853450c8284d175ef8854f32e9bc67415a692048ead26cf31c35645f9e0e5
 DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B 
d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55
 SHA512 
7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8

diff --git a/app-text/mupdf/mupdf-1.17.0.ebuild 
b/app-text/mupdf/mupdf-1.17.0.ebuild
deleted file mode 100644
index 01332031c1e..000
--- a/app-text/mupdf/mupdf-1.17.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="https://mupdf.com/;
-SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz;
-S="${WORKDIR}/${P}-source"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 
~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="X +javascript libressl opengl ssl"
-
-# Although we use the bundled, patched version of freeglut in mupdf (because of
-# bug #653298), the best way to ensure that its dependencies are present is to
-# install system's freeglut.
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-   >=dev-lang/mujs-1.0.7:=
-   media-libs/freetype:2=
-   media-libs/harfbuzz:=[truetype]
-   media-libs/jbig2dec:=
-   media-libs/libpng:0=
-   >=media-libs/openjpeg-2.1:2=
-   virtual/jpeg
-   opengl? ( >=media-libs/freeglut-3.0.0:= )
-   ssl? (
-   libressl? ( >=dev-libs/libressl-3.2.0:0= )
-   !libressl? ( >=dev-libs/openssl-1.1:0= )
-   )
-   X? (
-   x11-libs/libX11
-   x11-libs/libXext
-   )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.15-CFLAGS.patch
-   "${FILESDIR}"/${PN}-1.15-Makefile.patch
-   "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
-   # See bugs #662352
-   "${FILESDIR}"/${PN}-1.15-openssl-x11.patch
-   "${FILESDIR}"/${PN}-1.16.1-freeglut-fg_gl2-gcc-10.patch
-   # General cross fixes from Debian (refreshed)
-   "${FILESDIR}"/${PN}-1.17.0-cross-fixes.patch
-)
-
-src_prepare() {
-   xdg_src_prepare
-
-   use hppa && append-cflags -ffunction-sections
-
-   use javascript || \
-   sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
-   -i include/mupdf/fitz/config.h || die
-
-   sed -e "1iOS = Linux" \
-   -e "1iCC = $(tc-getCC)" \
-   -e "1iLD = $(tc-getLD)" \
-   -e "1iAR = $(tc-getAR)" \
-   -e "1iverbose = yes" \
-   -e "1ibuild = debug" \
-   -e "1iprefix = ${ED}/usr" \
-   -e "1ilibdir = ${ED}/usr/$(get_libdir)" \
-   -e "1idocdir = ${ED}/usr/share/doc/${PF}" \
-   -i Makerules || die
-}
-
-_emake() {
-   # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
-
-   # Bundled libs
-   # * General
-   # Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to 
upstream's
-   # recommendations. It does not mean "always use system libs".
-   # See [0] below for what it means in a specific version.
-   #
-   # * freeglut
-   # We don't use system's freeglut because upstream has a special modified
-   # version of it that gives mupdf clipboard support. See bug #653298
-   #
-   # * mujs
-   # As of v1.15.0, mupdf started using symbols in mujs that were not part
-   # of any release. We then went back to using the bundled version of it.
-   # But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this 
risk
-   # when bumping and check!
-   # See bug #685244
-   #
-   # * lmms2
-   # mupdf uses a 

[gentoo-commits] repo/gentoo:master commit in: x11-misc/i3status/

2021-01-17 Thread Sam James
commit: 7d0bc105f3ebf4a1596f90b282989c6e0ec7116b
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 00:47:32 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 00:47:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d0bc105

x11-misc/i3status: Stabilize 2.13-r1 x86, #765727

Signed-off-by: Sam James  gentoo.org>

 x11-misc/i3status/i3status-2.13-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/i3status/i3status-2.13-r1.ebuild 
b/x11-misc/i3status/i3status-2.13-r1.ebuild
index 9107ec983b7..2fcbbaebeb3 100644
--- a/x11-misc/i3status/i3status-2.13-r1.ebuild
+++ b/x11-misc/i3status/i3status-2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="pulseaudio"
 
 BDEPEND="virtual/pkgconfig"



[gentoo-commits] repo/gentoo:master commit in: x11-misc/i3blocks/

2021-01-17 Thread Sam James
commit: b579f67504fb5e7cdee2550aabce23ce0e1b6abc
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 00:47:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 00:47:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b579f675

x11-misc/i3blocks: Stabilize 1.5 x86, #765550

Signed-off-by: Sam James  gentoo.org>

 x11-misc/i3blocks/i3blocks-1.5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/i3blocks/i3blocks-1.5.ebuild 
b/x11-misc/i3blocks/i3blocks-1.5.ebuild
index d8ceeacffbb..2f997a98be4 100644
--- a/x11-misc/i3blocks/i3blocks-1.5.ebuild
+++ b/x11-misc/i3blocks/i3blocks-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} =  ]]; then
EGIT_REPO_URI="https://github.com/vivien/${PN};
 else
SRC_URI="https://github.com/vivien/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="~amd64 ~arm64 x86"
 fi
 
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/flatpak/

2021-01-17 Thread Sam James
commit: ffc56295eeb89bd2751a8b68a6efedc63d8f51d7
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 00:47:25 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 00:47:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffc56295

sys-apps/flatpak: Stabilize 1.10.0 x86, #765457

Signed-off-by: Sam James  gentoo.org>

 sys-apps/flatpak/flatpak-1.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/flatpak/flatpak-1.10.0.ebuild 
b/sys-apps/flatpak/flatpak-1.10.0.ebuild
index 50c5ffdbd6c..be7b57cfebd 100644
--- a/sys-apps/flatpak/flatpak-1.10.0.ebuild
+++ b/sys-apps/flatpak/flatpak-1.10.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://flatpak.org/;
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc gtk kde introspection policykit seccomp systemd"
 RESTRICT+=" test"
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/

2021-01-17 Thread Andreas K. Hüttel
commit: e5f553dd8add2ed320be6405a06d23860da9b490
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Mon Jan 18 00:41:20 2021 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Mon Jan 18 00:41:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5f553dd

media-libs/libjpeg-turbo: Adopt for codec project

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 media-libs/libjpeg-turbo/metadata.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-libs/libjpeg-turbo/metadata.xml 
b/media-libs/libjpeg-turbo/metadata.xml
index fa375260076..617cdf8ffdd 100644
--- a/media-libs/libjpeg-turbo/metadata.xml
+++ b/media-libs/libjpeg-turbo/metadata.xml
@@ -1,7 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
+  
+co...@gentoo.org
+Gentoo Codec Project
+  
   
 Reflect ABI of libturbojpeg.so.
   



[gentoo-commits] repo/gentoo:master commit in: profiles/arch/sparc/

2021-01-17 Thread Sam James
commit: e46d114fc8b4a39b3adfba0f4c5a0f519e646a95
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 00:28:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 00:30:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e46d114f

profiles/arch/sparc: stable-mask net-proxy/privoxy[mbedtls]

net-libs/mbedtls isn't stable on sparc right now,
and it doesn't make sense to block stabilisation
for a security bug for a new dependency that's optional.

We also add a package.use entry to avoid REQUIRED_USE
conflicts for users on stable.

Bug: https://bugs.gentoo.org/758428
Signed-off-by: Sam James  gentoo.org>

 profiles/arch/sparc/package.use | 7 +++
 profiles/arch/sparc/package.use.stable.mask | 7 +++
 2 files changed, 14 insertions(+)

diff --git a/profiles/arch/sparc/package.use b/profiles/arch/sparc/package.use
index 4babc96027f..944a4104549 100644
--- a/profiles/arch/sparc/package.use
+++ b/profiles/arch/sparc/package.use
@@ -1,6 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James  (2020-01-18)
+# net-libs/mbedtls is not stable on sparc
+# so, let's enable openssl to avoid
+# REQUIRED_USE default conflicts for users.
+# bug #758428
+net-proxy/privoxy openssl
+
 # Michał Górny  (2016-09-24)
 # Enable the GPU targets matching the default VIDEO_CARDS
 dev-ml/llvm-ocaml llvm_targets_AMDGPU

diff --git a/profiles/arch/sparc/package.use.stable.mask 
b/profiles/arch/sparc/package.use.stable.mask
index 092986b5bb3..f672af78d46 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -1,6 +1,13 @@
 # Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James  (2020-01-18)
+# net-libs/mbedtls is not stable on sparc
+# see also: package.use entry to allow
+# installs for now (+openssl).
+# bug #758428
+net-proxy/privoxy mbedtls
+
 # Sam James  (2021-01-04)
 # Drags in qt which is not stable here
 # bug #763405



[gentoo-commits] repo/gentoo:master commit in: app-doc/devmanual/

2021-01-17 Thread Ulrich Müller
commit: 419daa20fa9d22bf62d3567e13d8897ff7d6560a
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jan 18 00:28:20 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Jan 18 00:29:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=419daa20

app-doc/devmanual: Add missing dependency

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 app-doc/devmanual/devmanual-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-doc/devmanual/devmanual-.ebuild 
b/app-doc/devmanual/devmanual-.ebuild
index 60b6f7e86bd..64dd39240d6 100644
--- a/app-doc/devmanual/devmanual-.ebuild
+++ b/app-doc/devmanual/devmanual-.ebuild
@@ -25,7 +25,8 @@ IUSE="+offline"
 BDEPEND="dev-libs/libxml2
dev-libs/libxslt
gnome-base/librsvg
-   media-fonts/open-sans"
+   media-fonts/open-sans
+   ${PYTHON_DEPS}"
 
 PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch )
 



[gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm64/

2021-01-17 Thread Sam James
commit: 88461007e0c14aef9d474ab92e46bdd9e59a26a4
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 00:11:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 00:11:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88461007

profiles/arch/arm64/make.defaults: Aarch64 -> AArch64

Signed-off-by: Sam James  gentoo.org>

 profiles/arch/arm64/make.defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/arch/arm64/make.defaults 
b/profiles/arch/arm64/make.defaults
index 3fa7f0b1c87..9520c018c0d 100644
--- a/profiles/arch/arm64/make.defaults
+++ b/profiles/arch/arm64/make.defaults
@@ -1,4 +1,4 @@
-# Main ARM64 (Aarch64/ARMv8) profile; endian independent.
+# Main ARM64 (AArch64/ARMv8) profile; endian independent.
 
 ARCH="arm64"
 ACCEPT_KEYWORDS="arm64"



[gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm64/

2021-01-17 Thread Sam James
commit: bd612bb8eefca7178174de0082e329647abd3568
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 00:12:02 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 00:12:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd612bb8

profiles/arch/arm64/package.use.mask: drop trailing whitespace

Signed-off-by: Sam James  gentoo.org>

 profiles/arch/arm64/package.use.mask | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/profiles/arch/arm64/package.use.mask 
b/profiles/arch/arm64/package.use.mask
index 7527d94e22f..a24375cb46e 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -26,8 +26,8 @@ net-proxy/haproxy device-atlas
 media-sound/clementine lastfm
 
 # Roy Bamford  (2020-11-08)



[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/default/linux/

2021-01-17 Thread Sam James
commit: 2fcd5124e01a462c06a2894958cd207e577911ef
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 00:07:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 00:10:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fcd5124

profiles/base: move mask from default linux target

Signed-off-by: Sam James  gentoo.org>

 profiles/base/package.use.mask  | 4 
 profiles/default/linux/package.use.mask | 4 
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index bfe76852067..a696415ab18 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -242,6 +242,10 @@ net-irc/telepathy-idle test
 # libcxxrt is unmaintained and it's going to be removed.
 sys-libs/libcxx libcxxrt
 
+# Alexey Shvetsov  (2019-12-24)
+# Gromacs python module install br0ken
+sci-chemistry/gromacs python
+
 # Brian Evans  (2019-12-19)
 # PHP 7.1 is end of life and has security issues Bug 703326
 # Associated packages are not ready for new versions tracked in bug 702110

diff --git a/profiles/default/linux/package.use.mask 
b/profiles/default/linux/package.use.mask
index bf658379540..3bb3d790136 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Alexey Shvetsov  (2019-12-24)
-# Gromacs python module install br0ken
-sci-chemistry/gromacs python
-
 # Peter Levine  (2019-10-01)
 # Native inotify support is preferred on linux.
 # https://bugs.gentoo.org/697476



[gentoo-commits] repo/gentoo:master commit in: profiles/base/

2021-01-17 Thread Sam James
commit: b9c4e9723ccd6337c6dd4bf371f134969f00481a
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 00:09:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 00:10:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c4e972

profiles/base/package.use.mask: strip trailing whitespace

Signed-off-by: Sam James  gentoo.org>

 profiles/base/package.use.mask | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index a696415ab18..c4db6132b8f 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -70,7 +70,7 @@ x11-libs/colord-gtk doc
  (2020-12-03)
-# Doc building seem to be very random without any predictability, 
+# Doc building seem to be very random without any predictability,
 # bug #734104
 media-gfx/blender doc
 
@@ -115,7 +115,7 @@ net-im/telepathy-connection-managers gadu icq meanwhile 
steam yahoo
 sci-geosciences/viking mapnik
 
 # Joonas Niilola  (2020-09-23)
-# Highly experimental, may cause breakages when updating. Use with 
+# Highly experimental, may cause breakages when updating. Use with
 # caution!
 dev-libs/efl efl-one
 



[gentoo-commits] repo/gentoo:master commit in: profiles/

2021-01-17 Thread Sam James
commit: f86370b1623938cee6abefea0a67248dedabb19f
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 00:05:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 00:10:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f86370b1

profiles/package.mask: strip trailing whitespace

Signed-off-by: Sam James  gentoo.org>

 profiles/package.mask | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 73e00c4369f..7dd19c2c6cb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -41,7 +41,7 @@ games-strategy/0ad
 ~games-strategy/0ad-data-0.0.24_alpha_pre20210116040036
 
 # Jonas Stein  (2021-01-17)
-# Removal in 30 days.  
+# Removal in 30 days.
 # Fails to compile Bug #765697.
 x11-misc/rss-glx
 
@@ -74,9 +74,9 @@ virtual/httpd-php:7.2
 =dev-php/PHP_TokenStream-1.4.11-r1
 
 # Joonas Niilola  (2020-01-07)
-# Eterm's development stopped 2014 and upstream brought to life 
-# its successor, terminology. Eterm is unmaintained in Gentoo with 
-# multiple bugs open for a long time. Switch to any available 
+# Eterm's development stopped 2014 and upstream brought to life
+# its successor, terminology. Eterm is unmaintained in Gentoo with
+# multiple bugs open for a long time. Switch to any available
 # alternative, https://packages.gentoo.org/categories/x11-terms
 # For Esetroot replacement, use feh from media-gfx/feh or wmsetbg
 # from x11-wm/windowmaker.
@@ -84,8 +84,8 @@ virtual/httpd-php:7.2
 x11-terms/eterm
 
 # Joonas Niilola  (2020-01-07)
-# Doesn't compile, no maintainer, EAPI-5. Last version bump 3 years 
-# ago. Use any of the available alternatives, 
+# Doesn't compile, no maintainer, EAPI-5. Last version bump 3 years
+# ago. Use any of the available alternatives,
 # https://packages.gentoo.org/categories/x11-terms
 # Removal in ~30 days. Bug: #764353
 x11-terms/pangoterm



[gentoo-commits] repo/gentoo:master commit in: profiles/

2021-01-17 Thread Sam James
commit: 98b58a567f6fc6c18d23810a0832d2440c929841
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 00:03:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 00:10:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98b58a56

profiles/package.mask: update 0ad mask

Bug: https://bugs.gentoo.org/735352
Signed-off-by: Sam James  gentoo.org>

 profiles/package.mask | 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index e954c837f7a..73e00c4369f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James  (2021-01-18)
+# Older versions: need Python 2
+# Newer versions: ported to Python 3, but need
+# testing on real hardware.
+# bug #735352
+games-strategy/0ad
+~games-strategy/0ad-data-0.0.24_alpha_pre20210116040036
+
 # Jonas Stein  (2021-01-17)
 # Removal in 30 days.  
 # Fails to compile Bug #765697.
@@ -466,16 +474,6 @@ kde-apps/kdebase-meta:5
 =dev-python/pypy3-exe-7.3.3_p37*
 =dev-python/pypy3-exe-bin-7.3.3_p37*
 
-# Michał Górny  (2020-09-09)
-# These packages (or package versions) still require Python 2.7.
-# They are either dead upstream, their Python 3 porting efforts are
-# not progressing or their maintainers are simply unresponsive.
-# Please do not remove any packages from this list unless you actually
-# port them to Python 3.
-# Removal in 30 days.  Please find relevant bugs on tracker bug #694800.
-games-strategy/0ad
-~games-strategy/0ad-data-0.0.24_alpha_pre20210116040036
-
 # Arfrever Frehtes Taifersar Arahesis  (2020-09-01)
 # Mismatched version (bug #695022). Masked to force upgrade to 
2.0.4_pre20200306162733.
 # (Mask should remain after ebuilds are deleted, until 2021-03-01 or



[gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm64/, profiles/default/linux/arm64/

2021-01-17 Thread Sam James
commit: 9b803ccd76865ccb03feb6e55368c12f5ec5a6d7
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 00:06:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 00:10:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b803ccd

profiles/arch/arm64: move mask from default/linux/arm64

Signed-off-by: Sam James  gentoo.org>

 profiles/arch/arm64/package.use.mask  | 4 
 profiles/default/linux/arm64/package.use.mask | 4 
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/profiles/arch/arm64/package.use.mask 
b/profiles/arch/arm64/package.use.mask
index 615d8c37c97..7527d94e22f 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -124,6 +124,10 @@ sys-libs/glibc -static-pie
 # Not keyworded on arm64
 net-misc/whois xcrypt
 
+# Patrick McLean  (2019-03-26)
+# Some test deps aren't keyworded on arm64
+dev-python/kazoo test
+
 # Ettore Di Giacinto  (2016-11-10)
 # Dependency has no stable keyword
 # and as for now we have only stable mate versions

diff --git a/profiles/default/linux/arm64/package.use.mask 
b/profiles/default/linux/arm64/package.use.mask
index 553c46f9d95..31d44370856 100644
--- a/profiles/default/linux/arm64/package.use.mask
+++ b/profiles/default/linux/arm64/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Patrick McLean  (2019-03-26)
-# Some test deps aren't keyworded on arm64
-dev-python/kazoo test
-
 # Mike Frysinger  (2016-05-08)
 # This target supports VTV #547040.
 >=sys-devel/gcc-6 -vtv



[gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools/

2021-01-17 Thread Michał Górny
commit: aabe9e2e27390a3a0f4285b6439f21a5d0519558
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jan 17 23:21:45 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jan 17 23:21:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabe9e2e

dev-python/setuptools: Bump to 51.3.3

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/setuptools/Manifest |  1 +
 dev-python/setuptools/setuptools-51.3.3.ebuild | 62 ++
 2 files changed, 63 insertions(+)

diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 9750163fc12..eab769eb734 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -4,3 +4,4 @@ DIST setuptools-51.1.0.tar.gz 2050951 BLAKE2B 
58890bf458ffab84f93e68393a092c2b2e
 DIST setuptools-51.1.1.tar.gz 2051053 BLAKE2B 
182c8c4b4d3bb8caea8cb1812aaff929d7687942d3c469a7f6e0a68a0c5d3d001be2b42d0d131171815359f2c1d59a7b997c5deab657d2ec99c369c6b27ba03f
 SHA512 
ef08f0ecd0b4a255a8e43c2785c2a1ce76f807322c3358b7955d2ea814f9fa3f52962f7cd0431439ef9ee910fd44922d1be1888c350703031cfcab8db0f60ce7
 DIST setuptools-51.1.2.tar.gz 2051107 BLAKE2B 
a9f1d5dac6bed7b8744f1a3f023398312f6e3696ea68a84bdb252afca3e88b8617ae632384c18cf49906b1ec97f78f467ec158cc09e1842055b5089e154e0429
 SHA512 
cdfdb3c3666239268ab225704d1a887f027c297262521ee8d55af547cbcef0931656997cc86f4f9a871df6028974bd90b9eea6177c02bf34f98297415b9c410f
 DIST setuptools-51.3.1.tar.gz 2057167 BLAKE2B 
4077e117c33c5eaad4de2bc66db0432dc14064de3f4a55e853541b09475bec81b9a07c3baec77a1574ed7912f3db2c6a83b7dcffbbe9bbffb15de13a928e6280
 SHA512 
5ae96ce0595bdaaa86fbe916e79b545db5a18278f150da2a38a83e43e891bbce8d4f03975ef0d7c6138b3ebcdb16fcfa4dae80a970007c8c60683fd57edc998e
+DIST setuptools-51.3.3.tar.gz 2053035 BLAKE2B 
73b33359f10f900233b82e68c91781609665bdecb6b0e2963d7d15a798149c104030cc1e124ee945b23e5fc8db3f573d0b9012cfba7767ff913077af907141e4
 SHA512 
5a3572466a68c6f650111448ce3343f64c62044650bb8635edbff97e2bc7b216b8bbe3b4e3bccf34e6887f3bedc911b27ca5f9a515201cae49cf44fbacf03345

diff --git a/dev-python/setuptools/setuptools-51.3.3.ebuild 
b/dev-python/setuptools/setuptools-51.3.3.ebuild
new file mode 100644
index 000..49b44d46c0d
--- /dev/null
+++ b/dev-python/setuptools/setuptools-51.3.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools 
https://pypi.org/project/setuptools/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+   test? (
+   dev-python/jaraco-envs[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/pip[${PYTHON_USEDEP}]
+   dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+   dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+   dev-python/pytest-xdist[${PYTHON_USEDEP}]
+   >=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+   dev-python/wheel[${PYTHON_USEDEP}]
+   )
+"
+PDEPEND="
+   >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+   dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+python_test() {
+   distutils_install_for_testing --via-root
+   local deselect=(
+   # TODO
+   
setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+   # this one's unhappy about pytest-xdist but one test is not 
worth
+   # losing the speed gain
+   
setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import
+   )
+   # test_easy_install raises a SandboxViolation due to 
${HOME}/.pydistutils.cfg
+   # It tries to sandbox the test in a tempdir
+   HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \
+   -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+   setuptools || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+   export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+   distutils-r1_python_install
+}



[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/, games-engines/devilutionx/files/

2021-01-17 Thread Lars Wendler
commit: c10ee37782c5045e949a2758cdb5fd0e6dbe8aa2
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Jan 17 23:18:08 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Jan 17 23:20:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c10ee377

games-engines/devilutionx: Avoid bundled font again

Bug: https://bugs.gentoo.org/704508
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 .../devilutionx/devilutionx-1.1.0-r1.ebuild| 65 ++
 .../files/devilutionx-1.1.0-no_bundled_font.patch  | 51 +
 2 files changed, 116 insertions(+)

diff --git a/games-engines/devilutionx/devilutionx-1.1.0-r1.ebuild 
b/games-engines/devilutionx/devilutionx-1.1.0-r1.ebuild
new file mode 100644
index 000..913e1f40eef
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.1.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Sometimes build with ninja fails.
+# Please check occasionally if we can revert back to ninja.
+# Latest known issue:
+#
+#CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake desktop
+
+DESCRIPTION="Diablo engine for modern operating systems"
+HOMEPAGE="https://github.com/diasurgical/devilutionX;
+if [[ "${PV}" ==  ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/diasurgical/devilutionX.git;
+else
+   
SRC_URI="https://github.com/diasurgical/devilutionX/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+   S="${WORKDIR}/devilutionX-${PV}"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+
+IUSE="debug lto"
+
+RDEPEND="
+   dev-libs/libsodium
+   media-fonts/sil-charis
+   media-libs/libsdl2[haptic]
+   media-libs/sdl2-mixer
+   media-libs/sdl2-ttf
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-1.1.0-no_bundled_font.patch" #704508
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DASAN="OFF"
+   -DDEBUG="$(usex debug)"
+   -DDISABLE_LTO="$(usex !lto)"
+   -DDIST="ON"
+   -DUBSAN="OFF"
+   )
+   cmake_src_configure
+
+   # Build system still doesn't reliably set release version in the build
+   sed "/PROJECT_VERSION/s@-@${PV}@" -i "${BUILD_DIR}/config.h" || die
+}
+
+pkg_postinst() {
+   einfo "In order to play the game you need to install the file"
+   einfo "  diabdat.mpq"
+   einfo "from the original game CD into the following directory:"
+   einfo "  \${HOME}/.local/share/diasurgical/devilution/"
+}

diff --git 
a/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch 
b/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
new file mode 100644
index 000..7944a8221d2
--- /dev/null
+++ b/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/704508
+
+--- devilutionX-1.1.0/CMakeLists.txt
 devilutionX-1.1.0/CMakeLists.txt
+@@ -298,7 +298,6 @@
+   SourceX/main.cpp
+   SourceX/devilutionx.exe.manifest
+   Packaging/macOS/AppIcon.icns
+-  Packaging/resources/CharisSILB.ttf
+   Packaging/windows/devilutionx.rc)
+ 
+ if(NOT NONET)
+@@ -339,9 +338,6 @@
+ 
+ add_executable(${BIN_TARGET} WIN32 MACOSX_BUNDLE ${devilutionx_SRCS})
+ 
+-# Copy the font to the build directory to it works from the build directory
+-file(COPY "Packaging/resources/CharisSILB.ttf" DESTINATION 
"${CMAKE_CURRENT_BINARY_DIR}")
+-
+ # Use file GENERATE instead of configure_file because configure_file
+ # does not support generator expressions.
+ get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+@@ -563,7 +559,6 @@
+ 
+ if(APPLE)
+   set_source_files_properties("./Packaging/macOS/AppIcon.icns" PROPERTIES 
MACOSX_PACKAGE_LOCATION Resources)
+-  set_source_files_properties("./Packaging/resources/CharisSILB.ttf" 
PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+   set(MACOSX_BUNDLE_GUI_IDENTIFIER com.diasurgical.devilutionx)
+   set(MACOSX_BUNDLE_COPYRIGHT Unlicense)
+   set(MACOSX_BUNDLE_BUNDLE_NAME devilutionx)
+@@ -624,9 +619,6 @@
+   DESTINATION "share/icons/hicolor/512x512/apps"
+   RENAME "${project_name}.png"
+ )
+-install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/CharisSILB.ttf"
+-  DESTINATION "share/fonts/truetype"
+-)
+ 
+ # -G DEB
+ set(CPACK_PACKAGE_CONTACT "and...@jenbo.dk")
+--- devilutionX-1.1.0/SourceX/DiabloUI/fonts.h
 devilutionX-1.1.0/SourceX/DiabloUI/fonts.h
+@@ -11,7 +11,7 @@
+ #endif
+ 
+ #ifndef TTF_FONT_NAME
+-#define TTF_FONT_NAME "CharisSILB.ttf"
++#define TTF_FONT_NAME "CharisSIL-B.ttf"
+ #endif
+ 
+ namespace dvl {



[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/

2021-01-17 Thread Lars Wendler
commit: 4c3c1f142e58787c09900e790080cccf2f512174
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Jan 17 23:20:09 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Jan 17 23:20:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c3c1f14

games-engines/devilutionx: Synced live ebuild

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 games-engines/devilutionx/devilutionx-.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/games-engines/devilutionx/devilutionx-.ebuild 
b/games-engines/devilutionx/devilutionx-.ebuild
index 3966e9a6b14..913e1f40eef 100644
--- a/games-engines/devilutionx/devilutionx-.ebuild
+++ b/games-engines/devilutionx/devilutionx-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,6 +29,7 @@ IUSE="debug lto"
 
 RDEPEND="
dev-libs/libsodium
+   media-fonts/sil-charis
media-libs/libsdl2[haptic]
media-libs/sdl2-mixer
media-libs/sdl2-ttf
@@ -38,6 +39,10 @@ BDEPEND="
virtual/pkgconfig
 "
 
+PATCHES=(
+   "${FILESDIR}/${PN}-1.1.0-no_bundled_font.patch" #704508
+)
+
 src_configure() {
local mycmakeargs=(
-DASAN="OFF"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/go/

2021-01-17 Thread William Hubbs
commit: df46887c0bb287b8074a835faf7057ab613ddade
Author: William Hubbs  gentoo  org>
AuthorDate: Sun Jan 17 22:27:56 2021 +
Commit: William Hubbs  gentoo  org>
CommitDate: Sun Jan 17 22:34:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df46887c

dev-lang/go: remove 1.14.12 and 1.15.5

Signed-off-by: William Hubbs  gentoo.org>

 dev-lang/go/Manifest  |   2 -
 dev-lang/go/go-1.14.12.ebuild | 203 --
 dev-lang/go/go-1.15.5.ebuild  | 203 --
 3 files changed, 408 deletions(-)

diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 1ab9b22ace1..5adbdb1ef2d 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,4 +1,2 @@
-DIST go1.14.12.src.tar.gz 22553834 BLAKE2B 
f2b3f750cc451c00376846962a5337c8e57aa9f4f737c7a8ab826772547ca0677bb3c6e52d004259f7e53d49efb013f645ce5223241fd29b35121149dc09a76c
 SHA512 
cba26b97878d5bd57d75bd1541932786779ddb7e9fa0bfb7bf003c7ae9e7bee8318c0d2108ce918453b863892b8f562e481bd0ed6cfc44e43d901522603adff2
 DIST go1.14.13.src.tar.gz 22553900 BLAKE2B 
35aed1c43a59e06c1d5feaa91a6c4120c586958257cb3e4f83ab4e767159e20ae953d70bc0debabd80722bca0965d1b129531a2bd89f558df0a8700cadc09edc
 SHA512 
b54a0bc3b85809a78d4704fe2e97ad7417a2027608ec0f90c2784e2ddb28b505df3cda862dc6f1b99af2d136363cbb9b120e2fd6ed985cb300c43f8e539a5e28
-DIST go1.15.5.src.tar.gz 23019303 BLAKE2B 
549f0e9c4e22432db7a1c6e06724d6ada0ac90c09c0886d3053296390d85686df89bcaff86c703e8a2789119f670ffb2c6c11f4bf7e186c14a75896e8e6b8c6e
 SHA512 
8e1d71f628d364b949b1e124af8950a563bbe9d9ae73b94c66af6ce029f67c26e2654556c0c118d0bc8566af52a7e9ed736b4667bbef7ccdab2bd338c43e6eb4
 DIST go1.15.6.src.tar.gz 23019337 BLAKE2B 
d328401af9843f4a099dee7d82433ad2a0b349add0f2ecb609635814cca610e17a6fc50215e9928b8cb0d8ea8dd6ae9d84ffca125e1362dfb18ba08783bb4264
 SHA512 
f20e495204f32170d6554e8f4b64763dae8302a7859005020f650d1d53a5b15de3afbaff28e0b6418287396166c67bdc4c6bee7a0fd7ba8a87bb79b6c1d38326

diff --git a/dev-lang/go/go-1.14.12.ebuild b/dev-lang/go/go-1.14.12.ebuild
deleted file mode 100644
index 7c0569dd4b0..000
--- a/dev-lang/go/go-1.14.12.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-**)
-   EGIT_REPO_URI="https://github.com/golang/go.git;
-   inherit git-r3
-   ;;
-*)
-   SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-   S="${WORKDIR}"/go
-   case ${PV} in
-   *_beta*|*_rc*) ;;
-   *)
-   KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux 
~x86-linux ~x64-macos ~x64-solaris"
-   ;;
-   esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org;
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-
-BDEPEND="|| (
-   dev-lang/go
-   dev-lang/go-bootstrap )"
-RDEPEND="!https://golang.org/issue/2775
-   #
-   # deliberately use cp to retain permissions
-   cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-   # testdata directories are not needed on the installed system
-   rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-   if go_cross_compile; then
-   bin_path="bin/$(go_tuple)"
-   else
-   bin_path=bin
-   fi
-   for x in ${bin_path}/*; do
-   f=${x##*/}
-   dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-   done
-   einstalldocs
-
-   if [[ ${CHOST} == *-darwin* ]] ; then
-   # fix install_name for test object (binutils_test) on Darwin, it
-   # is never used in real circumstances
-   local 
libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
- 
libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-   install_name_tool -id "${libmac64}" "${D}${libmac64}"
-   fi
-}
-
-pkg_postinst() {
-   [[ -z ${REPLACING_VERSIONS} ]] && return
-   has_version "https://bugs.gentoo.org/752153 for more info"
-}

diff --git a/dev-lang/go/go-1.15.5.ebuild b/dev-lang/go/go-1.15.5.ebuild
deleted file mode 100644
index 7c0569dd4b0..000
--- a/dev-lang/go/go-1.15.5.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-**)
-   EGIT_REPO_URI="https://github.com/golang/go.git;
-   inherit git-r3
-   ;;
-*)
-   SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-   S="${WORKDIR}"/go
-   case ${PV} in
-   

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel/

2021-01-17 Thread Michał Górny
commit: 93bf28b45f40d56e357376ea1a2fd44591d88f8b
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jan 17 20:40:21 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jan 17 22:30:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93bf28b4

sys-kernel/gentoo-kernel: Bump to 5.4.90

Signed-off-by: Michał Górny  gentoo.org>

 sys-kernel/gentoo-kernel/Manifest  |  2 +
 .../gentoo-kernel/gentoo-kernel-5.4.90.ebuild  | 96 ++
 2 files changed, 98 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 06a3b7f7afe..ef756e0afa0 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -24,6 +24,8 @@ DIST genpatches-5.4-90.base.tar.xz 2956112 BLAKE2B 
e0ba7a4fed329f452cb754ee4fcd2
 DIST genpatches-5.4-90.extras.tar.xz 1772 BLAKE2B 
557c305f86b0b6d5a93c1ca2da7751362f55d385cb4f57df12f15258d5cdcb1a0ad2c99c9ce53ba89b6c27abe761d5033ce54fa97ca6eaacbd845244d6b20d8b
 SHA512 
eb2fc3f76099bd504f8e0cdf3c0aca60aa083b5c055e06fa2560e895278aa7d32f518ab2e671f9d0182e713ec6807552843448a38d633a4051b926ae4fd2adc4
 DIST genpatches-5.4-91.base.tar.xz 2975372 BLAKE2B 
6385731a166348210c96f8ad6a8134e5548eb482fcc3a0b40b4421c88c1109bd302f678adf5bc0e5effc574a8574f40e90012bbf31e5087cd0db4f0e8183fd0b
 SHA512 
77b00ca6b7956801b78687c356d4c07320ea5d291c3534c4dad5de2bf9e14ad948050c51191ba0943fdaefa66594acbd6af96ac87f101d205568a5071efaed55
 DIST genpatches-5.4-91.extras.tar.xz 1772 BLAKE2B 
d7440a80cd6d994cc853f54f5f4c4708f203fd625b99c9b9431cbecc2206dd335f0710dc6364b658e246eaa8e758a65bdb6daa45cd795f06a6f963853a7be04d
 SHA512 
63317305324b862fdd70bb2955504795d4764f9e90fb74953d40ecd8c0201114b1bfe11fea96a97471011b35d72f16234de7c0540f466e8e510a69e7047e3ffd
+DIST genpatches-5.4-92.base.tar.xz 2987648 BLAKE2B 
ffdccfc93b1b759494cd3adf2496e2074e847c46ec1c9dfdab32d3a7dfaf5a334df0391ba7ccb35250c562a529df8ae2784656628e110887b593536ac6b0d3ea
 SHA512 
d2c08ecebcabaeb658407626c71c98201f86cf6510c4906b37f45d0f9fd6677b709fbdd9a1ce16622632c9a2e72a11d93463bdae62c5d8d0655c999223909e51
+DIST genpatches-5.4-92.extras.tar.xz 1768 BLAKE2B 
41cca01e9893db97ab1c7bc920d3240b3aec6207ff6516b346a87f24b47811077d7bbbdca49ed267238af4f5eeb2e8e0de03c946fb6f3784a08bdde348a5a64b
 SHA512 
bb88a3c13a4335b93eb1ded903696e63ffa87b0a1dc587f464335fe077623abc36831fe514f33737960328ec765c5c0bf5489e84dff3fc6ae37ab2e1cd61d94e
 DIST gentoo-kernel-config-5.10.7.tar.gz 1146 BLAKE2B 
f755581e9f3be3122e5f6e6fc133d3e5c3116d4580b53f95ff5b2cee5150233fe82be5cd45637a9792ae4612be5d2cb4dd954506f97fe82c9e96cb8b772cb342
 SHA512 
8c64768e83d2552e69a29c6c3f958ef6a1e5a767acd04b3bfcd0cd49453ab5d0aa54fcfee76a8c9d07f72abdbf70380b070e3d1584e7b7d05a6daa3399892f51
 DIST gentoo-kernel-config-5.4.77-r1.tar.gz 1289 BLAKE2B 
6612741cfbf458f4bd8915b476aac3aa6934e8bbab344da877fa4ad52b6133e01f5d44bf0e5d048e79e56c1a351774135ee55f1aa839b230e2418db7c5d9b123
 SHA512 
2a09dd85af37447b278847aeaad114ef47470726cec015ed5ee1b54b3080f4b2c48de8b2f7b817eeb4e27c753579cf0820053e22caa762cb1552116d8d69eba0
 DIST gentoo-kernel-config-5.4.89.tar.gz 1240 BLAKE2B 
50bd2e64eb1a62d2f0d67e02b78da56cb507fd7a5993d663b880c94ecd535898285ed01e00d5d07fc1ba0d044657e776456736d8fdcacecf7ca464979a8a1d06
 SHA512 
ad31f9895b9dd45edd7f8715516edfc303c23600f243f3ca122c7c554c9fdbe3c3aa62970a24ef7291d7937e04c63c0258f6348e796686902a011c055c1bed01

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.90.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.90.ebuild
new file mode 100644
index 000..e8748c9098f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.90.ebuild
@@ -0,0 +1,96 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.89
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/;
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 
1).x/${MY_P}.tar.xz
+   
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+   
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+   
https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+   -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+   amd64? (
+   
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+   -> kernel-x86_64.config.${CONFIG_VER}
+   )
+   arm64? (
+   
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+   -> kernel-aarch64.config.${CONFIG_VER}
+   )
+   ppc64? (
+   

[gentoo-commits] repo/gentoo:master commit in: virtual/dist-kernel/

2021-01-17 Thread Michał Górny
commit: 076b8bb05d1b4848a7039fa68158b6f57c4b2fb0
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jan 17 20:40:22 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jan 17 22:30:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=076b8bb0

virtual/dist-kernel: Bump to 5.4.90

Signed-off-by: Michał Górny  gentoo.org>

 virtual/dist-kernel/dist-kernel-5.4.90.ebuild | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/virtual/dist-kernel/dist-kernel-5.4.90.ebuild 
b/virtual/dist-kernel/dist-kernel-5.4.90.ebuild
new file mode 100644
index 000..11d6573ded7
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.90.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+   || (
+   ~sys-kernel/gentoo-kernel-${PV}
+   ~sys-kernel/gentoo-kernel-bin-${PV}
+   ~sys-kernel/vanilla-kernel-${PV}
+   )"



[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel-bin/

2021-01-17 Thread Michał Górny
commit: b5769b5ee564928eb264385a7e92fe5abbd1406b
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jan 17 22:18:09 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jan 17 22:30:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5769b5e

sys-kernel/gentoo-kernel-bin: Bump to 5.4.90

Signed-off-by: Michał Górny  gentoo.org>

 sys-kernel/gentoo-kernel-bin/Manifest  |  2 +
 .../gentoo-kernel-bin-5.4.90.ebuild| 55 ++
 2 files changed, 57 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index 5463ec2a929..8c38664f350 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -33,3 +33,5 @@ DIST gentoo-kernel-5.4.88-1.x86.xpak 52893703 BLAKE2B 
dec54ce2650c69ef3a558b6ab6
 DIST gentoo-kernel-5.4.89-1.amd64.xpak 61058877 BLAKE2B 
212ddf9eaa4dcc2633536fec9671fb7931225763a82f2c7eaff109745e6ec3eb7fb82a35604e23d66a881b8b8510ed81458f46aa45535fff2b5c889e435d4b7d
 SHA512 
aabdb8c8541adef9b8c3da26213d5256a6846a5cf375945489bcd3b2c46bba4d6649f2c912deb2cfa8a2495f7cb233ee5b02702c6953d42d6a04fbf93b1814ca
 DIST gentoo-kernel-5.4.89-1.arm64.xpak 56269701 BLAKE2B 
966bfcdb6fda5680e6e11f85ec04f52b82d9a51822dcd19639e862727846a63e15f7a99fe4d681fc4030a044a525fca06c76e9ba1bf637e04f271e72eb5316f0
 SHA512 
aab0e8af373b495fd1dd941be8861159d8ee734d7e94d4cad4c06444ec042451324e35e8b1351a401b9fc8dfdad9ee3f108e663259ce054d868ac0918a0f705e
 DIST gentoo-kernel-5.4.89-1.x86.xpak 52893729 BLAKE2B 
10ab4e0b343cfc5803a72a0328854cb566dbceb44f5b4af3e20d082850ed819ff9e2c44e4cc5e814a55172185466842197553506bc78c89692ca8cabfae26e42
 SHA512 
a2906c0f4958a8c1baca27da81ec04d10161a92e8c95692fe91bf08572d899221ec07a13d6dd908e984abe9b639f76fb77a5b76382bcaa74f7942f6cf007f573
+DIST gentoo-kernel-5.4.90-1.amd64.xpak 61093793 BLAKE2B 
3230b63cfd81a4b9ab3721f3288fe92d87578fed12ee0b9e9ffa677a1373a3c4d62003d47bc08d6e3ca27d8bd121cf904bc59de2267f684ff36e976cb75d3c68
 SHA512 
430153300290d9900b9418518452b4a0d35fd8ab91c74b48fff52ea35ef0d8fa70212752d3666ac9e3faae8880b0849f7839633858b91656f2541b10ead63861
+DIST gentoo-kernel-5.4.90-1.x86.xpak 52894045 BLAKE2B 
53e8bf765625298041c5f2e2d47ac7f9c5f34e40acae62b43a895aaf2285c3a9bc2bdc841ecc9b0da731522fb9fe32e6ff4461ba9ad57a8ea040ff45c96501a1
 SHA512 
89f51dd4e420dd75063c0b7ea15dec896dfe25cc64dea3bcaf8fd9362b34a6ef57c5155a248f59cc89162c66d81383bcc2194ccd2a23c6bbde457e61ea8b7298

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.90.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.90.ebuild
new file mode 100644
index 000..b8eb2c63573
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.90.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/;
+SRC_URI+="
+   amd64? (
+   
https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+   -> ${MY_P}.amd64.xpak
+   )
+   x86? (
+   
https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+   -> ${MY_P}.x86.xpak
+   )"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   !sys-kernel/gentoo-kernel:${SLOT}
+   !sys-kernel/vanilla-kernel:${SLOT}
+   !sys-kernel/vanilla-kernel-bin:${SLOT}"
+PDEPEND="
+   >=virtual/dist-kernel-${PV}"
+
+QA_PREBUILT='*'
+
+pkg_pretend() {
+   ewarn "Starting with 5.4.52, Distribution Kernels are switching from 
Arch"
+   ewarn "Linux configs to Fedora.  Please keep a backup kernel just in 
case."
+
+   kernel-install_pkg_pretend
+}
+
+src_unpack() {
+   ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+   tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+   eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+   kernel-install_test "${PV}" \
+   "${WORKDIR}/usr/src/linux-${PV}/$(dist-kernel_get_image_path)" \
+   "lib/modules/${PV}"
+}
+
+src_install() {
+   mv * "${ED}" || die
+}



[gentoo-commits] repo/gentoo:master commit in: xfce-extra/xfce4-pulseaudio-plugin/

2021-01-17 Thread Michał Górny
commit: 3e9cf151d8aac19010f2244112c89d24b361f5f0
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jan 17 22:02:17 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jan 17 22:30:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e9cf151

xfce-extra/xfce4-pulseaudio-plugin: Enable keybinder by default

Bug: https://bugs.gentoo.org/765595
Signed-off-by: Michał Górny  gentoo.org>

 ...udio-plugin-0.4.3.ebuild => xfce4-pulseaudio-plugin-0.4.3-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild 
b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3-r1.ebuild
similarity index 97%
rename from 
xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild
rename to 
xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3-r1.ebuild
index 926604491db..e341432ec56 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild
+++ b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2;
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
-IUSE="debug keybinder libnotify wnck"
+IUSE="+keybinder libnotify wnck"
 
 RDEPEND=">=dev-libs/glib-2.42.0:=
media-sound/pulseaudio:=



[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel-bin/

2021-01-17 Thread Michał Górny
commit: 257bbb0a0a450805b8703806d71788737a1f57cc
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jan 17 22:18:11 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jan 17 22:30:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=257bbb0a

sys-kernel/gentoo-kernel-bin: Bump to 5.10.8

Signed-off-by: Michał Górny  gentoo.org>

 sys-kernel/gentoo-kernel-bin/Manifest  |  2 +
 .../gentoo-kernel-bin-5.10.8.ebuild| 48 ++
 2 files changed, 50 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index 8c38664f350..08a8027c66e 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -13,6 +13,8 @@ DIST gentoo-kernel-5.10.6-1.x86.xpak 57273410 BLAKE2B 
1853ffb277f195e37143871737
 DIST gentoo-kernel-5.10.7-1.amd64.xpak 64335956 BLAKE2B 
c0f22c44fc7adf6e013cb52f5aa92c444f5fcde27eb47eb9ed900e04a91beaeab1524d15b42ec3ecafbf3d2db82ff8aca8a3016ae602e5f83882dc42380b7179
 SHA512 
b5969f1c6fed830dc8e61fc027549c427dd880dfd780477625697aa0f3efdeb3d0723e086abc6a71cc93144993230c1aecc1c29f343aadf7180c3a211fa2094a
 DIST gentoo-kernel-5.10.7-1.arm64.xpak 59756733 BLAKE2B 
d9b6c4e2efc029f4ceafca616fe8f726029e6596188527a1f82a578dbbde4b53008667fadd1d24fe392d341659b64de626868e751ec0aa0e7c815ee9044533fd
 SHA512 
653ec9a703a70e3b93890ffeccc3ca9f25da473e05d0ceb63854eadc386c19822fd66b8637b92d114c22a328c4e5e7dd8eb542f7b3c98128d963e319d9a4204e
 DIST gentoo-kernel-5.10.7-1.x86.xpak 57282477 BLAKE2B 
743d2bb10de76025510a307f938de4cd6f08849ffd0c6e2d8b1b148d63cb718efd3cceb2e72ceb32a4a940050637683bdb49ec63caee9018d7aaaf4b99a18d81
 SHA512 
b30a17fbd6852a107a98501b6229b9c62221b2d4aaacc67afb88ab992130c9247b14a538b2f222db6816cbf05be42dc7ae4023b24558d1ae5a4ce15d042f2fba
+DIST gentoo-kernel-5.10.8-1.amd64.xpak 64351138 BLAKE2B 
7518aea3dff97debfd4ce1d3670c4d388b0ee66c865144c87b7d68bc735f0c6861980316357d76b9981169c082bb7fa443bd8c652fabe85ff69280d5455b
 SHA512 
0c9b7790f7fee0f70dc7553bc5a1d279021769be6e975e936942ca468828a3215e75986ec7d05f573f4bb1c90697c52d36ade5c8b2f3f7586c64dc38b4e3e51f
+DIST gentoo-kernel-5.10.8-1.x86.xpak 57271496 BLAKE2B 
f141f9eac74d497327e39456fd346a810334b05e5f3b19ae1cf3b8e27297a412038165ec93a0bea42c46b712ec91bf9b3d51d3c452e7f34dcad0d338fda647a4
 SHA512 
ec84d1bc50def3bcad74a2f0f8555e120a91f8fd8c2df334faa73f7ef3e00f9ff34815124a124481751609b94e844c4e7946eeb6199abf729058f5c7b4ee0943
 DIST gentoo-kernel-5.4.80-r1-1.amd64.xpak 61053571 BLAKE2B 
24eebf676e1824b01aa6b75963ff8afe25e797afe90440016f4675e8385e1d6b1a04aa662d7c92217af97d56d79f9631a84c2a271b005b5ea7ad71bb8637d941
 SHA512 
ea99729ee68a44f6b5081e0d81dd7d5abbb50482eda8c4e435d6ee997572362de09d7c813da2ecf1aac4ed299feb73205bcff7d4d359793889690ce07cfb057f
 DIST gentoo-kernel-5.4.80-r1-1.x86.xpak 52880910 BLAKE2B 
f94a7bbdcdbd383e919f2542251d2552e50e34264ab495a43d75e28dab881162f2549b48383b32a3b2a813a192b7d9f602eaa8210085733ac123e2246e6a285b
 SHA512 
3b5dd91103461306f4a4ea4554792d4cdabedba6165de119523b927abb2009adc7d554f23110ddeac1a1add69b2d1674b7b87b93b1e1b186a2594174808dd9d2
 DIST gentoo-kernel-5.4.83-1.amd64.xpak 61015400 BLAKE2B 
73527460e0c430a23c8221f8a736416ef6c3ff0ab93d017096456e72bd6c2c88e2a631bd18b2f995bc929f918e9b5a59aa033119a534a985ae1e33d39ff48790
 SHA512 
53dbb9fe6d940bd93eeb35c93bb869931f8f423f6c3997433030bede0b0c11dde478e391ff372ff252771a1bb32207cefbfb478f79715ba2ee3910016087bd87

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.8.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.8.ebuild
new file mode 100644
index 000..31b6fee9f81
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/;
+SRC_URI+="
+   amd64? (
+   
https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+   -> ${MY_P}.amd64.xpak
+   )
+   x86? (
+   
https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+   -> ${MY_P}.x86.xpak
+   )"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   !sys-kernel/gentoo-kernel:${SLOT}
+   !sys-kernel/vanilla-kernel:${SLOT}
+   !sys-kernel/vanilla-kernel-bin:${SLOT}"
+PDEPEND="
+   >=virtual/dist-kernel-${PV}"
+
+QA_PREBUILT='*'
+
+src_unpack() {
+   ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+   tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+   eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+   kernel-install_test "${PV}" \
+   "${WORKDIR}/usr/src/linux-${PV}/$(dist-kernel_get_image_path)" \
+ 

[gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-meta/

2021-01-17 Thread Michał Górny
commit: 281cbb133f012639466b73ef99b08f27e9a454a6
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jan 17 22:02:53 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jan 17 22:30:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=281cbb13

xfce-base/xfce4-meta: Use xfce4-pulseaudio-plugin only

Closes: https://bugs.gentoo.org/765595
Signed-off-by: Michał Górny  gentoo.org>

 .../{xfce4-meta-4.16-r1.ebuild => xfce4-meta-4.16-r2.ebuild} | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.16-r1.ebuild 
b/xfce-base/xfce4-meta/xfce4-meta-4.16-r2.ebuild
similarity index 91%
rename from xfce-base/xfce4-meta/xfce4-meta-4.16-r1.ebuild
rename to xfce-base/xfce4-meta/xfce4-meta-4.16-r2.ebuild
index 2cf5d6c4930..eb803863e76 100644
--- a/xfce-base/xfce4-meta/xfce4-meta-4.16-r1.ebuild
+++ b/xfce-base/xfce4-meta/xfce4-meta-4.16-r2.ebuild
@@ -32,9 +32,6 @@ RDEPEND="x11-themes/hicolor-icon-theme
media-fonts/dejavu
virtual/freedesktop-icon-theme
)
-   pulseaudio? (
-   xfce-extra/xfce4-pulseaudio-plugin
-   xfce-extra/xfce4-volumed-pulse
-   )
+   pulseaudio? ( xfce-extra/xfce4-pulseaudio-plugin )
svg? ( gnome-base/librsvg )
upower? ( >=xfce-extra/xfce4-power-manager-4.16 )"



[gentoo-commits] repo/gentoo:master commit in: virtual/dist-kernel/

2021-01-17 Thread Michał Górny
commit: 33259d85b5fe73c0191afb557877fee868efe65e
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jan 17 20:40:57 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jan 17 22:30:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33259d85

virtual/dist-kernel: Bump to 5.10.8

Signed-off-by: Michał Górny  gentoo.org>

 virtual/dist-kernel/dist-kernel-5.10.8.ebuild | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/virtual/dist-kernel/dist-kernel-5.10.8.ebuild 
b/virtual/dist-kernel/dist-kernel-5.10.8.ebuild
new file mode 100644
index 000..3df38272de3
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.8.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+   || (
+   ~sys-kernel/gentoo-kernel-${PV}
+   ~sys-kernel/gentoo-kernel-bin-${PV}
+   ~sys-kernel/vanilla-kernel-${PV}
+   )"



[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel/

2021-01-17 Thread Michał Górny
commit: f9e47019ecf3abe699a6a9134f72ce8e38b176b1
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jan 17 20:40:56 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jan 17 22:30:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9e47019

sys-kernel/gentoo-kernel: Bump to 5.10.8

Signed-off-by: Michał Górny  gentoo.org>

 sys-kernel/gentoo-kernel/Manifest  |  2 +
 .../gentoo-kernel/gentoo-kernel-5.10.8.ebuild  | 89 ++
 2 files changed, 91 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index ef756e0afa0..23b8100c4d7 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,3 +1,5 @@
+DIST genpatches-5.10-10.base.tar.xz 303380 BLAKE2B 
61d1378cbde5f4df5ee41d2a3391705279e647410125350a2329c6448357617cc93e1acb7f8af4cb43869ff11b6759caa3652242b52feeb8ce2aa2c36c26260a
 SHA512 
9d9bd200682a6cd92e067024e42bdb80347e7083a698d2aa135de34998a80454130ac82ab49018e538197d35f48fdfb0e60827a219e2d6844e221450b86b9ada
+DIST genpatches-5.10-10.extras.tar.xz 1768 BLAKE2B 
cabeb1ebfbd545382a8bd7fe89ca78d58665848b86a5b25519c2d018720d04253847824d4059308b80edfe137383d26c89491c15be8efe86b95dcc184d3f35e0
 SHA512 
1e7c37441d3324c961d8d55eda3e43afed64cdbb45f2080673ab888b65b3b93c5f74495d8a3a53197b17f9d07f01cfc84a0b1719e5f3cd93652a512b9be536e4
 DIST genpatches-5.10-5.base.tar.xz 19928 BLAKE2B 
6fe55e2d7b32871600fc8d97b644e22797dac42450512c9d35f9d7f1eb72671bdc4e71ae22dbc178d1fed479ce2c8d908e77087da9c9eff90ce0b9536e89d0cf
 SHA512 
dc9f536c40259a584041a72e8aebd6c38e94645ba2a25d05da76c254be0d1d959a45245e9645c876fb44a00887e8730c94c14bd7bb81cc194260f0688fecd3ac
 DIST genpatches-5.10-5.extras.tar.xz 1772 BLAKE2B 
1c475a58e71f1d029676d627e31859d93970b59d300106dfb24839bec1545dc5f9185ae802c325f5f0f76bdfa9bec27514d8aa9c61388b5ff76b2ada1d742edd
 SHA512 
96aad42f563cb5eab9944b660d51639c2ac30e9c4a5f4742796c5084d22dacf2789226cb7df804aad5b9450f5715945632bae1df6f22183eb6ab38494e16527c
 DIST genpatches-5.10-6.base.tar.xz 203736 BLAKE2B 
9bc25d288cf6f0b7c8b93518484a3bdb4324627813ad4b03c4a8189637776b6a142bc1168ff34d0e50c539887a17d4ae26647cb508dee64de010407567b9107a
 SHA512 
0314a323a35cd98d736010753dea6a267fefee0d648ca66f5cabafbbd760a6e2424ec86785c1a1d3da7b933afba01a09f13d9af73e2cd1b8303e9912e81cc28e

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.8.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.8.ebuild
new file mode 100644
index 000..57b838f8aba
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.8.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.7
+CONFIG_HASH=b238267df7cd80dc3aa6b5b654cbe145367383df
+GENTOO_CONFIG_VER=5.10.7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/;
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 
1).x/${MY_P}.tar.xz
+   
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+   
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+   
https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+   -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+   amd64? (
+   
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+   -> kernel-x86_64-fedora.config.${CONFIG_VER}
+   )
+   arm64? (
+   
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+   -> kernel-aarch64-fedora.config.${CONFIG_VER}
+   )
+   ppc64? (
+   
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+   -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+   )
+   x86? (
+   
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+   -> kernel-i686-fedora.config.${CONFIG_VER}
+   )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+   !sys-kernel/vanilla-kernel:${SLOT}
+   !sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+   debug? ( dev-util/dwarves )"
+PDEPEND="
+   >=virtual/dist-kernel-${PV}"
+
+src_prepare() {
+   local PATCHES=(
+   # meh, genpatches have no directory
+   "${WORKDIR}"/*.patch
+   )
+   default
+
+   # prepare the default config
+   case ${ARCH} in
+   amd64)
+   cp 
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" 

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/

2021-01-17 Thread Michał Górny
commit: a60377994a572342cf049b6962c458d457e8ca03
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jan 17 20:40:45 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jan 17 22:30:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6037799

sys-kernel/vanilla-kernel: Bump to 5.10.8

Signed-off-by: Michał Górny  gentoo.org>

 sys-kernel/vanilla-kernel/Manifest |   2 +
 .../vanilla-kernel/vanilla-kernel-5.10.8.ebuild| 100 +
 2 files changed, 102 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 9b1eec7ce91..62d7c593248 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -24,6 +24,8 @@ DIST linux-5.10.6.tar.sign 989 BLAKE2B 
3ae45a240fd1072e177c4638b8da2147b7a76e190
 DIST linux-5.10.6.tar.xz 116617788 BLAKE2B 
2da9e47f6524ecb50db9f515b9f281f08fbcb323f6e4ddb225c2b2f6379787c37efee25589e49286e13ff663c414a422b680912739400afab89f0ebaf741d33b
 SHA512 
fbf4442b9acda111de40de59a5809a6609edc12896a2067f1a7c8cabee7458e6705ad40d3f6734ac39f2c71cfe6db3161a79c830236470632b743a384f721384
 DIST linux-5.10.7.tar.sign 989 BLAKE2B 
b6c0f9ede022691159e3b8d85f1ac96435485e05b68420e84050970eea94570c04ebbe4e1a6bc5b67944aa693271e4fbe19a95c85e61fedd6b0e1dbe59ea0aed
 SHA512 
37808aaffc5f249368704bf5df1e12c42ca77041dc2ca2baf0eb52fe7128c999570ba78aa1c326939d189e33b24b8997b16888f5f2869b6fdf915b70cb58c5d9
 DIST linux-5.10.7.tar.xz 116616036 BLAKE2B 
c3a222cf56350a3778bd825ba8434d27266412ffe921429be189d51fa97ec66b6aaf336bfd67c20d44828e4b150afade9659b341e9c499f63d6dc01fc2a4fb03
 SHA512 
d639ee7ddd8071b1b54354e68034508bd32a3d2b8eb50ab4aa0f64f3beac9d4ce4f7940ba1848f9903ee827f7cad1a2625185eb4071b0f348bc4639af6f41d9a
+DIST linux-5.10.8.tar.sign 989 BLAKE2B 
5f4194a7199daac1bb9d967b81cf6e9107d7064065cd2df4ea9ca195195c2924e8f314ca0a0c33a0c373cc59ae7d64536faef5a2193e18102d4e89c5694c474f
 SHA512 
cc4da89a8e12aff5a933d92642146789bea700ec2cffd5e32b555bb0dc700819f59df5cc807cd2acad3b54ff13a6080a5c0874b8fa3e6dab049c87aa43712e65
+DIST linux-5.10.8.tar.xz 116625448 BLAKE2B 
1bea3293bb036639d5dd72aba9ca078e1cf94c3752d48abd6462c65038ca5808ee976919623ccb64356756b2cc766a014e57483e8e1418a089236522a0e0a56e
 SHA512 
13ea7cf81db43059466c1558bd80175a6c2090496786fe9220c165958d19781d5501104f41f8207e0239a101611a1faa38b203dd1e8890964494ef8518f5f21e
 DIST linux-5.4.80.tar.sign 989 BLAKE2B 
7d0fa889c353c83eeb38d4868de3736baf6dd668db2b6660472b85dd6f9fffa83350954da80bd8e6441b54aa15324d68734ca863b0b1980b92a7b3a58073037e
 SHA512 
54b7a124065020a69702fbc4ec82359c728ba32e8cafb7ba083d12974914c8309cc6b33b85769d87f91cbb2583b7c0a20d019d1b3808f32f07dda0ec795e8906
 DIST linux-5.4.80.tar.xz 109626784 BLAKE2B 
b395b0326162ca6d9b9a59966e641eb1df63dbd402c8287b276c915478819132e201ae68fcbab2fbae353591ff4f38951a643b6a2e1283a551ab8464c21a2abc
 SHA512 
ba400e61ce4e55a8bf391b45df15bb71f43f42de1f2cf2c19468f503b102ec1269589908fa186bfff946baf031ae1531f30ab420605a078439508898e5fdfb37
 DIST linux-5.4.83.tar.sign 989 BLAKE2B 
0c1c9737b51eb02747146498475436682fec4d0e97c6e90e840682878eff34aeffa6970eac0ce117ce18bb8ca2e15fc1a9b0bfb83e021b710fa10dd713437c32
 SHA512 
be2564571dc109611e802d5dfe1d69339d375bb01259d46888c18ef03979401d9943721131c10609a8a07f14cfe0b990e558e15c7d89a2eccc71e86d620cf4c0

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.8.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.8.ebuild
new file mode 100644
index 000..51afd5f766b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.8.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.7
+CONFIG_HASH=b238267df7cd80dc3aa6b5b654cbe145367383df
+GENTOO_CONFIG_VER=5.10.7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/;
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 
1).x/${MY_P}.tar.xz
+   
https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+   -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+   verify-sig? (
+   https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 
1).x/${MY_P}.tar.sign
+   )
+   amd64? (
+   
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+   -> kernel-x86_64-fedora.config.${CONFIG_VER}
+   )
+   arm64? (
+   
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+   -> kernel-aarch64-fedora.config.${CONFIG_VER}
+   )
+   ppc64? (
+   
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+   -> 

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/

2021-01-17 Thread Michał Górny
commit: c854409b1c896dd55a1c3d5a19882cafbb3a94fc
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jan 17 20:39:43 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jan 17 22:30:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c854409b

sys-kernel/vanilla-kernel: Bump to 5.4.90

Signed-off-by: Michał Górny  gentoo.org>

 sys-kernel/vanilla-kernel/Manifest |   2 +
 .../vanilla-kernel/vanilla-kernel-5.4.90.ebuild| 106 +
 2 files changed, 108 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 5b3d87c0e5a..9b1eec7ce91 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -38,3 +38,5 @@ DIST linux-5.4.88.tar.sign 989 BLAKE2B 
a3757a095bb72f810847a45e0dcb7401ba264317c
 DIST linux-5.4.88.tar.xz 109644692 BLAKE2B 
002e09b5a4571a6967979cc7907cbd7f064ef8bb38045cabd73de09735157798db058ac0150cd53b83fdcf69740ec0a2034868626d028aab24d01b86bb8577c6
 SHA512 
85cfc22c93c40dce1032a909c7af4f7f26e0b9506469a401f8d9b569de6e3f6fe177dbfe7044fd8a786358fae4b4a1df10a08b3cef3a3e0d541ce4f750511346
 DIST linux-5.4.89.tar.sign 989 BLAKE2B 
6a18738bf3d05b8eec8937604680d2d836b75df6df80c6ab3fc950ea32a366ff05a8f5401c856d4e01a4dcafb7f9a865a23415acdec4aae89a8820f9c7a2646a
 SHA512 
51e8cbd7c3add6b91029a963b79c14c80cdc968d4795cb0f4e805fc8e511e0dc05e1d07c7b78addaf982ae8e7f7864aeaa926110c77ea20a00bd42c55f39017c
 DIST linux-5.4.89.tar.xz 109646912 BLAKE2B 
598c524ea324dfa77abeaf0117ed9587c9e1d4d9c7b2db60d46c3e374b31e72374df095aa08e66372a62aba9bf5ebfd489c335557fa0e837ff4b0ab198228cb2
 SHA512 
b69793a9ad0807db409593bee12dd4998b21bdf43a4b07d212818f7f6b916cfadd4a599007f1989fc49425367cd5ba5094fc35e075bb796b2efb7502813e657e
+DIST linux-5.4.90.tar.sign 989 BLAKE2B 
5ccde60f966806468ea1a839cbab030dbdeff530a5ef76e64ba1d9d861ae3b5dba3c773d5f56c14e103662e57ec3c4984d21935a27ecc01451d3837d77548a3c
 SHA512 
f4b71ee6298f2d54f5f51b0b6fca6d5adf41c7139cac1ffd16b8ebc516b12ae9b0be123f0edeae777f46f7820bd4ab2118a5d6a847d70b054409e49c66da30f8
+DIST linux-5.4.90.tar.xz 109650236 BLAKE2B 
d40a447bea1b77eb9ebac798c1d35e4ce63a2babb54675da5ebff3d954f8ce6c40dc367b019e2280463e7d7813035374461d0cb4dbd80c9574cc752486e86f6f
 SHA512 
4be07d786b74958ce27d6aaf196dd9b920f1e25dc93dd18edaace0fb86f7d0570bd7b594afb27c0502b23533fee22ae825200c37bcbfd10aa54140bea1dfc5e4

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.90.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.90.ebuild
new file mode 100644
index 000..f8ec23f5913
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.90.ebuild
@@ -0,0 +1,106 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.89
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/;
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 
1).x/${MY_P}.tar.xz
+   
https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+   -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+   verify-sig? (
+   https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 
1).x/${MY_P}.tar.sign
+   )
+   amd64? (
+   
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+   -> kernel-x86_64.config.${CONFIG_VER}
+   )
+   arm64? (
+   
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+   -> kernel-aarch64.config.${CONFIG_VER}
+   )
+   ppc64? (
+   
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+   -> kernel-ppc64le.config.${CONFIG_VER}
+   )
+   x86? (
+   
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+   -> kernel-i686.config.${CONFIG_VER}
+   )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+   !sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+   debug? ( dev-util/dwarves )
+   verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+   >=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+pkg_pretend() {
+   ewarn "Starting with 5.4.52, Distribution Kernels are switching from 
Arch"
+   ewarn "Linux configs to Fedora.  Please keep a backup kernel just in 
case."
+
+   kernel-install_pkg_pretend
+}
+
+src_unpack() {
+   if use verify-sig; then
+   einfo "Unpacking linux-${PV}.tar.xz ..."
+   verify-sig_verify_detached 

[gentoo-commits] repo/gentoo:master commit in: app-doc/devmanual/

2021-01-17 Thread Ulrich Müller
commit: 5275a7d6a0ce5b3e82a98c53b8cdee4f8eb73048
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Jan 17 22:15:46 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Jan 17 22:16:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5275a7d6

app-doc/devmanual: Inherit python-any-r1.eclass

Bug: https://bugs.gentoo.org/765826
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 app-doc/devmanual/devmanual-.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-doc/devmanual/devmanual-.ebuild 
b/app-doc/devmanual/devmanual-.ebuild
index fdaf6ddcf5d..60b6f7e86bd 100644
--- a/app-doc/devmanual/devmanual-.ebuild
+++ b/app-doc/devmanual/devmanual-.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+PYTHON_COMPAT=(python3_{6,7,8,9})
 
-inherit readme.gentoo-r1
+inherit python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="The Gentoo Development Guide"
 HOMEPAGE="https://devmanual.gentoo.org/;



[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/

2021-01-17 Thread Matt Turner
commit: 34a7db68e78b8db8cbaf4e1da21e46eedb39dbea
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 17 22:06:51 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jan 17 22:10:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34a7db68

gnome-base/gnome-shell: Version bump to 3.38.3

Signed-off-by: Matt Turner  gentoo.org>

 gnome-base/gnome-shell/Manifest  |   1 +
 gnome-base/gnome-shell/gnome-shell-3.38.3.ebuild | 186 +++
 2 files changed, 187 insertions(+)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 189bd8c6385..068694653c3 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,3 +1,4 @@
 DIST gnome-shell-3.36.7-patchset.tar.xz 6364 BLAKE2B 
80a2e2a03e4cc3b15db6af872a2330c0921a63bcd03db78a970190fee93c982296b381d08ac4bd1cb5dbe5b14d9732e447445f5dcc06d607826a9026395f10bb
 SHA512 
6f9145fd00117e6b4170e7457c83a8c3fc6086ce3bcd07813b5a4f05e58f42e889cc90799d6988af05fce9791a792e4d8d60ffe58818563c852f9923930d
 DIST gnome-shell-3.36.7.tar.xz 1777236 BLAKE2B 
4dd3b98e8a2ffa711bffe0b3b78708c85c1979122ee71e7e0d7c55626a608ba4598071bf8659338c960ba4b0349e5b621b97f294a4961cf021b9047753136af5
 SHA512 
7275d1e2d2629abd2fbfae910a77c25485464e39f8317ba1b0e8e1ae3368e69af4eb85c2611e82ea04270bfd8185e24f13002df9b13335adbdff144847790656
 DIST gnome-shell-3.38.2.tar.xz 1814152 BLAKE2B 
765f584ad8f71ac185e9dc6683f1866308c126d8ce8ba9330068e324ea9586b57315cf7feade62eb4142bb3a4effd80c7e6e0d7b36b6c5fb7d547e3bff9c2ab2
 SHA512 
ac37549039a11f4f1b2cdd8b0f8cab72093efca74a5909ad187121565cce737c6a6f296c7241ac5f2174fdfcf11070f7584e713e244fafc911fe039d8fd05f04
+DIST gnome-shell-3.38.3.tar.xz 1815204 BLAKE2B 
1df05f0a3709d851d9bb01c8d8f82b3e36aa1da68256198afe7f5663bbf3dc3b88148220b4f90a1ab3eb3d2a14e370dc038e9afd73c57133f9535423b074ac27
 SHA512 
695446a934b3e5f8512084cb4eaba3e27aec0e03041890fb2a7a9eb4d91d3a9f2f5ca94a8616ce4e7303a2073fda7878425ba31bf590c448132f379fa7138d47

diff --git a/gnome-base/gnome-shell/gnome-shell-3.38.3.ebuild 
b/gnome-base/gnome-shell/gnome-shell-3.38.3.ebuild
new file mode 100644
index 000..e8428c44af4
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.38.3.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell;
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager 
systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include 

+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+   >=gnome-extra/evolution-data-server-3.33.1:=
+   >=app-crypt/gcr-3.7.5[introspection]
+   >=dev-libs/glib-2.57.2:2
+   >=dev-libs/gobject-introspection-1.49.1:=
+   >=dev-libs/gjs-1.65.1
+   >=x11-libs/gtk+-3.15.0:3[introspection]
+   >=x11-wm/mutter-3.38.0:0/7[introspection]
+   >=sys-auth/polkit-0.100[introspection]
+   >=gnome-base/gsettings-desktop-schemas-3.33.1
+   >=x11-libs/startup-notification-0.11
+   >=app-i18n/ibus-1.5.2
+   >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+   bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+   >=media-libs/gstreamer-0.11.92:1.0
+   media-libs/gst-plugins-base:1.0
+   >=media-video/pipewire-0.3.0:0/0.3
+   networkmanager? (
+   >=net-misc/networkmanager-1.10.4:=[introspection]
+   net-libs/libnma[introspection]
+   >=app-crypt/libsecret-0.18
+   dev-libs/dbus-glib )
+   systemd? ( >=sys-apps/systemd-242
+   >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+   elogind? ( >=sys-auth/elogind-237 )
+   app-arch/gnome-autoar
+   dev-libs/json-glib
+
+   >=app-accessibility/at-spi2-atk-2.5.3
+   x11-libs/gdk-pixbuf:2[introspection]
+   dev-libs/libxml2:2
+   x11-libs/libX11
+
+   >=media-sound/pulseaudio-2[glib]
+   >=dev-libs/atk-2[introspection]
+   dev-libs/libical:=
+   >=x11-libs/libXfixes-5.0
+
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+   ')
+   media-libs/mesa[X(+)]
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated using:
+#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
+# Each block:
+# 1. Introspection stuff needed via imports.gi.*
+# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
+# 3. Control shell settings
+# 4. logind interface needed 

[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/

2021-01-17 Thread Matt Turner
commit: ba701fbb200c2c7f7ed3b9e3e76479d298b1148b
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jan 17 21:53:17 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jan 17 22:10:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba701fbb

x11-wm/mutter: Version bump to 3.38.3

Signed-off-by: Matt Turner  gentoo.org>

 x11-wm/mutter/Manifest |   1 +
 x11-wm/mutter/mutter-3.38.3.ebuild | 143 +
 2 files changed, 144 insertions(+)

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 956fe5d467b..6b09d82d85b 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,3 +1,4 @@
 DIST mutter-3.36.7-patchset.tar.xz 14232 BLAKE2B 
90a289f7012e28607d487fd635b73683e657bfd8792dbf662f8822ac7f096d21add6fcd3b7092e4e82f2130226f5b1ff9afd1e026fec8333680c9b4e4712dea2
 SHA512 
74e3951358a02c552a45b590360b9a038283e983ff78daf433fea1589ca3e7824f21af3b786a06ba84fb400581dfc4f97f29d259afdaca2ae3e1456a49a96243
 DIST mutter-3.36.7.tar.xz 2689176 BLAKE2B 
a3849b254dbe2029736ef760fe4225e63bf1d87bf2856a87682574904bd047822916485a3e00d2760118132466414b68764731ea4af9add5d734fd7ce3eac730
 SHA512 
6061cc8a3bdefe57049f9da757b9a33321b28ff7bc9543bc1db3abd75c7261bf233180fb1e8a2f76145dd67ebda91c48981f6e844a866ef6cbb66203af4b7ef7
 DIST mutter-3.38.2.tar.xz 2621648 BLAKE2B 
93ddeaa8b1c09ac0cd711513cb755eb94b72c1c44a751e2c6656dd3415fcb278d22e92577400df9443ece0e3dd1bc77adc88d1a24d59bb911ce8114e53340cae
 SHA512 
8bd826fdb643bc966f6b7c38ed12cec9806440bf9cf4792cb90aa62dd96d2fd1018be39148ebd4432ba799cfdd30ed5c3952620ca13b9fac933fb0a477c9937a
+DIST mutter-3.38.3.tar.xz 2622808 BLAKE2B 
3ee6442c03a3ca5bbaecd32ac451e9c2ba91258af0425745ea871aca2a95218d8afcff8b2e5845e5ab8a4ff2c0308a0bcc0561922b4675ad68b700c04dd3028d
 SHA512 
686027d097439e5a21f7bc748251da8b2f7fdccb2c17599fd6a141b0fda04fe7a19cbb3be2b3e668075fff562bcdae68a61ffb049d103b5b05f2443a5315

diff --git a/x11-wm/mutter/mutter-3.38.3.ebuild 
b/x11-wm/mutter/mutter-3.38.3.ebuild
new file mode 100644
index 000..9c81a28880d
--- /dev/null
+++ b/x11-wm/mutter/mutter-3.38.3.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/;
+
+LICENSE="GPL-2+"
+SLOT="0/7" # 0/libmutter_api_version - ONLY gnome-shell (or anything using 
mutter-clutter-.pc) should use the subslot
+
+IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd 
test udev wayland"
+# native backend requires gles3 for hybrid graphics blitting support, udev and 
a logind provider
+REQUIRED_USE="
+   wayland? ( ^^ ( elogind systemd ) udev )
+   test? ( wayland )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gnome-settings-daemon is build checked, but used at runtime only for 
org.gnome.settings-daemon.peripherals.keyboard gschema
+# xorg-server is needed at build and runtime with USE=wayland for Xwayland
+# v3.32.2 has many excessive or unused *_req variables declared, thus 
currently the dep order ignores those and goes via dependency() call order
+DEPEND="
+   x11-libs/libX11
+   >=media-libs/graphene-1.9.3[introspection?]
+   >=x11-libs/gtk+-3.19.8:3[X,introspection?]
+   x11-libs/gdk-pixbuf:2
+   >=x11-libs/pango-1.30[introspection?]
+   >=dev-libs/fribidi-1.0.0
+   >=x11-libs/cairo-1.14[X]
+   >=gnome-base/gsettings-desktop-schemas-3.37.2[introspection?]
+   >=dev-libs/glib-2.61.1:2
+   gnome-base/gnome-settings-daemon
+   >=dev-libs/json-glib-0.12.0[introspection?]
+   gnome-base/gnome-desktop:3=
+   >=x11-libs/libXcomposite-0.4
+   x11-libs/libXcursor
+   x11-libs/libXdamage
+   x11-libs/libXext
+   >=x11-libs/libXfixes-3
+   >=x11-libs/libXi-1.7.4
+   x11-libs/libXtst
+   x11-libs/libxkbfile
+   x11-misc/xkeyboard-config
+   >=x11-libs/libxkbcommon-0.4.3[X]
+   x11-libs/libXrender
+   >=x11-libs/libXrandr-1.5.0
+   x11-libs/libxcb
+   x11-libs/libXinerama
+   x11-libs/libXau
+   x11-libs/libICE
+   >=dev-libs/atk-2.5.3[introspection?]
+   >=media-libs/libcanberra-0.26
+   sys-apps/dbus
+   media-libs/mesa[X(+),egl]
+   sysprof? ( >=dev-util/sysprof-capture-3.38.0:4 )
+   wayland? (
+   >=dev-libs/wayland-protocols-1.19
+   >=dev-libs/wayland-1.18.0
+   x11-libs/libdrm:=
+   >=media-libs/mesa-17.3[egl,gbm,wayland,gles2]
+   >=dev-libs/libinput-1.7
+   systemd? ( sys-apps/systemd )
+   elogind? ( sys-auth/elogind )
+   x11-base/xorg-server[wayland]
+   )
+   udev? ( >=dev-libs/libgudev-232:=
+   >=virtual/libudev-232-r1:= )
+  

[gentoo-commits] proj/devmanual:master commit in: /

2021-01-17 Thread Ulrich Müller
commit: c92ff87eb8afef815d6f39c78579392f893967d0
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Jan 17 22:09:37 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Jan 17 22:09:37 2021 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=c92ff87e

Makefile: Call build_search_documents.py with python3 explicitly

Bug: https://bugs.gentoo.org/765826
Signed-off-by: Ulrich Müller  gentoo.org>

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index be1224f..13f2bb9 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ build: $(HTMLS) $(IMAGES)
 # document in devmanual gets a unique ID, which is used to
 # quickly tie search matches to the corresponding documents.
 documents.js: bin/build_search_documents.py $(XMLS)
-   @./bin/build_search_documents.py $(XMLS) > $@ && echo "$@ built"
+   @python3 bin/build_search_documents.py $(XMLS) > $@ && echo "$@ built"
 
 %.png : %.svg
rsvg-convert --output=$@ $<



[gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-sources/

2021-01-17 Thread Agostino Sarubbo
commit: f98e61a80afbeca209b2573626686cbb005cba23
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jan 17 21:44:06 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jan 17 21:44:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f98e61a8

sys-kernel/vanilla-sources: Automated version bump to 
{4.4.252,4.9.252,4.14.216,4.19.168,5.4.90,5.10.8} - remove old.

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-kernel/vanilla-sources/Manifest  | 12 ++--
 ...urces-4.14.215.ebuild => vanilla-sources-4.14.216.ebuild} |  0
 ...urces-4.19.167.ebuild => vanilla-sources-4.19.168.ebuild} |  0
 ...sources-4.4.251.ebuild => vanilla-sources-4.4.252.ebuild} |  0
 ...sources-4.9.251.ebuild => vanilla-sources-4.9.252.ebuild} |  0
 ...a-sources-5.10.7.ebuild => vanilla-sources-5.10.8.ebuild} |  0
 ...a-sources-5.4.89.ebuild => vanilla-sources-5.4.90.ebuild} |  0
 7 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-kernel/vanilla-sources/Manifest 
b/sys-kernel/vanilla-sources/Manifest
index 2088d9e8f22..00e49336751 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -4,9 +4,9 @@ DIST linux-4.4.tar.xz 87295988 BLAKE2B 
f260f1858994f5d481fd078c86e51bddbc958f7c5
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 
83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7
 SHA512 
bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST linux-5.10.tar.xz 116606704 BLAKE2B 
b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1
 SHA512 
95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 
193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13
 SHA512 
9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST patch-4.14.215.xz 4097964 BLAKE2B 
70d6e322f001af692d8fa6ecd0a4a1a93193173ce5103a76152e78aedd2d50497d53ee61a579716e5546c75c90c9985368340ca5ed0cb0a32adf72e3169d43aa
 SHA512 
d4ff7f3a47e4cf049cb88d73e2da0e9813a62a8efb05c3161558ad2ad289a58914383ddba89895b2db6ddd02ce063845b6775187b6bee6ef24a7aef76e76a768
-DIST patch-4.19.167.xz 3731708 BLAKE2B 
a5bba38bbc355672d7e31016892197b3a518e6bc4f679e3514f8f5a9b34c8e0ee1fdb699152e78b2b86075e51cc856f88a9606a87f5ae62b0c453a6a994b6853
 SHA512 
639fbf255e0fdb5428fe2b01e306d9021a86082a3d5c99393b28e4505209ac8433e14822f5ba60d7461ee4543311432cea5c2679b8ba421d0f5d6cd9b1ce6497
-DIST patch-4.4.251.xz 3433612 BLAKE2B 
9145fb9d54d1cff666a33ecf9c1ed4fc511a7e6cd4a1677ebbf1a8f35ec0eec673423f6f5cd615903bfa03e3572b426c7fddfa93de204d37a4dc3b81f6ecad6a
 SHA512 
a52a76a0f19a5b960dbfb762bc129fb40f7028bf72765d346c76aa002129600e90c4bdd75487e8168b81bb307e5868b5892bbe667a7f41b5d844ba4bfeee1c8c
-DIST patch-4.9.251.xz 3826372 BLAKE2B 
c0a23192bb2b6b2d3f4dee652bcea609d7f092d55733f13e20ad0cbc4cdf416b7cf933a4a8207e4e32bad72106302d74877336799cac0559409425d5e34f5296
 SHA512 
602fd1d4c9e0cc45836751f5ff5b7eb1c4412001fd5d86e4e05314683b198d0e9de1b39d44f0c346a466512cb8669a5d9cd3f2afa1a8f7fe90c20cb3577fd070
-DIST patch-5.10.7.xz 272248 BLAKE2B 
0b54a1047e97951ff624316c0e0296619ab3d7f8b1f1e3ca8192593661fcb4f6fb35d9d89878e5fed0b2af6027a968fd7af209cb47abf5e5f9ef24aa04510efd
 SHA512 
2f82b0065c2751c5e9dfcf50d6e1d7f1aaf933aba63aede310c6f847114cac2c65d98f1f9dab9481b8a03ded8f95a3e565c279b9b8b935ce810db2349db701cb
-DIST patch-5.4.89.xz 2526936 BLAKE2B 
af7933dd076ec86fcba733adb746ed60af220d3b0a6067f909482f8827ec0bb0dd4e4bfe56debd1a6f2131ff04d7d51c91b192946cf7e16eb25dc6cf5073b9c1
 SHA512 
5427e114efd8436aac32a003b54ac5529b67b7cc469212e22c0b95e90928420e78d66e179cb831f40aec6b1c11e1e7d2bf7dbac8453ca2e7c736e70319b5b78d
+DIST patch-4.14.216.xz 4101572 BLAKE2B 
614b2653087bc1535e31071403c98a53bc7bd56bb1cac971a52e5f940d389568e0dd571af05814992a4ed1d25eb693fe19d0f241bb500e3f1ec6bc92cbf15b65
 SHA512 
e16cd2aa38a4c8e7522079e2acf43cd4f666fec6fdff3d2e888107b7c1df0ade19b9ecb0fcd0cf9c8e14508e75c95d207dfa0fd3089e1bb3e3240b0b6be03466
+DIST patch-4.19.168.xz 3738200 BLAKE2B 
9fde60b5163c5246b116069626f125d9c81e6b84ec660c8eb83e6ef9e282d73231af6f28cdee3dc119f48157c39bfac01c60e5111e1d4bcefcee0b07af681ed9
 SHA512 
bcda20f0b340498d85d4f35b271eef9974dfd166514e1617ceabfba96a229ff3cccff66445a61ed9f4cf25eb4a1daa838a830f9d919aa78f26b7da5b8fc4664f
+DIST patch-4.4.252.xz 3437184 BLAKE2B 
8208f5b6e2534bbc5edfe10ec6181e06c8c38f0d1cb3e5a1691060d045c4f1019112cde5d5d7ea39845a3a980ee99e5e7e791dadb6d4276f383f312d3ce81eba
 SHA512 

[gentoo-commits] repo/gentoo:master commit in: net-misc/dropbear/

2021-01-17 Thread Sam James
commit: d46416cf0096fe3ff8ec3939234363ed51380ed6
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 17 21:26:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 17 21:26:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d46416cf

net-misc/dropbear: fix static case (use bundled)

We don't really want to expose static libs for libtomcrypt, so
let's use the bundled sources instead.

Closes: https://bugs.gentoo.org/765808
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-misc/dropbear/dropbear-2020.81-r1.ebuild | 25 ++---
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/net-misc/dropbear/dropbear-2020.81-r1.ebuild 
b/net-misc/dropbear/dropbear-2020.81-r1.ebuild
index fc989e06172..b52672266a0 100644
--- a/net-misc/dropbear/dropbear-2020.81-r1.ebuild
+++ b/net-misc/dropbear/dropbear-2020.81-r1.ebuild
@@ -17,12 +17,15 @@ IUSE="bsdpty minimal multicall pam +shadow static +syslog 
zlib"
 
 LIB_DEPEND="
zlib? ( sys-libs/zlib[static-libs(+)] )
-   >=dev-libs/libtommath-1.2.0[static-libs(+)]
 "
 RDEPEND="
acct-group/sshd
acct-user/sshd
-   !static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+   !static? (
+   >=dev-libs/libtomcrypt-1.18.2-r2
+   >=dev-libs/libtommath-1.2.0
+   ${LIB_DEPEND//\[static-libs(+)]}
+   )
pam? ( sys-libs/pam )
 "
 DEPEND="
@@ -47,6 +50,12 @@ set_options() {
)
 }
 
+pkg_setup() {
+   if use static ; then
+   ewarn "Using bundled copies of libtommath and libtomcrypt"
+   fi
+}
+
 src_prepare() {
default
sed \
@@ -59,13 +68,14 @@ src_prepare() {
 }
 
 src_configure() {
-   # XXX: Need to add libtomcrypt to the tree and re-enable this.
-   #   --disable-bundled-libtom
-   # We disable the hardening flags as our compiler already enables them
-   # by default as is appropriate for the target.
+   # Notes:
+   # 1) We use bundled libtom* when static build is enabled because
+   #libtomcrypt lacks it and we don't particularly want to add it.
+   # 2) We disable the hardening flags as our compiler already enables them
+   #by default as is appropriate for the target.
local myeconfargs=(
--disable-harden
-   --disable-bundled-libtom
+   $(use_enable static bundled-libtom)
$(use_enable zlib)
$(use_enable pam)
$(use_enable !bsdpty openpty)
@@ -73,6 +83,7 @@ src_configure() {
$(use_enable static)
$(use_enable syslog)
)
+
econf "${myeconfargs[@]}"
 }
 



[gentoo-commits] repo/gentoo:master commit in: www-client/luakit/

2021-01-17 Thread Marek Szuba
commit: 6717e8e06c8727d60380bee7d6915366aa023b01
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Jan 17 21:20:02 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Jan 17 21:24:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6717e8e0

www-client/luajit: set USE_LUAJIT in src_install() too

Seems to be needed according to comments in the bug.

Bug: https://bugs.gentoo.org/744541
Signed-off-by: Marek Szuba  gentoo.org>

 www-client/luakit/luakit-2.2.1-r100.ebuild | 1 +
 www-client/luakit/luakit-2.2.1.ebuild  | 1 +
 www-client/luakit/luakit-.ebuild   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/www-client/luakit/luakit-2.2.1-r100.ebuild 
b/www-client/luakit/luakit-2.2.1-r100.ebuild
index 4c0f4d8faf9..b1ab4c1af05 100644
--- a/www-client/luakit/luakit-2.2.1-r100.ebuild
+++ b/www-client/luakit/luakit-2.2.1-r100.ebuild
@@ -83,6 +83,7 @@ src_install() {
DESTDIR="${ED}" \
DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
PREFIX="${EPREFIX}/usr" \
+   USE_LUAJIT=$(usex lua_single_target_luajit 1 0) \
XDGPREFIX="${EPREFIX}/etc/xdg" \
install
 

diff --git a/www-client/luakit/luakit-2.2.1.ebuild 
b/www-client/luakit/luakit-2.2.1.ebuild
index 6821a2d84cd..ee701ad719a 100644
--- a/www-client/luakit/luakit-2.2.1.ebuild
+++ b/www-client/luakit/luakit-2.2.1.ebuild
@@ -77,6 +77,7 @@ src_install() {
DESTDIR="${D}" \
DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
PREFIX="${EPREFIX}/usr" \
+   USE_LUAJIT=$(usex luajit 1 0) \
XDGPREFIX="${EPREFIX}/etc/xdg" \
install
 

diff --git a/www-client/luakit/luakit-.ebuild 
b/www-client/luakit/luakit-.ebuild
index 874b328f3b3..c9e270416ac 100644
--- a/www-client/luakit/luakit-.ebuild
+++ b/www-client/luakit/luakit-.ebuild
@@ -82,6 +82,7 @@ src_install() {
DESTDIR="${ED}" \
DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
PREFIX="${EPREFIX}/usr" \
+   USE_LUAJIT=$(usex lua_single_target_luajit 1 0) \
XDGPREFIX="${EPREFIX}/etc/xdg" \
install
 



  1   2   3   4   >