commit:     3499242f0065d174fb4a3837245b65e595edfa3e
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 18:55:49 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 19:17:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3499242f

dev-lang/jimtcl: [QA] Port to git-r3

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-lang/jimtcl/jimtcl-0.74-r1.ebuild | 13 +++++++------
 dev-lang/jimtcl/jimtcl-0.75-r1.ebuild |  6 +++---
 dev-lang/jimtcl/jimtcl-0.75.ebuild    | 13 +++++++------
 dev-lang/jimtcl/jimtcl-0.76.ebuild    |  6 +++---
 dev-lang/jimtcl/jimtcl-9999.ebuild    |  6 +++---
 5 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/dev-lang/jimtcl/jimtcl-0.74-r1.ebuild 
b/dev-lang/jimtcl/jimtcl-0.74-r1.ebuild
index 56008de46ce..bba26a59e81 100644
--- a/dev-lang/jimtcl/jimtcl-0.74-r1.ebuild
+++ b/dev-lang/jimtcl/jimtcl-0.74-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -31,13 +31,14 @@ src_compile() {
 
 src_install() {
        dobin jimsh
-       use static-libs && {
+
+       if use static-libs; then
                dolib.a libjim.a
-       } || {
+       else
                dolib.so libjim.so.${PV}
-               dosym /usr/$(get_libdir)/libjim.so.${PV} \
-                       /usr/$(get_libdir)/libjim.so
-       }
+               dosym libjim.so.${PV} /usr/$(get_libdir)/libjim.so
+       fi
+
        insinto /usr/include
        doins jim.h jimautoconf.h jim-subcmd.h jim-signal.h
        doins jim-win32compat.h jim-eventloop.h jim-config.h

diff --git a/dev-lang/jimtcl/jimtcl-0.75-r1.ebuild 
b/dev-lang/jimtcl/jimtcl-0.75-r1.ebuild
index d05b5040644..3c79869f318 100644
--- a/dev-lang/jimtcl/jimtcl-0.75-r1.ebuild
+++ b/dev-lang/jimtcl/jimtcl-0.75-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 inherit multiprocessing eutils
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
        EGIT_REPO_URI="http://repo.or.cz/r/jimtcl.git";
-       inherit git-2
+       inherit git-r3
 else
        inherit vcs-snapshot
        SRC_URI="https://github.com/msteveb/jimtcl/zipball/${PV} -> ${P}.zip"

diff --git a/dev-lang/jimtcl/jimtcl-0.75.ebuild 
b/dev-lang/jimtcl/jimtcl-0.75.ebuild
index 59a5c92d192..86af1bb8fb9 100644
--- a/dev-lang/jimtcl/jimtcl-0.75.ebuild
+++ b/dev-lang/jimtcl/jimtcl-0.75.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -31,13 +31,14 @@ src_compile() {
 
 src_install() {
        dobin jimsh
-       use static-libs && {
+
+       if use static-libs; then
                dolib.a libjim.a
-       } || {
+       else
                dolib.so libjim.so.${PV}
-               dosym /usr/$(get_libdir)/libjim.so.${PV} \
-                       /usr/$(get_libdir)/libjim.so
-       }
+               dosym libjim.so.${PV} /usr/$(get_libdir)/libjim.so
+       fi
+
        insinto /usr/include
        doins jim.h jimautoconf.h jim-subcmd.h jim-signal.h
        doins jim-win32compat.h jim-eventloop.h jim-config.h

diff --git a/dev-lang/jimtcl/jimtcl-0.76.ebuild 
b/dev-lang/jimtcl/jimtcl-0.76.ebuild
index a82e24c9b20..3d5515b2e63 100644
--- a/dev-lang/jimtcl/jimtcl-0.76.ebuild
+++ b/dev-lang/jimtcl/jimtcl-0.76.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 inherit multiprocessing eutils
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
        EGIT_REPO_URI="http://repo.or.cz/r/jimtcl.git";
-       inherit git-2
+       inherit git-r3
 else
        inherit vcs-snapshot
        SRC_URI="https://github.com/msteveb/jimtcl/zipball/${PV} -> ${P}.zip"

diff --git a/dev-lang/jimtcl/jimtcl-9999.ebuild 
b/dev-lang/jimtcl/jimtcl-9999.ebuild
index d05b5040644..3c79869f318 100644
--- a/dev-lang/jimtcl/jimtcl-9999.ebuild
+++ b/dev-lang/jimtcl/jimtcl-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 inherit multiprocessing eutils
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
        EGIT_REPO_URI="http://repo.or.cz/r/jimtcl.git";
-       inherit git-2
+       inherit git-r3
 else
        inherit vcs-snapshot
        SRC_URI="https://github.com/msteveb/jimtcl/zipball/${PV} -> ${P}.zip"

Reply via email to