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 77024138806 for ; Mon, 25 Dec 2017 10:43:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8CB42E0DFE; Mon, 25 Dec 2017 10:43:51 +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 5BDC2E0DFE for ; Mon, 25 Dec 2017 10:43:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 BD23533FE2A for ; Mon, 25 Dec 2017 10:43:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 195C2AEA7 for ; Mon, 25 Dec 2017 10:43:48 +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: <1514198572.0e53e7374ad68a0ce6ade031bdbf34294e38d39f.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/libftdi/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-embedded/libftdi/libftdi-0.19.ebuild dev-embedded/libftdi/libftdi-0.20-r1.ebuild dev-embedded/libftdi/libftdi-1.2-r1.ebuild dev-embedded/libftdi/libftdi-1.2-r2.ebuild dev-embedded/libftdi/libftdi-9999.ebuild X-VCS-Directories: dev-embedded/libftdi/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 0e53e7374ad68a0ce6ade031bdbf34294e38d39f X-VCS-Branch: master Date: Mon, 25 Dec 2017 10:43:48 +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: 990f8cfd-b23e-4a5d-b8ee-15e5ebdf6c80 X-Archives-Hash: 3752069b00b60b74412c71b73d8daa3d commit: 0e53e7374ad68a0ce6ade031bdbf34294e38d39f Author: David Seifert gentoo org> AuthorDate: Mon Dec 25 10:24:02 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Mon Dec 25 10:42:52 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e53e737 dev-embedded/libftdi: [QA] Run cmake-utils_src_prepare Closes: https://bugs.gentoo.org/640204 Package-Manager: Portage-2.3.19, Repoman-2.3.6 dev-embedded/libftdi/libftdi-0.19.ebuild | 4 ++-- dev-embedded/libftdi/libftdi-0.20-r1.ebuild | 13 ++++++++----- dev-embedded/libftdi/libftdi-1.2-r1.ebuild | 7 +++---- dev-embedded/libftdi/libftdi-1.2-r2.ebuild | 5 ++--- dev-embedded/libftdi/libftdi-9999.ebuild | 5 ++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dev-embedded/libftdi/libftdi-0.19.ebuild b/dev-embedded/libftdi/libftdi-0.19.ebuild index 69ea48c31b0..71475c70766 100644 --- a/dev-embedded/libftdi/libftdi-0.19.ebuild +++ b/dev-embedded/libftdi/libftdi-0.19.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="2" if [[ ${PV} == 9999* ]] ; then + inherit git-r3 autotools EGIT_REPO_URI="git://developer.intra2net.com/${PN}" - inherit git-2 autotools else SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${P}.tar.gz" KEYWORDS="amd64 arm ppc ppc64 sparc x86" diff --git a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild index 87f52c9e3e5..8aed5262ba3 100644 --- a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild +++ b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild @@ -7,8 +7,8 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 ) inherit cmake-utils python-single-r1 if [[ ${PV} == 9999* ]] ; then + inherit git-r3 EGIT_REPO_URI="git://developer.intra2net.com/${PN}" - inherit git-2 else SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" @@ -20,6 +20,7 @@ HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/" LICENSE="LGPL-2" SLOT="0" IUSE="cxx doc examples python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="virtual/libusb:0 cxx? ( dev-libs/boost ) @@ -28,7 +29,10 @@ DEPEND="${RDEPEND} python? ( dev-lang/swig ) doc? ( app-doc/doxygen )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +PATCHES=( + "${FILESDIR}"/${P}-cmake-include.patch + "${FILESDIR}"/${P}-cmake-version.patch +) pkg_setup() { use python && python-single-r1_pkg_setup @@ -44,12 +48,11 @@ src_prepare() { -e '/SET(LIB_SUFFIX /d' \ CMakeLists.txt || die - eapply "${FILESDIR}"/${P}-cmake-{include,version}.patch - eapply_user + cmake-utils_src_prepare } src_configure() { - mycmakeargs=( + local mycmakeargs=( -DFTDIPP=$(usex cxx) -DDOCUMENTATION=$(usex doc) -DEXAMPLES=$(usex examples) diff --git a/dev-embedded/libftdi/libftdi-1.2-r1.ebuild b/dev-embedded/libftdi/libftdi-1.2-r1.ebuild index 8c4d73cf0ed..9ca55beeaad 100644 --- a/dev-embedded/libftdi/libftdi-1.2-r1.ebuild +++ b/dev-embedded/libftdi/libftdi-1.2-r1.ebuild @@ -8,8 +8,8 @@ inherit cmake-utils python-single-r1 MY_P="${PN}1-${PV}" if [[ ${PV} == 9999* ]] ; then + inherit git-r3 EGIT_REPO_URI="git://developer.intra2net.com/${PN}" - inherit git-2 else SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2" KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 sparc x86" @@ -21,6 +21,7 @@ HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/" LICENSE="LGPL-2" SLOT="1" IUSE="cxx doc examples python static-libs test tools" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="virtual/libusb:1 cxx? ( dev-libs/boost ) @@ -33,8 +34,6 @@ DEPEND="${RDEPEND} python? ( dev-lang/swig ) doc? ( app-doc/doxygen )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - pkg_setup() { use python && python-single-r1_pkg_setup } @@ -42,7 +41,7 @@ pkg_setup() { S=${WORKDIR}/${MY_P} src_configure() { - mycmakeargs=( + local mycmakeargs=( -DFTDIPP=$(usex cxx) -DDOCUMENTATION=$(usex doc) -DEXAMPLES=$(usex examples) diff --git a/dev-embedded/libftdi/libftdi-1.2-r2.ebuild b/dev-embedded/libftdi/libftdi-1.2-r2.ebuild index c52061be670..e35ae39feab 100644 --- a/dev-embedded/libftdi/libftdi-1.2-r2.ebuild +++ b/dev-embedded/libftdi/libftdi-1.2-r2.ebuild @@ -21,6 +21,7 @@ HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/" LICENSE="LGPL-2" SLOT="1" IUSE="cxx doc examples python static-libs test tools" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="virtual/libusb:1 cxx? ( dev-libs/boost ) @@ -33,8 +34,6 @@ DEPEND="${RDEPEND} python? ( dev-lang/swig ) doc? ( app-doc/doxygen )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - pkg_setup() { use python && python-single-r1_pkg_setup } @@ -42,7 +41,7 @@ pkg_setup() { S=${WORKDIR}/${MY_P} src_configure() { - mycmakeargs=( + local mycmakeargs=( -DFTDIPP=$(usex cxx) -DDOCUMENTATION=$(usex doc) -DEXAMPLES=$(usex examples) diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-9999.ebuild index c52061be670..e35ae39feab 100644 --- a/dev-embedded/libftdi/libftdi-9999.ebuild +++ b/dev-embedded/libftdi/libftdi-9999.ebuild @@ -21,6 +21,7 @@ HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/" LICENSE="LGPL-2" SLOT="1" IUSE="cxx doc examples python static-libs test tools" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="virtual/libusb:1 cxx? ( dev-libs/boost ) @@ -33,8 +34,6 @@ DEPEND="${RDEPEND} python? ( dev-lang/swig ) doc? ( app-doc/doxygen )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - pkg_setup() { use python && python-single-r1_pkg_setup } @@ -42,7 +41,7 @@ pkg_setup() { S=${WORKDIR}/${MY_P} src_configure() { - mycmakeargs=( + local mycmakeargs=( -DFTDIPP=$(usex cxx) -DDOCUMENTATION=$(usex doc) -DEXAMPLES=$(usex examples)