| 1 |
commit: b67c8ac5ebf4579d43946a27441523d361dea878 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jun 28 15:35:32 2015 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 29 15:03:13 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b67c8ac5 |
| 7 |
|
| 8 |
[eclass] Fix minimum dependencies after kde-apps pkgmove |
| 9 |
|
| 10 |
eclass/kde4-functions.eclass | 8 ++++---- |
| 11 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass |
| 14 |
index 2a4c206..989eeb9 100644 |
| 15 |
--- a/eclass/kde4-functions.eclass |
| 16 |
+++ b/eclass/kde4-functions.eclass |
| 17 |
@@ -296,10 +296,10 @@ add_kdeapps_dep() { |
| 18 |
# to allow merging packages against more stable basic stuff |
| 19 |
elif [[ ${PV} == *.9999 ]]; then |
| 20 |
ver=$(get_kde_version) |
| 21 |
- # if building live master depend on final stable applications version |
| 22 |
- # as live KDE4 ebuilds are slowly being shown the door |
| 23 |
- elif [[ ${CATEGORY} == kde-apps && ${PV} == 9999 ]]; then |
| 24 |
- ver=14.12.3 |
| 25 |
+ # if building live master or kde-apps, use the final SC version |
| 26 |
+ # since there are no further general releases. |
| 27 |
+ elif [[ ${CATEGORY} == kde-apps || ${PV} == 9999 ]]; then |
| 28 |
+ ver=4.14.3 |
| 29 |
else |
| 30 |
ver=${PV} |
| 31 |
fi |
Archives