From: "Patrick McLean" <chutzpah@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
Date: Wed, 17 Jan 2018 02:52:24 +0000 (UTC) [thread overview]
Message-ID: <1516157529.2bbe3ec2825e97faf62e6cc66e27588c5d210415.chutzpah@gentoo> (raw)
commit: 2bbe3ec2825e97faf62e6cc66e27588c5d210415
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 17 02:52:09 2018 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Jan 17 02:52:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bbe3ec2
app-emulation/ganeti: Allow arping from iputils as well as the separate package
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-emulation/ganeti/ganeti-2.15.2-r5.ebuild | 42 +++++++++++++---------------
app-emulation/ganeti/ganeti-2.15.2-r6.ebuild | 42 +++++++++++++---------------
2 files changed, 38 insertions(+), 46 deletions(-)
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
index a91a6db5a25..002bd0085ca 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,27 +12,20 @@ MY_PV="${MY_PV/_beta/~beta}"
MY_P="${PN}-${MY_PV}"
SERIES="$(get_version_component_range 1-2)"
-if [[ ${PV} =~ [9]{4,} ]] ; then
- EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
- inherit git-2
- KEYWORDS=""
- PATCHES=()
-else
- DEBIAN_PATCH=4
- SRC_URI="
- http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
- mirror://ubuntu/pool/universe/${PN:0:1}/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
- "
- KEYWORDS="amd64 x86"
- PATCHES=(
- "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
- "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
- "${WORKDIR}"/debian/patches/relax-deps
- "${WORKDIR}"/debian/patches/zlib-0.6-compatibility
- "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
- "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
- )
-fi
+DEBIAN_PATCH=4
+SRC_URI="
+ http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
+ mirror://ubuntu/pool/universe/${PN:0:1}/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
+"
+KEYWORDS="amd64 x86"
+PATCHES=(
+ "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
+ "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
+ "${WORKDIR}"/debian/patches/relax-deps
+ "${WORKDIR}"/debian/patches/zlib-0.6-compatibility
+ "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
+ "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
+)
DESCRIPTION="Ganeti is a virtual server management software tool"
HOMEPAGE="http://www.ganeti.org/"
@@ -61,7 +54,10 @@ DEPEND="
dev-python/bitarray[${PYTHON_USEDEP}]
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/fdsend[${PYTHON_USEDEP}]
- net-analyzer/arping
+ || (
+ net-misc/iputils[arping]
+ net-analyzer/arping
+ )
net-analyzer/fping
net-misc/bridge-utils
net-misc/curl[ssl]
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
index ec6c5e7a33f..739b9186e2d 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,27 +12,20 @@ MY_PV="${MY_PV/_beta/~beta}"
MY_P="${PN}-${MY_PV}"
SERIES="$(get_version_component_range 1-2)"
-if [[ ${PV} =~ [9]{4,} ]] ; then
- EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
- inherit git-2
- KEYWORDS=""
- PATCHES=()
-else
- DEBIAN_PATCH=4
- SRC_URI="
- http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
- mirror://ubuntu/pool/universe/${PN:0:1}/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
- "
- KEYWORDS="~amd64 ~x86"
- PATCHES=(
- "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
- "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
- "${WORKDIR}"/debian/patches/relax-deps
- "${WORKDIR}"/debian/patches/zlib-0.6-compatibility
- "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
- "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
- )
-fi
+DEBIAN_PATCH=4
+SRC_URI="
+ http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
+ mirror://ubuntu/pool/universe/${PN:0:1}/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
+"
+KEYWORDS="~amd64 ~x86"
+PATCHES=(
+ "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
+ "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
+ "${WORKDIR}"/debian/patches/relax-deps
+ "${WORKDIR}"/debian/patches/zlib-0.6-compatibility
+ "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
+ "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
+)
DESCRIPTION="Ganeti is a virtual server management software tool"
HOMEPAGE="http://www.ganeti.org/"
@@ -61,7 +54,10 @@ DEPEND="
dev-python/bitarray[${PYTHON_USEDEP}]
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/fdsend[${PYTHON_USEDEP}]
- net-analyzer/arping
+ || (
+ net-misc/iputils[arping]
+ net-analyzer/arping
+ )
net-analyzer/fping
net-misc/bridge-utils
net-misc/curl[ssl]
next reply other threads:[~2018-01-17 2:52 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-17 2:52 Patrick McLean [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-07-23 18:51 [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/ Ionen Wolkens
2022-07-23 17:11 Robin H. Johnson
2022-07-23 17:11 Robin H. Johnson
2022-07-23 16:39 Robin H. Johnson
2022-07-23 16:39 Robin H. Johnson
2022-07-23 16:39 Robin H. Johnson
2020-07-27 10:02 Michał Górny
2020-07-27 10:02 Michał Górny
2020-05-06 1:02 Patrick McLean
2019-04-14 11:12 Agostino Sarubbo
2019-04-08 17:11 Robin H. Johnson
2018-08-25 20:20 Michał Górny
2018-01-31 1:04 Patrick McLean
2017-12-10 9:27 Ulrich Müller
2016-12-02 0:56 Patrick McLean
2016-12-01 11:51 Agostino Sarubbo
2016-12-01 11:50 Agostino Sarubbo
2016-07-13 21:37 Robin H. Johnson
2016-07-13 17:22 Robin H. Johnson
2016-07-12 22:54 Robin H. Johnson
2016-07-12 17:13 Robin H. Johnson
2016-07-12 0:53 Robin H. Johnson
2016-07-12 0:13 Robin H. Johnson
2016-07-11 22:50 Robin H. Johnson
2016-07-11 22:50 Robin H. Johnson
2016-07-05 21:55 Robin H. Johnson
2016-05-12 23:25 Patrick McLean
2016-04-05 23:18 Patrick McLean
2016-04-05 18:42 Patrick McLean
2016-04-05 18:42 Patrick McLean
2016-04-04 23:43 Patrick McLean
2016-04-01 23:57 Patrick McLean
2016-02-15 18:30 Sergey Popov
2016-02-15 9:48 Sergey Popov
2015-11-23 23:41 Patrick McLean
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1516157529.2bbe3ec2825e97faf62e6cc66e27588c5d210415.chutzpah@gentoo \
--to=chutzpah@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox