radhermit 14/11/27 18:05:23 Modified: ChangeLog Added: protobuf-2.5.0-r2.ebuild protobuf-2.6.1-r1.ebuild Log: Add multilib support. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Revision Changes Path 1.71 dev-libs/protobuf/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?rev=1.71&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?rev=1.71&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?r1=1.70&r2=1.71 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- ChangeLog 21 Nov 2014 14:04:29 -0000 1.70 +++ ChangeLog 27 Nov 2014 18:05:23 -0000 1.71 @@ -1,6 +1,13 @@ # 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.70 2014/11/21 14:04:29 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.71 2014/11/27 18:05:23 radhermit Exp $ + +*protobuf-2.6.1-r1 (27 Nov 2014) +*protobuf-2.5.0-r2 (27 Nov 2014) + + 27 Nov 2014; Tim Harder <[email protected]> +protobuf-2.5.0-r2.ebuild, + +protobuf-2.6.1-r1.ebuild: + Add multilib support. 21 Nov 2014; Agostino Sarubbo <[email protected]> protobuf-2.5.0-r1.ebuild: Stable for amd64, wrt bug #529858 1.1 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.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?rev=1.1&content-type=text/plain Index: protobuf-2.5.0-r2.ebuild =================================================================== # 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 $ EAPI=5 AUTOTOOLS_AUTORECONF=1 AUTOTOOLS_PRUNE_LIBTOOL_FILES=all 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 DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" HOMEPAGE="http://code.google.com/p/protobuf/"; SRC_URI="http://protobuf.googlecode.com/files/${P}.tar.bz2"; 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" CDEPEND="emacs? ( virtual/emacs ) python? ( ${PYTHON_DEPS} )" DEPEND="${CDEPEND} java? ( >=virtual/jdk-1.5 ) python? ( dev-python/setuptools[${PYTHON_USEDEP}] )" RDEPEND="${CDEPEND} java? ( >=virtual/jre-1.5 )" src_prepare() { local PATCHES=( "${FILESDIR}"/${P}-x32.patch ) # breaks Darwin, bug #472514 [[ ${CHOST} != *-darwin* ]] && PATCHES+=( "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch ) append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI if use python; then cd python && distutils-r1_src_prepare fi autotools-multilib_src_prepare } src_compile() { autotools-multilib_src_compile if use python; then einfo "Compiling Python library ..." pushd python >/dev/null distutils-r1_src_compile popd >/dev/null fi if use java; then einfo "Compiling Java library ..." src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto mkdir java/build pushd java/src/main/java >/dev/null ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed" popd >/dev/null jar cf ${PN}.jar -C java/build . || die "jar failed" fi if use emacs; then elisp-compile "${S}"/editors/protobuf-mode.el fi } src_test() { autotools-multilib_src_test check if use python; then pushd python >/dev/null distutils-r1_src_test popd >/dev/null fi } src_install() { local DOCS=( CHANGES.txt CONTRIBUTORS.txt README.txt ) autotools-multilib_src_install if use python; then pushd python >/dev/null distutils-r1_src_install popd >/dev/null fi if use java; then java-pkg_dojar ${PN}.jar use source && java-pkg_dosrc java/src/main/java/* fi if use vim-syntax; then insinto /usr/share/vim/vimfiles/syntax doins editors/proto.vim insinto /usr/share/vim/vimfiles/ftdetect/ doins "${FILESDIR}"/proto.vim fi if use emacs; then elisp-install ${PN} editors/protobuf-mode.el* elisp-site-file-install "${FILESDIR}"/70${PN}-gentoo.el fi if use examples; then dodoc -r examples docompress -x /usr/share/doc/${PF}/examples fi } pkg_postinst() { use emacs && elisp-site-regen } pkg_postrm() { use emacs && elisp-site-regen } 1.1 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.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?rev=1.1&content-type=text/plain Index: protobuf-2.6.1-r1.ebuild =================================================================== # 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 $ EAPI=5 AUTOTOOLS_AUTORECONF=1 AUTOTOOLS_PRUNE_LIBTOOL_FILES=all 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 DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" HOMEPAGE="http://code.google.com/p/protobuf/ https://github.com/google/protobuf/"; SRC_URI="https://github.com/google/${PN}/releases/download/${PV}/${P}.tar.bz2"; LICENSE="Apache-2.0" SLOT="0/9" # subslot = soname major version KEYWORDS="~amd64 ~arm -hppa ~mips -ppc -ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="emacs examples java python static-libs vim-syntax" CDEPEND="emacs? ( virtual/emacs ) python? ( ${PYTHON_DEPS} )" DEPEND="${CDEPEND} java? ( >=virtual/jdk-1.5 ) python? ( dev-python/google-apputils[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] )" RDEPEND="${CDEPEND} java? ( >=virtual/jre-1.5 )" src_prepare() { # breaks Darwin, bug #472514 [[ ${CHOST} != *-darwin* ]] && local PATCHES=( "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch ) append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI if use python; then cd python && distutils-r1_src_prepare fi autotools-multilib_src_prepare } src_compile() { autotools-multilib_src_compile if use python; then einfo "Compiling Python library ..." pushd python >/dev/null distutils-r1_src_compile popd >/dev/null fi if use java; then einfo "Compiling Java library ..." src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto mkdir java/build pushd java/src/main/java >/dev/null ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed" popd >/dev/null jar cf ${PN}.jar -C java/build . || die "jar failed" fi if use emacs; then elisp-compile "${S}"/editors/protobuf-mode.el fi } src_test() { autotools-multilib_src_test check if use python; then pushd python >/dev/null distutils-r1_src_test popd >/dev/null fi } src_install() { local DOCS=( CHANGES.txt CONTRIBUTORS.txt README.md ) autotools-multilib_src_install if use python; then pushd python >/dev/null distutils-r1_src_install popd >/dev/null fi if use java; then java-pkg_dojar ${PN}.jar use source && java-pkg_dosrc java/src/main/java/* fi if use vim-syntax; then insinto /usr/share/vim/vimfiles/syntax doins editors/proto.vim insinto /usr/share/vim/vimfiles/ftdetect/ doins "${FILESDIR}"/proto.vim fi if use emacs; then elisp-install ${PN} editors/protobuf-mode.el* elisp-site-file-install "${FILESDIR}"/70${PN}-gentoo.el fi if use examples; then dodoc -r examples docompress -x /usr/share/doc/${PF}/examples fi } pkg_postinst() { use emacs && elisp-site-regen } pkg_postrm() { use emacs && elisp-site-regen }
