commit: 503b08b33fa2c0d9bbab96fb7704c6348c6bad57
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 17:11:25 2022 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> 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 <robbat2 <AT> 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:
