[gentoo-commits] repo/gentoo:master commit in: app-admin/calamares/

[Johannes Huber]

commit:     9e51ef982b6d5ee64385554af86c03a8e9944e0c
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 11:11:21 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 11:11:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e51ef98

app-admin/calamares: Version bump 2.1

Package-Manager: portage-2.2.28

 app-admin/calamares/Manifest                                     | 2 +-
 .../{calamares-1.1.2-r1.ebuild => calamares-2.1.ebuild}          | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 4f3c7bc..7ae91e5 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1 @@
-DIST calamares-1.1.2.tar.gz 3642991 SHA256 
6adf5777f51998a88b19f37c3dd4bb8256be4464106ffbd5d1393ef67109d49c SHA512 
567bfae24691576fb814297d7db66f61b39a639b71b2191defb43fd0d2e56b9ccf70dfd666e1fd1faaa1b954c349aea96ad2b5d1b5d59bdc5a351cde6bbdcea6
 WHIRLPOOL 
e6b88ec952d31088c138a6467b98bd66f739ee48daf7689b5e8356274565beddd602ae02df559d6aa9f6483f797da3b7e284d04071eb3e54cf7b8679abe3730a
+DIST calamares-2.1.tar.gz 2000234 SHA256 
77bfdc8fe202cd1c068680d41d3df113bd9ee28362aeded63a113bdbaa76d362 SHA512 
3e90376ea7d7cc2d2bf6d7b5efffcd74c486c366964bb25e9d7243a2139f5b04007de28a1c5d60463342ed4ad2beda60360a9f117ab94aee20cb49e3d2202bb6
 WHIRLPOOL 
d8934c6043278f292f1b4dbad14038f9afc66d77bd089fb9258dbb080d2a4a5dddea03a3527a056856413ce8f18d0af8c77287147ffd5e38231a290249d43b22

diff --git a/app-admin/calamares/calamares-1.1.2-r1.ebuild 
b/app-admin/calamares/calamares-2.1.ebuild
similarity index 94%
rename from app-admin/calamares/calamares-1.1.2-r1.ebuild
rename to app-admin/calamares/calamares-2.1.ebuild
index 3d29dd3..73af205 100644
--- a/app-admin/calamares/calamares-1.1.2-r1.ebuild
+++ b/app-admin/calamares/calamares-2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python{3_3,3_4} )
 inherit kde5 python-r1
@@ -26,8 +26,10 @@ DEPEND="${PYTHON_DEPS}
        >=dev-cpp/yaml-cpp-0.5.1
        >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
        $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep ki18n)
        $(add_frameworks_dep kcoreaddons)
+       $(add_frameworks_dep ki18n)
+       $(add_frameworks_dep kparts)
+       $(add_frameworks_dep kservice)
        $(add_frameworks_dep solid)
        dev-qt/linguist-tools:5
        dev-qt/qtdbus:5
@@ -38,6 +40,7 @@ DEPEND="${PYTHON_DEPS}
        sys-apps/dbus
        sys-apps/dmidecode
        sys-auth/polkit-qt[qt5]
+       >=sys-libs/kpmcore-2.1.0
 "
 
 RDEPEND="${DEPEND}
@@ -61,6 +64,8 @@ src_prepare() {
               PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
               PYTHON_CFLAGS="$(python_get_CFLAGS)"\
               PYTHON_LIBS="$(python_get_LIBS)"
+
+       eapply_user
 }
 
 src_configure() {