[gentoo-commits] repo/gentoo:master commit in: sci-physics/root/

[Guilherme Amadio]

commit:     a0b5a58dd6efb7fb0c54857453381f5572a1ea3e
Author:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Tue May  7 06:25:56 2019 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Tue May  7 06:30:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0b5a58d

sci-physics/root: update dependencies for afterstep removal

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>

 sci-physics/root/root-6.12.06-r9.ebuild |  5 +----
 sci-physics/root/root-6.14.08-r2.ebuild |  5 +----
 sci-physics/root/root-6.16.00-r1.ebuild |  5 +----
 sci-physics/root/root-6.16.00.ebuild    |  5 +----
 sci-physics/root/root-9999.ebuild       | 11 ++++-------
 5 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/sci-physics/root/root-6.12.06-r9.ebuild b/sci-physics/root/root-6.12.06-r9.ebuild
index eecef68d7cb..7797664bc1d 100644
--- a/sci-physics/root/root-6.12.06-r9.ebuild
+++ b/sci-physics/root/root-6.12.06-r9.ebuild
@@ -63,10 +63,7 @@ CDEPEND="
 			dev-qt/qtwebengine:5[widgets]
 		)
 	)
-	asimage? ( || (
-		media-libs/libafterimage[gif,jpeg,png,tiff?]
-		>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
-	) )
+	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] )
 	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 	davix? ( net-libs/davix )
 	emacs? ( virtual/emacs )

diff --git a/sci-physics/root/root-6.14.08-r2.ebuild b/sci-physics/root/root-6.14.08-r2.ebuild
index 9bdd6bbf7eb..36f4c068c94 100644
--- a/sci-physics/root/root-6.14.08-r2.ebuild
+++ b/sci-physics/root/root-6.14.08-r2.ebuild
@@ -67,10 +67,7 @@ CDEPEND="
 			dev-qt/qtwebengine:5[widgets]
 		)
 	)
-	asimage? ( || (
-		media-libs/libafterimage[gif,jpeg,png,tiff?]
-		>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
-	) )
+	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] )
 	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
 	davix? ( net-libs/davix )

diff --git a/sci-physics/root/root-6.16.00-r1.ebuild b/sci-physics/root/root-6.16.00-r1.ebuild
index ca7b8a8c5fd..7d0884db553 100644
--- a/sci-physics/root/root-6.16.00-r1.ebuild
+++ b/sci-physics/root/root-6.16.00-r1.ebuild
@@ -68,10 +68,7 @@ CDEPEND="
 			dev-qt/qtwebengine:5[widgets]
 		)
 	)
-	asimage? ( || (
-		media-libs/libafterimage[gif,jpeg,png,tiff?]
-		>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
-	) )
+	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] )
 	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
 	davix? ( net-libs/davix )

diff --git a/sci-physics/root/root-6.16.00.ebuild b/sci-physics/root/root-6.16.00.ebuild
index ddd708c69ae..c6952c5f419 100644
--- a/sci-physics/root/root-6.16.00.ebuild
+++ b/sci-physics/root/root-6.16.00.ebuild
@@ -68,10 +68,7 @@ CDEPEND="
 			dev-qt/qtwebengine:5[widgets]
 		)
 	)
-	asimage? ( || (
-		media-libs/libafterimage[gif,jpeg,png,tiff?]
-		>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
-	) )
+	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] )
 	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
 	davix? ( net-libs/davix )

diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 0c248faf0e5..77c8e057cd0 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -80,10 +80,7 @@ CDEPEND="
 			dev-qt/qtwebengine:5[widgets]
 		)
 	)
-	asimage? ( || (
-		media-libs/libafterimage[gif,jpeg,png,tiff?]
-		>=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
-	) )
+	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] )
 	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
 	davix? ( net-libs/davix )
@@ -301,9 +298,9 @@ src_install() {
 	ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)
 
 	if [[ ${PV} == "9999" ]]; then
-		ROOTENV=$((9900 - $(ver_cut 2)))${PN}-git
+		ROOTENV="9900${PN}-git"
 	else
-		ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)-git
+		ROOTENV="$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)-git"
 	fi
 
 	cat > ${ROOTENV} <<- EOF || die
@@ -325,7 +322,7 @@ src_install() {
 
 	pushd "${D}/${ROOTSYS}" > /dev/null
 
-	rm -r test emacs bin/*.{csh,sh,fish} || die
+	rm -r emacs bin/*.{csh,sh,fish} || die
 
 	if ! use examples; then
 		rm -r tutorials || die