From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-932440-garchives=archives.gentoo.org@lists.gentoo.org>
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 22B1B139694
for <garchives@archives.gentoo.org>; Sat, 18 Feb 2017 10:33:02 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 473A4E0C2B;
Sat, 18 Feb 2017 10:33:01 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 1A75DE0C2B
for <gentoo-commits@lists.gentoo.org>; Sat, 18 Feb 2017 10:33:01 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B704634071C
for <gentoo-commits@lists.gentoo.org>; Sat, 18 Feb 2017 10:32:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 58AC84BFE
for <gentoo-commits@lists.gentoo.org>; Sat, 18 Feb 2017 10:32:57 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1487413971.36324f213e954c264c57dbd4b531d7511e06b638.mgorny@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.20-r1.ebuild dev-embedded/libftdi/libftdi-0.20.ebuild dev-embedded/libftdi/libftdi-1.2-r1.ebuild dev-embedded/libftdi/libftdi-9999.ebuild
X-VCS-Directories: dev-embedded/libftdi/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 36324f213e954c264c57dbd4b531d7511e06b638
X-VCS-Branch: master
Date: Sat, 18 Feb 2017 10:32:57 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: c77d2655-61c6-4a28-b9d1-73bbd9704a87
X-Archives-Hash: 6af6a911ba719771379afd6dbea4e85f
commit: 36324f213e954c264c57dbd4b531d7511e06b638
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 10:31:38 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 10:32:51 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36324f21
dev-embedded/libftdi: python-single-r1, EAPI=6
...{libftdi-0.20.ebuild => libftdi-0.20-r1.ebuild} | 37 ++++++++++++++--------
.../{libftdi-9999.ebuild => libftdi-1.2-r1.ebuild} | 32 ++++++++++++-------
dev-embedded/libftdi/libftdi-9999.ebuild | 34 ++++++++++++--------
3 files changed, 65 insertions(+), 38 deletions(-)
diff --git a/dev-embedded/libftdi/libftdi-0.20.ebuild b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
similarity index 61%
rename from dev-embedded/libftdi/libftdi-0.20.ebuild
rename to dev-embedded/libftdi/libftdi-0.20-r1.ebuild
index 0abb3b32f3..26f83972b5 100644
--- a/dev-embedded/libftdi/libftdi-0.20.ebuild
+++ b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="2"
+EAPI=6
-inherit cmake-utils python eutils
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+inherit cmake-utils python-single-r1
if [[ ${PV} == 9999* ]] ; then
EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
@@ -23,28 +24,37 @@ IUSE="cxx doc examples python"
RDEPEND="virtual/libusb:0
cxx? ( dev-libs/boost )
- python? ( dev-lang/python )"
+ python? ( ${PYTHON_DEPS} )"
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
+}
+
src_prepare() {
- sed -i \
- -e "s:[$]{PYTHON_LIB_INSTALL}/../site-packages:$(python_get_sitedir):" \
- bindings/CMakeLists.txt || die
+ if use python; then
+ sed -i \
+ -e "s:[$]{PYTHON_LIB_INSTALL}/../site-packages:$(python_get_sitedir):" \
+ bindings/CMakeLists.txt || die
+ fi
sed -i \
-e '/SET(LIB_SUFFIX /d' \
CMakeLists.txt || die
- epatch "${FILESDIR}"/${P}-cmake-{include,version}.patch
+ eapply "${FILESDIR}"/${P}-cmake-{include,version}.patch
+ eapply_user
}
src_configure() {
mycmakeargs=(
- $(cmake-utils_use cxx FTDIPP)
- $(cmake-utils_use doc DOCUMENTATION)
- $(cmake-utils_use examples EXAMPLES)
- $(cmake-utils_use python PYTHON_BINDINGS)
+ -DFTDIPP=$(usex cxx)
+ -DDOCUMENTATION=$(usex doc)
+ -DEXAMPLES=$(usex examples)
+ -DPYTHON_BINDINGS=$(usex python)
-DCMAKE_SKIP_BUILD_RPATH=ON
)
cmake-utils_src_configure
@@ -52,6 +62,7 @@ src_configure() {
src_install() {
cmake-utils_src_install
+ use python && python_optimize
dodoc ChangeLog README
if use doc ; then
@@ -59,7 +70,7 @@ src_install() {
rm -vf "${CMAKE_BUILD_DIR}"/doc/man/man3/{_,usb_,deprecated}*
doman "${CMAKE_BUILD_DIR}"/doc/man/man3/*
- dohtml "${CMAKE_BUILD_DIR}"/doc/html/*
+ dodoc -r "${CMAKE_BUILD_DIR}"/doc/html
fi
if use examples ; then
docinto examples
diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-1.2-r1.ebuild
similarity index 67%
copy from dev-embedded/libftdi/libftdi-9999.ebuild
copy to dev-embedded/libftdi/libftdi-1.2-r1.ebuild
index 38eb00e083..24fdd6e7cf 100644
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.2-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="4"
+EAPI=6
-inherit cmake-utils
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+inherit cmake-utils python-single-r1
MY_P="${PN}1-${PV}"
if [[ ${PV} == 9999* ]] ; then
@@ -24,7 +25,7 @@ IUSE="cxx doc examples python static-libs test tools"
RDEPEND="virtual/libusb:1
cxx? ( dev-libs/boost )
- python? ( dev-lang/python )
+ python? ( ${PYTHON_DEPS} )
tools? (
!<dev-embedded/ftdi_eeprom-1.0
dev-libs/confuse
@@ -33,17 +34,23 @@ 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
+}
+
S=${WORKDIR}/${MY_P}
src_configure() {
mycmakeargs=(
- $(cmake-utils_use cxx FTDIPP)
- $(cmake-utils_use doc DOCUMENTATION)
- $(cmake-utils_use examples EXAMPLES)
- $(cmake-utils_use python PYTHON_BINDINGS)
- $(cmake-utils_use static-libs STATICLIBS)
- $(cmake-utils_use test BUILD_TESTS)
- $(cmake-utils_use tools FTDI_EEPROM)
+ -DFTDIPP=$(usex cxx)
+ -DDOCUMENTATION=$(usex doc)
+ -DEXAMPLES=$(usex examples)
+ -DPYTHON_BINDINGS=$(usex python)
+ -DSTATICLIBS=$(usex static-libs)
+ -DBUILD_TESTS=$(usex test)
+ -DFTDI_EEPROM=$(usex tools)
-DCMAKE_SKIP_BUILD_RPATH=ON
)
cmake-utils_src_configure
@@ -51,6 +58,7 @@ src_configure() {
src_install() {
cmake-utils_src_install
+ use python && python_optimize
dodoc AUTHORS ChangeLog README TODO
if use doc ; then
@@ -58,7 +66,7 @@ src_install() {
rm -vf "${CMAKE_BUILD_DIR}"/doc/man/man3/_* || die
doman "${CMAKE_BUILD_DIR}"/doc/man/man3/*
- dohtml "${CMAKE_BUILD_DIR}"/doc/html/*
+ dodoc -r "${CMAKE_BUILD_DIR}"/doc/html
fi
if use examples ; then
docinto examples
diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-9999.ebuild
index 38eb00e083..04136fcafa 100644
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ b/dev-embedded/libftdi/libftdi-9999.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="4"
+EAPI=6
-inherit cmake-utils
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+inherit cmake-utils python-single-r1
MY_P="${PN}1-${PV}"
if [[ ${PV} == 9999* ]] ; then
EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
- inherit git-2
+ inherit git-r3
else
SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
@@ -24,7 +25,7 @@ IUSE="cxx doc examples python static-libs test tools"
RDEPEND="virtual/libusb:1
cxx? ( dev-libs/boost )
- python? ( dev-lang/python )
+ python? ( ${PYTHON_DEPS} )
tools? (
!<dev-embedded/ftdi_eeprom-1.0
dev-libs/confuse
@@ -33,17 +34,23 @@ 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
+}
+
S=${WORKDIR}/${MY_P}
src_configure() {
mycmakeargs=(
- $(cmake-utils_use cxx FTDIPP)
- $(cmake-utils_use doc DOCUMENTATION)
- $(cmake-utils_use examples EXAMPLES)
- $(cmake-utils_use python PYTHON_BINDINGS)
- $(cmake-utils_use static-libs STATICLIBS)
- $(cmake-utils_use test BUILD_TESTS)
- $(cmake-utils_use tools FTDI_EEPROM)
+ -DFTDIPP=$(usex cxx)
+ -DDOCUMENTATION=$(usex doc)
+ -DEXAMPLES=$(usex examples)
+ -DPYTHON_BINDINGS=$(usex python)
+ -DSTATICLIBS=$(usex static-libs)
+ -DBUILD_TESTS=$(usex test)
+ -DFTDI_EEPROM=$(usex tools)
-DCMAKE_SKIP_BUILD_RPATH=ON
)
cmake-utils_src_configure
@@ -51,6 +58,7 @@ src_configure() {
src_install() {
cmake-utils_src_install
+ use python && python_optimize
dodoc AUTHORS ChangeLog README TODO
if use doc ; then
@@ -58,7 +66,7 @@ src_install() {
rm -vf "${CMAKE_BUILD_DIR}"/doc/man/man3/_* || die
doman "${CMAKE_BUILD_DIR}"/doc/man/man3/*
- dohtml "${CMAKE_BUILD_DIR}"/doc/html/*
+ dodoc -r "${CMAKE_BUILD_DIR}"/doc/html
fi
if use examples ; then
docinto examples