Update apachedirectorystudio into EAPI 7

Signed-off-by: Samuel Bernardo <samuelbernardo.mail@gmail.com>

3 files changed, 9 insertions, 65 deletions

diff --git a/net-nds/apachedirectorystudio/Manifest b/net-nds/apachedirectorystudio/Manifest
index 619895c..c99cbae 100644
--- a/net-nds/apachedirectorystudio/Manifest
+++ b/net-nds/apachedirectorystudio/Manifest
@@ -1,4 +1,2 @@
-DIST ApacheDirectoryStudio-2.0.0.v20180908-M14-linux.gtk.x86.tar.gz 146593441 BLAKE2B f72b595ee419a5141c1347e83592714cd5a0e8c23f0ca3cee1f80aeb1d62378241b7b8133723379f2e9d16fbb3367c2d680e59942845af45cf5fc06219938bea SHA512 ea7eda032584a9ddd40a3b712eff5128a3263e0bb75c43cd70df3901516c1d563e510c2d649a4be2a3651e94ae2e3933ced11974c2bd0e5894685354a9562107
-DIST ApacheDirectoryStudio-2.0.0.v20180908-M14-linux.gtk.x86_64.tar.gz 146704643 BLAKE2B 192201af0525b52b00b0adafd149ea678978c07f59314801b58287f9b18e21027bc8857b70dd403573a0926ddeb7c447cbac5b3062bdf740807ea9edf60e5254 SHA512 47a00ea0bc646ea924ea3f55b6d48180bdd0d5c5ba41f70abf83e27f5244c4c82ab76cdeff44bc3dfd0bb802832f49bada3b58bcdaaacb62ea84f9beca7e2aad
-EBUILD apachedirectorystudio-2.0.0.20180908-r1.ebuild 1316 BLAKE2B 9b43ce3854f6738739c4857e1d7d462e28467c42a38721ad4aea56ad1d4a1a0450606194ec650ac68b4954bf26458be4d62590a17bd4e3bd84de5f9a2d7d1f31 SHA512 cff05c628fd3ed7cc773ee77234aa08aca3db3c5d928b85a62e6ad47bfa13202218f8ded12fedbb7936eb816dc40efb3b5564e0eb5a354a554e191289c47a5af
-EBUILD apachedirectorystudio-2.0.0.20180908.ebuild 1343 BLAKE2B 1856c0f2ed2f9a26d721e0bd5ffff8688a96b51fa920b69c102e88644e2ce8957677e2396ef642b08eb2aa8fc34da62d5da2c9d2597e32935b235d72f06604e0 SHA512 15be6d8441e554731664dbd95555084c3086cd5a17a1ee8fac19b2d18eac4f97aa185581c64c5aa34a69477e4457c8419ec9cd00c450f9a08657f21c8e2a7c00
+DIST ApacheDirectoryStudio-2.0.0.v20210717-M17-linux.gtk.x86_64.tar.gz 140122735 BLAKE2B d54f3dcb9fa7b1d54f88495415bd9e6f11e15f5c8ecb875a17a43eff417eb1f090df6dd4a9e71c22b55a265bf24ab94025b08b1bd2ff395b38bc0c5906a1e0ad SHA512 771a5c2d6b9f6f0487ceb435ee765863eb51a66f9ff4506fd5bba5745cff4c41b7557a7916dabe85bae8204e79746a1bb95d75c1aeacc474193cafc6401a8edb
+EBUILD apachedirectorystudio-2.0.0.20210717.17.ebuild 1169 BLAKE2B 1359e8ad854450b12d0c8c6bcd38526b44b9f12441b6e08f684cedb7f7603b4ae5e1c4b78d00baf81dc834aa099105ed14296cbbd43e493e5b5d36de289112af SHA512 6aad7ed9e413f72997107fb69af26f0ad69e722de06d389080e3dd85ae401f4e9fe8151ce7107271e00fef536e569dcff29aa12a0634d7cce31242c07461c76e
diff --git a/net-nds/apachedirectorystudio/apachedirectorystudio-2.0.0.20180908.ebuild b/net-nds/apachedirectorystudio/apachedirectorystudio-2.0.0.20180908.ebuild
deleted file mode 100644
index 91c1406..0000000
--- a/net-nds/apachedirectorystudio/apachedirectorystudio-2.0.0.20180908.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="6"
-
-inherit eutils versionator
-
-MY_PV=$(replace_version_separator 3 '.v')
-MY_PN="ApacheDirectoryStudio"
-MY_PKGM=14
-
-
-DESCRIPTION="Apache Directory Studio is an universal LDAP directory tool."
-SRC_URI="amd64? (
-		"http://www.us.apache.org/dist/directory/studio/${MY_PV}-M${MY_PKGM}/${MY_PN}-${MY_PV}-M${MY_PKGM}-linux.gtk.x86_64.tar.gz"
-	)
-	x86? (
-		"http://www.us.apache.org/dist/directory/studio/${MY_PV}-M${MY_PKGM}/${MY_PN}-${MY_PV}-M${MY_PKGM}-linux.gtk.x86.tar.gz"
-	)"
-HOMEPAGE="http://directory.apache.org/studio/"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="2"
-LICENSE="Apache-2.0"
-IUSE=""
-
-DEPEND="!net-nds/Apache-DS" # obsolete ebuild name
-RDEPEND=">=virtual/jre-1.8.0
-	x11-libs/gtk+:2"
-
-MY_ARCH="x86?  ( x86 ) amd64? ( amd64 )"
-INSTALL_DIR="/opt"
-S="${WORKDIR}/${MY_PN}-linux-${MY_ARCH}-${MY_PV}"
-
-src_install() {
-
-	insinto "${INSTALL_DIR}"
-	
-	newicon "${MY_PN}/features/org.apache.directory.studio.schemaeditor.feature_${MY_PV}-M${MY_PKGM}/studio.png" "${MY_PN}.png"
-	#newicon "${MY_PN}/icon.xpm" "${MY_PN}.xpm"
-	
-	make_desktop_entry "${MY_PN}" "Apache Directory Studio" "${MY_PN}" "System"
-	
-	doins -r *
-	
-	fperms +x "${INSTALL_DIR}/${MY_PN}/${MY_PN}"
-	
-	dosym "${INSTALL_DIR}/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
-}
diff --git a/net-nds/apachedirectorystudio/apachedirectorystudio-2.0.0.20180908-r1.ebuild b/net-nds/apachedirectorystudio/apachedirectorystudio-2.0.0.20210717.17.ebuild
index 89adb07..2a0a8cd 100644
--- a/net-nds/apachedirectorystudio/apachedirectorystudio-2.0.0.20180908-r1.ebuild
+++ b/net-nds/apachedirectorystudio/apachedirectorystudio-2.0.0.20210717.17.ebuild
@@ -1,23 +1,19 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="6"
+EAPI="7"
 
-inherit eutils versionator
+inherit eutils
 
-MY_PV=$(replace_version_separator 3 '.v')
+MY_PV=$(ver_rs 3 '.v')
+MY_PV=$(ver_cut 1-5 ${MY_PV})
 MY_PN="ApacheDirectoryStudio"
-MY_PKGM=14
+MY_PKGM=$(ver_cut 5)
 
 
 DESCRIPTION="Apache Directory Studio is an universal LDAP directory tool."
-SRC_URI="amd64? (
-		"http://www.us.apache.org/dist/directory/studio/${MY_PV}-M${MY_PKGM}/${MY_PN}-${MY_PV}-M${MY_PKGM}-linux.gtk.x86_64.tar.gz"
-	)
-	x86? (
-		"http://www.us.apache.org/dist/directory/studio/${MY_PV}-M${MY_PKGM}/${MY_PN}-${MY_PV}-M${MY_PKGM}-linux.gtk.x86.tar.gz"
-	)"
+SRC_URI="http://www.apache.org/dist/directory/studio/${MY_PV}-M${MY_PKGM}/${MY_PN}-${MY_PV}-M${MY_PKGM}-linux.gtk.x86_64.tar.gz"
 HOMEPAGE="http://directory.apache.org/studio/"
 
 KEYWORDS="~amd64 ~x86"