1 |
commit: 04438b1d34bb88f7c899faec4d70d6bdc6f9ae6f |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 20 10:09:35 2015 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 20 10:09:35 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04438b1d |
7 |
|
8 |
dev-python/bicyclerepair: Clean old |
9 |
|
10 |
Package-Manager: portage-2.2.20.1 |
11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
12 |
|
13 |
.../bicyclerepair/bicyclerepair-0.9-r2.ebuild | 63 ---------------------- |
14 |
.../bicyclerepair/bicyclerepair-0.9-r3.ebuild | 18 ++++--- |
15 |
2 files changed, 11 insertions(+), 70 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/bicyclerepair/bicyclerepair-0.9-r2.ebuild b/dev-python/bicyclerepair/bicyclerepair-0.9-r2.ebuild |
18 |
deleted file mode 100644 |
19 |
index e2b20f4..0000000 |
20 |
--- a/dev-python/bicyclerepair/bicyclerepair-0.9-r2.ebuild |
21 |
+++ /dev/null |
22 |
@@ -1,63 +0,0 @@ |
23 |
-# Copyright 1999-2012 Gentoo Foundation |
24 |
-# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Id$ |
26 |
- |
27 |
-EAPI="3" |
28 |
-PYTHON_DEPEND="2" |
29 |
-SUPPORT_PYTHON_ABIS="1" |
30 |
-RESTRICT_PYTHON_ABIS="3.*" |
31 |
- |
32 |
-inherit distutils elisp-common eutils |
33 |
- |
34 |
-DESCRIPTION="Bicycle Repair Man is the Python Refactoring Browser" |
35 |
-HOMEPAGE="http://bicyclerepair.sourceforge.net/" |
36 |
-SRC_URI="mirror://sourceforge/bicyclerepair/${P}.tar.gz" |
37 |
- |
38 |
-LICENSE="icu GPL-2+" |
39 |
-SLOT="0" |
40 |
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86" |
41 |
-IUSE="emacs" |
42 |
- |
43 |
-DEPEND="emacs? ( |
44 |
- app-emacs/pymacs |
45 |
- app-emacs/python-mode |
46 |
- )" |
47 |
-RDEPEND="${DEPEND}" |
48 |
- |
49 |
-SITEFILE="50${PN}-gentoo.el" |
50 |
-PYTHON_MODNAME="BicycleRepairMan_Idle.py bike bikeemacs.py" |
51 |
- |
52 |
-src_prepare() { |
53 |
- distutils_src_prepare |
54 |
- |
55 |
- # bikeemacs.py contains non-ASCII characters in comments. |
56 |
- sed -e '1s/$/\t-*- coding: latin-1 -*-/' -i ide-integration/bikeemacs.py || die "sed failed" |
57 |
- |
58 |
- epatch "${FILESDIR}/${P}-idle.patch" |
59 |
- epatch "${FILESDIR}/${P}-invalid-syntax.patch" |
60 |
-} |
61 |
- |
62 |
-src_test() { |
63 |
- testing() { |
64 |
- "$(PYTHON)" testall.py |
65 |
- } |
66 |
- python_execute_function testing |
67 |
-} |
68 |
- |
69 |
-src_install() { |
70 |
- distutils_src_install |
71 |
- |
72 |
- if use emacs; then |
73 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die "elisp-site-file-install failed" |
74 |
- fi |
75 |
-} |
76 |
- |
77 |
-pkg_postinst() { |
78 |
- distutils_pkg_postinst |
79 |
- use emacs && elisp-site-regen |
80 |
-} |
81 |
- |
82 |
-pkg_postrm() { |
83 |
- distutils_pkg_postrm |
84 |
- use emacs && elisp-site-regen |
85 |
-} |
86 |
|
87 |
diff --git a/dev-python/bicyclerepair/bicyclerepair-0.9-r3.ebuild b/dev-python/bicyclerepair/bicyclerepair-0.9-r3.ebuild |
88 |
index 1174f34..a0fa68d 100644 |
89 |
--- a/dev-python/bicyclerepair/bicyclerepair-0.9-r3.ebuild |
90 |
+++ b/dev-python/bicyclerepair/bicyclerepair-0.9-r3.ebuild |
91 |
@@ -3,6 +3,7 @@ |
92 |
# $Id$ |
93 |
|
94 |
EAPI=5 |
95 |
+ |
96 |
PYTHON_COMPAT=( python2_7 ) |
97 |
|
98 |
inherit distutils-r1 elisp-common |
99 |
@@ -16,18 +17,23 @@ SLOT="0" |
100 |
KEYWORDS="amd64 ~ia64 ppc ppc64 x86" |
101 |
IUSE="emacs" |
102 |
|
103 |
-DEPEND="emacs? ( |
104 |
+DEPEND=" |
105 |
+ emacs? ( |
106 |
app-emacs/pymacs[${PYTHON_USEDEP}] |
107 |
- app-emacs/python-mode )" |
108 |
+ app-emacs/python-mode |
109 |
+ )" |
110 |
RDEPEND="${DEPEND}" |
111 |
|
112 |
SITEFILE="50${PN}-gentoo.el" |
113 |
|
114 |
+PATCHES=( |
115 |
+ "${FILESDIR}/${P}-idle.patch" |
116 |
+ "${FILESDIR}/${P}-invalid-syntax.patch" |
117 |
+) |
118 |
+ |
119 |
python_prepare_all() { |
120 |
# bikeemacs.py contains non-ASCII characters in comments. |
121 |
sed -e '1s/$/\t-*- coding: latin-1 -*-/' -i ide-integration/bikeemacs.py || die "sed failed" |
122 |
- epatch "${FILESDIR}/${P}-idle.patch" |
123 |
- epatch "${FILESDIR}/${P}-invalid-syntax.patch" |
124 |
|
125 |
distutils-r1_python_prepare_all |
126 |
} |
127 |
@@ -39,9 +45,7 @@ python_test() { |
128 |
src_install() { |
129 |
distutils-r1_src_install |
130 |
|
131 |
- if use emacs; then |
132 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die "elisp-site-file-install failed" |
133 |
- fi |
134 |
+ use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
135 |
} |
136 |
|
137 |
pkg_postinst() { |