sci-physics/root: update dependencies for afterstep removal
authorGuilherme Amadio <amadio@gentoo.org>
Tue, 7 May 2019 06:25:56 +0000 (08:25 +0200)
committerGuilherme Amadio <amadio@gentoo.org>
Tue, 7 May 2019 06:30:26 +0000 (08:30 +0200)
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Guilherme Amadio <amadio@gentoo.org>
sci-physics/root/root-6.12.06-r9.ebuild
sci-physics/root/root-6.14.08-r2.ebuild
sci-physics/root/root-6.16.00-r1.ebuild
sci-physics/root/root-6.16.00.ebuild
sci-physics/root/root-9999.ebuild

index eecef68d7cb91dae21ab5accd4bfaa9336b5958b..7797664bc1d85a6d4569bc63116af94db47119b1 100644 (file)
@@ -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 )
index 9bdd6bbf7eb458701779d22e964cccf53bc9860c..36f4c068c94f9ca6e47f97f4fd91660e0270b35b 100644 (file)
@@ -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 )
index ca7b8a8c5fd4aaac0fb46f7be2d012a21815c0ec..7d0884db5536ef4fe6f6ca74d8c9d116e9743b09 100644 (file)
@@ -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 )
index ddd708c69aeafbc4e902142c642b4b2d30024a12..c6952c5f4198252f08130dd821666fcf6f82c620 100644 (file)
@@ -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 )
index 0c248faf0e5afe55dea1d845fced15dbba1c8305..77c8e057cd0cc1447d2586639d4ab0d6f1bc51aa 100644 (file)
@@ -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