gentoo resync : 05.12.2021

6 files changed, 37 insertions, 47 deletions

diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index ac6d23df7b60..84e5078bceca 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/go-colortext/Manifest b/dev-go/go-colortext/Manifest
index 9a1731183aa0..a21b7c302e42 100644
--- a/dev-go/go-colortext/Manifest
+++ b/dev-go/go-colortext/Manifest
@@ -1,3 +1,3 @@
 DIST go-colortext-0_pre20150720.tar.gz 3542 BLAKE2B 5979377b716c94a20445ade2f6c405203b1b77fc4beb5163480c6a9f837b0b183b607c69f5d80018e8918dff8526b914ec89badf639dfc550a8480ee3815d23d SHA512 7f70e32f6f7b17c683c4e6131ef6e15d7c1f40ad7cfeb3e8ce02e799370af02493fcdeb8896c73e8f71b4c28ba3accce646a795f404900b7b63bb40f9651287d
-EBUILD go-colortext-0_pre20150720.ebuild 675 BLAKE2B 87615c9d36ceaf9b624ec270ebc6e55772dc1e63e99303e55ff730e073cdb3e621769b792f2c1060871f0307702514ca2d0956d2350d451b60d1e1f44d166632 SHA512 74f97af81e9bb7cc6267eb773fd1987700349c1929ee7ec1262f3c3a72d9bbce8ca82c19e421fcd861102fabb7f1c13b8312b75192b579a88465d63851371279
+EBUILD go-colortext-0_pre20150720.ebuild 575 BLAKE2B 8641a1b8a9b88bc1b1d494257775afbbfce03d1e8180f7be4f89d231a369219ac6272ab2b75b0f8b23aba14607486e0878df5bc1a238cd7cb8046b1880615b33 SHA512 cfe67dcc887dbd4064c35486ec073ebeaf8b613e82a562fc198c37203c04f027370877146a98b1828c427e6eee15f1b1a21d6cad9c9c0d17aed6df474581a1ed
 MISC metadata.xml 338 BLAKE2B 0c4caddfa119c7882211c4db3c0e83df17afed659cec843cb3901a4918c8d5cb29814d9265eba318a3f89c5ade57a0b196a42e3a75a4aca12791eb5cadbdd1b7 SHA512 05f818a2c9c1323213acb1cca9ff95b59784c5128aad38c053758c33a631757f92be9fb8fd17262ff16c6d0f43c30edd717f13434bb6b55a228e59bf4293a3e7
diff --git a/dev-go/go-colortext/go-colortext-0_pre20150720.ebuild b/dev-go/go-colortext/go-colortext-0_pre20150720.ebuild
index 181bd09a7642..edf72cdb953e 100644
--- a/dev-go/go-colortext/go-colortext-0_pre20150720.ebuild
+++ b/dev-go/go-colortext/go-colortext-0_pre20150720.ebuild
@@ -1,29 +1,22 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-EGO_PN="github.com/daviddengcn/go-colortext"
+EAPI=7
 
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	EGIT_COMMIT=3b18c85
-	ARCHIVE_URI="https://github.com/daviddengcn/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
+EGO_PN="github.com/daviddengcn/go-colortext"
+EGIT_COMMIT=3b18c85
+ARCHIVE_URI="https://github.com/daviddengcn/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+inherit golang-build golang-vcs-snapshot
 
 DESCRIPTION="Change the console foreground and background colors"
 HOMEPAGE="https://github.com/daviddengcn/go-colortext"
 SRC_URI="${ARCHIVE_URI}"
+
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
-DEPEND=""
-RDEPEND=""
+KEYWORDS="~amd64"
 
 src_install() {
 	golang-build_src_install
-dodoc src/${EGO_PN}/*.md
+	dodoc src/${EGO_PN}/*.md
 }
diff --git a/dev-go/gom/Manifest b/dev-go/gom/Manifest
index f7803bce9752..12797aec99ec 100644
--- a/dev-go/gom/Manifest
+++ b/dev-go/gom/Manifest
@@ -1,3 +1,3 @@
 DIST gom-0_pre20151110.tar.gz 9146 BLAKE2B 52909e5756aaa08fdd18363e0a4dec57f7d5d0541fafaab854eded65e4225a1765d64d2393fc22f3400b523abc0130610b24bc29d07281659c98a93d3f9d3f20 SHA512 3afde9f2fb9318ffa41a8d429f24e93540117a3ff988a39651cb50c8ba0bcb2c5d94481fed052891404750cfae97a0b176e82121c1ede3dab27eb98ddc476c2c
-EBUILD gom-0_pre20151110.ebuild 653 BLAKE2B b6b520ce7c139b83aec9f9eb28c63e673f99517c3d1922501c266a264e5ef5cbabd39a1aa4e32afea145993231f965e7eea167de6866a28540e6ac8a2e5d08e3 SHA512 e00bd74c9912c451e0f33c6ef118162b24337120b42d744bd3b11d67815755cc1190aec93f979e138dc01c96f2ccf94ac2c2c8e2b8aaf6bcbc1dadf116db8d2b
+EBUILD gom-0_pre20151110-r1.ebuild 593 BLAKE2B 5094acad9f8a7f901437e479fe766b990e6094f2eea07fd77975767ebc07e380757d031306428c2774608c4d33001273333dbbef1c3c35f34fd41c7019051672 SHA512 0c5cfc85350d46d26e8e3404860c970ed99a5f342ed6f7b191f3aa8a8fa33d29a527645f4b245e23b5398e0756808f1ce5c1fa9e4c331672e7e1dc82a42acb7d
 MISC metadata.xml 323 BLAKE2B f810727a4049a68c322b1e3027f026ab749ef7ac2fa4c5fb36505ce528f3ea67772a79ebe8247eefb955937b522099839266a4e9423c0a23ea34c9e2a1720978 SHA512 cb1235adbe325ae367a6815a5efb8b3796512672b41e26df3504964aa740457f5c7e4979918c7bbaa87284f225f487b6aaecd699aef0dbf628ecc6dd0cf1b5ef
diff --git a/dev-go/gom/gom-0_pre20151110-r1.ebuild b/dev-go/gom/gom-0_pre20151110-r1.ebuild
new file mode 100644
index 000000000000..80a4aad7a4a8
--- /dev/null
+++ b/dev-go/gom/gom-0_pre20151110-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN=github.com/mattn/gom
+
+EGIT_COMMIT=c522e7d
+ARCHIVE_URI="https://github.com/mattn/gom/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Go Dependency management system similar to bundle for ruby"
+HOMEPAGE="https://github.com/mattn/gom"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-go/go-colortext:="
+RDEPEND="!media-sound/gom"
+
+src_install() {
+	dobin gom
+	dodoc src/${EGO_PN}/README.mkd
+}
diff --git a/dev-go/gom/gom-0_pre20151110.ebuild b/dev-go/gom/gom-0_pre20151110.ebuild
deleted file mode 100644
index c895ff693699..000000000000
--- a/dev-go/gom/gom-0_pre20151110.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-EGO_PN=github.com/mattn/gom
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	EGIT_COMMIT=c522e7d
-	ARCHIVE_URI="https://github.com/mattn/gom/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Go Dependency management system similar to bundle for ruby"
-HOMEPAGE="https://github.com/mattn/gom"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-DEPEND="dev-go/go-colortext:="
-RDEPEND=""
-
-src_install() {
-dobin gom
-dodoc src/${EGO_PN}/README.mkd
-}