[gentoo-commits] repo/proj/guru:dev commit in: dev-util/aws-cli-bin/, app-admin/awscli-bin/

[gentoo-commits] repo/proj/guru:dev commit in: dev-util/aws-cli-bin/, app-admin/awscli-bin/

[Marcin Woźniak]

commit:     93e5fe2c91902b63b0c268c1c206f4a1d1e242c0
Author:     Marcin Woźniak <y0rune <AT> aol <DOT> com>
AuthorDate: Fri Nov 12 21:04:50 2021 +0000
Commit:     Marcin Woźniak <y0rune <AT> aol <DOT> com>
CommitDate: Fri Nov 12 21:04:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=93e5fe2c

app-admin/awscli-bin: Removed duplicate package and update the metadata

Signed-off-by: Marcin Woźniak <y0rune <AT> aol.com>

Hi!
In the ticket 822285. The user inform us the package is duplicated.
So I:
- removed the `dev-util/aws-cli-bin`
- added the second maintainer into the `app-admin/awscli-bin`.
- updated the licence in the `app-admin/awscli-bin-2.3.2-r1.ebuild`

 app-admin/awscli-bin/awscli-bin-2.3.2-r1.ebuild |  2 +-
 app-admin/awscli-bin/awscli-bin-2.3.2.ebuild    | 21 --------------------
 app-admin/awscli-bin/metadata.xml               |  4 ++++
 dev-util/aws-cli-bin/Manifest                   |  1 -
 dev-util/aws-cli-bin/aws-cli-bin-2.2.41.ebuild  | 26 -------------------------
 dev-util/aws-cli-bin/metadata.xml               |  8 --------
 6 files changed, 5 insertions(+), 57 deletions(-)

diff --git a/app-admin/awscli-bin/awscli-bin-2.3.2-r1.ebuild b/app-admin/awscli-bin/awscli-bin-2.3.2-r1.ebuild
index 0708f50f4..b8b45c520 100644
--- a/app-admin/awscli-bin/awscli-bin-2.3.2-r1.ebuild
+++ b/app-admin/awscli-bin/awscli-bin-2.3.2-r1.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Universal Command Line Interface for Amazon Web Services version 2"
 HOMEPAGE="https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html"
 SRC_URI="https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${PV}.zip -> ${P}.zip"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 MIT LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
 

diff --git a/app-admin/awscli-bin/awscli-bin-2.3.2.ebuild b/app-admin/awscli-bin/awscli-bin-2.3.2.ebuild
deleted file mode 100644
index dd9781c59..000000000
--- a/app-admin/awscli-bin/awscli-bin-2.3.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Universal Command Line Interface for Amazon Web Services version 2"
-HOMEPAGE="https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html"
-SRC_URI="https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${PV}.zip -> ${P}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="!app-admin/awscli"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/aws"
-
-src_install() {
-	./install --install-dir "${D}/opt/awscli" --bin-dir "${D}/usr/bin"
-}

diff --git a/app-admin/awscli-bin/metadata.xml b/app-admin/awscli-bin/metadata.xml
index e40c46a6b..240c88168 100644
--- a/app-admin/awscli-bin/metadata.xml
+++ b/app-admin/awscli-bin/metadata.xml
@@ -5,6 +5,10 @@
 		<email>alexey@zapparov.com</email>
 		<name>Alexey Zapparov</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>ezzieyguywuf@gmail.com</email>
+		<name>Wolfgang E. Sanyer</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/aws/aws-cli/issues</bugs-to>
 		<changelog>https://github.com/aws/aws-cli/blob/v2/CHANGELOG.rst</changelog>

diff --git a/dev-util/aws-cli-bin/Manifest b/dev-util/aws-cli-bin/Manifest
deleted file mode 100644
index 4b5068e8c..000000000
--- a/dev-util/aws-cli-bin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST aws-cli-bin-2.2.41.zip 44410083 BLAKE2B 7d70df6ef345044a86c76dd6fc8f73077de5c331b0ba24a6df83867418aca5adfce109733a1478ba44f02680cca3d71b576aaa8281ab18ae1e9b3067f5771151 SHA512 f843e713b67a54570e5d44560a3f65ab0b8726ca6272bdc2fc63aee2cd4b905c5fb867af865feae6cb05771d81ae27e47e6ad584deb44ef54b8c185a114d9b99

diff --git a/dev-util/aws-cli-bin/aws-cli-bin-2.2.41.ebuild b/dev-util/aws-cli-bin/aws-cli-bin-2.2.41.ebuild
deleted file mode 100644
index 336e68b16..000000000
--- a/dev-util/aws-cli-bin/aws-cli-bin-2.2.41.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN_BASE="$(ver_cut 1 ${PN})"
-MY_PN="${MY_PN_BASE}$(ver_cut 2 ${PN})"
-
-DESCRIPTION="A unified command line interface to Amazon Web Services"
-HOMEPAGE="https://aws.amazon.com/cli/"
-SRC_URI="https://awscli.amazonaws.com/${MY_PN}-exe-linux-x86_64-${PV}.zip -> ${P}.zip"
-
-LICENSE="Apache-2.0 MIT LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="!!app-admin/awscli"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN_BASE}"
-
-src_install() {
-	local install_dir="${D}/${EPREFIX}/opt/${PN}"
-
-	./install -i ${install_dir} -b "${D}/${EPREFIX}/usr/bin" || die
-}

diff --git a/dev-util/aws-cli-bin/metadata.xml b/dev-util/aws-cli-bin/metadata.xml
deleted file mode 100644
index 132632716..000000000
--- a/dev-util/aws-cli-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>ezzieyguywuf@gmail.com</email>
-		<name>Wolfgang E. Sanyer</name>
-	</maintainer>
-</pkgmetadata>