Add emacs USE flag, see bug #271007.

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

5 files changed, 57 insertions, 12 deletions

diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog
index ff13d6ee46b3..cf9cc16b0553 100644
--- a/dev-libs/protobuf/ChangeLog
+++ b/dev-libs/protobuf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/protobuf
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.6 2009/05/18 19:28:15 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.7 2009/05/24 22:32:50 nelchael Exp $
+
+  24 May 2009; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/70protobuf-gentoo.el, protobuf-2.1.0.ebuild,
+  +files/protobuf-2.1.0-fix-emacs-byte-compile.patch:
+  Add emacs USE flag, see bug #271007.
 
   18 May 2009; Krzysiek Pawlik <nelchael@gentoo.org>
   -protobuf-2.0.0_beta.ebuild, -protobuf-2.0.1.ebuild,
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 756935ae7a52..c61efc0f88bc 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 70protobuf-gentoo.el 170 RMD160 f6208c9a555325c1a6e1b26daee6fbc425cbfd98 SHA1 8f8f8ce9bdab9a8f9a11b16236be383488277cb3 SHA256 b6e5c2f11a63f9eb4a9382227ce8f41bfcf23213166d2fb212e21e237b2f264d
 AUX protobuf-2.0.3-decoder_test_64bit_fix.patch 935 RMD160 71b217978e1ae97e0db49292be3d325483990d03 SHA1 1c7704958ce43e958a59852eb7c71ebec092fd8d SHA256 c836602d5f0c4686122c07312892b42e8dc20c8517d8a89ff41924c0872be4b0
+AUX protobuf-2.1.0-fix-emacs-byte-compile.patch 653 RMD160 64580c8aeb0d7656096367eabb3debd4e1410d98 SHA1 78e12dbde5e8581748dac5953dd398aa7a1b6d2e SHA256 74f0fd6978eda88cfea02f3ab5b451e5400ba154f0e3443fee20a3f338af2eed
 DIST protobuf-2.0.3.tar.bz2 800667 RMD160 624ea3075ba5756106c367be224c6eb68ee4ae69 SHA1 aad5cbe1423060b0ff315d2a1447e7bf1209dc63 SHA256 b1d558df74c49aeda8e92c0c33dd9633d53e5ab2e180ab5b6873f167d8dc016c
 DIST protobuf-2.1.0.tar.bz2 1286218 RMD160 f209732febc8d4cc321246c5caff2b7502d13073 SHA1 042025cac0b8f76468091bc796d3fd8807a4664f SHA256 55ead035337b248bb63243d2c6deeb42e5e88789109d14b5ae0beda6548928e1
 EBUILD protobuf-2.0.3.ebuild 1847 RMD160 34450a9e3ced8cb893aa4b95aa35adebb5aeb380 SHA1 762de4d65ba612592e83aaa1fb9b95a0b68b0587 SHA256 73f8c74ccf17221cc035e71fae42eaf678b9d2d5adceae25e1a1b21b79b6812e
-EBUILD protobuf-2.1.0.ebuild 1846 RMD160 a52ec56a884ce432c3284c3632eb19e1b05b1a0a SHA1 44eb8de540730df1f8e3536d2a597f7f294a3d4a SHA256 f96d3e66fddd66c6c8f096e3c31430e85a74a6c2c7a8ee4d8d54c9532e11611c
-MISC ChangeLog 1390 RMD160 45b704726fe516336fdf6959c869c0d4a74f7f54 SHA1 7406b02e5985a7cda8c40a836a5045d3b7ac5959 SHA256 74900069bfabe24cdf188525ea3cf0c6ea2061983020073c3a1875c3af166936
+EBUILD protobuf-2.1.0.ebuild 2343 RMD160 9e4315fa1f72ac413cb35e74c93497a7b8ed6d88 SHA1 a1d299408f32cba3652b4118b7c5cb03b77a2ecc SHA256 0cc39313c78b45fb67c54970b22442ed69302ce2f93f993dabbf7fcc74c6c1b0
+MISC ChangeLog 1591 RMD160 98cda0c98335fb0f9a70523636f58a22fd56992f SHA1 c7ab3ab73d9c0dae003b0bd47c0cdd9d53cc15d3 SHA256 a778f974b780fce251739a5716ec9ad190615905438989e713d7f23474208b35
 MISC metadata.xml 356 RMD160 b6b528df5c353d5d918c22800774c0162af8d968 SHA1 8ab96b25050ac855282587b12969b795b3e96544 SHA256 854e6241f233981ad8d1b7dce927e72f5e483b88f1210759b3c5f3054a31e89a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoRttUACgkQgo/w9rxVVVFkvACgvdanTFQQlO0aq8nFeRREgROI
-kVIAoIspM1OgAsMzfG/+vacIscnZmb7c
-=fbZ6
+iEYEARECAAYFAkoZyxgACgkQgo/w9rxVVVGQwQCglYyb64Tzf6q49eVn0x5xZ/3x
+nq8An0m7nw2Xr91DvNNkbMwh7rVEIs0o
+=e2I4
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/protobuf/files/70protobuf-gentoo.el b/dev-libs/protobuf/files/70protobuf-gentoo.el
new file mode 100644
index 000000000000..51370527f6f2
--- /dev/null
+++ b/dev-libs/protobuf/files/70protobuf-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'auto-mode-alist '("\\.proto\\'" . protobuf-mode))
+(autoload 'protobuf-mode "protobuf-mode" "Google protobuf mode." t)
diff --git a/dev-libs/protobuf/files/protobuf-2.1.0-fix-emacs-byte-compile.patch b/dev-libs/protobuf/files/protobuf-2.1.0-fix-emacs-byte-compile.patch
new file mode 100644
index 000000000000..8a2381a47083
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-2.1.0-fix-emacs-byte-compile.patch
@@ -0,0 +1,15 @@
+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
diff --git a/dev-libs/protobuf/protobuf-2.1.0.ebuild b/dev-libs/protobuf/protobuf-2.1.0.ebuild
index f38718a4c429..a821620fbb5f 100644
--- a/dev-libs/protobuf/protobuf-2.1.0.ebuild
+++ b/dev-libs/protobuf/protobuf-2.1.0.ebuild
@@ -1,12 +1,12 @@
 # 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.1.0.ebuild,v 1.2 2009/05/18 19:28:15 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.1.0.ebuild,v 1.3 2009/05/24 22:32:50 nelchael Exp $
 
 EAPI="2"
 
 JAVA_PKG_IUSE="source"
 
-inherit eutils distutils python java-pkg-opt-2
+inherit 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/"
@@ -15,14 +15,17 @@ SRC_URI="http://protobuf.googlecode.com/files/${PF}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples java python vim-syntax"
+IUSE="emacs examples java python vim-syntax"
 
 DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 )
-	python? ( dev-python/setuptools )"
-RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.5 )"
+	python? ( dev-python/setuptools )
+	emacs? ( virtual/emacs )"
+RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.5 )
+	emacs? ( virtual/emacs )"
 
 src_prepare() {
-	epatch "${FILESDIR}/protobuf-2.0.3-decoder_test_64bit_fix.patch"
+	epatch "${FILESDIR}/${PN}-2.0.3-decoder_test_64bit_fix.patch"
+	epatch "${FILESDIR}/${PN}-2.1.0-fix-emacs-byte-compile.patch"
 }
 
 src_compile() {
@@ -40,6 +43,10 @@ src_compile() {
 		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() {
@@ -55,6 +62,11 @@ src_install() {
 		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"
@@ -74,3 +86,11 @@ src_test() {
 		 cd ..
 	fi
 }
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}