drop Emacs support as Emacs 23 and above ship it directly, see bug 396103

Package-Manager: portage-2.1.10.41/cvs/Linux i686

3 files changed, 14 insertions, 48 deletions

diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index 529d40f2ff6c..2c43430c7209 100644
--- a/dev-vcs/bzr/ChangeLog
+++ b/dev-vcs/bzr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/bzr
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.44 2011/12/26 22:41:32 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.45 2011/12/28 14:29:30 fauli Exp $
+
+  28 Dec 2011; Christian Faulhammer <fauli@gentoo.org> bzr-2.4.2.ebuild:
+  drop Emacs support as Emacs 23 and above ship it directly, see bug 396103
 
   26 Dec 2011; Mike Gilbert <floppym@gentoo.org> bzr-2.4.2.ebuild:
   Add || die.
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index c1dfad4e26b3..a56607041226 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 71bzr-gentoo.el 124 RMD160 d85713f80f9be8685bf56979626003f46ebbc22f SHA1 150e54685444e444e2328bb5cb9dbb1c68c066e0 SHA256 8033a55433689ba25acd502865086600d1a03158a88f4a596fae0e7d3d953454
 AUX bzr-0.90-tests-fix_root.patch 1173 RMD160 572b86dbf99620abe5090b72a9a29c3d6d2ea566 SHA1 a41671354dcf7498039c421e81bc7d9fbbc7bb29 SHA256 b2275d04401bd4ba36c0a565f5e6b7c8471ca50acd48bbf5f5d1995b197809ec
@@ -15,13 +15,13 @@ DIST bzr-2.4.2.tar.gz 7528721 RMD160 47ecfd1651d10aeea28c0dff3124c637dbbb93ab SH
 EBUILD bzr-2.2.2-r1.ebuild 4008 RMD160 6a66fb84971bd83d155255ba3102ae115e843f51 SHA1 8c6409561102e6db409e04f8fa772c59c7c80459 SHA256 3b06b5af051c8cf0c3a6c9aaa1589852b100e91c195798285d39d5a446ecd7ad
 EBUILD bzr-2.4.0.ebuild 4561 RMD160 5609878647dacae25f6ade03c88ff78f57683e15 SHA1 d487e32eb2fc3245a9d7fcc14893ff593d59397f SHA256 5b591262de192575512c1b353fc04fc3e6044c71ab1cf1c3b5a2de057e8ef9e0
 EBUILD bzr-2.4.1.ebuild 4606 RMD160 a893bffd34e953a204329e59c38f9fb7aced7d41 SHA1 e028169e49da6dcf9fbfbf86191b50670edf831a SHA256 bbfd700f3746ee0c96e29aeae46a64392d00ec1a3c718e1fbe3a2a6ddccf85a5
-EBUILD bzr-2.4.2.ebuild 4585 RMD160 308615cfca14b2bde961a3db4d02ab96c7438e97 SHA1 9b1bd4914563e0aebb33b921cec101bbcc07e056 SHA256 ce1cb8af4904ced1393d1f9244412b3a8cbd789e04df91904b10367ec111dfa3
-MISC ChangeLog 24585 RMD160 303182b238c69fe55ec697d95bce834a8bd171e8 SHA1 5b21faa3cbf36b1b1945157ae466b14586783285 SHA256 b23753646e3948933de92233e59b504599e28fa1d4f32f7e1f2979f0517b124e
+EBUILD bzr-2.4.2.ebuild 3652 RMD160 26d28816115373a0212c22f40a2237b9ca972474 SHA1 4f97864f0154578ef070c36201f5d3468c4e078a SHA256 f6df979baa4802fe649d3dc2961d25eba473231fb4ed7935f1b6f07a4e40f8e0
+MISC ChangeLog 24733 RMD160 c974a27d03a7eb09a983192bd7bf5e0bf38e6bfd SHA1 f3e6bb0dbc21247b76a50f85f97114abd077c3f3 SHA256 3643c9cde91ad5f1ddb04ab074e7d3c405cc4408c598abe797b53288a6cbc20c
 MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk74+CEACgkQC77qH+pIQ6SszQD/Xc+ryWzyOJ1e+wTXap9SvwTH
-BI03ZWtLIpM93h43080BAJjPCyNu68Rym085CiLC/Ia7uHZ/hVZ1S7h6ulS774uI
-=C5jA
+iEYEARECAAYFAk77KAUACgkQNQqtfCuFnePpjwCdHP98D4lK2hyAiAFv41LtRwwE
+9QQAn11AU906RzICUyDJk+Tw4KAg1IfG
+=YkfB
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr/bzr-2.4.2.ebuild b/dev-vcs/bzr/bzr-2.4.2.ebuild
index 967677a98667..13a18c59ed29 100644
--- a/dev-vcs/bzr/bzr-2.4.2.ebuild
+++ b/dev-vcs/bzr/bzr-2.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.4.2.ebuild,v 1.3 2011/12/26 22:41:32 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.4.2.ebuild,v 1.4 2011/12/28 14:29:30 fauli Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.[45] 3.*"
 
-inherit bash-completion-r1 distutils elisp-common eutils versionator
+inherit bash-completion-r1 distutils eutils versionator
 
 MY_P=${PN}-${PV}
 SERIES=$(get_version_component_range 1-2)
@@ -20,14 +20,13 @@ SRC_URI="http://launchpad.net/bzr/${SERIES}/${PV}/+download/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="curl doc emacs +sftp test"
+IUSE="curl doc +sftp test"
 
 RDEPEND="|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-python/celementtree )
 	curl? ( dev-python/pycurl )
 	sftp? ( dev-python/paramiko )"
 
-DEPEND="emacs? ( virtual/emacs )
-	test? (
+DEPEND="test? (
 		${RDEPEND}
 		|| ( dev-python/pyftpdlib dev-python/medusa )
 		dev-python/subunit
@@ -40,7 +39,6 @@ PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
 
 DOCS="doc/*.txt"
 PYTHON_MODNAME="bzrlib"
-SITEFILE="71bzr-gentoo.el"
 
 src_prepare() {
 	distutils_src_prepare
@@ -49,14 +47,6 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.4.2-no-pyrex-citon.patch"
 }
 
-src_compile() {
-	distutils_src_compile
-
-	if use emacs; then
-		elisp-compile contrib/emacs/bzr-mode.el || die
-	fi
-}
-
 src_test() {
 	# Some tests expect the usual pyc compiling behaviour.
 	python_enable_pyc
@@ -94,32 +84,5 @@ src_install() {
 		done
 	fi
 
-	if use emacs; then
-		elisp-install ${PN} contrib/emacs/*.el* || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/.nosearch"
-	fi
-
 	dobashcomp contrib/bash/bzr || die
 }
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	if use emacs; then
-		elisp-site-regen
-		elog "If you are using a GNU Emacs version greater than 22.1, bzr support"
-		elog "is already included.  This ebuild does not automatically activate bzr support"
-		elog "in versions below, but prepares it in a way you can load it from your ~/.emacs"
-		elog "file by adding"
-		elog "       (load \"bzr-mode\")"
-	fi
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	use emacs && elisp-site-regen
-}