From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/collada-dom/
Date: Mon, 19 Feb 2018 19:42:42 +0000 (UTC) [thread overview]
Message-ID: <1519069253.8ab009d9b3bb82c395cb6e5d4fbf8077f41089bc.soap@gentoo> (raw)
commit: 8ab009d9b3bb82c395cb6e5d4fbf8077f41089bc
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 18:17:21 2018 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 19:40:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ab009d9
dev-libs/collada-dom: Update to EAPI 6
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-libs/collada-dom/collada-dom-2.5.0.ebuild | 23 ++++++-----------------
dev-libs/collada-dom/collada-dom-9999.ebuild | 25 +++++++------------------
2 files changed, 13 insertions(+), 35 deletions(-)
diff --git a/dev-libs/collada-dom/collada-dom-2.5.0.ebuild b/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
index 610f4d0ace1..4086834d6c4 100644
--- a/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
+++ b/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
@@ -1,23 +1,13 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
-fi
-
-inherit ${SCM} cmake-utils flag-o-matic
+inherit cmake-utils flag-o-matic
-if [ "${PV#9999}" != "${PV}" ] ; then
- KEYWORDS=""
- SRC_URI=""
-elif [ "${PV%_pre*}" != "${PV}" ]; then
- # snapshot
- KEYWORDS="~amd64 ~arm"
- SRC_URI="mirror://gentoo/${P}.tar.xz"
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
else
KEYWORDS="~amd64 ~arm"
SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -34,8 +24,7 @@ RDEPEND="
dev-libs/boost:=
sys-libs/zlib:=[minizip]
dev-libs/libxml2
- dev-libs/libpcre[cxx]
-"
+ dev-libs/libpcre[cxx]"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/dev-libs/collada-dom/collada-dom-9999.ebuild b/dev-libs/collada-dom/collada-dom-9999.ebuild
index 610f4d0ace1..bb015f58bab 100644
--- a/dev-libs/collada-dom/collada-dom-9999.ebuild
+++ b/dev-libs/collada-dom/collada-dom-9999.ebuild
@@ -1,23 +1,13 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
-fi
-
-inherit ${SCM} cmake-utils flag-o-matic
+inherit cmake-utils flag-o-matic
-if [ "${PV#9999}" != "${PV}" ] ; then
- KEYWORDS=""
- SRC_URI=""
-elif [ "${PV%_pre*}" != "${PV}" ]; then
- # snapshot
- KEYWORDS="~amd64 ~arm"
- SRC_URI="mirror://gentoo/${P}.tar.xz"
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
else
KEYWORDS="~amd64 ~arm"
SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -33,9 +23,8 @@ IUSE=""
RDEPEND="
dev-libs/boost:=
sys-libs/zlib:=[minizip]
- dev-libs/libxml2
- dev-libs/libpcre[cxx]
-"
+ dev-libs/libxml2:=
+ dev-libs/libpcre:=[cxx]"
DEPEND="${RDEPEND}
virtual/pkgconfig"
next reply other threads:[~2018-02-19 19:43 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-19 19:42 David Seifert [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-07-02 21:23 [gentoo-commits] repo/gentoo:master commit in: dev-libs/collada-dom/ Sam James
2022-07-02 21:23 Sam James
2022-07-02 21:23 Sam James
2022-07-02 21:23 Sam James
2022-07-02 21:10 Sam James
2022-07-02 20:56 Sam James
2022-03-01 0:01 Sam James
2022-02-28 23:58 Sam James
2022-02-28 5:21 Sam James
2021-12-08 3:33 Sam James
2021-09-21 8:10 Michał Górny
2021-07-20 9:03 David Seifert
2021-07-12 21:59 Sam James
2021-07-12 21:59 Sam James
2021-07-08 7:11 Sergei Trofimovich
2021-07-08 7:11 Sergei Trofimovich
2021-07-05 6:06 Sergei Trofimovich
2021-07-05 6:06 Sergei Trofimovich
2018-02-19 19:42 David Seifert
2018-01-07 6:38 Alexis Ballier
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=1519069253.8ab009d9b3bb82c395cb6e5d4fbf8077f41089bc.soap@gentoo \
--to=soap@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