From 3986db4f2d42d3f799c712e9c0d481222a62b1ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Sun, 4 Oct 2020 13:34:04 +0200 Subject: [PATCH 1/6] www-client/brave-bin: Updated to 1.12.78, removed 1.12.76 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Woźniak --- www-client/brave-bin/Manifest | 2 +- .../{brave-bin-1.12.76.ebuild => brave-bin-1.12.78.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename www-client/brave-bin/{brave-bin-1.12.76.ebuild => brave-bin-1.12.78.ebuild} (100%) diff --git a/www-client/brave-bin/Manifest b/www-client/brave-bin/Manifest index e19f170..0a38e51 100644 --- a/www-client/brave-bin/Manifest +++ b/www-client/brave-bin/Manifest @@ -1,2 +1,2 @@ -DIST brave-bin-1.12.76.zip 105336169 BLAKE2B 71bd0cab3074a3e1a32e8fe1df3774323ac9d7265f1e87b80291e0131ea7f32952efc815669f54a6c011dec0198a975450015617fde446025d76c2c6967e1808 SHA512 e5484b39b8263de51b86f8597833d35a8647c0cd9649867566ac38285e4ecf25cb5d0bbb70559e314724940aea6bea3b987fa7611d2056d117b1c5a102763725 DIST brave-bin-1.12.77.zip 105335718 BLAKE2B ceb862da4a37251ed1f0d3b78fbe98d2a5c8e548b9beabbfb623c7d39f9429fac95b425c1b8f70ed9ac652991912165fe5aaee3493006b128345b6c069cb2ede SHA512 85156f38d743061ec28e49ff52bc63d74801e0181dfc22fbedfc3cf3450189f035360395dc8369c2742188011421e4c41dcc29f0b23f4772a666e9bf132ce433 +DIST brave-bin-1.12.78.zip 105406124 BLAKE2B 2eefa972fccad821564b06a877a185eea0107600dd1c45e0bd91b04af15ba446502e41f4f1b758c0cd22e0889518f325a2756d284a33992a4212ae96897359bd SHA512 046ca3f163e364c60bacd3692a37b3cd5db5542d3320dc4fc3ff0a4685d356fcd8dedff89201633b4035b3e3a0d94226bf2328882d085972c7a91615feca34f0 diff --git a/www-client/brave-bin/brave-bin-1.12.76.ebuild b/www-client/brave-bin/brave-bin-1.12.78.ebuild similarity index 100% rename from www-client/brave-bin/brave-bin-1.12.76.ebuild rename to www-client/brave-bin/brave-bin-1.12.78.ebuild From 494142bb52789c7d01bf49a01c59eab8428cfaf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Sun, 4 Oct 2020 18:09:46 +0200 Subject: [PATCH 2/6] examples: update overlay configuration example --- examples/repos.conf/src_prepare-overlay.conf | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/examples/repos.conf/src_prepare-overlay.conf b/examples/repos.conf/src_prepare-overlay.conf index a4a4d85..ab333d5 100644 --- a/examples/repos.conf/src_prepare-overlay.conf +++ b/examples/repos.conf/src_prepare-overlay.conf @@ -1,5 +1,9 @@ +# CONTRIBUTORS: +# Consider using the example given in CONTRIBUTING.md +# https://gitlab.com/src_prepare/src_prepare-overlay/-/blob/master/CONTRIBUTING.md#add-the-overlay-to-the-system + [src_prepare-overlay] -location = /var/db/repos/src_prepare-overlay -sync-uri = https://gitlab.com/src_prepare/src_prepare-overlay.git -sync-type = git auto-sync = yes +location = /var/db/repos/src_prepare-overlay +sync-type = git +sync-uri = https://gitlab.com/src_prepare/src_prepare-overlay.git From 2cb5dfd603bfab21b3248cd7cde4ff34129d6393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Sun, 4 Oct 2020 18:30:20 +0200 Subject: [PATCH 3/6] contributing: update notice about failing sync --- CONTRIBUTING.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 99efa5b..681d7ff 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -# Contributing +# Contributing ## How to contribute @@ -89,7 +89,11 @@ sync-type = git sync-uri = git@gitlab.com:src_prepare/src_prepare-overlay.git sync-user = :portage ``` -If you dont have write access to the cloned branch yet use "sync-uri = https://gitlab.com/src_prepare/src_prepare-overlay.git" instead. +If you don't have write access to the cloned branch yet use "sync-uri = https://gitlab.com/src_prepare/src_prepare-overlay.git" instead. + +If you lock your SSH key with a password autosyncing may fail. +To evade that use "auto-sync = no" and pull the changes manually (or using a different tool other than 'emerge --sync' or 'eix-sync'). +Either way, remember that if you pull with a user different than the sync will fail (because that user likely won't have the SSH keys). ### Sync the overlay As root From d57899271b95aba0e717db8cb42bb507aec0c1b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Sun, 4 Oct 2020 18:34:23 +0200 Subject: [PATCH 4/6] link example configuraton to top of the tree --- src_prepare-overlay.conf | 1 + 1 file changed, 1 insertion(+) create mode 120000 src_prepare-overlay.conf diff --git a/src_prepare-overlay.conf b/src_prepare-overlay.conf new file mode 120000 index 0000000..4d42eb5 --- /dev/null +++ b/src_prepare-overlay.conf @@ -0,0 +1 @@ +examples/repos.conf/src_prepare-overlay.conf \ No newline at end of file From 1be59553b0dcfaecbdbb301f463cb49ef7f7ecb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Tue, 6 Oct 2020 03:17:29 +0200 Subject: [PATCH 5/6] metadata: update layout --- metadata/layout.conf | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/metadata/layout.conf b/metadata/layout.conf index 9771f09..ab79d63 100644 --- a/metadata/layout.conf +++ b/metadata/layout.conf @@ -1,9 +1,12 @@ -eapis-banned = 0 1 2 3 -eapis-deprecated = 0 1 2 3 4 5 masters = gentoo -sign-commits = true -sign-manifests = false -thin-manifests = true + +cache-formats = md5-dict manifest-hashes = BLAKE2B SHA512 manifest-required-hashes = BLAKE2B profile-formats = portage-2 profile-set +sign-commits = true +sign-manifests = false +thin-manifests = true +update-changelog = false + +eapis-banned = 0 1 2 3 4 5 6 From 2c5a0890c5ecc4d4a929ad22cc0c20eacb9029be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Tue, 6 Oct 2020 03:29:44 +0200 Subject: [PATCH 6/6] metadata: unban eapi 6 developers: but please - still consider migrating to >=7 --- metadata/layout.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/layout.conf b/metadata/layout.conf index ab79d63..c92df33 100644 --- a/metadata/layout.conf +++ b/metadata/layout.conf @@ -9,4 +9,4 @@ sign-manifests = false thin-manifests = true update-changelog = false -eapis-banned = 0 1 2 3 4 5 6 +eapis-banned = 0 1 2 3 4 5