commit:     d2c004d8d6e33c536f7e6ec23231470208512205
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Thu Jan 28 16:32:50 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Jan 28 16:32:50 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d2c004d8

sci-mathematics/Oid: EAPI bump

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sci-mathematics/Oid/Oid-4.0.ebuild | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/sci-mathematics/Oid/Oid-4.0.ebuild 
b/sci-mathematics/Oid/Oid-4.0.ebuild
index bbc267637..ce967fd46 100644
--- a/sci-mathematics/Oid/Oid-4.0.ebuild
+++ b/sci-mathematics/Oid/Oid-4.0.ebuild
@@ -1,35 +1,38 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils java-pkg-2 versionator
+inherit java-pkg-2
 
-MY_PV=$(replace_version_separator 1 '-')
+MY_PV="${PV//./-}"
 MY_P="${PN}${MY_PV}"
 
 DESCRIPTION="An interactive, extensible software system for experimenting with 
matroids"
-HOMEPAGE="http://sites.google.com/site/wwwmatroids/";
+HOMEPAGE="https://sites.google.com/site/wwwmatroids/";
 SRC_URI="
-       http://sites.google.com/site/wwwmatroids/${MY_P}.tar.gz
-       doc? ( 
http://sites.google.com/site/wwwmatroids/${PN}UserManual${MY_PV}.pdf )"
+       https://sites.google.com/site/wwwmatroids/${MY_P}.tar.gz -> ${P}.tar.gz
+       https://sites.google.com/site/wwwmatroids/${PN}UserManual${MY_PV}.pdf
+"
 
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE="doc"
 
 DEPEND=">=virtual/jdk-1.4:*"
 RDEPEND=">=virtual/jre-1.4:*"
 
 # The source uses 'enum' as an identifier, therefore:
 JAVA_PKG_WANT_SOURCE="1.4"
+S="${WORKDIR}"
 
 src_prepare () {
        mkdir classes || die
 
-# change path names
+       # change path names
        sed -i -e 's:NAME = ":NAME = "/usr/share/Oid/:' MatroidToolkit.java || 
die
+
+       default
 }
 
 src_compile () {
@@ -42,8 +45,7 @@ src_install () {
 
        java-pkg_dojar Oid.jar
        java-pkg_dolauncher
-
-       use doc && dodoc "${DISTDIR}"/OidUserManual4-0.pdf
+       dodoc "${DISTDIR}"/OidUserManual4-0.pdf
 
        insinto /usr/share/Oid
        doins matroid*.txt

Reply via email to