summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2013-04-02 18:19:55 +0000
committerTim Harder <radhermit@gentoo.org>2013-04-02 18:19:55 +0000
commit0e366f99d4c243610d575349d8363016fa2e4eb8 (patch)
tree9fe1cb1d41f50d37b066e551ef8a2bbf0cfdf137
parentMask kde-base/kdebindings-meta[csharp]. (diff)
downloadgentoo-2-0e366f99d4c243610d575349d8363016fa2e4eb8.tar.gz
gentoo-2-0e366f99d4c243610d575349d8363016fa2e4eb8.tar.bz2
gentoo-2-0e366f99d4c243610d575349d8363016fa2e4eb8.zip
Run java-pkg-opt-2_pkg_setup when the java use flag is enabled.
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
-rw-r--r--dev-libs/protobuf/ChangeLog6
-rw-r--r--dev-libs/protobuf/protobuf-2.4.0a.ebuild5
-rw-r--r--dev-libs/protobuf/protobuf-2.4.1.ebuild3
3 files changed, 10 insertions, 4 deletions
diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog
index 331e4fb60a87..3974734a5fab 100644
--- a/dev-libs/protobuf/ChangeLog
+++ b/dev-libs/protobuf/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/protobuf
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.43 2013/03/05 17:53:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.44 2013/04/02 18:19:55 radhermit Exp $
+
+ 02 Apr 2013; Tim Harder <radhermit@gentoo.org> protobuf-2.4.0a.ebuild,
+ protobuf-2.4.1.ebuild:
+ Run java-pkg-opt-2_pkg_setup when the java use flag is enabled.
05 Mar 2013; Tim Harder <radhermit@gentoo.org> files/proto.vim:
Simplify vim ftdetect file (bug #459304 by Laurent Bachelier).
diff --git a/dev-libs/protobuf/protobuf-2.4.0a.ebuild b/dev-libs/protobuf/protobuf-2.4.0a.ebuild
index b9393e3e644c..1d68fd0ea88b 100644
--- a/dev-libs/protobuf/protobuf-2.4.0a.ebuild
+++ b/dev-libs/protobuf/protobuf-2.4.0a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 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.8 2011/07/15 16:05:13 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.4.0a.ebuild,v 1.9 2013/04/02 18:19:55 radhermit Exp $
EAPI="3"
@@ -33,6 +33,7 @@ pkg_setup() {
python_set_active_version 2
python_pkg_setup
fi
+ use java && java-pkg-opt-2_pkg_setup
}
src_prepare() {
diff --git a/dev-libs/protobuf/protobuf-2.4.1.ebuild b/dev-libs/protobuf/protobuf-2.4.1.ebuild
index aeba044a902a..0f3f5a8b4efc 100644
--- a/dev-libs/protobuf/protobuf-2.4.1.ebuild
+++ b/dev-libs/protobuf/protobuf-2.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.4.1.ebuild,v 1.6 2013/02/19 03:39:19 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.4.1.ebuild,v 1.7 2013/04/02 18:19:55 radhermit Exp $
EAPI="3"
@@ -33,6 +33,7 @@ pkg_setup() {
python_set_active_version 2
python_pkg_setup
fi
+ use java && java-pkg-opt-2_pkg_setup
}
src_prepare() {