| 1 |
commit: e58b27650fec503b092ea1802ae33e1c3c159995 |
| 2 |
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 27 18:54:25 2016 +0000 |
| 4 |
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 27 20:59:56 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e58b2765 |
| 7 |
|
| 8 |
net-p2p/retroshare: fix wrong assumption that REPLACING_VERSION is a string |
| 9 |
|
| 10 |
Gentoo-Bug: 589502 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.0 |
| 13 |
|
| 14 |
net-p2p/retroshare/retroshare-0.6.0.ebuild | 20 ++++++++++++-------- |
| 15 |
net-p2p/retroshare/retroshare-0.6.9999.ebuild | 19 +++++++++++-------- |
| 16 |
2 files changed, 23 insertions(+), 16 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-p2p/retroshare/retroshare-0.6.0.ebuild b/net-p2p/retroshare/retroshare-0.6.0.ebuild |
| 19 |
index 7c2f2e4..7088971 100644 |
| 20 |
--- a/net-p2p/retroshare/retroshare-0.6.0.ebuild |
| 21 |
+++ b/net-p2p/retroshare/retroshare-0.6.0.ebuild |
| 22 |
@@ -4,7 +4,7 @@ |
| 23 |
|
| 24 |
EAPI=6 |
| 25 |
|
| 26 |
-inherit eutils gnome2-utils qmake-utils |
| 27 |
+inherit eutils gnome2-utils qmake-utils versionator |
| 28 |
|
| 29 |
DESCRIPTION="P2P private sharing application" |
| 30 |
HOMEPAGE="http://retroshare.sourceforge.net" |
| 31 |
@@ -147,13 +147,17 @@ src_install() { |
| 32 |
} |
| 33 |
|
| 34 |
pkg_preinst() { |
| 35 |
- if [[ "${REPLACING_VERSIONS}" = "0.5*" ]]; then |
| 36 |
- elog "You are upgrading from Retroshare 0.5.* to ${PV}" |
| 37 |
- elog "Version 0.6.* is backward-incompatible with 0.5 branch" |
| 38 |
- elog "and clients with 0.6.* can not connect to clients that have 0.5.*" |
| 39 |
- elog "It's recommended to drop all your configuration and either" |
| 40 |
- elog "generate a new certificate or import existing from a backup" |
| 41 |
- fi |
| 42 |
+ local ver |
| 43 |
+ for ver in ${REPLACING_VERSIONS}; do |
| 44 |
+ if ! version_is_at_least 0.5.9999 ${ver}; then |
| 45 |
+ elog "You are upgrading from Retroshare 0.5.* to ${PV}" |
| 46 |
+ elog "Version 0.6.* is backward-incompatible with 0.5 branch" |
| 47 |
+ elog "and clients with 0.6.* can not connect to clients that have 0.5.*" |
| 48 |
+ elog "It's recommended to drop all your configuration and either" |
| 49 |
+ elog "generate a new certificate or import existing from a backup" |
| 50 |
+ break |
| 51 |
+ fi |
| 52 |
+ done |
| 53 |
gnome2_icon_savelist |
| 54 |
} |
| 55 |
|
| 56 |
|
| 57 |
diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild |
| 58 |
index 88822af..053fb70 100644 |
| 59 |
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild |
| 60 |
+++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild |
| 61 |
@@ -5,7 +5,7 @@ |
| 62 |
EAPI=6 |
| 63 |
|
| 64 |
EGIT_REPO_URI="https://github.com/RetroShare/RetroShare.git" |
| 65 |
-inherit eutils git-r3 gnome2-utils qmake-utils |
| 66 |
+inherit eutils git-r3 gnome2-utils qmake-utils versionator |
| 67 |
|
| 68 |
DESCRIPTION="P2P private sharing application" |
| 69 |
HOMEPAGE="http://retroshare.sourceforge.net" |
| 70 |
@@ -144,13 +144,16 @@ src_install() { |
| 71 |
} |
| 72 |
|
| 73 |
pkg_preinst() { |
| 74 |
- if [[ "${REPLACING_VERSIONS}" = "0.5*" ]]; then |
| 75 |
- elog "You are upgrading from Retroshare 0.5.* to ${PV}" |
| 76 |
- elog "Version 0.6.* is backward-incompatible with 0.5 branch" |
| 77 |
- elog "and clients with 0.6.* can not connect to clients that have 0.5.*" |
| 78 |
- elog "It's recommended to drop all your configuration and either" |
| 79 |
- elog "generate a new certificate or import existing from a backup" |
| 80 |
- fi |
| 81 |
+ for ver in ${REPLACING_VERSIONS}; do |
| 82 |
+ if ! version_is_at_least 0.5.9999 ${ver}; then |
| 83 |
+ elog "You are upgrading from Retroshare 0.5.* to ${PV}" |
| 84 |
+ elog "Version 0.6.* is backward-incompatible with 0.5 branch" |
| 85 |
+ elog "and clients with 0.6.* can not connect to clients that have 0.5.*" |
| 86 |
+ elog "It's recommended to drop all your configuration and either" |
| 87 |
+ elog "generate a new certificate or import existing from a backup" |
| 88 |
+ break |
| 89 |
+ fi |
| 90 |
+ done |
| 91 |
gnome2_icon_savelist |
| 92 |
} |
Archives