From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 440901382C5 for ; Mon, 19 Feb 2018 19:43:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6EE2AE0CAA; Mon, 19 Feb 2018 19:43:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2FEBCE0CA8 for ; Mon, 19 Feb 2018 19:43:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D1A09335C33 for ; Mon, 19 Feb 2018 19:43:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E76AE246 for ; Mon, 19 Feb 2018 19:42:42 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1519069253.8ab009d9b3bb82c395cb6e5d4fbf8077f41089bc.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/collada-dom/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/collada-dom/collada-dom-2.5.0.ebuild dev-libs/collada-dom/collada-dom-9999.ebuild X-VCS-Directories: dev-libs/collada-dom/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 8ab009d9b3bb82c395cb6e5d4fbf8077f41089bc X-VCS-Branch: master Date: Mon, 19 Feb 2018 19:42:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: af9934db-c7da-4b70-8bba-951c9823f24b X-Archives-Hash: 0379d2b36eacb31e345a50e1abd539ea commit: 8ab009d9b3bb82c395cb6e5d4fbf8077f41089bc Author: David Seifert gentoo org> AuthorDate: Mon Feb 19 18:17:21 2018 +0000 Commit: David Seifert gentoo 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"