From 323afedd6e46d273457add43d92f166ffba5acbf Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Sun, 27 Oct 2019 02:33:04 +0100
Subject: Fix building of some legacy ebuilds
---
app-admin/openshift-client-tools/Manifest | 2 +-
.../openshift-client-tools-3.7.1-r1.ebuild | 50 ++++++++++++++++++++++
.../openshift-client-tools-3.7.1.ebuild | 47 --------------------
app-admin/openshift-source-to-image/Manifest | 2 +-
.../openshift-source-to-image-1.1.8.ebuild | 4 ++
5 files changed, 56 insertions(+), 49 deletions(-)
create mode 100644 app-admin/openshift-client-tools/openshift-client-tools-3.7.1-r1.ebuild
delete mode 100644 app-admin/openshift-client-tools/openshift-client-tools-3.7.1.ebuild
(limited to 'app-admin')
diff --git a/app-admin/openshift-client-tools/Manifest b/app-admin/openshift-client-tools/Manifest
index 9a13658..25043b6 100644
--- a/app-admin/openshift-client-tools/Manifest
+++ b/app-admin/openshift-client-tools/Manifest
@@ -1,2 +1,2 @@
DIST openshift-client-tools-3.7.1.tar.gz 103203908 BLAKE2B 0fba2ceb09f2c83e44eeea72cae1428506ceaad405947a3ad4d0fa4362c7441b948d37c9ded9048ac845666d74d0d5751f4d086b8988ccaaa380dc44353b7ad0 SHA512 ee2ddbe482dcf53c827423adf16e88adaa379b8914e214ba619ee87b0d84dfd53eaf52b687ef6140d24a7d7fb733908770d55901bbc96e5a430a343cba0b0a3e
-EBUILD openshift-client-tools-3.7.1.ebuild 1119 BLAKE2B cee91219906d85ad0eed649ba80c6420aecc46f58d0fe989992c602194b21c32c936e064ac770bcda4d43ade5d4ef848955522e07a27c2aee6e4f7c60c1f5d9e SHA512 21dd8666b1456efc0c9c05c60ff1db1c59ab6d3e321b0dcff8faa32dab9e493c25d378f7938cb077673c361c7a9419b110c0062ced0994c48b99a4097d7931fb
+EBUILD openshift-client-tools-3.7.1-r1.ebuild 1222 BLAKE2B 4de9a1978627d655a52bed20df9bba30301526478ce55e28b78ec9f7846f4c459f2c5ea0aedb468263a76dcbf13b520b0271a83b535c06b93c4b735552f6fa73 SHA512 8adf0aa3971b91c5b04471e2b98605ac00e1a49174ad2fd335e6f37a7e51da5f0bd687dd7743a220ba6414e23d480aaff13278c78b06a65a22f27cb720338a1b
diff --git a/app-admin/openshift-client-tools/openshift-client-tools-3.7.1-r1.ebuild b/app-admin/openshift-client-tools/openshift-client-tools-3.7.1-r1.ebuild
new file mode 100644
index 0000000..6c84fdc
--- /dev/null
+++ b/app-admin/openshift-client-tools/openshift-client-tools-3.7.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="Enterprise Kubernetes for Developers (Client Tools)"
+HOMEPAGE="https://www.openshift.org"
+SRC_URI="https://github.com/openshift/origin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="bash-completion kerberos"
+
+DEPEND="dev-lang/go
+ kerberos? ( app-crypt/mit-krb5 )"
+RDEPEND="bash-completion? ( >=app-shells/bash-completion-2.3-r1 )"
+
+S="${WORKDIR}/origin-${PV}"
+
+src_compile() {
+ use kerberos && MY_TAGS="-tags=gssapi"
+
+ export OS_GIT_CATALOG_VERSION="v${PV}"
+ export OS_GIT_MINOR=""
+ export OS_GIT_MAJOR=""
+ export OS_GIT_VERSION="v${PV}"
+
+ # Check fails go1.12 < go1.8
+ sed -i'' -e 's#go1.8#go1.10#' hack/lib/build/binaries.sh
+
+ emake all WHAT="cmd/oc ${MY_TAGS} -v"
+
+ emake all WHAT="tools/gendocs -v"
+ emake all WHAT="tools/genman -v"
+ hack/generate-docs.sh || exit 1
+}
+
+src_install() {
+ case "${ARCH}" in
+ x86) MY_ARCH="386" ;;
+ *) MY_ARCH="${ARCH}" ;;
+ esac
+
+ dobin "_output/local/bin/linux/${MY_ARCH}/oc"
+ doman docs/man/man1/oc*
+ use bash-completion && dobashcomp contrib/completions/bash/oc
+}
\ No newline at end of file
diff --git a/app-admin/openshift-client-tools/openshift-client-tools-3.7.1.ebuild b/app-admin/openshift-client-tools/openshift-client-tools-3.7.1.ebuild
deleted file mode 100644
index f53b694..0000000
--- a/app-admin/openshift-client-tools/openshift-client-tools-3.7.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="Enterprise Kubernetes for Developers (Client Tools)"
-HOMEPAGE="https://www.openshift.org"
-SRC_URI="https://github.com/openshift/origin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bash-completion kerberos"
-
-DEPEND="dev-lang/go
- kerberos? ( app-crypt/mit-krb5 )"
-RDEPEND="bash-completion? ( >=app-shells/bash-completion-2.3-r1 )"
-
-S="${WORKDIR}/origin-${PV}"
-
-src_compile() {
- use kerberos && MY_TAGS="-tags=gssapi"
-
- export OS_GIT_CATALOG_VERSION="v${PV}"
- export OS_GIT_MINOR=""
- export OS_GIT_MAJOR=""
- export OS_GIT_VERSION="v${PV}"
-
- emake all WHAT="cmd/oc ${MY_TAGS} -v"
-
- emake all WHAT="tools/gendocs -v"
- emake all WHAT="tools/genman -v"
- hack/generate-docs.sh || exit 1
-}
-
-src_install() {
- case "${ARCH}" in
- x86) MY_ARCH="386" ;;
- *) MY_ARCH="${ARCH}" ;;
- esac
-
- dobin "_output/local/bin/linux/${MY_ARCH}/oc"
- doman docs/man/man1/oc*
- use bash-completion && dobashcomp contrib/completions/bash/oc
-}
\ No newline at end of file
diff --git a/app-admin/openshift-source-to-image/Manifest b/app-admin/openshift-source-to-image/Manifest
index 3232699..57f9ae3 100644
--- a/app-admin/openshift-source-to-image/Manifest
+++ b/app-admin/openshift-source-to-image/Manifest
@@ -1,2 +1,2 @@
DIST openshift-source-to-image-1.1.8.tar.gz 1724043 BLAKE2B 6aa43322aef3de31a5e20f9e9e5ca7a950c16e2c685c2b2aab361da156b99662047e9dbfd559cd6c98bc771612018a30045830a2f6d26084795ad9e3d98925c8 SHA512 a38111fad26578a27efcefb1fe38a85635a29236eed65cb18c9f6c8a880ecca121e98b8f1613b4974363204ad0dcfb0590289bad349168743c287cdcf5601a95
-EBUILD openshift-source-to-image-1.1.8.ebuild 971 BLAKE2B 6023e83864dcc9be7b308757c94bfa71cb59dcceef06081065f67fdd11bd306963f4002ac60ec4350d4a648caab5a91b9b01480b45d0e69bf7af6e90517fb976 SHA512 bf64f14a3adad1970480d36fe73923045b7a1ba487250cd60d88f63ee2b664ad40979d54190e7b4898b0b27ea9f7de8a7dd917114d665d1e41c4c33351f1c100
+EBUILD openshift-source-to-image-1.1.8.ebuild 1063 BLAKE2B 1027fb4b0ee6672b05ec8dfc5efdde17af56bf9bb86ffc7f3ed3d775d1dab960bcabb845c16d03544304b1a027b029c9417d7253ad9d729167111572385bc8e8 SHA512 38240fa3656e57e99df97f70c33af52d45d1448e2a1f5567b29e1a57e677a18152adf18421562baf48d55cb53ff66415ff213a9811e983378557640b8ff53b50
diff --git a/app-admin/openshift-source-to-image/openshift-source-to-image-1.1.8.ebuild b/app-admin/openshift-source-to-image/openshift-source-to-image-1.1.8.ebuild
index 8e21426..f85e058 100644
--- a/app-admin/openshift-source-to-image/openshift-source-to-image-1.1.8.ebuild
+++ b/app-admin/openshift-source-to-image/openshift-source-to-image-1.1.8.ebuild
@@ -23,6 +23,10 @@ src_compile() {
export S2I_GIT_MINOR=""
export S2I_GIT_MAJOR=""
export S2I_GIT_VERSION="v${PV}"
+
+ # Check fails go1.12 < go1.4
+ sed -i'' -e 's#go1.4#go1.10#' hack/common.sh
+
hack/build-go.sh || die
}
--
cgit v1.2.3