From 505f5ff251c3b1c9ccd56f724fecec12bb972fa3 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sun, 23 Apr 2017 10:44:12 +0200 Subject: dev-libs/protobuf: [QA] Add missing python metadata variables Package-Manager: Portage-2.3.5, Repoman-2.3.2 --- dev-libs/protobuf/protobuf-2.5.0-r2.ebuild | 3 ++- dev-libs/protobuf/protobuf-2.6.1-r3.ebuild | 1 + dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild | 17 ++++++++++++----- dev-libs/protobuf/protobuf-3.0.2.ebuild | 10 +++++----- dev-libs/protobuf/protobuf-3.1.0.ebuild | 10 +++++----- 5 files changed, 25 insertions(+), 16 deletions(-) (limited to 'dev-libs/protobuf') diff --git a/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild b/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild index ade6ac794551..f13799b4c143 100644 --- a/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild +++ b/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -18,6 +18,7 @@ LICENSE="Apache-2.0" SLOT="0/8" # subslot = soname major version KEYWORDS="amd64 arm -hppa ~ia64 ~mips ppc ~ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="emacs examples java python static-libs vim-syntax" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" CDEPEND="emacs? ( virtual/emacs ) python? ( ${PYTHON_DEPS} )" diff --git a/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild b/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild index d4ef1827154f..600cb16edb50 100644 --- a/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild +++ b/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild @@ -18,6 +18,7 @@ LICENSE="Apache-2.0" SLOT="0/9" # subslot = soname major version KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="emacs examples java python static-libs vim-syntax zlib" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" CDEPEND="emacs? ( virtual/emacs ) python? ( ${PYTHON_DEPS} ) diff --git a/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild b/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild index 20b43b53220c..e7de4715d511 100644 --- a/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild +++ b/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,17 +19,24 @@ LICENSE="Apache-2.0" SLOT="0/10b3" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="emacs examples java python static-libs test vim-syntax zlib" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DEPEND="emacs? ( virtual/emacs ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) +RDEPEND=" + emacs? ( virtual/emacs ) + python? ( ${PYTHON_DEPS} ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} test? ( dev-cpp/gmock[${MULTILIB_USEDEP}] )" # This is provided for backwards compatibility due to (likely incorrect) use in consumers. PDEPEND="java? ( dev-java/protobuf-java ) python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )" + S="${WORKDIR}/${PN}-${MY_PV}" -PATCHES=( "${FILESDIR}/${PN}-2.5.0-emacs-24.4.patch" +PATCHES=( + "${FILESDIR}/${PN}-2.5.0-emacs-24.4.patch" "${FILESDIR}/${PN}-2.6.1-protoc-cmdline.patch" - "${FILESDIR}/${PN}-3.0.0_beta2-disable-local-gmock.patch" ) + "${FILESDIR}/${PN}-3.0.0_beta2-disable-local-gmock.patch" +) src_prepare() { append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI diff --git a/dev-libs/protobuf/protobuf-3.0.2.ebuild b/dev-libs/protobuf/protobuf-3.0.2.ebuild index 2f4f4b18e891..686c45c6427e 100644 --- a/dev-libs/protobuf/protobuf-3.0.2.ebuild +++ b/dev-libs/protobuf/protobuf-3.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,14 +19,14 @@ LICENSE="Apache-2.0" SLOT="0/10" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="emacs examples java python static-libs test vim-syntax zlib" - REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DEPEND=" +RDEPEND=" emacs? ( virtual/emacs ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) + python? ( ${PYTHON_DEPS} ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} test? ( dev-cpp/gmock[${MULTILIB_USEDEP}] )" - # This is provided for backwards compatibility due to (likely incorrect) use in consumers. PDEPEND=" java? ( dev-java/protobuf-java ) diff --git a/dev-libs/protobuf/protobuf-3.1.0.ebuild b/dev-libs/protobuf/protobuf-3.1.0.ebuild index db4298867f31..fafdd32458f0 100644 --- a/dev-libs/protobuf/protobuf-3.1.0.ebuild +++ b/dev-libs/protobuf/protobuf-3.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,14 +19,14 @@ LICENSE="Apache-2.0" SLOT="0/11" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="emacs examples java python static-libs test vim-syntax zlib" - REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DEPEND=" +RDEPEND=" emacs? ( virtual/emacs ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) + python? ( ${PYTHON_DEPS} ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} test? ( dev-cpp/gmock[${MULTILIB_USEDEP}] )" - # This is provided for backwards compatibility due to (likely incorrect) use in consumers. PDEPEND=" java? ( dev-java/protobuf-java ) -- cgit v1.2.3-65-gdbad