commit: 680c7787192159fd45db3b72a04247916de3b798 Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> AuthorDate: Fri Jan 1 15:29:11 2021 +0000 Commit: Horea Christian <horea.christ <AT> gmail <DOT> com> CommitDate: Sun Jan 3 22:13:51 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=680c7787
dev-java/jgraphx: EAPI bump, version bump Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> Signed-off-by: Horea Christian <chr <AT> chymera.eu> dev-java/jgraphx/jgraphx-1.8.0.6.ebuild | 45 ---------------------- dev-java/jgraphx/jgraphx-2.5.0.3.ebuild | 41 -------------------- ...jgraphx-1.4.1.0.ebuild => jgraphx-4.2.2.ebuild} | 25 +++++------- 3 files changed, 10 insertions(+), 101 deletions(-) diff --git a/dev-java/jgraphx/jgraphx-1.8.0.6.ebuild b/dev-java/jgraphx/jgraphx-1.8.0.6.ebuild deleted file mode 100644 index ae457bf45..000000000 --- a/dev-java/jgraphx/jgraphx-1.8.0.6.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 versionator - -MY_PV=$(replace_all_version_separators '_') - -DESCRIPTION="Open-source graph component for Java" -HOMEPAGE="http://www.jgraph.com"; -SRC_URI="http://www.jgraph.com/downloads/jgraphx/archive/${PN}-${MY_PV}.zip -> ${P}.zip" - -SLOT="1.8" -LICENSE="BSD" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples source" - -DEPEND=" - >=virtual/jdk-1.5 - app-arch/unzip" -RDEPEND=">=virtual/jre-1.5" - -S="${WORKDIR}/${PN}" - -src_prepare() { - # don't do javadoc always - sed -i \ - -e 's/depends="doc"/depends="compile"/' \ - build.xml || die "sed failed" - rm -rf doc/api lib/jgraphx.jar || die -} - -EANT_BUILD_TARGET="build" -EANT_DOC_TARGET="doc" - -src_install() { - java-pkg_dojar lib/${PN}.jar - - use doc && java-pkg_dojavadoc docs/api - use source && java-pkg_dosrc src/org - use examples && java-pkg_doexamples examples -} diff --git a/dev-java/jgraphx/jgraphx-2.5.0.3.ebuild b/dev-java/jgraphx/jgraphx-2.5.0.3.ebuild deleted file mode 100644 index 926d260f7..000000000 --- a/dev-java/jgraphx/jgraphx-2.5.0.3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -JAVA_PKG_IUSE="doc source" -inherit java-pkg-2 java-ant-2 versionator - -MY_PV=$(replace_all_version_separators '_') - -DESCRIPTION="Open-source graph component for Java" -SRC_URI="http://www.jgraph.com/downloads/jgraphx/archive/${PN}-${MY_PV}.zip\ - -> ${P}.zip" -HOMEPAGE="http://www.jgraph.com"; -IUSE="doc examples source" -DEPEND=">=virtual/jdk-1.5 - app-arch/unzip" -RDEPEND=">=virtual/jre-1.5" -LICENSE="BSD" -SLOT="2.5" -KEYWORDS="~amd64 ~x86" - -S="${WORKDIR}/${PN}" - -src_prepare() { - # don't do javadoc always - sed -i \ - -e 's/depends="doc"/depends="compile"/' \ - build.xml || die "sed failed" - rm -rf doc/api lib/jgraphx.jar || die -} - -EANT_BUILD_TARGET="build" -EANT_DOC_TARGET="doc" - -src_install() { - java-pkg_dojar lib/${PN}.jar - - use doc && java-pkg_dojavadoc docs/api - use source && java-pkg_dosrc src/org - use examples && java-pkg_doexamples examples -} diff --git a/dev-java/jgraphx/jgraphx-1.4.1.0.ebuild b/dev-java/jgraphx/jgraphx-4.2.2.ebuild similarity index 63% rename from dev-java/jgraphx/jgraphx-1.4.1.0.ebuild rename to dev-java/jgraphx/jgraphx-4.2.2.ebuild index 488bafcef..de4e6ab36 100644 --- a/dev-java/jgraphx/jgraphx-1.4.1.0.ebuild +++ b/dev-java/jgraphx/jgraphx-4.2.2.ebuild @@ -1,31 +1,26 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 versionator - -MY_PV=$(replace_all_version_separators '_') +inherit java-pkg-2 java-ant-2 DESCRIPTION="Open-source graph component for Java" -HOMEPAGE="http://www.jgraph.com"; -SRC_URI="http://www.jgraph.com/downloads/jgraphx/archive/${PN}-${MY_PV}.zip -> ${P}.zip" +HOMEPAGE="https://github.com/jgraph"; +SRC_URI="https://github.com/jgraph/jgraphx/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SLOT="0" LICENSE="BSD" +SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc examples source" -DEPEND=" - >=virtual/jdk-1.5 - app-arch/unzip" -RDEPEND=">=virtual/jre-1.5" +IUSE="doc examples source" -S="${WORKDIR}/${PN}" +DEPEND=">=virtual/jdk-1.7" +RDEPEND=">=virtual/jre-1.7" src_prepare() { + default # don't do javadoc always sed -i \ -e 's/depends="doc"/depends="compile"/' \
