commit: 1502b6c1d3b8c0f4bb196b97c1936a3801ea6e5e Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Sun Jun 4 15:16:10 2017 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Sun Jun 4 15:16:10 2017 +0000 URL: https://gitweb.gentoo.org/proj/betagarden.git/commit/?id=1502b6c1
dev-lang/opal: Bump EAPI & fix metadata.xml Package-Manager: Portage-2.3.6, Repoman-2.3.2 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> dev-lang/opal/metadata.xml | 2 +- dev-lang/opal/opal-2.4b.ebuild | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dev-lang/opal/metadata.xml b/dev-lang/opal/metadata.xml index 937d476..a55175a 100644 --- a/dev-lang/opal/metadata.xml +++ b/dev-lang/opal/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <maintainer type="unknown"> + <maintainer type="person"> <email>r...@gentoo.org</email> </maintainer> </pkgmetadata> diff --git a/dev-lang/opal/opal-2.4b.ebuild b/dev-lang/opal/opal-2.4b.ebuild index b84501a..0579091 100644 --- a/dev-lang/opal/opal-2.4b.ebuild +++ b/dev-lang/opal/opal-2.4b.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit eutils +EAPI=6 MY_P=ocs-${PV} @@ -16,11 +14,13 @@ SLOT="0" KEYWORDS="~amd64 ~sparc ~x86" IUSE="X doc +tk +tcl" +REQUIRED_USE="tk? ( tcl )" + DEPEND=" - >=sys-libs/ncurses-5.4-r5 - >=sys-libs/readline-4.3-r5 - =dev-lang/tcl-8.5* - =dev-lang/tk-8.5* + >=sys-libs/ncurses-5.4-r5:0= + >=sys-libs/readline-4.3-r5:0= + tcl? ( =dev-lang/tcl-8.5*:* ) + tk? ( =dev-lang/tk-8.5*:* ) " S="${WORKDIR}/${MY_P}" @@ -54,5 +54,7 @@ src_install() { fi # Fix "OCS=${D}//usr" in binaries (due to broken --disable-absolute-pathes) - sed -i 's|^OCS=.*|OCS=/usr|' "${D}"/usr/bin/{dosfop,oasys,oasys1,ocs,pureDosfop} || die + sed \ + -e 's|^OCS=.*|OCS=/usr|' \ + -i "${D}"/usr/bin/{dosfop,oasys,oasys1,ocs,pureDosfop} || die }
