[gentoo-commits] repo/gentoo:master commit in: dev-libs/collada-dom/

[David Seifert]

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"