commit: e482ee2190800320d2c7495c74c5d648e95dcd6c Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Mon Dec 13 16:32:26 2021 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Mon Dec 13 16:32:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e482ee21
sci-geosciences/josm: treeclean Closes: https://bugs.gentoo.org/819129 Closes: https://bugs.gentoo.org/669218 Closes: https://bugs.gentoo.org/717274 Closes: https://bugs.gentoo.org/622502 Closes: https://bugs.gentoo.org/810712 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> profiles/package.mask | 6 --- sci-geosciences/josm/Manifest | 1 - sci-geosciences/josm/josm-10966.ebuild | 68 ---------------------------------- sci-geosciences/josm/josm-99999.ebuild | 50 ------------------------- sci-geosciences/josm/metadata.xml | 8 ---- 5 files changed, 133 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 93fcb33e1b6c..3c809bfb9cb8 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -371,12 +371,6 @@ dev-java/jsoup dev-libs/go-fuse sys-fs/tmsu -# Jakov Smolić <[email protected]> (2021-11-13) -# Outdated, multiple bugs reported, uses EAPI 5, no revdeps. -# Please use sci-geosciences/josm-bin instead. -# Removal on 2021-12-13. Bug #819129. -sci-geosciences/josm - # Mart Raudsepp <[email protected]> (2021-11-11) # Needs testing to ensure valac-0.54 works for existing packages >=dev-libs/vala-common-0.53 diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest deleted file mode 100644 index c9742966e182..000000000000 --- a/sci-geosciences/josm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST josm-10966.tar.gz 61397663 BLAKE2B 31fce57126f0a311c1e7d815c1a26406c7d29429c737fc2405c3fed4240787f1e25b08ad7ca1d9b476bbf2d722a4f03db4dc6cf4a2911edd73f77165d253ef82 SHA512 a710e8c8b696955140a858dcb53184515a5c0d7b8cde71099258690b26cc980b903cfea2e4ef9b7fbf524e3b8a153f71d4464260294b0fdcf8941812ffe6b5ee diff --git a/sci-geosciences/josm/josm-10966.ebuild b/sci-geosciences/josm/josm-10966.ebuild deleted file mode 100644 index a357e498979b..000000000000 --- a/sci-geosciences/josm/josm-10966.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_ANT_ENCODING=UTF-8 - -[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion" -ESVN_REPO_URI="https://josm.openstreetmap.de/svn/trunk"; -inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS} -unset SUBVERSION_ECLASS - -DESCRIPTION="Java-based editor for the OpenStreetMap project" -HOMEPAGE="https://josm.openstreetmap.de/"; -# Upstream doesn't provide versioned tarballs, so we'll have to create one on our own: -# REVISION=${PV} -# mkdir -p josm-${REVISION} -# svn co -r ${REVISION} https://josm.openstreetmap.de/svn/trunk/ josm-${REVISION} -# cd josm-${REVISION} && ant init-svn-revision-xml && cd - -# tar -cz --exclude=.svn -f /usr/portage/distfiles/josm-${REVISION}.tar.gz josm-${REVISION} -[[ ${PV} == "9999" ]] || SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" - -# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 -[[ ${PV} == "9999" ]] || \ -KEYWORDS="amd64 x86" - -DEPEND=">=virtual/jdk-1.8" -RDEPEND=">=virtual/jre-1.8" - -IUSE="" - -src_prepare() { - - if [[ ${PV} == "9999" ]]; then - - # create-revision needs the compile directory to be a svn directory - # see also https://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html - sed -i \ - -e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \ - build.xml || die "sed failed" - - else - - # Remove dependency on git and svn just for generating a - # revision - the tarball should already have REVISION.XML - sed -i -e 's:, *init-git-revision-xml::g' \ - -e '/<exec[ \t].*"svn"[ \t].*/,+5{d;n;}' \ - -e 's:${svn.info.result}:1:' \ - build.xml || die "sed failed" - - fi - -} - -src_compile() { - eant dist-optimized -} - -src_install() { - java-pkg_newjar "dist/${PN}-custom-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed" - java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed" - - newicon images/logo.png josm.png || die "newicon failed" - make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience" -} diff --git a/sci-geosciences/josm/josm-99999.ebuild b/sci-geosciences/josm/josm-99999.ebuild deleted file mode 100644 index 58def9eb19e5..000000000000 --- a/sci-geosciences/josm/josm-99999.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_ANT_ENCODING=UTF-8 - -[[ ${PV} == "99999" ]] && SUBVERSION_ECLASS="subversion" -ESVN_REPO_URI="https://josm.openstreetmap.de/svn/trunk"; -inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS} -unset SUBVERSION_ECLASS - -DESCRIPTION="Java-based editor for the OpenStreetMap project" -HOMEPAGE="https://josm.openstreetmap.de/"; -[[ ${PV} == "99999" ]] || SRC_URI="http://josm.hboeck.de/${P}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" - -# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 -[[ ${PV} == "99999" ]] || \ -KEYWORDS="~amd64 ~x86" - -DEPEND=">=virtual/jdk-1.8" -RDEPEND=">=virtual/jre-1.8" - -IUSE="" - -src_prepare() { - if [[ ${PV} == "99999" ]]; then - - # create-revision needs the compile directory to be a svn directory - # see also https://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html - sed -i \ - -e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \ - build.xml || die "Sed failed" - fi -} - -src_compile() { - eant dist-optimized -} - -src_install() { - java-pkg_newjar "dist/${PN}-custom-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed" - java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed" - - newicon images/logo.svg josm.svg || die "newicon failed" - make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience" -} diff --git a/sci-geosciences/josm/metadata.xml b/sci-geosciences/josm/metadata.xml deleted file mode 100644 index d3369ac77939..000000000000 --- a/sci-geosciences/josm/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Geosciences Project</name> - </maintainer> -</pkgmetadata>
