4 files changed, 75 insertions, 17 deletions
diff --git a/dev-util/argouml/argouml-0.34-r1.ebuild b/dev-util/argouml/argouml-0.34-r1.ebuild
new file mode 100644
index 000000000000..1ed077a3de26
--- /dev/null
+++ b/dev-util/argouml/argouml-0.34-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg-utils java-pkg-2
+
+DESCRIPTION="Modelling tool that helps you do your design using UML"
+HOMEPAGE="https://argouml-tigris-org.github.io/"
+BASE_URI="http://argouml-downloads.tigris.org/nonav/${P}"
+SRC_URI="${BASE_URI}/ArgoUML-${PV}.tar.gz
+	http://argouml-downloads.tigris.org/nonav/argouml-db-1.0/dbuml-module-1.0.4.zip
+	doc? (
+		${BASE_URI}/manual-${PV}.pdf
+		${BASE_URI}/quickguide-${PV}.pdf
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_compile() { :; }
+
+src_install() {
+	java-pkg_jarinto /opt/${PN}/lib
+	java-pkg_dojar ${P}/*.jar
+
+	java-pkg_jarinto /opt/${PN}/lib/ext
+	java-pkg_dojar ${P}/ext/*.jar release/ext/*.jar
+
+	java-pkg_dolauncher ${PN} --main org.argouml.application.Main
+
+	dodoc ${P}/README.txt
+
+	if use doc; then
+		find release/ \( -name Thumbs.db -o -name filelist.xml \) \
+			-delete || die
+		HTML_DOCS=( release/{Readme.htm,www} )
+		DOCS=(
+			"${DISTDIR}"/manual-${PV}.pdf
+			"${DISTDIR}"/quickguide-${PV}.pdf
+		)
+		einstalldocs
+	fi
+
+	newicon ${P}/icon/ArgoIcon128x128.png ${PN}.png || die
+	make_desktop_entry ${PN} "ArgoUML"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/dev-util/quilt/quilt-0.67.ebuild b/dev-util/quilt/quilt-0.67.ebuild
index 9cefbff0bb67..4b0a1a4a4ff4 100644
--- a/dev-util/quilt/quilt-0.67.ebuild
+++ b/dev-util/quilt/quilt-0.67.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 IUSE="emacs graphviz"
 # unresolved test failures
 RESTRICT="test"
diff --git a/dev-util/rosdep/rosdep-0.21.0.ebuild b/dev-util/rosdep/rosdep-0.21.0.ebuild
index 2871e83fef20..bf8db82fa76a 100644
--- a/dev-util/rosdep/rosdep-0.21.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.21.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,7 +44,7 @@ BDEPEND="
 "
 PATCHES=( "${FILESDIR}/tests.patch" )
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
 
 src_test() {
 	unset ROS_DISTRO
diff --git a/dev-util/rosdep/rosdep-9999.ebuild b/dev-util/rosdep/rosdep-9999.ebuild
index 2871e83fef20..a8dc54daea6c 100644
--- a/dev-util/rosdep/rosdep-9999.ebuild
+++ b/dev-util/rosdep/rosdep-9999.ebuild
@@ -1,22 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep"
-fi
-
-inherit ${SCM} distutils-r1
+inherit distutils-r1
 
 DESCRIPTION="Command-line tool for installing ROS system dependencies"
 HOMEPAGE="https://wiki.ros.org/rosdep"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
+
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep"
+	inherit git-r3
 else
 	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
 		https://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz
@@ -29,7 +25,7 @@ SLOT="0"
 
 # Tests need network
 RESTRICT="test"
-PROPERTIES+=" test_network"
+PROPERTIES="test_network"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
@@ -44,7 +40,7 @@ BDEPEND="
 "
 PATCHES=( "${FILESDIR}/tests.patch" )
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
 
 src_test() {
 	unset ROS_DISTRO