diff options
author | David Seifert <soap@gentoo.org> | 2018-02-19 19:17:21 +0100 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2018-02-19 20:40:53 +0100 |
commit | 8ab009d9b3bb82c395cb6e5d4fbf8077f41089bc (patch) | |
tree | 1613817b8a86544547065401087ff402d16fd0ed /dev-libs/collada-dom | |
parent | sci-misc/lttoolbox: Always build in C++14 mode (diff) | |
download | gentoo-8ab009d9b3bb82c395cb6e5d4fbf8077f41089bc.tar.gz gentoo-8ab009d9b3bb82c395cb6e5d4fbf8077f41089bc.tar.bz2 gentoo-8ab009d9b3bb82c395cb6e5d4fbf8077f41089bc.zip |
dev-libs/collada-dom: Update to EAPI 6
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'dev-libs/collada-dom')
-rw-r--r-- | dev-libs/collada-dom/collada-dom-2.5.0.ebuild | 23 | ||||
-rw-r--r-- | 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 610f4d0ace18..4086834d6c40 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 610f4d0ace18..bb015f58bab1 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" |