commit: e58b27650fec503b092ea1802ae33e1c3c159995 Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> AuthorDate: Wed Jul 27 18:54:25 2016 +0000 Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> CommitDate: Wed Jul 27 20:59:56 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e58b2765
net-p2p/retroshare: fix wrong assumption that REPLACING_VERSION is a string Gentoo-Bug: 589502 Package-Manager: portage-2.3.0 net-p2p/retroshare/retroshare-0.6.0.ebuild | 20 ++++++++++++-------- net-p2p/retroshare/retroshare-0.6.9999.ebuild | 19 +++++++++++-------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/net-p2p/retroshare/retroshare-0.6.0.ebuild b/net-p2p/retroshare/retroshare-0.6.0.ebuild index 7c2f2e4..7088971 100644 --- a/net-p2p/retroshare/retroshare-0.6.0.ebuild +++ b/net-p2p/retroshare/retroshare-0.6.0.ebuild @@ -4,7 +4,7 @@ EAPI=6 -inherit eutils gnome2-utils qmake-utils +inherit eutils gnome2-utils qmake-utils versionator DESCRIPTION="P2P private sharing application" HOMEPAGE="http://retroshare.sourceforge.net"; @@ -147,13 +147,17 @@ src_install() { } pkg_preinst() { - if [[ "${REPLACING_VERSIONS}" = "0.5*" ]]; then - elog "You are upgrading from Retroshare 0.5.* to ${PV}" - elog "Version 0.6.* is backward-incompatible with 0.5 branch" - elog "and clients with 0.6.* can not connect to clients that have 0.5.*" - elog "It's recommended to drop all your configuration and either" - elog "generate a new certificate or import existing from a backup" - fi + local ver + for ver in ${REPLACING_VERSIONS}; do + if ! version_is_at_least 0.5.9999 ${ver}; then + elog "You are upgrading from Retroshare 0.5.* to ${PV}" + elog "Version 0.6.* is backward-incompatible with 0.5 branch" + elog "and clients with 0.6.* can not connect to clients that have 0.5.*" + elog "It's recommended to drop all your configuration and either" + elog "generate a new certificate or import existing from a backup" + break + fi + done gnome2_icon_savelist } diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild index 88822af..053fb70 100644 --- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild +++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild @@ -5,7 +5,7 @@ EAPI=6 EGIT_REPO_URI="https://github.com/RetroShare/RetroShare.git"; -inherit eutils git-r3 gnome2-utils qmake-utils +inherit eutils git-r3 gnome2-utils qmake-utils versionator DESCRIPTION="P2P private sharing application" HOMEPAGE="http://retroshare.sourceforge.net"; @@ -144,13 +144,16 @@ src_install() { } pkg_preinst() { - if [[ "${REPLACING_VERSIONS}" = "0.5*" ]]; then - elog "You are upgrading from Retroshare 0.5.* to ${PV}" - elog "Version 0.6.* is backward-incompatible with 0.5 branch" - elog "and clients with 0.6.* can not connect to clients that have 0.5.*" - elog "It's recommended to drop all your configuration and either" - elog "generate a new certificate or import existing from a backup" - fi + for ver in ${REPLACING_VERSIONS}; do + if ! version_is_at_least 0.5.9999 ${ver}; then + elog "You are upgrading from Retroshare 0.5.* to ${PV}" + elog "Version 0.6.* is backward-incompatible with 0.5 branch" + elog "and clients with 0.6.* can not connect to clients that have 0.5.*" + elog "It's recommended to drop all your configuration and either" + elog "generate a new certificate or import existing from a backup" + break + fi + done gnome2_icon_savelist }
