radhermit 14/11/27 19:51:33
Modified: ChangeLog protobuf-2.5.0-r2.ebuild
protobuf-2.6.1-r1.ebuild
Log:
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)
Revision Changes Path
1.72 dev-libs/protobuf/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?rev=1.72&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?rev=1.72&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?r1=1.71&r2=1.72
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ChangeLog 27 Nov 2014 18:05:23 -0000 1.71
+++ ChangeLog 27 Nov 2014 19:51:33 -0000 1.72
@@ -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 <[email protected]> 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)
1.2 dev-libs/protobuf/protobuf-2.5.0-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?r1=1.1&r2=1.2
Index: protobuf-2.5.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- protobuf-2.5.0-r2.ebuild 27 Nov 2014 18:05:23 -0000 1.1
+++ protobuf-2.5.0-r2.ebuild 27 Nov 2014 19:51:33 -0000 1.2
@@ -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 @@
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 @@
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() {
1.2 dev-libs/protobuf/protobuf-2.6.1-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?r1=1.1&r2=1.2
Index: protobuf-2.6.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- protobuf-2.6.1-r1.ebuild 27 Nov 2014 18:05:23 -0000 1.1
+++ protobuf-2.6.1-r1.ebuild 27 Nov 2014 19:51:33 -0000 1.2
@@ -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 @@
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 @@
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() {
