diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2015-11-23 13:10:03 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2015-11-23 13:10:24 +0000 |
| commit | 9a98f5bba8b88fd03cd42da2b8a3ac6364d66f82 (patch) | |
| tree | c7ec701f1dc7f7c58207880c8ea5eca3cb1fff71 /app-text | |
| parent | dev-python/pbr: Add missing keywords (diff) | |
| parent | app-text/asciidoc: remove vim-syntax from IUSE (diff) | |
| download | gentoo-9a98f5bba8b88fd03cd42da2b8a3ac6364d66f82.tar.gz gentoo-9a98f5bba8b88fd03cd42da2b8a3ac6364d66f82.tar.bz2 gentoo-9a98f5bba8b88fd03cd42da2b8a3ac6364d66f82.zip | |
Merge remote-tracking branch 'github/pr/379'.
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/asciidoc/asciidoc-8.6.9-r2.ebuild | 13 | ||||
| -rw-r--r-- | app-text/asciidoc/asciidoc-9999.ebuild | 13 |
2 files changed, 2 insertions, 24 deletions
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild index e329c8e742d5..94f5ba0f9c90 100644 --- a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild +++ b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa LICENSE="GPL-2" SLOT="0" -IUSE="examples graphviz highlight test vim-syntax" +IUSE="examples graphviz highlight test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -44,15 +44,6 @@ REQUISITES for a list of runtime dependencies. " src_prepare() { - if ! use vim-syntax; then - sed -i -e '/^install/s/install-vim//' Makefile.in || die - else - sed -i\ - -e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \ - -e 's:/etc/vim::' \ - Makefile.in || die - fi - # Only needed for prefix - harmless (does nothing) otherwise sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \ "${S}/asciidoc.py" || die @@ -63,8 +54,6 @@ src_configure() { } src_install() { - use vim-syntax && dodir /usr/share/vim/vimfiles - emake DESTDIR="${D}" install python_fix_shebang "${ED}"/usr/bin/*.py diff --git a/app-text/asciidoc/asciidoc-9999.ebuild b/app-text/asciidoc/asciidoc-9999.ebuild index 0a4f1a949fe4..81bb1da1eed0 100644 --- a/app-text/asciidoc/asciidoc-9999.ebuild +++ b/app-text/asciidoc/asciidoc-9999.ebuild @@ -22,7 +22,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="examples graphviz highlight test vim-syntax" +IUSE="examples graphviz highlight test" REQUIRED_USE="highlight? ( ${PYTHON_REQUIRED_USE} )" @@ -58,15 +58,6 @@ if [ "$PV" == "9999" ]; then fi src_prepare() { - if ! use vim-syntax; then - sed -i -e '/^install/s/install-vim//' Makefile.in || die - else - sed -i\ - -e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \ - -e 's:/etc/vim::' \ - Makefile.in || die - fi - # Only needed for prefix - harmless (does nothing) otherwise sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \ "${S}/asciidoc.py" || die @@ -88,8 +79,6 @@ src_compile() { } src_install() { - use vim-syntax && dodir /usr/share/vim/vimfiles - emake DESTDIR="${D}" install python_fix_shebang "${ED}"/usr/bin/*.py |