dev-lang/maude: Add USE="cxx" dep for dev-lang/maude-2.7

Gentoo-bug: 595402

Package-Manager: portage-2.3.1

diff --git a/dev-lang/maude/maude-2.7.ebuild b/dev-lang/maude/maude-2.7.ebuild
index b48d92e91264389a9178c9cf96c833e327c7b80c..e7a0f1fd4e58f28c201df3f0080068ae98f441a1 100644 (file)
--- a/dev-lang/maude/maude-2.7.ebuild
+++ b/dev-lang/maude/maude-2.7.ebuild
@@ -4,14 +4,12 @@
 
 EAPI=6
 
-inherit autotools versionator
-
-MYP="${PN/m/M}-$(get_version_component_range 1-2)"
+inherit autotools
 
 DESCRIPTION="High-level specification language for equational and logic programming"
 HOMEPAGE="http://maude.cs.uiuc.edu/"
 SRC_URI="
-       http://maude.cs.illinois.edu/w/images/2/2d/${MYP}.tar.gz
+       http://maude.cs.illinois.edu/w/images/2/2d/${P^}.tar.gz
        https://dev.gentoo.org/~jlec/distfiles/${PN}-2.6-extras.tar.xz"
 
 LICENSE="GPL-2"
@@ -20,7 +18,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="
-       dev-libs/gmp:0=
+       dev-libs/gmp:0=[cxx]
        dev-libs/libsigsegv
        dev-libs/libtecla
        sci-libs/buddy"
@@ -28,7 +26,7 @@ DEPEND="${RDEPEND}
        sys-devel/bison
        sys-devel/flex"
 
-S="${WORKDIR}/${MYP}"
+S="${WORKDIR}/${P^}"
 
 PATCHES=(
        "${FILESDIR}/${PN}-2.5.0-prll.patch"
@@ -51,9 +49,10 @@ src_install() {
        doins "${WORKDIR}"/${PN}-2.6-extras/full-maude.maude
 
        # install docs and examples
-       use doc && dodoc "${WORKDIR}"/${PN}-2.6-extras/pdfs/*
+       use doc && dodoc -r "${WORKDIR}"/${PN}-2.6-extras/pdfs/.
        if use examples; then
-               insinto /usr/share/doc/${PF}/examples
-               doins -r "${WORKDIR}"/${PN}-2.6-extras/{manual,primer}-examples
+               docinto examples
+               dodoc -r "${WORKDIR}"/${PN}-2.6-extras/{manual,primer}-examples
+               docompress -x /usr/share/doc/${PF}/examples
        fi
 }