Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/asciidoc/
Date: Mon, 23 Nov 2015 13:13:09
Message-Id: 1448032115.168218b3a889f0357c7bebd3c42286bfa482f04d.monsieurp@gentoo
1 commit: 168218b3a889f0357c7bebd3c42286bfa482f04d
2 Author: Marc Joliet <marcec <AT> gmx <DOT> de>
3 AuthorDate: Mon Nov 9 15:59:23 2015 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 20 15:08:35 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=168218b3
7
8 app-text/asciidoc: remove vim-syntax from IUSE
9
10 The vim-syntax USE flag is useless now, for the following reasons:
11
12 - The actions it controls have no effect, since the Makefile.in doesn't do
13 anything vim-related anymore, as mentioned in the CHANGELOG.
14 - Vim comes with its own syntax file since version 7.4, which is maintained (by
15 AsciiDoc upstream, according to its header) and was last updated in 2014,
16 whereas the upstream syntax file has not been changed since 2013.
17
18 Gentoo-bug: 530808
19 Signed-off-by: Marc Joliet <marcec <AT> gmx.de>
20
21 app-text/asciidoc/asciidoc-8.6.9-r2.ebuild | 13 +------------
22 app-text/asciidoc/asciidoc-9999.ebuild | 13 +------------
23 2 files changed, 2 insertions(+), 24 deletions(-)
24
25 diff --git a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
26 index e329c8e..94f5ba0 100644
27 --- a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
28 +++ b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
29 @@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
30
31 LICENSE="GPL-2"
32 SLOT="0"
33 -IUSE="examples graphviz highlight test vim-syntax"
34 +IUSE="examples graphviz highlight test"
35
36 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
37
38 @@ -44,15 +44,6 @@ REQUISITES for a list of runtime dependencies.
39 "
40
41 src_prepare() {
42 - if ! use vim-syntax; then
43 - sed -i -e '/^install/s/install-vim//' Makefile.in || die
44 - else
45 - sed -i\
46 - -e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \
47 - -e 's:/etc/vim::' \
48 - Makefile.in || die
49 - fi
50 -
51 # Only needed for prefix - harmless (does nothing) otherwise
52 sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
53 "${S}/asciidoc.py" || die
54 @@ -63,8 +54,6 @@ src_configure() {
55 }
56
57 src_install() {
58 - use vim-syntax && dodir /usr/share/vim/vimfiles
59 -
60 emake DESTDIR="${D}" install
61
62 python_fix_shebang "${ED}"/usr/bin/*.py
63
64 diff --git a/app-text/asciidoc/asciidoc-9999.ebuild b/app-text/asciidoc/asciidoc-9999.ebuild
65 index 0a4f1a9..81bb1da 100644
66 --- a/app-text/asciidoc/asciidoc-9999.ebuild
67 +++ b/app-text/asciidoc/asciidoc-9999.ebuild
68 @@ -22,7 +22,7 @@ fi
69
70 LICENSE="GPL-2"
71 SLOT="0"
72 -IUSE="examples graphviz highlight test vim-syntax"
73 +IUSE="examples graphviz highlight test"
74
75 REQUIRED_USE="highlight? ( ${PYTHON_REQUIRED_USE} )"
76
77 @@ -58,15 +58,6 @@ if [ "$PV" == "9999" ]; then
78 fi
79
80 src_prepare() {
81 - if ! use vim-syntax; then
82 - sed -i -e '/^install/s/install-vim//' Makefile.in || die
83 - else
84 - sed -i\
85 - -e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \
86 - -e 's:/etc/vim::' \
87 - Makefile.in || die
88 - fi
89 -
90 # Only needed for prefix - harmless (does nothing) otherwise
91 sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
92 "${S}/asciidoc.py" || die
93 @@ -88,8 +79,6 @@ src_compile() {
94 }
95
96 src_install() {
97 - use vim-syntax && dodir /usr/share/vim/vimfiles
98 -
99 emake DESTDIR="${D}" install
100
101 python_fix_shebang "${ED}"/usr/bin/*.py