mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-15 00:46:58 +02:00
feat(dev-libs/protobuf) remove as newer versions are in portage-stable
This commit is contained in:
Greg Kroah-Hartman
parent
b0e075a09a
commit
07066716ba
@ -1,2 +0,0 @@
|
|||||||
DIST protobuf-2.2.0.tar.bz2 1350084 SHA256 731dfb6b19e0bbc4e20fcc4d2cc317d8acb4203bc611e4247684bae8403c724b SHA512 b9ae5450fde3e322f8c3c617819b604ac360db845d46869623455fcb6b34b70beae573caa52863b402f53a6248867d3776dc8b6bc83325cc58964d9e5f81c96b WHIRLPOOL 8b2c0794fe02593958dc6602b6fb614a598e83023e470cce8e32a111015a5f7b8690ab34189b010f169a458d21eb63df00960f4f03d5dba7eb5ba367d202dbfe
|
|
||||||
DIST protobuf-2.3.0.tar.bz2 1424966 SHA256 760c7707c3fe9ce801916bbd3067d711a33aa550c01b32d1e1761119cf6280ac
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
(add-to-list 'load-path "@SITELISP@")
|
|
||||||
(add-to-list 'auto-mode-alist '("\\.proto\\'" . protobuf-mode))
|
|
||||||
(autoload 'protobuf-mode "protobuf-mode" "Google protobuf mode." t)
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
augroup filetype
|
|
||||||
au! BufRead,BufNewFile *.proto setfiletype proto
|
|
||||||
augroup end
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
diff -Naurp protobuf-2.0.3-orig/python/google/protobuf/internal/decoder_test.py protobuf-2.0.3/python/google/protobuf/internal/decoder_test.py
|
|
||||||
--- protobuf-2.0.3-orig/python/google/protobuf/internal/decoder_test.py 2008-12-05 19:07:15.000000000 +0100
|
|
||||||
+++ protobuf-2.0.3/python/google/protobuf/internal/decoder_test.py 2008-12-06 22:11:48.000000000 +0100
|
|
||||||
@@ -106,6 +106,13 @@ class DecoderTest(unittest.TestCase):
|
|
||||||
self.mox.ReplayAll()
|
|
||||||
result = decoder_method(d)
|
|
||||||
self.assertEqual(expected_result, result)
|
|
||||||
+ # HACK: Convert all ints to longs so that different behavior
|
|
||||||
+ # between 32-bit and 64-bit systems does not impact the result
|
|
||||||
+ # of the test.
|
|
||||||
+ if isinstance(result, int):
|
|
||||||
+ result = long(result)
|
|
||||||
+ if isinstance(expected_result, int):
|
|
||||||
+ expected_result = long(expected_result)
|
|
||||||
self.assert_(isinstance(result, type(expected_result)))
|
|
||||||
self.mox.VerifyAll()
|
|
||||||
self.mox.ResetAll()
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
http://bugs.gentoo.org/271007
|
|
||||||
Fix error with byte-compilation in Emacs.
|
|
||||||
|
|
||||||
--- protobuf-2.1.0-orig/editors/protobuf-mode.el 2009-05-13 22:36:40.000000000 +0200
|
|
||||||
+++ protobuf-2.1.0/editors/protobuf-mode.el 2009-05-24 13:37:04.000000000 +0200
|
|
||||||
@@ -71,7 +71,8 @@
|
|
||||||
|
|
||||||
;; This mode does not inherit properties from other modes. So, we do not use
|
|
||||||
;; the usual `c-add-language' function.
|
|
||||||
-(put 'protobuf-mode 'c-mode-prefix "protobuf-")
|
|
||||||
+(eval-and-compile
|
|
||||||
+ (put 'protobuf-mode 'c-mode-prefix "protobuf-"))
|
|
||||||
|
|
||||||
;; The following code uses of the `c-lang-defconst' macro define syntactic
|
|
||||||
;; features of protocol buffer language. Refer to the documentation in the
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
Fixing as-needed issue
|
|
||||||
|
|
||||||
http://bugs.gentoo.org/show_bug.cgi?id=271509
|
|
||||||
|
|
||||||
--- m4/acx_pthread.m4
|
|
||||||
+++ m4/acx_pthread.m4
|
|
||||||
@@ -278,7 +278,8 @@
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
- if test x"$done" = xno; then
|
|
||||||
+ if test x"$done" = xyes; then
|
|
||||||
+ done="no"
|
|
||||||
AC_MSG_CHECKING([whether -pthread is sufficient with -shared])
|
|
||||||
AC_TRY_LINK([#include <pthread.h>],
|
|
||||||
[pthread_t th; pthread_join(th, 0);
|
|
||||||
--- gtest/m4/acx_pthread.m4
|
|
||||||
+++ gtest/m4/acx_pthread.m4
|
|
||||||
@@ -278,7 +278,8 @@
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
- if test x"$done" = xno; then
|
|
||||||
+ if test x"$done" = xyes; then
|
|
||||||
+ done="no"
|
|
||||||
AC_MSG_CHECKING([whether -pthread is sufficient with -shared])
|
|
||||||
AC_TRY_LINK([#include <pthread.h>],
|
|
||||||
[pthread_t th; pthread_join(th, 0);
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
Fixing as-needed issues
|
|
||||||
|
|
||||||
http://bugs.gentoo.org/show_bug.cgi?id=271509
|
|
||||||
|
|
||||||
--- m4/acx_pthread.m4
|
|
||||||
+++ m4/acx_pthread.m4
|
|
||||||
@@ -99,7 +99,7 @@
|
|
||||||
# which indicates that we try without any flags at all, and "pthread-config"
|
|
||||||
# which is a program returning the flags for the Pth emulation library.
|
|
||||||
|
|
||||||
-acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
|
|
||||||
+acx_pthread_flags="pthreads none pthread -Kthread -kthread lthread -pthread -pthreads -mthreads --thread-safe -mt pthread-config"
|
|
||||||
|
|
||||||
# The ordering *is* (sometimes) important. Some notes on the
|
|
||||||
# individual items follow:
|
|
||||||
--- gtest/m4/acx_pthread.m4
|
|
||||||
+++ gtest/m4/acx_pthread.m4
|
|
||||||
@@ -99,7 +99,7 @@
|
|
||||||
# which indicates that we try without any flags at all, and "pthread-config"
|
|
||||||
# which is a program returning the flags for the Pth emulation library.
|
|
||||||
|
|
||||||
-acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
|
|
||||||
+acx_pthread_flags="pthreads none pthread -Kthread -kthread lthread -pthread -pthreads -mthreads --thread-safe -mt pthread-config"
|
|
||||||
|
|
||||||
# The ordering *is* (sometimes) important. Some notes on the
|
|
||||||
# individual items follow:
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
diff -Naur protobuf-2.3.0-orig/python/setup.py protobuf-2.3.0/python/setup.py
|
|
||||||
--- protobuf-2.3.0-orig/python/setup.py 2011-03-22 16:33:33.000000000 -0700
|
|
||||||
+++ protobuf-2.3.0/python/setup.py 2011-03-22 17:01:14.000000000 -0700
|
|
||||||
@@ -16,7 +16,9 @@
|
|
||||||
maintainer_email = "protobuf@googlegroups.com"
|
|
||||||
|
|
||||||
# Find the Protocol Compiler.
|
|
||||||
-if os.path.exists("../src/protoc"):
|
|
||||||
+if 'PROTOC' in os.environ and os.path.exists(os.environ['PROTOC']):
|
|
||||||
+ protoc = os.environ['PROTOC']
|
|
||||||
+elif os.path.exists("../src/protoc"):
|
|
||||||
protoc = "../src/protoc"
|
|
||||||
elif os.path.exists("../src/protoc.exe"):
|
|
||||||
protoc = "../src/protoc.exe"
|
|
||||||
@ -1,105 +0,0 @@
|
|||||||
# Copyright 1999-2009 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.2.0.ebuild,v 1.1 2009/08/21 17:41:18 nelchael Exp $
|
|
||||||
|
|
||||||
EAPI="2"
|
|
||||||
|
|
||||||
JAVA_PKG_IUSE="source"
|
|
||||||
|
|
||||||
inherit eutils 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/${PF}.tar.bz2"
|
|
||||||
|
|
||||||
LICENSE="Apache-2.0"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~x86 ~arm"
|
|
||||||
IUSE="emacs examples java python 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 )"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch "${FILESDIR}/${P}-decoder_test_64bit_fix.patch"
|
|
||||||
epatch "${FILESDIR}/${P}-fix-emacs-byte-compile.patch"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
local protoc=""
|
|
||||||
if tc-is-cross-compiler; then
|
|
||||||
protoc="--with-protoc=$(which protoc)" ||
|
|
||||||
die "need native protoc tool to cross compile"
|
|
||||||
fi
|
|
||||||
econf ${protoc} || die "died running econf"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
emake || die
|
|
||||||
|
|
||||||
if use python; then
|
|
||||||
cd python; distutils_src_compile; cd ..
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use java; then
|
|
||||||
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_install() {
|
|
||||||
emake DESTDIR="${D}" install
|
|
||||||
dodoc CHANGES.txt CONTRIBUTORS.txt README.txt
|
|
||||||
|
|
||||||
if use python; then
|
|
||||||
cd python; distutils_src_install; cd ..
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use vim-syntax; then
|
|
||||||
insinto /usr/share/vim/vimfiles/syntax
|
|
||||||
doins editors/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
|
|
||||||
|
|
||||||
if use java; then
|
|
||||||
java-pkg_dojar ${PN}.jar
|
|
||||||
use source && java-pkg_dosrc java/src/main/java/*
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
emake check
|
|
||||||
|
|
||||||
if use python; then
|
|
||||||
cd python; ${python} setup.py test || die "python test failed"
|
|
||||||
cd ..
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
use emacs && elisp-site-regen
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
use emacs && elisp-site-regen
|
|
||||||
}
|
|
||||||
@ -1,141 +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-r1.ebuild,v 1.5 2011/03/16 18:00:10 xarthisius Exp $
|
|
||||||
|
|
||||||
EAPI="3"
|
|
||||||
|
|
||||||
PYTHON_DEPEND="python-runtime? 2"
|
|
||||||
JAVA_PKG_IUSE="source"
|
|
||||||
|
|
||||||
inherit autotools eutils distutils python-old-eapi3 java-pkg-opt-2 elisp-common toolchain-funcs
|
|
||||||
|
|
||||||
DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
|
|
||||||
HOMEPAGE="http://code.google.com/p/protobuf/"
|
|
||||||
SRC_URI="http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/${P}.tar.bz2"
|
|
||||||
|
|
||||||
LICENSE="Apache-2.0"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 arm ppc ppc64 x86 ~x64-macos"
|
|
||||||
|
|
||||||
IUSE="emacs examples java python python-runtime static-libs vim-syntax"
|
|
||||||
|
|
||||||
DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 )
|
|
||||||
python? ( dev-lang/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"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch "${FILESDIR}"/${P}-asneeded-2.patch
|
|
||||||
epatch "${FILESDIR}"/${P}-crosscompile.patch
|
|
||||||
eautoreconf
|
|
||||||
|
|
||||||
if use python; then
|
|
||||||
python_set_active_version 2
|
|
||||||
python_convert_shebangs -r 2 .
|
|
||||||
distutils_src_prepare
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
PROTOC_ARG=
|
|
||||||
if tc-is-cross-compiler ; then
|
|
||||||
host_protoc=$(which protoc)
|
|
||||||
[[ -n ${host_protoc} ]] || die "Please install ${P} in your host environment."
|
|
||||||
PROTOC_ARG="--with-protoc=${host_protoc}"
|
|
||||||
export PROTOC=${host_protoc}
|
|
||||||
fi
|
|
||||||
|
|
||||||
export LDFLAGS="-L./.libs ${LDFLAGS}"
|
|
||||||
econf $PROTOC_ARG \
|
|
||||||
$(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.eclass doesn't allow us to install into /usr/local, so we
|
|
||||||
# have to do this manually.
|
|
||||||
"${EPYTHON}" setup.py install --root="${D}" --prefix=/usr/local
|
|
||||||
popd
|
|
||||||
# HACK ALERT: upstream setup.py forgets to install google/__init__.py,
|
|
||||||
# hack now, fix properly later.
|
|
||||||
pushd "${D}"
|
|
||||||
local whereto="$(find . -name 'site-packages')"
|
|
||||||
popd
|
|
||||||
insinto "${whereto/./}"/google/
|
|
||||||
doins "${S}"/python/google/__init__.py
|
|
||||||
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
|
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
use emacs && elisp-site-regen
|
|
||||||
}
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user