From 70d7680dd524ce687b43b1026dd9b879868373b1 Mon Sep 17 00:00:00 2001 From: Krzysztof Pawlik Date: Sat, 12 Feb 2011 22:19:02 +0000 Subject: Version bump. (Portage version: 2.1.9.39/cvs/Linux x86_64) --- dev-libs/protobuf/ChangeLog | 8 +- dev-libs/protobuf/protobuf-2.3.0-r2.ebuild | 130 ----------------------------- dev-libs/protobuf/protobuf-2.4.0a.ebuild | 130 +++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+), 131 deletions(-) delete mode 100644 dev-libs/protobuf/protobuf-2.3.0-r2.ebuild create mode 100644 dev-libs/protobuf/protobuf-2.4.0a.ebuild (limited to 'dev-libs') diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog index 4fad330bf65f..48d812927643 100644 --- a/dev-libs/protobuf/ChangeLog +++ b/dev-libs/protobuf/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/protobuf # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.24 2011/02/06 18:06:01 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.25 2011/02/12 22:19:02 nelchael Exp $ + +*protobuf-2.4.0a (12 Feb 2011) + + 12 Feb 2011; Krzysztof Pawlik + -protobuf-2.3.0-r2.ebuild, +protobuf-2.4.0a.ebuild: + Version bump. *protobuf-2.3.0-r2 (06 Feb 2011) diff --git a/dev-libs/protobuf/protobuf-2.3.0-r2.ebuild b/dev-libs/protobuf/protobuf-2.3.0-r2.ebuild deleted file mode 100644 index 047a62faef83..000000000000 --- a/dev-libs/protobuf/protobuf-2.3.0-r2.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.3.0-r2.ebuild,v 1.1 2011/02/06 18:06:01 nelchael Exp $ - -EAPI="3" - -JAVA_PKG_IUSE="source" -PYTHON_DEPEND="python? 2" - -inherit autotools eutils distutils python 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" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos" -IUSE="emacs examples java python static-libs vim-syntax" - -DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 ) - python? ( dev-python/setuptools ) - emacs? ( virtual/emacs )" -RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.5 ) - emacs? ( virtual/emacs )" - -PYTHON_MODNAME="google/protobuf" -DISTUTILS_SRC_TEST="setup.py" - -pkg_setup() { - if use python; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-asneeded-2.patch - eautoreconf - - if use python; then - python_convert_shebangs -r 2 . - distutils_src_prepare - fi -} - -src_configure() { - econf \ - $(use_enable static-libs static) -} - -src_compile() { - emake || die "emake failed" - - if use python; then - einfo "Compiling Python library ..." - pushd python - distutils_src_compile - popd - 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 - ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed" - popd - jar cf "${PN}.jar" -C java/build . || die "jar failed" - fi - - if use emacs; then - elisp-compile "${S}/editors/protobuf-mode.el" || die "elisp-compile failed!" - fi -} - -src_test() { - emake check || die "emake check failed" - - if use python; then - pushd python - distutils_src_test - popd - fi -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc CHANGES.txt CONTRIBUTORS.txt README.txt - - use static-libs || rm -rf "${D}"/usr/lib*/*.la - - if use python; then - pushd python - distutils_src_install - popd - 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* || die "elisp-install failed!" - elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" - fi - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins -r examples/* || die "doins examples failed" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen - use python && distutils_pkg_postinst -} - -pkg_postrm() { - use emacs && elisp-site-regen - use python && distutils_pkg_postrm -} diff --git a/dev-libs/protobuf/protobuf-2.4.0a.ebuild b/dev-libs/protobuf/protobuf-2.4.0a.ebuild new file mode 100644 index 000000000000..d5467b585017 --- /dev/null +++ b/dev-libs/protobuf/protobuf-2.4.0a.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.4.0a.ebuild,v 1.1 2011/02/12 22:19:02 nelchael Exp $ + +EAPI="3" + +JAVA_PKG_IUSE="source" +PYTHON_DEPEND="python? 2" + +inherit autotools eutils distutils python 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" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos" +IUSE="emacs examples java python static-libs vim-syntax" + +DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 ) + python? ( dev-python/setuptools ) + emacs? ( virtual/emacs )" +RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.5 ) + emacs? ( virtual/emacs )" + +PYTHON_MODNAME="google/protobuf" +DISTUTILS_SRC_TEST="setup.py" + +pkg_setup() { + if use python; then + python_set_active_version 2 + python_pkg_setup + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch + eautoreconf + + if use python; then + python_convert_shebangs -r 2 . + distutils_src_prepare + fi +} + +src_configure() { + econf \ + $(use_enable static-libs static) +} + +src_compile() { + emake || die "emake failed" + + if use python; then + einfo "Compiling Python library ..." + pushd python + distutils_src_compile + popd + 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 + ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed" + popd + jar cf "${PN}.jar" -C java/build . || die "jar failed" + fi + + if use emacs; then + elisp-compile "${S}/editors/protobuf-mode.el" || die "elisp-compile failed!" + fi +} + +src_test() { + emake check || die "emake check failed" + + if use python; then + pushd python + distutils_src_test + popd + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc CHANGES.txt CONTRIBUTORS.txt README.txt + + use static-libs || rm -rf "${D}"/usr/lib*/*.la + + if use python; then + pushd python + distutils_src_install + popd + 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* || die "elisp-install failed!" + elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" + fi + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins -r examples/* || die "doins examples failed" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen + use python && distutils_pkg_postinst +} + +pkg_postrm() { + use emacs && elisp-site-regen + use python && distutils_pkg_postrm +} -- cgit v1.2.3-65-gdbad