| 1 |
fauli 11/12/28 14:29:30 |
| 2 |
|
| 3 |
Modified: ChangeLog bzr-2.4.2.ebuild |
| 4 |
Log: |
| 5 |
drop Emacs support as Emacs 23 and above ship it directly, see bug 396103 |
| 6 |
|
| 7 |
(Portage version: 2.1.10.41/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.45 dev-vcs/bzr/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzr/ChangeLog?rev=1.45&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzr/ChangeLog?rev=1.45&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzr/ChangeLog?r1=1.44&r2=1.45 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v |
| 19 |
retrieving revision 1.44 |
| 20 |
retrieving revision 1.45 |
| 21 |
diff -u -r1.44 -r1.45 |
| 22 |
--- ChangeLog 26 Dec 2011 22:41:32 -0000 1.44 |
| 23 |
+++ ChangeLog 28 Dec 2011 14:29:30 -0000 1.45 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for dev-vcs/bzr |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.44 2011/12/26 22:41:32 floppym Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.45 2011/12/28 14:29:30 fauli Exp $ |
| 29 |
+ |
| 30 |
+ 28 Dec 2011; Christian Faulhammer <fauli@g.o> bzr-2.4.2.ebuild: |
| 31 |
+ drop Emacs support as Emacs 23 and above ship it directly, see bug 396103 |
| 32 |
|
| 33 |
26 Dec 2011; Mike Gilbert <floppym@g.o> bzr-2.4.2.ebuild: |
| 34 |
Add || die. |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.4 dev-vcs/bzr/bzr-2.4.2.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzr/bzr-2.4.2.ebuild?rev=1.4&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzr/bzr-2.4.2.ebuild?rev=1.4&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzr/bzr-2.4.2.ebuild?r1=1.3&r2=1.4 |
| 43 |
|
| 44 |
Index: bzr-2.4.2.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.4.2.ebuild,v |
| 47 |
retrieving revision 1.3 |
| 48 |
retrieving revision 1.4 |
| 49 |
diff -u -r1.3 -r1.4 |
| 50 |
--- bzr-2.4.2.ebuild 26 Dec 2011 22:41:32 -0000 1.3 |
| 51 |
+++ bzr-2.4.2.ebuild 28 Dec 2011 14:29:30 -0000 1.4 |
| 52 |
@@ -1,13 +1,13 @@ |
| 53 |
# Copyright 1999-2011 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.4.2.ebuild,v 1.3 2011/12/26 22:41:32 floppym Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.4.2.ebuild,v 1.4 2011/12/28 14:29:30 fauli Exp $ |
| 57 |
|
| 58 |
EAPI="3" |
| 59 |
PYTHON_DEPEND="2:2.6" |
| 60 |
SUPPORT_PYTHON_ABIS="1" |
| 61 |
RESTRICT_PYTHON_ABIS="2.[45] 3.*" |
| 62 |
|
| 63 |
-inherit bash-completion-r1 distutils elisp-common eutils versionator |
| 64 |
+inherit bash-completion-r1 distutils eutils versionator |
| 65 |
|
| 66 |
MY_P=${PN}-${PV} |
| 67 |
SERIES=$(get_version_component_range 1-2) |
| 68 |
@@ -20,14 +20,13 @@ |
| 69 |
LICENSE="GPL-2" |
| 70 |
SLOT="0" |
| 71 |
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" |
| 72 |
-IUSE="curl doc emacs +sftp test" |
| 73 |
+IUSE="curl doc +sftp test" |
| 74 |
|
| 75 |
RDEPEND="|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-python/celementtree ) |
| 76 |
curl? ( dev-python/pycurl ) |
| 77 |
sftp? ( dev-python/paramiko )" |
| 78 |
|
| 79 |
-DEPEND="emacs? ( virtual/emacs ) |
| 80 |
- test? ( |
| 81 |
+DEPEND="test? ( |
| 82 |
${RDEPEND} |
| 83 |
|| ( dev-python/pyftpdlib dev-python/medusa ) |
| 84 |
dev-python/subunit |
| 85 |
@@ -40,7 +39,6 @@ |
| 86 |
|
| 87 |
DOCS="doc/*.txt" |
| 88 |
PYTHON_MODNAME="bzrlib" |
| 89 |
-SITEFILE="71bzr-gentoo.el" |
| 90 |
|
| 91 |
src_prepare() { |
| 92 |
distutils_src_prepare |
| 93 |
@@ -49,14 +47,6 @@ |
| 94 |
epatch "${FILESDIR}/${PN}-2.4.2-no-pyrex-citon.patch" |
| 95 |
} |
| 96 |
|
| 97 |
-src_compile() { |
| 98 |
- distutils_src_compile |
| 99 |
- |
| 100 |
- if use emacs; then |
| 101 |
- elisp-compile contrib/emacs/bzr-mode.el || die |
| 102 |
- fi |
| 103 |
-} |
| 104 |
- |
| 105 |
src_test() { |
| 106 |
# Some tests expect the usual pyc compiling behaviour. |
| 107 |
python_enable_pyc |
| 108 |
@@ -94,32 +84,5 @@ |
| 109 |
done |
| 110 |
fi |
| 111 |
|
| 112 |
- if use emacs; then |
| 113 |
- elisp-install ${PN} contrib/emacs/*.el* || die |
| 114 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die |
| 115 |
- |
| 116 |
- # don't add automatically to the load-path, so the sitefile |
| 117 |
- # can do a conditional loading |
| 118 |
- touch "${ED}${SITELISP}/${PN}/.nosearch" |
| 119 |
- fi |
| 120 |
- |
| 121 |
dobashcomp contrib/bash/bzr || die |
| 122 |
} |
| 123 |
- |
| 124 |
-pkg_postinst() { |
| 125 |
- distutils_pkg_postinst |
| 126 |
- |
| 127 |
- if use emacs; then |
| 128 |
- elisp-site-regen |
| 129 |
- elog "If you are using a GNU Emacs version greater than 22.1, bzr support" |
| 130 |
- elog "is already included. This ebuild does not automatically activate bzr support" |
| 131 |
- elog "in versions below, but prepares it in a way you can load it from your ~/.emacs" |
| 132 |
- elog "file by adding" |
| 133 |
- elog " (load \"bzr-mode\")" |
| 134 |
- fi |
| 135 |
-} |
| 136 |
- |
| 137 |
-pkg_postrm() { |
| 138 |
- distutils_pkg_postrm |
| 139 |
- use emacs && elisp-site-regen |
| 140 |
-} |
Archives