Version bump, remove old.

Package-Manager: portage-2.1.9.47/cvs/Linux x86_64

4 files changed, 37 insertions, 49 deletions

diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog
index c9b7c116c168..c8eb0e4706db 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.31 2011/04/26 20:11:44 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.32 2011/05/07 21:49:44 nelchael Exp $
+
+*protobuf-2.4.1 (07 May 2011)
+
+  07 May 2011; Krzysztof Pawlik <nelchael@gentoo.org> -protobuf-2.3.0.ebuild,
+  -files/protobuf-2.3.0-asneeded.patch, +protobuf-2.4.1.ebuild:
+  Version bump, remove old.
 
   26 Apr 2011; Christoph Mende <angelos@gentoo.org> protobuf-2.4.0a.ebuild:
   Stable on amd64 wrt bug #363403
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 653d763b02ed..ab2bb6c84584 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,21 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 70protobuf-gentoo.el 170 RMD160 f6208c9a555325c1a6e1b26daee6fbc425cbfd98 SHA1 8f8f8ce9bdab9a8f9a11b16236be383488277cb3 SHA256 b6e5c2f11a63f9eb4a9382227ce8f41bfcf23213166d2fb212e21e237b2f264d
 AUX proto.vim 79 RMD160 5b83f181a96502f8f3f362c3b73723d018928b7e SHA1 36d21ea5e6e54c4f4fcafe418c1f340c4fa8d258 SHA256 64d5a506e8f527f97f7c737a7135c64c5361b4d195674541656c24fbd88166aa
 AUX protobuf-2.3.0-asneeded-2.patch 705 RMD160 b52f82889f932e6a25a73f4a4d0c7e000e6bb2fe SHA1 5fc75e8ddb84204b2b2500eef42ecffb79b0e63e SHA256 558ea98a54e544919837f88d133b8887ad5101b4493a62737d3cea94ae58464c
-AUX protobuf-2.3.0-asneeded.patch 1224 RMD160 8a59e9cc17e8650e84a8b1d5fd7c90dfca50af00 SHA1 f9e05456ffe091aedb5d6336de3c7578793341d4 SHA256 97bc007faafac8472d898c875bb2eabe062239088ec614ebd0c3ba2915e15d53
 DIST protobuf-2.3.0.tar.bz2 1424966 RMD160 92b9c374ce3ccbb0b0d22d08e9f9d3a5a68d1ac8 SHA1 db0fbdc58be22a676335a37787178a4dfddf93c6 SHA256 760c7707c3fe9ce801916bbd3067d711a33aa550c01b32d1e1761119cf6280ac
 DIST protobuf-2.4.0a.tar.bz2 1508837 RMD160 91dc98caf019e088b36f13bbb89e286da1eebd25 SHA1 5816b0dd686115c3d90c3beccf17fd89432d3f07 SHA256 cef863023fb051b0f7e8f47b53fe57f7277a7743d644eae9563fb14db5bd7e4e
+DIST protobuf-2.4.1.tar.bz2 1440188 RMD160 405eccad08463c2f84064bb68d8a8e757235765f SHA1 df5867e37a4b51fb69f53a8baf5b994938691d6d SHA256 cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf
 EBUILD protobuf-2.3.0-r1.ebuild 2899 RMD160 4558185633cbcbe0d55299c6cd52c6159616081a SHA1 d2e7ae2beafeb753cfe6576c3f4b90e2d0ea37a4 SHA256 77b2671ad264417dbd046782975fbcf3dcef29027cdc9f39de3eaa58ca6361c5
-EBUILD protobuf-2.3.0.ebuild 2698 RMD160 d883f937b26aa146f2266ab6feec614d469c0389 SHA1 7315551c2d201245ab3d4d7b574bff6f09db866c SHA256 9fdb4ac6ae764710e108356f22c46598be971a12cd7a98631fa559ef984d99ae
 EBUILD protobuf-2.4.0a.ebuild 2946 RMD160 8c4cf405e580e07e314f997a7d03f1c0b8c7b5d7 SHA1 497c7eba98cb2b4c46fef7c09c735927a07b6432 SHA256 e91e5f95b1f108a012a4f977694fd92627a2d13e50d955149876f48d66933b28
-MISC ChangeLog 4971 RMD160 1e6adab73008474203bf0dc913f92d92648eb078 SHA1 43b606fadfbbb670cba9996c455c3410ef1f28cc SHA256 d5a7411a3678884e6e669f33c72bee30ea80b978b5991bbb48f1494318ef5f35
+EBUILD protobuf-2.4.1.ebuild 2948 RMD160 cc0ed7e0f4dc897e57c104b49425e9c07653d08a SHA1 d9938bc3af419bed1699faf0b1b5aa13dc4eb348 SHA256 7b32d6b858fcf43d5b7bbe432c3bde45a0d62ab2b0880131e1742d83abaf0f1c
+MISC ChangeLog 5174 RMD160 71db642edf2e0dce5b90b16f2167d7197759c83b SHA1 4a8acca1624c745847d926a8ddfbb988763d8d52 SHA256 d3fa417cbf7aed4b8820a18f344b3943293ea436b47b26dd55f4bec437146c67
 MISC metadata.xml 259 RMD160 854ca28d16ec40e1d7e59e2416c9633513d97454 SHA1 09b1f80597e496801e479f5b2642cd04aafadb74 SHA256 e4352d15b7bff1306476d49687525386bd7acca33010e3f06ed91b963e3d5893
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk23JvoACgkQmWq1bYTyC0PugwD9GgmL2GMYaaAIFbOqOB+G06b+
-ei/7PyLjJdp57U/AW90A/AgbNkSeeVJk7ewYUFlRc2IHNLgEar0wyDGXnzipCjE6
-=ujsj
+iQEcBAEBCgAGBQJNxb6EAAoJEBZyv1r2qA5GiT0IAI4gxzMeecYr4JoVo2FMOoK+
+ZPrpZQpN6wApRLuzNePso9Ey5VtReD4rjDnUIGTq3mJPuB9ryl8+xLQMtN0enwWc
++KlWSXQkyCSv1aXvbB0dC89RnlnnRaiGBzaM5WX2J7sADQokPEtUWrFDfjz9Z8Qu
+xLnVIESy9pxjMfEk8gqfwqA9sObnRZImSixIjgfpDjXJ7UHeLyPvHoiKozBigQQm
+o0TwwG+niyM+b4hZ0PAeGGgSPTtsD3LdnVHwRlb9fk7Rg6VdM/A8AUyZ46NWquZa
+IX5rfGMyNEveBBLJZOhqp9ujBLIRDNci941KE3XgjgeWPXSAD3ZAt+ZOrFv7dPY=
+=Q+5u
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/protobuf/files/protobuf-2.3.0-asneeded.patch b/dev-libs/protobuf/files/protobuf-2.3.0-asneeded.patch
deleted file mode 100644
index 86c4b5976396..000000000000
--- a/dev-libs/protobuf/files/protobuf-2.3.0-asneeded.patch
+++ /dev/null
@@ -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:
diff --git a/dev-libs/protobuf/protobuf-2.3.0.ebuild b/dev-libs/protobuf/protobuf-2.4.1.ebuild
index da1991ce88cb..5a2eb5422623 100644
--- a/dev-libs/protobuf/protobuf-2.3.0.ebuild
+++ b/dev-libs/protobuf/protobuf-2.4.1.ebuild
@@ -1,22 +1,23 @@
 # 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.ebuild,v 1.7 2011/01/12 20:47:56 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.4.1.ebuild,v 1.1 2011/05/07 21:49:44 nelchael Exp $
 
 EAPI="3"
 
 JAVA_PKG_IUSE="source"
 PYTHON_DEPEND="python? 2"
+DISTUTILS_SRC_TEST="setup.py"
 
-inherit autotools eutils distutils python java-pkg-opt-2 elisp-common
+inherit autotools eutils distutils 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"
+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 vim-syntax"
+IUSE="emacs examples java python static-libs vim-syntax"
 
 DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 )
 	python? ( dev-python/setuptools )
@@ -24,8 +25,8 @@ DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 )
 RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.5 )
 	emacs? ( virtual/emacs )"
 
+DISTUTILS_SETUP_FILES=("python|setup.py")
 PYTHON_MODNAME="google/protobuf"
-DISTUTILS_SRC_TEST="setup.py"
 
 pkg_setup() {
 	if use python; then
@@ -35,7 +36,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch
+	epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch
 	eautoreconf
 
 	if use python; then
@@ -44,14 +45,17 @@ src_prepare() {
 	fi
 }
 
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
+}
+
 src_compile() {
-	emake || die
+	emake || die "emake failed"
 
 	if use python; then
 		einfo "Compiling Python library ..."
-		pushd python
 		distutils_src_compile
-		popd
 	fi
 
 	if use java; then
@@ -70,23 +74,21 @@ src_compile() {
 }
 
 src_test() {
-	emake check
+	emake check || die "emake check failed"
 
 	if use python; then
-		 pushd python
 		 distutils_src_test
-		 popd
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" 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
@@ -97,6 +99,8 @@ src_install() {
 	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