From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 31219158094 for ; Sat, 23 Jul 2022 17:11:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41EAAE0D41; Sat, 23 Jul 2022 17:11:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 28FF1E0D41 for ; Sat, 23 Jul 2022 17:11:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F08BD341114 for ; Sat, 23 Jul 2022 17:11:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A05852B for ; Sat, 23 Jul 2022 17:11:47 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1658596305.503b08b33fa2c0d9bbab96fb7704c6348c6bad57.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/ganeti/ganeti-3.0.2-r2.ebuild app-emulation/ganeti/ganeti-3.0.9999.ebuild app-emulation/ganeti/ganeti-3.1.9999.ebuild X-VCS-Directories: app-emulation/ganeti/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 503b08b33fa2c0d9bbab96fb7704c6348c6bad57 X-VCS-Branch: master Date: Sat, 23 Jul 2022 17:11:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0ab0aff0-6a9c-44e2-99b6-ba65e25b28c8 X-Archives-Hash: ccdd81056684d5e02dd9a670b786b470 commit: 503b08b33fa2c0d9bbab96fb7704c6348c6bad57 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Jul 23 17:11:25 2022 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sat Jul 23 17:11:45 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=503b08b3 app-emulation/ganeti: add live ebuilds Signed-off-by: Robin H. Johnson gentoo.org> app-emulation/ganeti/ganeti-3.0.2-r2.ebuild | 10 +++++++--- .../{ganeti-3.0.2-r2.ebuild => ganeti-3.0.9999.ebuild} | 10 +++++++--- .../{ganeti-3.0.2-r2.ebuild => ganeti-3.1.9999.ebuild} | 12 ++++++++---- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild b/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild index e6ac4895670c..ea66aef7fbf0 100644 --- a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild +++ b/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild @@ -14,8 +14,9 @@ MY_P="${PN}-${MY_PV}" SERIES="3.0" if [[ ${PV} =~ [9]{4,} ]] ; then - EGIT_REPO_URI="git://git.ganeti.org/ganeti.git" - inherit git-2 + EGIT_REPO_URI="https://github.com/ganeti/ganeti" + EGIT_BRANCH="stable-$SERIES" + inherit git-r3 PATCHES=() else DEBIAN_PV="${PV}" @@ -233,8 +234,11 @@ src_prepare() { PATCHES+=( ) fi + # Some debian patches have trailing whitespace, which trips upstream testing - sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/* || die "sed failed" + if test -d "${WORKDIR}"/debian/patches ; then + sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/* || die "sed failed" + fi eapply "${PATCHES[@]}" # Upstream commits: diff --git a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild b/app-emulation/ganeti/ganeti-3.0.9999.ebuild similarity index 98% copy from app-emulation/ganeti/ganeti-3.0.2-r2.ebuild copy to app-emulation/ganeti/ganeti-3.0.9999.ebuild index e6ac4895670c..ea66aef7fbf0 100644 --- a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild +++ b/app-emulation/ganeti/ganeti-3.0.9999.ebuild @@ -14,8 +14,9 @@ MY_P="${PN}-${MY_PV}" SERIES="3.0" if [[ ${PV} =~ [9]{4,} ]] ; then - EGIT_REPO_URI="git://git.ganeti.org/ganeti.git" - inherit git-2 + EGIT_REPO_URI="https://github.com/ganeti/ganeti" + EGIT_BRANCH="stable-$SERIES" + inherit git-r3 PATCHES=() else DEBIAN_PV="${PV}" @@ -233,8 +234,11 @@ src_prepare() { PATCHES+=( ) fi + # Some debian patches have trailing whitespace, which trips upstream testing - sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/* || die "sed failed" + if test -d "${WORKDIR}"/debian/patches ; then + sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/* || die "sed failed" + fi eapply "${PATCHES[@]}" # Upstream commits: diff --git a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild b/app-emulation/ganeti/ganeti-3.1.9999.ebuild similarity index 97% copy from app-emulation/ganeti/ganeti-3.0.2-r2.ebuild copy to app-emulation/ganeti/ganeti-3.1.9999.ebuild index e6ac4895670c..10ff7a522300 100644 --- a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild +++ b/app-emulation/ganeti/ganeti-3.1.9999.ebuild @@ -11,11 +11,12 @@ inherit autotools bash-completion-r1 python-single-r1 tmpfiles MY_PV="${PV/_rc/~rc}" MY_PV="${MY_PV/_beta/~beta}" MY_P="${PN}-${MY_PV}" -SERIES="3.0" +SERIES="3.1" if [[ ${PV} =~ [9]{4,} ]] ; then - EGIT_REPO_URI="git://git.ganeti.org/ganeti.git" - inherit git-2 + EGIT_REPO_URI="https://github.com/ganeti/ganeti" + EGIT_BRANCH="master" # not branched yet + inherit git-r3 PATCHES=() else DEBIAN_PV="${PV}" @@ -233,8 +234,11 @@ src_prepare() { PATCHES+=( ) fi + # Some debian patches have trailing whitespace, which trips upstream testing - sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/* || die "sed failed" + if test -d "${WORKDIR}"/debian/patches ; then + sed -r -i -e 's,[[:space:]]+$,,g' "${WORKDIR}"/debian/patches/* || die "sed failed" + fi eapply "${PATCHES[@]}" # Upstream commits: