diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2014-11-27 19:51:33 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2014-11-27 19:51:33 +0000 |
| commit | 24dfe56383e64c3a4027bbc7c68d42c71edbecf5 (patch) | |
| tree | 26f9f5f90b73967284a8a09ec08714ae28d1be7a /dev-libs/protobuf | |
| parent | Append -DUSE_INTERP_RESULT to CPPFLAGS for Tk/Tcl >= 8.6 wrt #514604 by Patri... (diff) | |
| download | gentoo-2-24dfe56383e64c3a4027bbc7c68d42c71edbecf5.tar.gz gentoo-2-24dfe56383e64c3a4027bbc7c68d42c71edbecf5.tar.bz2 gentoo-2-24dfe56383e64c3a4027bbc7c68d42c71edbecf5.zip | |
Apply patches manually so they don't get applied twice.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'dev-libs/protobuf')
| -rw-r--r-- | dev-libs/protobuf/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/protobuf/protobuf-2.5.0-r2.ebuild | 14 | ||||
| -rw-r--r-- | dev-libs/protobuf/protobuf-2.6.1-r1.ebuild | 12 |
3 files changed, 18 insertions, 14 deletions
diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog index 5c6b6cce9c6a..5bda099c89ff 100644 --- a/dev-libs/protobuf/ChangeLog +++ b/dev-libs/protobuf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/protobuf # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.71 2014/11/27 18:05:23 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.72 2014/11/27 19:51:33 radhermit Exp $ + + 27 Nov 2014; Tim Harder <radhermit@gentoo.org> protobuf-2.5.0-r2.ebuild, + protobuf-2.6.1-r1.ebuild: + Apply patches manually so they don't get applied twice. *protobuf-2.6.1-r1 (27 Nov 2014) *protobuf-2.5.0-r2 (27 Nov 2014) diff --git a/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild b/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild index e91770a14309..c6fcb7e643f3 100644 --- a/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild +++ b/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild,v 1.1 2014/11/27 18:05:23 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild,v 1.2 2014/11/27 19:51:33 radhermit Exp $ EAPI=5 AUTOTOOLS_AUTORECONF=1 @@ -9,7 +9,7 @@ JAVA_PKG_IUSE="source" PYTHON_COMPAT=( python2_7 ) DISTUTILS_OPTIONAL=1 -inherit autotools-multilib flag-o-matic distutils-r1 java-pkg-opt-2 elisp-common +inherit autotools-multilib eutils flag-o-matic distutils-r1 java-pkg-opt-2 elisp-common DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" HOMEPAGE="http://code.google.com/p/protobuf/" @@ -29,18 +29,18 @@ RDEPEND="${CDEPEND} java? ( >=virtual/jre-1.5 )" src_prepare() { - local PATCHES=( "${FILESDIR}"/${P}-x32.patch ) + append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI + + epatch "${FILESDIR}"/${P}-x32.patch # breaks Darwin, bug #472514 - [[ ${CHOST} != *-darwin* ]] && PATCHES+=( "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch ) + [[ ${CHOST} != *-darwin* ]] && epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch - append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI + autotools-multilib_src_prepare if use python; then cd python && distutils-r1_src_prepare fi - - autotools-multilib_src_prepare } src_compile() { diff --git a/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild b/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild index 596ab27c7f57..bc7842a056f3 100644 --- a/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild +++ b/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild,v 1.1 2014/11/27 18:05:23 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild,v 1.2 2014/11/27 19:51:33 radhermit Exp $ EAPI=5 AUTOTOOLS_AUTORECONF=1 @@ -9,7 +9,7 @@ JAVA_PKG_IUSE="source" PYTHON_COMPAT=( python2_7 ) DISTUTILS_OPTIONAL=1 -inherit autotools-multilib flag-o-matic distutils-r1 java-pkg-opt-2 elisp-common +inherit autotools-multilib eutils flag-o-matic distutils-r1 java-pkg-opt-2 elisp-common DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" HOMEPAGE="http://code.google.com/p/protobuf/ https://github.com/google/protobuf/" @@ -32,16 +32,16 @@ RDEPEND="${CDEPEND} java? ( >=virtual/jre-1.5 )" src_prepare() { + append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI + # breaks Darwin, bug #472514 - [[ ${CHOST} != *-darwin* ]] && local PATCHES=( "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch ) + [[ ${CHOST} != *-darwin* ]] && epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch - append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI + autotools-multilib_src_prepare if use python; then cd python && distutils-r1_src_prepare fi - - autotools-multilib_src_prepare } src_compile() { |