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

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

2024-05-27 Thread Andrew Ammerlaan

commit: bd3279d3755bea0ca69489ec3b6e38f801dc169b
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon May 27 21:25:27 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon May 27 21:26:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd3279d3

app-admin/calamares: revbump for dropped dep

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 app-admin/calamares/{calamares-3.3.6.ebuild => calamares-3.3.6-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-admin/calamares/calamares-3.3.6.ebuild 
b/app-admin/calamares/calamares-3.3.6-r1.ebuild
similarity index 100%
rename from app-admin/calamares/calamares-3.3.6.ebuild
rename to app-admin/calamares/calamares-3.3.6-r1.ebuild

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

2024-05-27 Thread Andrew Ammerlaan

commit: 80fb9e80096f17aadc8abe55af406865c6a4ff71
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon May 27 21:25:05 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon May 27 21:26:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80fb9e80

app-admin/calamares: drop 3.3.5

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 app-admin/calamares/Manifest   |   1 -
 app-admin/calamares/calamares-3.3.5.ebuild | 165 -
 2 files changed, 166 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index c13fb1de9f0c..66fea02d53c4 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,3 +1,2 @@
 DIST calamares-3.2.60.tar.gz 4260547 BLAKE2B 
edf300ce9d534cd506b2341b3ce314bbde7fcc6dac40ad2307e549bbeab7a63ddfe6d7ae8c8176ee1ad4e4b02c9eadcd5efc66872e1f464c39200d8d117dca80
 SHA512 
dfc01212f74694f10d40dd1d1ad61db384c83021dc9cd4753027a9cf40b92c8e8b2d5032df76533a8f22c05448aba546c9bb21c38c03fb0cb8d7de35fb79fb7f
-DIST calamares-3.3.5.tar.gz 4722988 BLAKE2B 
bc3270fbc2f804c46008f1f0a106719b779a07d7d5d3cc9f1ab17da7597ebb5dfebc8793036e19570b0048afb667df4b9fed55e813374d7465513ea048e00ffc
 SHA512 
6846e13455e4fa38bd4d5061eece1baf5a972700f489dc1e35d988cfb5359650c63f79f9453431f1aff722af696260504c27f0c000490d781ab5fe03a5c46cf2
 DIST calamares-3.3.6.tar.gz 4733000 BLAKE2B 
6c5bae1c7939d84fdbf599e7c5b478c799efbdf21f1aa120fda05106775477274eafd5687a787c177b747226c8438aec72acc90414bff9c7952d71ce8cb5e376
 SHA512 
3fa38f136a7a8c1f7dc2be8f98d2f323e38ab3bb535ffaf833d26839c3a2fe1d1dab392cd103380098328fc7465f262cde7ae09efa996c7fb66233d8391ae4f6

diff --git a/app-admin/calamares/calamares-3.3.5.ebuild 
b/app-admin/calamares/calamares-3.3.5.ebuild
deleted file mode 100644
index 084a3d6d3c68..
--- a/app-admin/calamares/calamares-3.3.5.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit ecm python-single-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="+networkmanager qt6 +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-QT5_MIN="5.15.0"
-KF_QT5_MIN="5.78"
-QT6_MIN="6.5.0"
-KF_QT6_MIN="5.240"
-
-BDEPEND="
-   qt6? (
-   >=dev-qt/qttools-${QT6_MIN}:6[linguist]
-   >=kde-frameworks/extra-cmake-modules-${KF_QT6_MIN}
-   )
-   !qt6? (
-   >=dev-qt/linguist-tools-${QT5_MIN}:5
-   >=kde-frameworks/extra-cmake-modules-${KF_QT5_MIN}
-   )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-   dev-cpp/yaml-cpp:=
-   $(python_gen_cond_dep '
-   >=dev-libs/boost-1.72.0:=[python,${PYTHON_USEDEP}]
-   dev-libs/libpwquality[${PYTHON_USEDEP}]
-   ')
-   qt6? (
-   
>=dev-qt/qtbase-${QT6_MIN}:6[concurrent,dbus,gui,network,widgets,xml]
-   >=dev-qt/qtdeclarative-${QT6_MIN}:6
-   >=dev-qt/qtsvg-${QT6_MIN}:6
-   >=dev-qt/qtwebengine-${QT6_MIN}:6[widgets]
-   >=kde-frameworks/kconfig-${KF_QT6_MIN}:6
-   >=kde-frameworks/kcoreaddons-${KF_QT6_MIN}:6
-   >=kde-frameworks/kcrash-${KF_QT6_MIN}:6
-   >=kde-frameworks/ki18n-${KF_QT6_MIN}:6
-   >=kde-frameworks/kpackage-${KF_QT6_MIN}:6
-   >=kde-frameworks/kparts-${KF_QT6_MIN}:6
-   >=kde-frameworks/kservice-${KF_QT6_MIN}:6
-   >=kde-frameworks/kwidgetsaddons-${KF_QT6_MIN}:6
-   sys-auth/polkit-qt[qt6(-)]
-   >=sys-libs/kpmcore-24.01.75:6=
-   )
-   !qt6? (
-   >=dev-qt/qtconcurrent-${QT5_MIN}:5
-   >=dev-qt/qtdbus-${QT5_MIN}:5
-   >=dev-qt/qtdeclarative-${QT5_MIN}:5
-   >=dev-qt/qtgui-${QT5_MIN}:5
-   >=dev-qt/qtnetwork-${QT5_MIN}:5
-   >=dev-qt/qtsvg-${QT5_MIN}:5
-   >=dev-qt/qtwebengine-${QT5_MIN}:5[widgets]
-   >=dev-qt/qtwidgets-${QT5_MIN}:5
-   >=dev-qt/qtxml-${QT5_MIN}:5
-   >=kde-frameworks/kconfig-${KF_QT5_MIN}:5
-   >=kde-frameworks/kcoreaddons-${KF_QT5_MIN}:5
-   >=kde-frameworks/kcrash-${KF_QT5_MIN}:5
-   >=kde-frameworks/ki18n-${KF_QT5_MIN}:5
-   >=kde-frameworks/kpackage-${KF_QT5_MIN}:5
-   >=kde-frameworks/kparts-${KF_QT5_MIN}:5
-   >=kde-frameworks/kservice-${KF_QT5_MIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KF_QT5_MIN}:5
-   sys-auth/polkit-qt[qt5(+)]
-   >=sys-libs/kpmcore-20.04.0:5=
-   )
-   sys-apps/dbus
-   sys-apps/dmidecode
-   virtual/libcrypt:=
-"
-DEPEND="${COMMON_DEPEND}
-   test? (
-

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

2024-05-27 Thread Andrew Ammerlaan

commit: b67502d34896b820827c605de0c6926f1430724e
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon May 27 19:27:58 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon May 27 19:27:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b67502d3

app-admin/calamares: drop dev-qt/kdsingleapplication dependency

It uses a bundled version

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 app-admin/calamares/calamares-3.3.5.ebuild | 2 --
 app-admin/calamares/calamares-3.3.6.ebuild | 2 --
 2 files changed, 4 deletions(-)

diff --git a/app-admin/calamares/calamares-3.3.5.ebuild 
b/app-admin/calamares/calamares-3.3.5.ebuild
index 18227c7ccfcf..084a3d6d3c68 100644
--- a/app-admin/calamares/calamares-3.3.5.ebuild
+++ b/app-admin/calamares/calamares-3.3.5.ebuild
@@ -44,7 +44,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-qt/qtdeclarative-${QT6_MIN}:6
>=dev-qt/qtsvg-${QT6_MIN}:6
>=dev-qt/qtwebengine-${QT6_MIN}:6[widgets]
-   dev-qt/kdsingleapplication[qt6]
>=kde-frameworks/kconfig-${KF_QT6_MIN}:6
>=kde-frameworks/kcoreaddons-${KF_QT6_MIN}:6
>=kde-frameworks/kcrash-${KF_QT6_MIN}:6
@@ -66,7 +65,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-qt/qtwebengine-${QT5_MIN}:5[widgets]
>=dev-qt/qtwidgets-${QT5_MIN}:5
>=dev-qt/qtxml-${QT5_MIN}:5
-   dev-qt/kdsingleapplication[-qt6]
>=kde-frameworks/kconfig-${KF_QT5_MIN}:5
>=kde-frameworks/kcoreaddons-${KF_QT5_MIN}:5
>=kde-frameworks/kcrash-${KF_QT5_MIN}:5

diff --git a/app-admin/calamares/calamares-3.3.6.ebuild 
b/app-admin/calamares/calamares-3.3.6.ebuild
index add03ed16ed6..2036bb2bfb26 100644
--- a/app-admin/calamares/calamares-3.3.6.ebuild
+++ b/app-admin/calamares/calamares-3.3.6.ebuild
@@ -44,7 +44,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-qt/qtdeclarative-${QT6_MIN}:6
>=dev-qt/qtsvg-${QT6_MIN}:6
>=dev-qt/qtwebengine-${QT6_MIN}:6[widgets]
-   dev-qt/kdsingleapplication[qt6]
>=kde-frameworks/kconfig-${KF_QT6_MIN}:6
>=kde-frameworks/kcoreaddons-${KF_QT6_MIN}:6
>=kde-frameworks/kcrash-${KF_QT6_MIN}:6
@@ -66,7 +65,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-qt/qtwebengine-${QT5_MIN}:5[widgets]
>=dev-qt/qtwidgets-${QT5_MIN}:5
>=dev-qt/qtxml-${QT5_MIN}:5
-   dev-qt/kdsingleapplication[-qt6]
>=kde-frameworks/kconfig-${KF_QT5_MIN}:5
>=kde-frameworks/kcoreaddons-${KF_QT5_MIN}:5
>=kde-frameworks/kcrash-${KF_QT5_MIN}:5

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

2024-04-29 Thread Andrew Ammerlaan

commit: 20803aadad124cc58f9ffb2f74a6bcd09e74e63c
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon Apr 29 19:15:57 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Apr 29 19:16:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20803aad

app-admin/calamares: add 3.3.6

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 app-admin/calamares/Manifest   |   1 +
 app-admin/calamares/calamares-3.3.6.ebuild | 157 +
 2 files changed, 158 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 30eda62874ab..c13fb1de9f0c 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1,3 @@
 DIST calamares-3.2.60.tar.gz 4260547 BLAKE2B 
edf300ce9d534cd506b2341b3ce314bbde7fcc6dac40ad2307e549bbeab7a63ddfe6d7ae8c8176ee1ad4e4b02c9eadcd5efc66872e1f464c39200d8d117dca80
 SHA512 
dfc01212f74694f10d40dd1d1ad61db384c83021dc9cd4753027a9cf40b92c8e8b2d5032df76533a8f22c05448aba546c9bb21c38c03fb0cb8d7de35fb79fb7f
 DIST calamares-3.3.5.tar.gz 4722988 BLAKE2B 
bc3270fbc2f804c46008f1f0a106719b779a07d7d5d3cc9f1ab17da7597ebb5dfebc8793036e19570b0048afb667df4b9fed55e813374d7465513ea048e00ffc
 SHA512 
6846e13455e4fa38bd4d5061eece1baf5a972700f489dc1e35d988cfb5359650c63f79f9453431f1aff722af696260504c27f0c000490d781ab5fe03a5c46cf2
+DIST calamares-3.3.6.tar.gz 4733000 BLAKE2B 
6c5bae1c7939d84fdbf599e7c5b478c799efbdf21f1aa120fda05106775477274eafd5687a787c177b747226c8438aec72acc90414bff9c7952d71ce8cb5e376
 SHA512 
3fa38f136a7a8c1f7dc2be8f98d2f323e38ab3bb535ffaf833d26839c3a2fe1d1dab392cd103380098328fc7465f262cde7ae09efa996c7fb66233d8391ae4f6

diff --git a/app-admin/calamares/calamares-3.3.6.ebuild 
b/app-admin/calamares/calamares-3.3.6.ebuild
new file mode 100644
index ..add03ed16ed6
--- /dev/null
+++ b/app-admin/calamares/calamares-3.3.6.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit ecm python-single-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE="+networkmanager qt6 +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+QT5_MIN="5.15.0"
+KF_QT5_MIN="5.78"
+QT6_MIN="6.5.0"
+KF_QT6_MIN="5.240"
+
+BDEPEND="
+   qt6? (
+   >=dev-qt/qttools-${QT6_MIN}:6[linguist]
+   >=kde-frameworks/extra-cmake-modules-${KF_QT6_MIN}
+   )
+   !qt6? (
+   >=dev-qt/linguist-tools-${QT5_MIN}:5
+   >=kde-frameworks/extra-cmake-modules-${KF_QT5_MIN}
+   )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+   dev-cpp/yaml-cpp:=
+   $(python_gen_cond_dep '
+   >=dev-libs/boost-1.72.0:=[python,${PYTHON_USEDEP}]
+   dev-libs/libpwquality[${PYTHON_USEDEP}]
+   ')
+   qt6? (
+   
>=dev-qt/qtbase-${QT6_MIN}:6[concurrent,dbus,gui,network,widgets,xml]
+   >=dev-qt/qtdeclarative-${QT6_MIN}:6
+   >=dev-qt/qtsvg-${QT6_MIN}:6
+   >=dev-qt/qtwebengine-${QT6_MIN}:6[widgets]
+   dev-qt/kdsingleapplication[qt6]
+   >=kde-frameworks/kconfig-${KF_QT6_MIN}:6
+   >=kde-frameworks/kcoreaddons-${KF_QT6_MIN}:6
+   >=kde-frameworks/kcrash-${KF_QT6_MIN}:6
+   >=kde-frameworks/ki18n-${KF_QT6_MIN}:6
+   >=kde-frameworks/kpackage-${KF_QT6_MIN}:6
+   >=kde-frameworks/kparts-${KF_QT6_MIN}:6
+   >=kde-frameworks/kservice-${KF_QT6_MIN}:6
+   >=kde-frameworks/kwidgetsaddons-${KF_QT6_MIN}:6
+   sys-auth/polkit-qt[qt6(-)]
+   >=sys-libs/kpmcore-24.01.75:6=
+   )
+   !qt6? (
+   >=dev-qt/qtconcurrent-${QT5_MIN}:5
+   >=dev-qt/qtdbus-${QT5_MIN}:5
+   >=dev-qt/qtdeclarative-${QT5_MIN}:5
+   >=dev-qt/qtgui-${QT5_MIN}:5
+   >=dev-qt/qtnetwork-${QT5_MIN}:5
+   >=dev-qt/qtsvg-${QT5_MIN}:5
+   >=dev-qt/qtwebengine-${QT5_MIN}:5[widgets]
+   >=dev-qt/qtwidgets-${QT5_MIN}:5
+   >=dev-qt/qtxml-${QT5_MIN}:5
+   dev-qt/kdsingleapplication[-qt6]
+   >=kde-frameworks/kconfig-${KF_QT5_MIN}:5
+   >=kde-frameworks/kcoreaddons-${KF_QT5_MIN}:5
+   >=kde-frameworks/kcrash-${KF_QT5_MIN}:5
+   >=kde-frameworks/ki18n-${KF_QT5_MIN}:5
+   >=kde-frameworks/kpackage-${KF_QT5_MIN}:5
+   >=kde-frameworks/kparts-${KF_QT5_MIN}:5
+   >=kde-frameworks/kservice-${KF_QT5_MIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KF_QT5_MIN}:5
+   sys-auth/polkit-qt[qt5(+)]
+   >=sys-libs/kpmcore-20.04.0:5=
+   )
+   sys-apps/dbus
+

[gentoo-commits] repo/gentoo:master commit in: app-admin/calamares/files/, app-admin/calamares/, profiles/base/

2024-03-22 Thread Andrew Ammerlaan

commit: 618852ed64e5fbfc546beec7663164646eac
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Mar 22 20:53:17 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Mar 22 20:54:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=618852ed

app-admin/calamares: add 3.3.5

- adds (maksed) qt6 support
- adds gentoo branding (read from /etc/os-release)
- drop tests requiring toml

Closes: https://bugs.gentoo.org/865265
Closes: https://bugs.gentoo.org/925724
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 app-admin/calamares/Manifest   |   1 +
 app-admin/calamares/calamares-3.3.5.ebuild | 167 ++
 .../calamares/files/calamares-gentoo-branding.desc | 239 +
 profiles/base/package.use.mask |   4 +
 4 files changed, 411 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 9301d4735645..30eda62874ab 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
 DIST calamares-3.2.60.tar.gz 4260547 BLAKE2B 
edf300ce9d534cd506b2341b3ce314bbde7fcc6dac40ad2307e549bbeab7a63ddfe6d7ae8c8176ee1ad4e4b02c9eadcd5efc66872e1f464c39200d8d117dca80
 SHA512 
dfc01212f74694f10d40dd1d1ad61db384c83021dc9cd4753027a9cf40b92c8e8b2d5032df76533a8f22c05448aba546c9bb21c38c03fb0cb8d7de35fb79fb7f
+DIST calamares-3.3.5.tar.gz 4722988 BLAKE2B 
bc3270fbc2f804c46008f1f0a106719b779a07d7d5d3cc9f1ab17da7597ebb5dfebc8793036e19570b0048afb667df4b9fed55e813374d7465513ea048e00ffc
 SHA512 
6846e13455e4fa38bd4d5061eece1baf5a972700f489dc1e35d988cfb5359650c63f79f9453431f1aff722af696260504c27f0c000490d781ab5fe03a5c46cf2

diff --git a/app-admin/calamares/calamares-3.3.5.ebuild 
b/app-admin/calamares/calamares-3.3.5.ebuild
new file mode 100644
index ..18227c7ccfcf
--- /dev/null
+++ b/app-admin/calamares/calamares-3.3.5.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit ecm python-single-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE="+networkmanager qt6 +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+QT5_MIN="5.15.0"
+KF_QT5_MIN="5.78"
+QT6_MIN="6.5.0"
+KF_QT6_MIN="5.240"
+
+BDEPEND="
+   qt6? (
+   >=dev-qt/qttools-${QT6_MIN}:6[linguist]
+   >=kde-frameworks/extra-cmake-modules-${KF_QT6_MIN}
+   )
+   !qt6? (
+   >=dev-qt/linguist-tools-${QT5_MIN}:5
+   >=kde-frameworks/extra-cmake-modules-${KF_QT5_MIN}
+   )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+   dev-cpp/yaml-cpp:=
+   $(python_gen_cond_dep '
+   >=dev-libs/boost-1.72.0:=[python,${PYTHON_USEDEP}]
+   dev-libs/libpwquality[${PYTHON_USEDEP}]
+   ')
+   qt6? (
+   
>=dev-qt/qtbase-${QT6_MIN}:6[concurrent,dbus,gui,network,widgets,xml]
+   >=dev-qt/qtdeclarative-${QT6_MIN}:6
+   >=dev-qt/qtsvg-${QT6_MIN}:6
+   >=dev-qt/qtwebengine-${QT6_MIN}:6[widgets]
+   dev-qt/kdsingleapplication[qt6]
+   >=kde-frameworks/kconfig-${KF_QT6_MIN}:6
+   >=kde-frameworks/kcoreaddons-${KF_QT6_MIN}:6
+   >=kde-frameworks/kcrash-${KF_QT6_MIN}:6
+   >=kde-frameworks/ki18n-${KF_QT6_MIN}:6
+   >=kde-frameworks/kpackage-${KF_QT6_MIN}:6
+   >=kde-frameworks/kparts-${KF_QT6_MIN}:6
+   >=kde-frameworks/kservice-${KF_QT6_MIN}:6
+   >=kde-frameworks/kwidgetsaddons-${KF_QT6_MIN}:6
+   sys-auth/polkit-qt[qt6(-)]
+   >=sys-libs/kpmcore-24.01.75:6=
+   )
+   !qt6? (
+   >=dev-qt/qtconcurrent-${QT5_MIN}:5
+   >=dev-qt/qtdbus-${QT5_MIN}:5
+   >=dev-qt/qtdeclarative-${QT5_MIN}:5
+   >=dev-qt/qtgui-${QT5_MIN}:5
+   >=dev-qt/qtnetwork-${QT5_MIN}:5
+   >=dev-qt/qtsvg-${QT5_MIN}:5
+   >=dev-qt/qtwebengine-${QT5_MIN}:5[widgets]
+   >=dev-qt/qtwidgets-${QT5_MIN}:5
+   >=dev-qt/qtxml-${QT5_MIN}:5
+   dev-qt/kdsingleapplication[-qt6]
+   >=kde-frameworks/kconfig-${KF_QT5_MIN}:5
+   >=kde-frameworks/kcoreaddons-${KF_QT5_MIN}:5
+   >=kde-frameworks/kcrash-${KF_QT5_MIN}:5
+   >=kde-frameworks/ki18n-${KF_QT5_MIN}:5
+   >=kde-frameworks/kpackage-${KF_QT5_MIN}:5
+   >=kde-frameworks/kparts-${KF_QT5_MIN}:5
+   >=kde-frameworks/kservice-${KF_QT5_MIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KF_QT5_MIN}:5
+   sys-auth/polkit-qt[qt5(+)]
+   >=sys-libs/kpmcore-20.04.0:5=
+   )
+

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

2024-03-05 Thread Andreas Sturmlechner

commit: 532056119dfee50ae862d97bad597eb7f6f8b376
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Mar  4 21:11:31 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar  5 09:56:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53205611

app-admin/calamares: Add sys-apps/polkit-qt[qt5(+)] USEdep

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../{calamares-3.2.60-r4.ebuild => calamares-3.2.60-r5.ebuild}| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/calamares/calamares-3.2.60-r4.ebuild 
b/app-admin/calamares/calamares-3.2.60-r5.ebuild
similarity index 97%
rename from app-admin/calamares/calamares-3.2.60-r4.ebuild
rename to app-admin/calamares/calamares-3.2.60-r5.ebuild
index 370b7cfa23d3..592c5af31d92 100644
--- a/app-admin/calamares/calamares-3.2.60-r4.ebuild
+++ b/app-admin/calamares/calamares-3.2.60-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -44,7 +44,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
kde-frameworks/kservice:5
sys-apps/dbus
sys-apps/dmidecode
-   sys-auth/polkit-qt
+   sys-auth/polkit-qt[qt5(+)]
>=sys-libs/kpmcore-4.0.0:5=
virtual/libcrypt:=
 "

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

2023-06-15 Thread Sam James

commit: 4175b9715b1d881307c536bb5980001f0aa11e3f
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 21:39:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 21:39:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4175b971

app-admin/calamares: fix systemd-boot dep deux

Fixes: 2a6e32f1ceeabf2fa4e95e9fdaee9a7046f72395
Signed-off-by: Sam James  gentoo.org>

 .../{calamares-3.2.60-r3.ebuild => calamares-3.2.60-r4.ebuild} | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app-admin/calamares/calamares-3.2.60-r3.ebuild 
b/app-admin/calamares/calamares-3.2.60-r4.ebuild
similarity index 95%
rename from app-admin/calamares/calamares-3.2.60-r3.ebuild
rename to app-admin/calamares/calamares-3.2.60-r4.ebuild
index 516017469b80..370b7cfa23d3 100644
--- a/app-admin/calamares/calamares-3.2.60-r3.ebuild
+++ b/app-admin/calamares/calamares-3.2.60-r4.ebuild
@@ -55,7 +55,12 @@ RDEPEND="${COMMON_DEPEND}
app-admin/sudo
dev-libs/libatasmart
net-misc/rsync
-   || ( sys-boot/grub:2 sys-apps/systemd sys-apps/systemd-utils[boot] )
+   || (
+   sys-boot/grub:2
+   sys-apps/systemd[gnuefi(-)]
+   sys-apps/systemd[boot(-)]
+   sys-apps/systemd-utils[boot]
+   )
sys-boot/os-prober
sys-fs/squashfs-tools
sys-libs/timezone-data

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

2023-06-14 Thread Sam James

commit: 2a6e32f1ceeabf2fa4e95e9fdaee9a7046f72395
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 02:27:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 02:27:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a6e32f1

app-admin/calamares: fix systemd-boot dep

Signed-off-by: Sam James  gentoo.org>

 .../{calamares-3.2.60-r2.ebuild => calamares-3.2.60-r3.ebuild}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/calamares/calamares-3.2.60-r2.ebuild 
b/app-admin/calamares/calamares-3.2.60-r3.ebuild
similarity index 97%
rename from app-admin/calamares/calamares-3.2.60-r2.ebuild
rename to app-admin/calamares/calamares-3.2.60-r3.ebuild
index 138ba7e10169..516017469b80 100644
--- a/app-admin/calamares/calamares-3.2.60-r2.ebuild
+++ b/app-admin/calamares/calamares-3.2.60-r3.ebuild
@@ -55,7 +55,7 @@ RDEPEND="${COMMON_DEPEND}
app-admin/sudo
dev-libs/libatasmart
net-misc/rsync
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   || ( sys-boot/grub:2 sys-apps/systemd sys-apps/systemd-utils[boot] )
sys-boot/os-prober
sys-fs/squashfs-tools
sys-libs/timezone-data

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

2023-06-14 Thread Sam James

commit: a20bc88711aa7317255b6a3c9be95f90a63204b8
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 15 02:26:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 15 02:26:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a20bc887

app-admin/calamares: drop 3.2.60-r1

Signed-off-by: Sam James  gentoo.org>

 app-admin/calamares/calamares-3.2.60-r1.ebuild | 118 -
 1 file changed, 118 deletions(-)

diff --git a/app-admin/calamares/calamares-3.2.60-r1.ebuild 
b/app-admin/calamares/calamares-3.2.60-r1.ebuild
deleted file mode 100644
index 0a569c256030..
--- a/app-admin/calamares/calamares-3.2.60-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit ecm python-single-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="+networkmanager +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-   dev-cpp/yaml-cpp:=
-   $(python_gen_cond_dep '
-   dev-libs/boost:=[python,${PYTHON_USEDEP}]
-   dev-libs/libpwquality[${PYTHON_USEDEP}]
-   ')
-   dev-qt/qtconcurrent:5
-   dev-qt/qtdbus:5
-   dev-qt/qtdeclarative:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwebengine:5[widgets]
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   kde-frameworks/kconfig:5
-   kde-frameworks/kcoreaddons:5
-   kde-frameworks/kcrash:5
-   kde-frameworks/kpackage:5
-   kde-frameworks/kparts:5
-   kde-frameworks/kservice:5
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt
-   >=sys-libs/kpmcore-4.0.0:5=
-   virtual/libcrypt:=
-"
-DEPEND="${COMMON_DEPEND}
-   test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   sys-libs/timezone-data
-   virtual/udev
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-PATCHES=(
-   "${FILESDIR}/${P}-ldflags.patch"
-)
-
-src_prepare() {
-   ecm_src_prepare
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-   PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-   PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-   PYTHON_LIBS="$(python_get_LIBS)"
-
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
-   calamares.desktop || die
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
-   calamares.desktop || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DINSTALL_CONFIG=ON
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
-   -DWITH_PYTHONQT=OFF
-   )
-
-   ecm_src_configure
-}
-
-src_test() {
-   local myctestargs=(
-   # Skipped tests:
-   # load-dracut: tries and fails to find Dracut config
-   # libcalamaresnetworktest: needs network
-   # libcalamaresutilstest: inspects /tmp (expects namespace?)
-   #
-   # Need investigation:
-   # test_libcalamaresuipaste
-   # validate-netinstall
-   # validate-services-systemd
-   # localetest
-   # machineidtest
-   # packagechoosertest
-   -E 
"(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest)"
-   )
-
-   cmake_src_test
-}
-
-src_install() {
-   ecm_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2023-03-18 Thread Ulrich Müller

commit: ebf55cb947722aaf5e000155f8a0fb0c846e3b71
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sat Mar 18 20:31:14 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Mar 18 20:38:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebf55cb9

app-admin/calamares: enable py3.11

Closes: https://bugs.gentoo.org/896462
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Ulrich Müller  gentoo.org>

 app-admin/calamares/calamares-3.2.60-r2.ebuild | 118 +
 1 file changed, 118 insertions(+)

diff --git a/app-admin/calamares/calamares-3.2.60-r2.ebuild 
b/app-admin/calamares/calamares-3.2.60-r2.ebuild
new file mode 100644
index ..138ba7e10169
--- /dev/null
+++ b/app-admin/calamares/calamares-3.2.60-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit ecm python-single-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE="+networkmanager +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+   dev-cpp/yaml-cpp:=
+   $(python_gen_cond_dep '
+   dev-libs/boost:=[python,${PYTHON_USEDEP}]
+   dev-libs/libpwquality[${PYTHON_USEDEP}]
+   ')
+   dev-qt/qtconcurrent:5
+   dev-qt/qtdbus:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwebengine:5[widgets]
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   kde-frameworks/kconfig:5
+   kde-frameworks/kcoreaddons:5
+   kde-frameworks/kcrash:5
+   kde-frameworks/kpackage:5
+   kde-frameworks/kparts:5
+   kde-frameworks/kservice:5
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt
+   >=sys-libs/kpmcore-4.0.0:5=
+   virtual/libcrypt:=
+"
+DEPEND="${COMMON_DEPEND}
+   test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-libs/timezone-data
+   virtual/udev
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+PATCHES=(
+   "${FILESDIR}/${P}-ldflags.patch"
+)
+
+src_prepare() {
+   ecm_src_prepare
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+   PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+   PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+   PYTHON_LIBS="$(python_get_LIBS)"
+
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
+   calamares.desktop || die
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
+   calamares.desktop || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DINSTALL_CONFIG=ON
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
+   -DWITH_PYTHONQT=OFF
+   )
+
+   ecm_src_configure
+}
+
+src_test() {
+   local myctestargs=(
+   # Skipped tests:
+   # load-dracut: tries and fails to find Dracut config
+   # libcalamaresnetworktest: needs network
+   # libcalamaresutilstest: inspects /tmp (expects namespace?)
+   #
+   # Need investigation:
+   # test_libcalamaresuipaste
+   # validate-netinstall
+   # validate-services-systemd
+   # localetest
+   # machineidtest
+   # packagechoosertest
+   -E 
"(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest)"
+   )
+
+   cmake_src_test
+}
+
+src_install() {
+   ecm_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2023-03-18 Thread Ulrich Müller

commit: c497ddda658af5747f1c3a1f72df7b80cec047bd
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sat Mar 18 19:58:08 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Mar 18 20:03:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c497ddda

app-admin/calamares: respect LDFLAGS

Closes: https://bugs.gentoo.org/865281
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Ulrich Müller  gentoo.org>

 ...{calamares-3.2.60.ebuild => calamares-3.2.60-r1.ebuild} |  4 
 app-admin/calamares/files/calamares-3.2.60-ldflags.patch   | 14 ++
 2 files changed, 18 insertions(+)

diff --git a/app-admin/calamares/calamares-3.2.60.ebuild 
b/app-admin/calamares/calamares-3.2.60-r1.ebuild
similarity index 98%
rename from app-admin/calamares/calamares-3.2.60.ebuild
rename to app-admin/calamares/calamares-3.2.60-r1.ebuild
index 138cda4176eb..0a569c256030 100644
--- a/app-admin/calamares/calamares-3.2.60.ebuild
+++ b/app-admin/calamares/calamares-3.2.60-r1.ebuild
@@ -64,6 +64,10 @@ RDEPEND="${COMMON_DEPEND}
upower? ( sys-power/upower )
 "
 
+PATCHES=(
+   "${FILESDIR}/${P}-ldflags.patch"
+)
+
 src_prepare() {
ecm_src_prepare
export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \

diff --git a/app-admin/calamares/files/calamares-3.2.60-ldflags.patch 
b/app-admin/calamares/files/calamares-3.2.60-ldflags.patch
new file mode 100644
index ..f81c49b50641
--- /dev/null
+++ b/app-admin/calamares/files/calamares-3.2.60-ldflags.patch
@@ -0,0 +1,14 @@
+From: Mario Haustein 
+Bug: https://bugs.gentoo.org/865281
+
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -203,7 +203,7 @@ set( CMAKE_C_FLAGS_MINSIZEREL   "-Os -DNDEBUG" )
+ set( CMAKE_C_FLAGS_RELEASE  "-O4 -DNDEBUG" )
+ set( CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g" )
+ 
+-set( CMAKE_SHARED_LINKER_FLAGS  "-Wl,--no-undefined -Wl,--fatal-warnings" 
)
++set( CMAKE_SHARED_LINKER_FLAGS  "-Wl,--no-undefined -Wl,--fatal-warnings 
${CMAKE_SHARED_LINKER_FLAGS}" )
+ 
+ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
+ message( STATUS "Found Clang ${CMAKE_CXX_COMPILER_VERSION}, setting up 
Clang-specific compiler flags." )

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

2022-10-16 Thread Andreas Sturmlechner

commit: 2504c85538260a890489ebf37565e4727dfb9baa
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Oct 16 12:44:54 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct 16 12:48:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2504c855

app-admin/calamares: drop 3.2.32.1-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-admin/calamares/Manifest   |  1 -
 app-admin/calamares/calamares-3.2.32.1-r1.ebuild   | 96 --
 .../calamares-3.2.32.1-remove-broken-tests.patch   | 83 ---
 3 files changed, 180 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 78f41b19dd7b..9301d4735645 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
-DIST calamares-3.2.32.1.tar.gz 3425260 BLAKE2B 
e10174d400a402cfe3d7a015f4fe7a02ad1653e5a4cdf65c31360467e3b3ff10629d991dd206424d51c67533f8ab550e09e74b4334dbebe9e5fec1a06ed0dbd4
 SHA512 
30e523dd3c340f9c4385a53a4011ed0f16e317572fa2e5b6acfe638aaf029538f0ab85924999e9683ba10014be99b3c35ff3234bc85cefa2ccd14e2715c87222
 DIST calamares-3.2.60.tar.gz 4260547 BLAKE2B 
edf300ce9d534cd506b2341b3ce314bbde7fcc6dac40ad2307e549bbeab7a63ddfe6d7ae8c8176ee1ad4e4b02c9eadcd5efc66872e1f464c39200d8d117dca80
 SHA512 
dfc01212f74694f10d40dd1d1ad61db384c83021dc9cd4753027a9cf40b92c8e8b2d5032df76533a8f22c05448aba546c9bb21c38c03fb0cb8d7de35fb79fb7f

diff --git a/app-admin/calamares/calamares-3.2.32.1-r1.ebuild 
b/app-admin/calamares/calamares-3.2.32.1-r1.ebuild
deleted file mode 100644
index bbb5ce9445ab..
--- a/app-admin/calamares/calamares-3.2.32.1-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit ecm python-single-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="+networkmanager +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-   dev-cpp/yaml-cpp:=
-   $(python_gen_cond_dep '
-   dev-libs/boost:=[python,${PYTHON_USEDEP}]
-   dev-libs/libpwquality[${PYTHON_USEDEP}]
-   ')
-   dev-qt/qtconcurrent:5
-   dev-qt/qtdbus:5
-   dev-qt/qtdeclarative:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwebengine:5[widgets]
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   kde-frameworks/kconfig:5
-   kde-frameworks/kcoreaddons:5
-   kde-frameworks/kcrash:5
-   kde-frameworks/kpackage:5
-   kde-frameworks/kparts:5
-   kde-frameworks/kservice:5
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt
-   >=sys-libs/kpmcore-4.0.0:5=
-   virtual/libcrypt:=
-"
-DEPEND="${COMMON_DEPEND}
-   test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   sys-libs/timezone-data
-   virtual/udev
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2.32.1-remove-broken-tests.patch )
-
-src_prepare() {
-   ecm_src_prepare
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-   PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-   PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-   PYTHON_LIBS="$(python_get_LIBS)"
-
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
-   calamares.desktop || die
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
-   calamares.desktop || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DINSTALL_CONFIG=ON
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
-   -DWITH_PYTHONQT=OFF
-   )
-
-   ecm_src_configure
-}
-
-src_install() {
-   ecm_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

diff --git 
a/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.patch 
b/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.patch
deleted file mode 100644
index 346e1bfb4028..
--- a/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.patch
+++ /dev/null
@@ -1,83 +0,0 @@
 a/src/libcalamares/CMakeLists.txt
-+++ b/src/libcalamares/CMakeLists.txt
-@@ -216,12 +216,6 @@
- )
- 
- calamares_add_test(
--libcalamaresnetworktest
--SOURCES
--network/Tests.cpp
--)
--
--calamares_add_test(
-

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

2022-07-19 Thread Sam James

commit: cbcb3b710419d9f296f1b87e7e67e33048afec1e
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 19 20:46:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 19 20:47:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbcb3b71

app-admin/calamares: add 3.2.60

Closes: https://bugs.gentoo.org/779130
Signed-off-by: Sam James  gentoo.org>

 app-admin/calamares/Manifest|   1 +
 app-admin/calamares/calamares-3.2.60.ebuild | 114 
 2 files changed, 115 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 7e1b42674308..78f41b19dd7b 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
 DIST calamares-3.2.32.1.tar.gz 3425260 BLAKE2B 
e10174d400a402cfe3d7a015f4fe7a02ad1653e5a4cdf65c31360467e3b3ff10629d991dd206424d51c67533f8ab550e09e74b4334dbebe9e5fec1a06ed0dbd4
 SHA512 
30e523dd3c340f9c4385a53a4011ed0f16e317572fa2e5b6acfe638aaf029538f0ab85924999e9683ba10014be99b3c35ff3234bc85cefa2ccd14e2715c87222
+DIST calamares-3.2.60.tar.gz 4260547 BLAKE2B 
edf300ce9d534cd506b2341b3ce314bbde7fcc6dac40ad2307e549bbeab7a63ddfe6d7ae8c8176ee1ad4e4b02c9eadcd5efc66872e1f464c39200d8d117dca80
 SHA512 
dfc01212f74694f10d40dd1d1ad61db384c83021dc9cd4753027a9cf40b92c8e8b2d5032df76533a8f22c05448aba546c9bb21c38c03fb0cb8d7de35fb79fb7f

diff --git a/app-admin/calamares/calamares-3.2.60.ebuild 
b/app-admin/calamares/calamares-3.2.60.ebuild
new file mode 100644
index ..a08899cfd837
--- /dev/null
+++ b/app-admin/calamares/calamares-3.2.60.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit ecm python-single-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE="+networkmanager +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+   dev-cpp/yaml-cpp:=
+   $(python_gen_cond_dep '
+   >=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}]
+   dev-libs/libpwquality[${PYTHON_USEDEP}]
+   ')
+   dev-qt/qtconcurrent:5
+   dev-qt/qtdbus:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwebengine:5[widgets]
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   kde-frameworks/kconfig:5
+   kde-frameworks/kcoreaddons:5
+   kde-frameworks/kcrash:5
+   kde-frameworks/kpackage:5
+   kde-frameworks/kparts:5
+   kde-frameworks/kservice:5
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt
+   >=sys-libs/kpmcore-4.0.0:5=
+   virtual/libcrypt:=
+"
+DEPEND="${COMMON_DEPEND}
+   test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-libs/timezone-data
+   virtual/udev
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   ecm_src_prepare
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+   PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+   PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+   PYTHON_LIBS="$(python_get_LIBS)"
+
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
+   calamares.desktop || die
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
+   calamares.desktop || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DINSTALL_CONFIG=ON
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
+   -DWITH_PYTHONQT=OFF
+   )
+
+   ecm_src_configure
+}
+
+src_test() {
+   local myctestargs=(
+   # Skipped tests:
+   # load-dracut: tries and fails to find Dracut config
+   # libcalamaresnetworktest: needs network
+   # libcalamaresutilstest: inspects /tmp (expects namespace?)
+   #
+   # Need investigation:
+   # test_libcalamaresuipaste
+   # validate-netinstall
+   # validate-services-systemd
+   # localetest
+   # machineidtest
+   # packagechoosertest
+   -E 
"(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest)"
+   )
+
+   cmake_src_test
+}
+
+src_install() {

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

2022-07-19 Thread Sam James

commit: 9f4cc39c66047811a159c39ee6620d5ad2e5f1fe
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 19 18:48:34 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 19 18:48:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f4cc39c

app-admin/calamares: enable py3.10

Closes: https://bugs.gentoo.org/845423
Thanks-to: Joost Ruis  sabayonlinux.org>
Signed-off-by: Sam James  gentoo.org>

 app-admin/calamares/calamares-3.2.32.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/calamares/calamares-3.2.32.1-r1.ebuild 
b/app-admin/calamares/calamares-3.2.32.1-r1.ebuild
index 8777435dad90..5e4cccfaf89e 100644
--- a/app-admin/calamares/calamares-3.2.32.1-r1.ebuild
+++ b/app-admin/calamares/calamares-3.2.32.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_TEST="true"
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit ecm python-single-r1

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

2021-08-21 Thread Sam James

commit: e8c7748e58673d10f684bbaf30f490e85f17e9ce
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 22 03:14:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 22 03:17:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8c7748e

app-admin/calamares: add missing libcrypt dependency

Closes: https://bugs.gentoo.org/807103
Signed-off-by: Sam James  gentoo.org>

 .../{calamares-3.2.32.1.ebuild => calamares-3.2.32.1-r1.ebuild}  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-admin/calamares/calamares-3.2.32.1.ebuild 
b/app-admin/calamares/calamares-3.2.32.1-r1.ebuild
similarity index 99%
rename from app-admin/calamares/calamares-3.2.32.1.ebuild
rename to app-admin/calamares/calamares-3.2.32.1-r1.ebuild
index ee3b00a..8777435dad9 100644
--- a/app-admin/calamares/calamares-3.2.32.1.ebuild
+++ b/app-admin/calamares/calamares-3.2.32.1-r1.ebuild
@@ -46,6 +46,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
sys-apps/dmidecode
sys-auth/polkit-qt
>=sys-libs/kpmcore-4.0.0:5=
+   virtual/libcrypt:=
 "
 DEPEND="${COMMON_DEPEND}
test? ( dev-qt/qttest:5 )

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

2021-08-07 Thread Sebastian Pipping

commit: 4e7137845d4e053f2143446cbd427add660f61de
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sat Aug  7 16:04:05 2021 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sat Aug  7 16:06:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e713784

app-admin/calamares: Fix odd patch filename

Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-3.0.20, Repoman-3.0.3

 app-admin/calamares/calamares-3.2.32.1.ebuild   | 2 +-
 ...broken-tests.ebuild => calamares-3.2.32.1-remove-broken-tests.patch} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/calamares/calamares-3.2.32.1.ebuild 
b/app-admin/calamares/calamares-3.2.32.1.ebuild
index 2f6bd1c6439..ee3b00a 100644
--- a/app-admin/calamares/calamares-3.2.32.1.ebuild
+++ b/app-admin/calamares/calamares-3.2.32.1.ebuild
@@ -63,7 +63,7 @@ RDEPEND="${COMMON_DEPEND}
upower? ( sys-power/upower )
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-3.2.32.1-remove-broken-tests.ebuild )
+PATCHES=( "${FILESDIR}"/${PN}-3.2.32.1-remove-broken-tests.patch )
 
 src_prepare() {
ecm_src_prepare

diff --git 
a/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild 
b/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.patch
similarity index 100%
rename from 
app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild
rename to app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.patch

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

2021-02-01 Thread Sam James

commit: 1a2f6381cee34983c6cbb00ea6c3fad89e65
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 16:29:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 16:32:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a2f6381

app-admin/calamares: retire mudler@

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 app-admin/calamares/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/app-admin/calamares/metadata.xml b/app-admin/calamares/metadata.xml
index 8c2f7964874..f28035634d1 100644
--- a/app-admin/calamares/metadata.xml
+++ b/app-admin/calamares/metadata.xml
@@ -5,10 +5,6 @@
j...@gentoo.org
Johannes Huber

-   
-   mud...@gentoo.org
-   Ettore Di Giacinto
-   

Calamares is a distribution-independent system installer, with 
an
advanced partitioning feature for both manual and automated

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

2020-10-24 Thread David Seifert

commit: 6050461d338838bb01c019923da0c07f61f4a269
Author: David Seifert  gentoo  org>
AuthorDate: Sat Oct 24 07:56:32 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Oct 24 07:56:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6050461d

app-admin/calamares: Mask all failing tests

Closes: https://bugs.gentoo.org/750557
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 .../files/calamares-3.2.32.1-remove-broken-tests.ebuild   | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git 
a/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild 
b/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild
index 6ecf6c36a99..346e1bfb402 100644
--- a/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild
+++ b/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild
@@ -1,6 +1,19 @@
 --- a/src/libcalamares/CMakeLists.txt
 +++ b/src/libcalamares/CMakeLists.txt
-@@ -238,12 +238,6 @@
+@@ -216,12 +216,6 @@
+ )
+ 
+ calamares_add_test(
+-libcalamaresnetworktest
+-SOURCES
+-network/Tests.cpp
+-)
+-
+-calamares_add_test(
+ libcalamarespartitiontest
+ SOURCES
+ partition/Tests.cpp
+@@ -238,12 +232,6 @@
  endif()
  
  calamares_add_test(

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

2020-10-21 Thread David Seifert

commit: 2a0cbc53e96583cc6572ea7a7846b750960df4ff
Author: David Seifert  gentoo  org>
AuthorDate: Wed Oct 21 11:53:48 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Oct 21 11:53:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a0cbc53

app-admin/calamares: Version bump to 3.2.32.1

Bug: https://bugs.gentoo.org/744316
Closes: https://bugs.gentoo.org/749984
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 app-admin/calamares/Manifest   |  1 +
 app-admin/calamares/calamares-3.2.32.1.ebuild  | 95 ++
 .../calamares-3.2.32.1-remove-broken-tests.ebuild  | 70 
 3 files changed, 166 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 98c99a4cf27..9901780ae48 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
 DIST calamares-3.2.28.3.tar.gz 3837417 BLAKE2B 
d248423e09aa21cd3808e00408f34d7c178a19d2c82bed5ab0dedff945ab7aad601f4aefbee62a772e4fdf5915dc3888af1fb0711e4bbe1e9b089adfbae2b1a0
 SHA512 
124de0bdd09fe15450460fa858c6f3df3a00c609684238bf3bc8eb18f10c39c4bc0e8fd02b0e9bae50d42bade2716cb16247c23ace397288a5e8f27790b60280
+DIST calamares-3.2.32.1.tar.gz 3425260 BLAKE2B 
e10174d400a402cfe3d7a015f4fe7a02ad1653e5a4cdf65c31360467e3b3ff10629d991dd206424d51c67533f8ab550e09e74b4334dbebe9e5fec1a06ed0dbd4
 SHA512 
30e523dd3c340f9c4385a53a4011ed0f16e317572fa2e5b6acfe638aaf029538f0ab85924999e9683ba10014be99b3c35ff3234bc85cefa2ccd14e2715c87222

diff --git a/app-admin/calamares/calamares-3.2.32.1.ebuild 
b/app-admin/calamares/calamares-3.2.32.1.ebuild
new file mode 100644
index 000..0c4287a8e8f
--- /dev/null
+++ b/app-admin/calamares/calamares-3.2.32.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit ecm python-single-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE="+networkmanager +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+   dev-cpp/yaml-cpp:=
+   $(python_gen_cond_dep '
+   >=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}]
+   dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}]
+   ')
+   dev-qt/qtconcurrent:5
+   dev-qt/qtdbus:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwebengine:5[widgets]
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   kde-frameworks/kconfig:5
+   kde-frameworks/kcoreaddons:5
+   kde-frameworks/kcrash:5
+   kde-frameworks/kpackage:5
+   kde-frameworks/kparts:5
+   kde-frameworks/kservice:5
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt
+   >=sys-libs/kpmcore-4.0.0:5=
+"
+DEPEND="${COMMON_DEPEND}
+   test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-libs/timezone-data
+   virtual/udev
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2.32.1-remove-broken-tests.ebuild )
+
+src_prepare() {
+   ecm_src_prepare
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+   PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+   PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+   PYTHON_LIBS="$(python_get_LIBS)"
+
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
+   calamares.desktop || die
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
+   calamares.desktop || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DINSTALL_CONFIG=ON
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
+   -DWITH_PYTHONQT=OFF
+   )
+
+   ecm_src_configure
+}
+
+src_install() {
+   ecm_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

diff --git 
a/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild 
b/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild
new file mode 100644
index 000..6ecf6c36a99
--- /dev/null
+++ b/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild
@@ -0,0 +1,70 @@
+--- a/src/libcalamares/CMakeLists.txt
 b/src/libcalamares/CMakeLists.txt
+@@ -238,12 +238,6 @@
+ endif()
+ 
+ calamares_add_test(
+-

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

2020-10-21 Thread David Seifert

commit: c43e85ec5787bad27354b96954d51858f94060f9
Author: David Seifert  gentoo  org>
AuthorDate: Wed Oct 21 11:53:50 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Oct 21 11:53:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c43e85ec

app-admin/calamares: Remove old 3.2.28.3

Closes: https://bugs.gentoo.org/744316
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 app-admin/calamares/Manifest  |  1 -
 app-admin/calamares/calamares-3.2.28.3.ebuild | 93 ---
 app-admin/calamares/metadata.xml  |  3 -
 3 files changed, 97 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 9901780ae48..7e1b4267430 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
-DIST calamares-3.2.28.3.tar.gz 3837417 BLAKE2B 
d248423e09aa21cd3808e00408f34d7c178a19d2c82bed5ab0dedff945ab7aad601f4aefbee62a772e4fdf5915dc3888af1fb0711e4bbe1e9b089adfbae2b1a0
 SHA512 
124de0bdd09fe15450460fa858c6f3df3a00c609684238bf3bc8eb18f10c39c4bc0e8fd02b0e9bae50d42bade2716cb16247c23ace397288a5e8f27790b60280
 DIST calamares-3.2.32.1.tar.gz 3425260 BLAKE2B 
e10174d400a402cfe3d7a015f4fe7a02ad1653e5a4cdf65c31360467e3b3ff10629d991dd206424d51c67533f8ab550e09e74b4334dbebe9e5fec1a06ed0dbd4
 SHA512 
30e523dd3c340f9c4385a53a4011ed0f16e317572fa2e5b6acfe638aaf029538f0ab85924999e9683ba10014be99b3c35ff3234bc85cefa2ccd14e2715c87222

diff --git a/app-admin/calamares/calamares-3.2.28.3.ebuild 
b/app-admin/calamares/calamares-3.2.28.3.ebuild
deleted file mode 100644
index 8ad695ecfb2..000
--- a/app-admin/calamares/calamares-3.2.28.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_7 )
-inherit ecm python-single-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="~amd64"
-SLOT=5
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-   dev-cpp/yaml-cpp:=
-   $(python_gen_cond_dep '
-   >=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}]
-   dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}]
-   ')
-   dev-qt/qtconcurrent:5
-   dev-qt/qtdbus:5
-   dev-qt/qtdeclarative:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwebengine:5[widgets]
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   kde-frameworks/kconfig:5
-   kde-frameworks/kcoreaddons:5
-   kde-frameworks/kcrash:5
-   kde-frameworks/kpackage:5
-   kde-frameworks/kparts:5
-   kde-frameworks/kservice:5
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt
-   >=sys-libs/kpmcore-4.0.0:5=
-   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_SINGLE_USEDEP}] )
-"
-DEPEND="${COMMON_DEPEND}
-   test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   sys-libs/timezone-data
-   virtual/udev
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   ecm_src_prepare
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-   PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-   PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-   PYTHON_LIBS="$(python_get_LIBS)"
-
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
-   calamares.desktop || die
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
-   calamares.desktop || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DINSTALL_CONFIG=ON
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
-   -DWITH_PYTHONQT=$(usex pythonqt)
-   )
-
-   ecm_src_configure
-}
-
-src_install() {
-   ecm_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

diff --git a/app-admin/calamares/metadata.xml b/app-admin/calamares/metadata.xml
index bc9aeb32994..8c2f7964874 100644
--- a/app-admin/calamares/metadata.xml
+++ b/app-admin/calamares/metadata.xml
@@ -21,7 +21,4 @@

calamares/calamares

-   
-   Enable PythonQt-based module 
interface
-

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

2020-08-19 Thread Johannes Huber

commit: 6c2003889205682955edc505839de6324c52fbd4
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Aug 20 05:36:37 2020 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Aug 20 05:37:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c200388

app-admin/calamares: Version bump 3.2.28.3

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Johannes Huber  gentoo.org>

 app-admin/calamares/Manifest  |  1 +
 app-admin/calamares/calamares-3.2.28.3.ebuild | 93 +++
 2 files changed, 94 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 81e23affb81..23f4d5a4f22 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
 DIST calamares-3.2.20.tar.gz 3246752 BLAKE2B 
11bc23da8f035a0399f54c1f0f9e11806b0e3b77ad9f57c694c15de077ad37d3f282d29d0b4c010f19372e78d14af2cf9c58b95b03d6d867ea6c0c104e701fab
 SHA512 
473422eca83007ce0d82e09d637b73c114fffab338ece8269d37a4496d786eeef5e75b06b60ec51fb85bbd145984d37f0a586edd9c5d58e23abde665b8370c7c
+DIST calamares-3.2.28.3.tar.gz 3837417 BLAKE2B 
d248423e09aa21cd3808e00408f34d7c178a19d2c82bed5ab0dedff945ab7aad601f4aefbee62a772e4fdf5915dc3888af1fb0711e4bbe1e9b089adfbae2b1a0
 SHA512 
124de0bdd09fe15450460fa858c6f3df3a00c609684238bf3bc8eb18f10c39c4bc0e8fd02b0e9bae50d42bade2716cb16247c23ace397288a5e8f27790b60280

diff --git a/app-admin/calamares/calamares-3.2.28.3.ebuild 
b/app-admin/calamares/calamares-3.2.28.3.ebuild
new file mode 100644
index 000..8ad695ecfb2
--- /dev/null
+++ b/app-admin/calamares/calamares-3.2.28.3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_7 )
+inherit ecm python-single-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+KEYWORDS="~amd64"
+SLOT=5
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+   dev-cpp/yaml-cpp:=
+   $(python_gen_cond_dep '
+   >=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}]
+   dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}]
+   ')
+   dev-qt/qtconcurrent:5
+   dev-qt/qtdbus:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwebengine:5[widgets]
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   kde-frameworks/kconfig:5
+   kde-frameworks/kcoreaddons:5
+   kde-frameworks/kcrash:5
+   kde-frameworks/kpackage:5
+   kde-frameworks/kparts:5
+   kde-frameworks/kservice:5
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt
+   >=sys-libs/kpmcore-4.0.0:5=
+   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_SINGLE_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+   test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-libs/timezone-data
+   virtual/udev
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   ecm_src_prepare
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+   PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+   PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+   PYTHON_LIBS="$(python_get_LIBS)"
+
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
+   calamares.desktop || die
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
+   calamares.desktop || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DINSTALL_CONFIG=ON
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
+   -DWITH_PYTHONQT=$(usex pythonqt)
+   )
+
+   ecm_src_configure
+}
+
+src_install() {
+   ecm_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2020-08-19 Thread Johannes Huber

commit: 40b9bdbc1c8b53f08bca9ade806bcffc2510617a
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Aug 20 05:37:08 2020 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Aug 20 05:37:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40b9bdbc

app-admin/calamares: Remove 3.2.20

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Johannes Huber  gentoo.org>

 app-admin/calamares/Manifest|  1 -
 app-admin/calamares/calamares-3.2.20.ebuild | 93 -
 2 files changed, 94 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 23f4d5a4f22..98c99a4cf27 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
-DIST calamares-3.2.20.tar.gz 3246752 BLAKE2B 
11bc23da8f035a0399f54c1f0f9e11806b0e3b77ad9f57c694c15de077ad37d3f282d29d0b4c010f19372e78d14af2cf9c58b95b03d6d867ea6c0c104e701fab
 SHA512 
473422eca83007ce0d82e09d637b73c114fffab338ece8269d37a4496d786eeef5e75b06b60ec51fb85bbd145984d37f0a586edd9c5d58e23abde665b8370c7c
 DIST calamares-3.2.28.3.tar.gz 3837417 BLAKE2B 
d248423e09aa21cd3808e00408f34d7c178a19d2c82bed5ab0dedff945ab7aad601f4aefbee62a772e4fdf5915dc3888af1fb0711e4bbe1e9b089adfbae2b1a0
 SHA512 
124de0bdd09fe15450460fa858c6f3df3a00c609684238bf3bc8eb18f10c39c4bc0e8fd02b0e9bae50d42bade2716cb16247c23ace397288a5e8f27790b60280

diff --git a/app-admin/calamares/calamares-3.2.20.ebuild 
b/app-admin/calamares/calamares-3.2.20.ebuild
deleted file mode 100644
index 8ad695ecfb2..000
--- a/app-admin/calamares/calamares-3.2.20.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_7 )
-inherit ecm python-single-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="~amd64"
-SLOT=5
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-   dev-cpp/yaml-cpp:=
-   $(python_gen_cond_dep '
-   >=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}]
-   dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}]
-   ')
-   dev-qt/qtconcurrent:5
-   dev-qt/qtdbus:5
-   dev-qt/qtdeclarative:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwebengine:5[widgets]
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   kde-frameworks/kconfig:5
-   kde-frameworks/kcoreaddons:5
-   kde-frameworks/kcrash:5
-   kde-frameworks/kpackage:5
-   kde-frameworks/kparts:5
-   kde-frameworks/kservice:5
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt
-   >=sys-libs/kpmcore-4.0.0:5=
-   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_SINGLE_USEDEP}] )
-"
-DEPEND="${COMMON_DEPEND}
-   test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   sys-libs/timezone-data
-   virtual/udev
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   ecm_src_prepare
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-   PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-   PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-   PYTHON_LIBS="$(python_get_LIBS)"
-
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
-   calamares.desktop || die
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
-   calamares.desktop || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DINSTALL_CONFIG=ON
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
-   -DWITH_PYTHONQT=$(usex pythonqt)
-   )
-
-   ecm_src_configure
-}
-
-src_install() {
-   ecm_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2020-03-19 Thread Johannes Huber

commit: 5d71c0e8669f349192450437ad79a8bc232ed4fb
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Mar 19 07:07:40 2020 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Mar 19 07:07:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d71c0e8

app-admin/calamares: Remove 3.2.17.1-r1

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Johannes Huber  gentoo.org>

 app-admin/calamares/Manifest |  1 -
 app-admin/calamares/calamares-3.2.17.1-r1.ebuild | 92 
 2 files changed, 93 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index a57d55683de..81e23affb81 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
-DIST calamares-3.2.17.1.tar.gz 3128350 BLAKE2B 
a6926faaf1d521647cc0037b88686f9ceee1cc8167b888fe3c25228cbca8058572c8786a51f6ce0ccb77b31351d21ac41fa6c86a6577569c118729e1263ccafa
 SHA512 
fa8f1906aa7774b0f6bd65d1dc87ea2e08df92018c162f7e7fe01fe6119e65d6391141bc242623f88040bb18eb8b71003cb7417b27c10b39bc30de0f0bf8deb0
 DIST calamares-3.2.20.tar.gz 3246752 BLAKE2B 
11bc23da8f035a0399f54c1f0f9e11806b0e3b77ad9f57c694c15de077ad37d3f282d29d0b4c010f19372e78d14af2cf9c58b95b03d6d867ea6c0c104e701fab
 SHA512 
473422eca83007ce0d82e09d637b73c114fffab338ece8269d37a4496d786eeef5e75b06b60ec51fb85bbd145984d37f0a586edd9c5d58e23abde665b8370c7c

diff --git a/app-admin/calamares/calamares-3.2.17.1-r1.ebuild 
b/app-admin/calamares/calamares-3.2.17.1-r1.ebuild
deleted file mode 100644
index de32e110d2e..000
--- a/app-admin/calamares/calamares-3.2.17.1-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_6 )
-inherit ecm python-single-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="~amd64"
-SLOT=5
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-   dev-cpp/yaml-cpp:=
-   $(python_gen_cond_dep '
-   >=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}]
-   dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}]
-   ')
-   dev-qt/qtconcurrent:5
-   dev-qt/qtdbus:5
-   dev-qt/qtdeclarative:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwebengine:5[widgets]
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   kde-frameworks/kconfig:5
-   kde-frameworks/kcoreaddons:5
-   kde-frameworks/kcrash:5
-   kde-frameworks/kpackage:5
-   kde-frameworks/kparts:5
-   kde-frameworks/kservice:5
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt
-   >=sys-libs/kpmcore-4.0.0:5=
-   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_SINGLE_USEDEP}] )
-"
-DEPEND="${COMMON_DEPEND}
-   test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   sys-libs/timezone-data
-   virtual/udev
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   ecm_src_prepare
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-   PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-   PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-   PYTHON_LIBS="$(python_get_LIBS)"
-
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
-   calamares.desktop || die
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
-   calamares.desktop || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
-   -DWITH_PYTHONQT=$(usex pythonqt)
-   )
-
-   ecm_src_configure
-}
-
-src_install() {
-   ecm_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2020-03-19 Thread Johannes Huber

commit: eb1c1d2a1c311be00c79d0e400ca62d346dcd9df
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Mar 19 07:03:44 2020 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Mar 19 07:07:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb1c1d2a

app-admin/calamares: Version bump 3.2.20

Closes: https://bugs.gentoo.org/708702
Closes: https://bugs.gentoo.org/698430
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Johannes Huber  gentoo.org>

 app-admin/calamares/Manifest|  1 +
 app-admin/calamares/calamares-3.2.20.ebuild | 93 +
 2 files changed, 94 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 4c0f5ca38d5..a57d55683de 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
 DIST calamares-3.2.17.1.tar.gz 3128350 BLAKE2B 
a6926faaf1d521647cc0037b88686f9ceee1cc8167b888fe3c25228cbca8058572c8786a51f6ce0ccb77b31351d21ac41fa6c86a6577569c118729e1263ccafa
 SHA512 
fa8f1906aa7774b0f6bd65d1dc87ea2e08df92018c162f7e7fe01fe6119e65d6391141bc242623f88040bb18eb8b71003cb7417b27c10b39bc30de0f0bf8deb0
+DIST calamares-3.2.20.tar.gz 3246752 BLAKE2B 
11bc23da8f035a0399f54c1f0f9e11806b0e3b77ad9f57c694c15de077ad37d3f282d29d0b4c010f19372e78d14af2cf9c58b95b03d6d867ea6c0c104e701fab
 SHA512 
473422eca83007ce0d82e09d637b73c114fffab338ece8269d37a4496d786eeef5e75b06b60ec51fb85bbd145984d37f0a586edd9c5d58e23abde665b8370c7c

diff --git a/app-admin/calamares/calamares-3.2.20.ebuild 
b/app-admin/calamares/calamares-3.2.20.ebuild
new file mode 100644
index 000..8ad695ecfb2
--- /dev/null
+++ b/app-admin/calamares/calamares-3.2.20.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_7 )
+inherit ecm python-single-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+KEYWORDS="~amd64"
+SLOT=5
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+   dev-cpp/yaml-cpp:=
+   $(python_gen_cond_dep '
+   >=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}]
+   dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}]
+   ')
+   dev-qt/qtconcurrent:5
+   dev-qt/qtdbus:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwebengine:5[widgets]
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   kde-frameworks/kconfig:5
+   kde-frameworks/kcoreaddons:5
+   kde-frameworks/kcrash:5
+   kde-frameworks/kpackage:5
+   kde-frameworks/kparts:5
+   kde-frameworks/kservice:5
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt
+   >=sys-libs/kpmcore-4.0.0:5=
+   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_SINGLE_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+   test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-libs/timezone-data
+   virtual/udev
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   ecm_src_prepare
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+   PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+   PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+   PYTHON_LIBS="$(python_get_LIBS)"
+
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
+   calamares.desktop || die
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
+   calamares.desktop || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DINSTALL_CONFIG=ON
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
+   -DWITH_PYTHONQT=$(usex pythonqt)
+   )
+
+   ecm_src_configure
+}
+
+src_install() {
+   ecm_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2020-03-12 Thread Andreas Sturmlechner

commit: f47fe7b3a6620323b9a29b1a9d5ab5860b891374
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 12 15:49:50 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 12 15:50:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f47fe7b3

app-admin/calamares: Drop 3.2.12

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-admin/calamares/Manifest|  1 -
 app-admin/calamares/calamares-3.2.12.ebuild | 96 -
 2 files changed, 97 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index b0d039b9964..4c0f5ca38d5 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
-DIST calamares-3.2.12.tar.gz 3008153 BLAKE2B 
32b8a141346da528c2aef40a8fe480445cc8acbccc1190ca5ad1b5b0d03b59c709abd663e5ed33503955e3c0caa71476e7d737d46422992fc22e3acd96260857
 SHA512 
00dec40eb9c9e95933d3785a7b2ddc606530d8b94fde233d91071afbe11067d4e5b0a81298e66aaa0c65b55b6a86359466d8789f3ed886e76c2102b850f2bbc0
 DIST calamares-3.2.17.1.tar.gz 3128350 BLAKE2B 
a6926faaf1d521647cc0037b88686f9ceee1cc8167b888fe3c25228cbca8058572c8786a51f6ce0ccb77b31351d21ac41fa6c86a6577569c118729e1263ccafa
 SHA512 
fa8f1906aa7774b0f6bd65d1dc87ea2e08df92018c162f7e7fe01fe6119e65d6391141bc242623f88040bb18eb8b71003cb7417b27c10b39bc30de0f0bf8deb0

diff --git a/app-admin/calamares/calamares-3.2.12.ebuild 
b/app-admin/calamares/calamares-3.2.12.ebuild
deleted file mode 100644
index 8ce51a9bf5d..000
--- a/app-admin/calamares/calamares-3.2.12.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-PYTHON_COMPAT=( python3_6 )
-inherit kde5 python-single-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN};
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-   $(add_qt_dep linguist-tools)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep kpackage)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtconcurrent)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   dev-cpp/yaml-cpp:=
-   $(python_gen_cond_dep '
-   >=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}]
-   dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}]
-   ')
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5(+)]
-   >=sys-libs/kpmcore-4.0.0:5=
-   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_SINGLE_USEDEP}] )
-"
-DEPEND="${COMMON_DEPEND}
-   test? ( $(add_qt_dep qttest) )
-"
-RDEPEND="${COMMON_DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   sys-libs/timezone-data
-   virtual/udev
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   cmake-utils_src_prepare
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
-   calamares.desktop || die
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
-   calamares.desktop || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
-   -DWITH_PYTHONQT=$(usex pythonqt)
-   )
-
-   kde5_src_configure
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2020-02-09 Thread Michał Górny

commit: d9e2995129f77953318443f8f67b93d78dc83579
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Feb  8 10:34:48 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb  9 15:54:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e29951

app-admin/calamares: Switch to python-single-r1

This package does not have *any* code to support multiple
implementations, and depends on single-r1 package.  Use python-single-r1
instead of hacking around python-r1 to make it work by miracle.

Signed-off-by: Michał Górny  gentoo.org>

 app-admin/calamares/calamares-3.2.12.ebuild   | 11 ++-
 ...calamares-3.2.17.1.ebuild => calamares-3.2.17.1-r1.ebuild} | 11 ++-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app-admin/calamares/calamares-3.2.12.ebuild 
b/app-admin/calamares/calamares-3.2.12.ebuild
index 9fea01c24f6..8ce51a9bf5d 100644
--- a/app-admin/calamares/calamares-3.2.12.ebuild
+++ b/app-admin/calamares/calamares-3.2.12.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 KDE_TEST="true"
 PYTHON_COMPAT=( python3_6 )
-inherit kde5 python-r1
+inherit kde5 python-single-r1
 
 DESCRIPTION="Distribution-independent installer framework"
 HOMEPAGE="https://calamares.io;
@@ -41,13 +41,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
dev-cpp/yaml-cpp:=
-   >=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}]
-   dev-libs/libpwquality[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '
+   >=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}]
+   dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}]
+   ')
sys-apps/dbus
sys-apps/dmidecode
sys-auth/polkit-qt[qt5(+)]
>=sys-libs/kpmcore-4.0.0:5=
-   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_SINGLE_USEDEP}] )
 "
 DEPEND="${COMMON_DEPEND}
test? ( $(add_qt_dep qttest) )
@@ -67,7 +69,6 @@ RDEPEND="${COMMON_DEPEND}
 
 src_prepare() {
cmake-utils_src_prepare
-   python_setup
export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
   PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
   PYTHON_CFLAGS="$(python_get_CFLAGS)"\

diff --git a/app-admin/calamares/calamares-3.2.17.1.ebuild 
b/app-admin/calamares/calamares-3.2.17.1-r1.ebuild
similarity index 89%
rename from app-admin/calamares/calamares-3.2.17.1.ebuild
rename to app-admin/calamares/calamares-3.2.17.1-r1.ebuild
index e94dcef7f30..de32e110d2e 100644
--- a/app-admin/calamares/calamares-3.2.17.1.ebuild
+++ b/app-admin/calamares/calamares-3.2.17.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_TEST="true"
 PYTHON_COMPAT=( python3_6 )
-inherit ecm python-r1
+inherit ecm python-single-r1
 
 DESCRIPTION="Distribution-independent installer framework"
 HOMEPAGE="https://calamares.io;
@@ -22,8 +22,10 @@ BDEPEND="
 "
 COMMON_DEPEND="${PYTHON_DEPS}
dev-cpp/yaml-cpp:=
-   >=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}]
-   dev-libs/libpwquality[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '
+   >=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}]
+   dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}]
+   ')
dev-qt/qtconcurrent:5
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
@@ -43,7 +45,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
sys-apps/dmidecode
sys-auth/polkit-qt
>=sys-libs/kpmcore-4.0.0:5=
-   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_SINGLE_USEDEP}] )
 "
 DEPEND="${COMMON_DEPEND}
test? ( dev-qt/qttest:5 )
@@ -63,7 +65,6 @@ RDEPEND="${COMMON_DEPEND}
 
 src_prepare() {
ecm_src_prepare
-   python_setup
export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
PYTHON_CFLAGS="$(python_get_CFLAGS)"\

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

2020-01-01 Thread Johannes Huber

commit: f39626ba34c53b247959c13b6436158bb372212c
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Jan  1 19:45:38 2020 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Jan  1 19:46:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f39626ba

app-admin/calamares: Version bump 3.2.17.1

Closes: https://bugs.gentoo.org/703694
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Johannes Huber  gentoo.org>

 app-admin/calamares/Manifest  |  1 +
 app-admin/calamares/calamares-3.2.17.1.ebuild | 91 +++
 2 files changed, 92 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index f7b4da30ca7..b0d039b9964 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
 DIST calamares-3.2.12.tar.gz 3008153 BLAKE2B 
32b8a141346da528c2aef40a8fe480445cc8acbccc1190ca5ad1b5b0d03b59c709abd663e5ed33503955e3c0caa71476e7d737d46422992fc22e3acd96260857
 SHA512 
00dec40eb9c9e95933d3785a7b2ddc606530d8b94fde233d91071afbe11067d4e5b0a81298e66aaa0c65b55b6a86359466d8789f3ed886e76c2102b850f2bbc0
+DIST calamares-3.2.17.1.tar.gz 3128350 BLAKE2B 
a6926faaf1d521647cc0037b88686f9ceee1cc8167b888fe3c25228cbca8058572c8786a51f6ce0ccb77b31351d21ac41fa6c86a6577569c118729e1263ccafa
 SHA512 
fa8f1906aa7774b0f6bd65d1dc87ea2e08df92018c162f7e7fe01fe6119e65d6391141bc242623f88040bb18eb8b71003cb7417b27c10b39bc30de0f0bf8deb0

diff --git a/app-admin/calamares/calamares-3.2.17.1.ebuild 
b/app-admin/calamares/calamares-3.2.17.1.ebuild
new file mode 100644
index 000..e94dcef7f30
--- /dev/null
+++ b/app-admin/calamares/calamares-3.2.17.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_6 )
+inherit ecm python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+KEYWORDS="~amd64"
+SLOT=5
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+   dev-cpp/yaml-cpp:=
+   >=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}]
+   dev-libs/libpwquality[${PYTHON_USEDEP}]
+   dev-qt/qtconcurrent:5
+   dev-qt/qtdbus:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwebengine:5[widgets]
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   kde-frameworks/kconfig:5
+   kde-frameworks/kcoreaddons:5
+   kde-frameworks/kcrash:5
+   kde-frameworks/kpackage:5
+   kde-frameworks/kparts:5
+   kde-frameworks/kservice:5
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt
+   >=sys-libs/kpmcore-4.0.0:5=
+   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+   test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-libs/timezone-data
+   virtual/udev
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   ecm_src_prepare
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+   PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+   PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+   PYTHON_LIBS="$(python_get_LIBS)"
+
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
+   calamares.desktop || die
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
+   calamares.desktop || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
+   -DWITH_PYTHONQT=$(usex pythonqt)
+   )
+
+   ecm_src_configure
+}
+
+src_install() {
+   ecm_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2019-08-18 Thread Andreas Sturmlechner

commit: a6706e2c90a89fbc7134957e5b3647d98811600b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug 17 08:54:02 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug 18 11:20:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6706e2c

app-admin/calamares: 3.2.12 bump, CVE-2019-13178, CVE-2019-13179

Bug: https://bugs.gentoo.org/690830
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-admin/calamares/Manifest|  1 +
 app-admin/calamares/calamares-3.2.12.ebuild | 95 +
 2 files changed, 96 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 6ec291032ca..6cf8abc08bc 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1,3 @@
 DIST calamares-3.1.13.tar.gz 2279516 BLAKE2B 
ff2c81e81086d53c205c25dbdb7e8b1b60f5f10c979e9afd85c02426cd38037c6fbbf76e21fa5fb152ea9bf1c47658563ba5b2fb7e84b4e2734d6269584315df
 SHA512 
451e04fe41448976e612b2a682cf38ed2683b490bb195ba82ad97d47dfd3eb808f8c25251be00104e3f3b4086ab37be462034bbd2866e64536e90f7ebcfb0d7a
+DIST calamares-3.2.12.tar.gz 3008153 BLAKE2B 
32b8a141346da528c2aef40a8fe480445cc8acbccc1190ca5ad1b5b0d03b59c709abd663e5ed33503955e3c0caa71476e7d737d46422992fc22e3acd96260857
 SHA512 
00dec40eb9c9e95933d3785a7b2ddc606530d8b94fde233d91071afbe11067d4e5b0a81298e66aaa0c65b55b6a86359466d8789f3ed886e76c2102b850f2bbc0
 DIST calamares-3.2.2.tar.gz 2579462 BLAKE2B 
f477493451e084a287f43abfdd66d4a77ce839cad61f921801462bef73df74d42e616d63682d09d59309d6f98ffe560e6c8f9176c9fb290701dfb4e5aa263b29
 SHA512 
f060534941e0191defa65f024ec8dbbd275d16d40e491015997f12d3eb404a3117d1f113d4dcef3421ed0d15c1e24bdd8b31fc4554d313ebbd3959058c202e63

diff --git a/app-admin/calamares/calamares-3.2.12.ebuild 
b/app-admin/calamares/calamares-3.2.12.ebuild
new file mode 100644
index 000..2b847131cb1
--- /dev/null
+++ b/app-admin/calamares/calamares-3.2.12.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="true"
+PYTHON_COMPAT=( python3_{5,6} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN};
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+   $(add_qt_dep linguist-tools)
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep kpackage)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtconcurrent)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   dev-cpp/yaml-cpp:=
+   >=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}]
+   dev-libs/libpwquality[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5(+)]
+   >=sys-libs/kpmcore-4.0.0:5=
+   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+   test? ( $(add_qt_dep qttest) )
+"
+RDEPEND="${COMMON_DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-libs/timezone-data
+   virtual/udev
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   cmake-utils_src_prepare
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
+   calamares.desktop || die
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
+   calamares.desktop || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
+   -DWITH_PYTHONQT=$(usex pythonqt)
+   )
+
+   kde5_src_configure
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2019-08-18 Thread Andreas Sturmlechner

commit: 61ed2b3ed7b15d05ac2e83144d62ed3de24a0dc2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug 17 08:59:32 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug 18 11:20:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61ed2b3e

app-admin/calamares: Drop 3.1.13 and 3.2.2 for security cleanup

Both are broken by current stable kpmcore anyway.

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-admin/calamares/Manifest|  2 -
 app-admin/calamares/calamares-3.1.13.ebuild | 79 --
 app-admin/calamares/calamares-3.2.2.ebuild  | 86 -
 3 files changed, 167 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 6cf8abc08bc..f7b4da30ca7 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,3 +1 @@
-DIST calamares-3.1.13.tar.gz 2279516 BLAKE2B 
ff2c81e81086d53c205c25dbdb7e8b1b60f5f10c979e9afd85c02426cd38037c6fbbf76e21fa5fb152ea9bf1c47658563ba5b2fb7e84b4e2734d6269584315df
 SHA512 
451e04fe41448976e612b2a682cf38ed2683b490bb195ba82ad97d47dfd3eb808f8c25251be00104e3f3b4086ab37be462034bbd2866e64536e90f7ebcfb0d7a
 DIST calamares-3.2.12.tar.gz 3008153 BLAKE2B 
32b8a141346da528c2aef40a8fe480445cc8acbccc1190ca5ad1b5b0d03b59c709abd663e5ed33503955e3c0caa71476e7d737d46422992fc22e3acd96260857
 SHA512 
00dec40eb9c9e95933d3785a7b2ddc606530d8b94fde233d91071afbe11067d4e5b0a81298e66aaa0c65b55b6a86359466d8789f3ed886e76c2102b850f2bbc0
-DIST calamares-3.2.2.tar.gz 2579462 BLAKE2B 
f477493451e084a287f43abfdd66d4a77ce839cad61f921801462bef73df74d42e616d63682d09d59309d6f98ffe560e6c8f9176c9fb290701dfb4e5aa263b29
 SHA512 
f060534941e0191defa65f024ec8dbbd275d16d40e491015997f12d3eb404a3117d1f113d4dcef3421ed0d15c1e24bdd8b31fc4554d313ebbd3959058c202e63

diff --git a/app-admin/calamares/calamares-3.1.13.ebuild 
b/app-admin/calamares/calamares-3.1.13.ebuild
deleted file mode 100644
index 9294153d0cc..000
--- a/app-admin/calamares/calamares-3.1.13.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_5,3_6} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN};
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   dev-cpp/yaml-cpp:=
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5(+)]
-   >=sys-libs/kpmcore-3.0.3:5=
-   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   virtual/udev
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   cmake-utils_src_prepare
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   -DWITH_PYTHONQT=$(usex pythonqt)
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

diff --git a/app-admin/calamares/calamares-3.2.2.ebuild 
b/app-admin/calamares/calamares-3.2.2.ebuild
deleted file mode 100644
index 39df940004c..000
--- a/app-admin/calamares/calamares-3.2.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_5,3_6} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"

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

2018-10-01 Thread Johannes Huber

commit: 9be114695fa2b3a63b3e296339acf699c422cdcd
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Oct  1 10:48:38 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Oct  1 10:48:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9be11469

app-admin/calamares: Remove 3.2.0-r1

Signed-off-by: Johannes Huber  gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 app-admin/calamares/Manifest  |  1 -
 app-admin/calamares/calamares-3.2.0-r1.ebuild | 85 ---
 2 files changed, 86 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index c505885b1e6..6ec291032ca 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,3 +1,2 @@
 DIST calamares-3.1.13.tar.gz 2279516 BLAKE2B 
ff2c81e81086d53c205c25dbdb7e8b1b60f5f10c979e9afd85c02426cd38037c6fbbf76e21fa5fb152ea9bf1c47658563ba5b2fb7e84b4e2734d6269584315df
 SHA512 
451e04fe41448976e612b2a682cf38ed2683b490bb195ba82ad97d47dfd3eb808f8c25251be00104e3f3b4086ab37be462034bbd2866e64536e90f7ebcfb0d7a
-DIST calamares-3.2.0.tar.gz 2488863 BLAKE2B 
6941cdd7eb381a6ee4f7bc2628605ee5a670de0d839b5797cec930737ec5fc09e214c484c2e8398ab2f12669bbc64768d5ee20b2aa1adae799fb96373a0b07df
 SHA512 
0b502749ace48ce56f2bb364d265c5b9197cca2b27115663f928cb58d02ba43e93b80b5022053bca5899ce6ee35146992157408fc5af017da6d61abdcdbc4e1d
 DIST calamares-3.2.2.tar.gz 2579462 BLAKE2B 
f477493451e084a287f43abfdd66d4a77ce839cad61f921801462bef73df74d42e616d63682d09d59309d6f98ffe560e6c8f9176c9fb290701dfb4e5aa263b29
 SHA512 
f060534941e0191defa65f024ec8dbbd275d16d40e491015997f12d3eb404a3117d1f113d4dcef3421ed0d15c1e24bdd8b31fc4554d313ebbd3959058c202e63

diff --git a/app-admin/calamares/calamares-3.2.0-r1.ebuild 
b/app-admin/calamares/calamares-3.2.0-r1.ebuild
deleted file mode 100644
index 2d482b898d0..000
--- a/app-admin/calamares/calamares-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_5,3_6} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN};
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep kpackage)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   dev-cpp/yaml-cpp:=
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   dev-libs/libpwquality[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5(+)]
-   >=sys-libs/kpmcore-3.0.3:5=
-   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   sys-libs/timezone-data
-   virtual/udev
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   cmake-utils_src_prepare
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   -DWITH_PYTHONQT=$(usex pythonqt)
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2018-09-27 Thread Ettore Di Giacinto

commit: f7b7f1445d9a87bafbef5be59afef9929cee97ba
Author: Ettore Di Giacinto  gentoo  org>
AuthorDate: Thu Sep 27 20:20:03 2018 +
Commit: Ettore Di Giacinto  gentoo  org>
CommitDate: Thu Sep 27 20:29:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7b7f144

app-admin/calamares: bump to 3.2.2

Add dev-qt/linguist-tools to deps

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-admin/calamares/Manifest   |  1 +
 app-admin/calamares/calamares-3.2.2.ebuild | 86 ++
 2 files changed, 87 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 57c83e0098e..c505885b1e6 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1,3 @@
 DIST calamares-3.1.13.tar.gz 2279516 BLAKE2B 
ff2c81e81086d53c205c25dbdb7e8b1b60f5f10c979e9afd85c02426cd38037c6fbbf76e21fa5fb152ea9bf1c47658563ba5b2fb7e84b4e2734d6269584315df
 SHA512 
451e04fe41448976e612b2a682cf38ed2683b490bb195ba82ad97d47dfd3eb808f8c25251be00104e3f3b4086ab37be462034bbd2866e64536e90f7ebcfb0d7a
 DIST calamares-3.2.0.tar.gz 2488863 BLAKE2B 
6941cdd7eb381a6ee4f7bc2628605ee5a670de0d839b5797cec930737ec5fc09e214c484c2e8398ab2f12669bbc64768d5ee20b2aa1adae799fb96373a0b07df
 SHA512 
0b502749ace48ce56f2bb364d265c5b9197cca2b27115663f928cb58d02ba43e93b80b5022053bca5899ce6ee35146992157408fc5af017da6d61abdcdbc4e1d
+DIST calamares-3.2.2.tar.gz 2579462 BLAKE2B 
f477493451e084a287f43abfdd66d4a77ce839cad61f921801462bef73df74d42e616d63682d09d59309d6f98ffe560e6c8f9176c9fb290701dfb4e5aa263b29
 SHA512 
f060534941e0191defa65f024ec8dbbd275d16d40e491015997f12d3eb404a3117d1f113d4dcef3421ed0d15c1e24bdd8b31fc4554d313ebbd3959058c202e63

diff --git a/app-admin/calamares/calamares-3.2.2.ebuild 
b/app-admin/calamares/calamares-3.2.2.ebuild
new file mode 100644
index 000..39df940004c
--- /dev/null
+++ b/app-admin/calamares/calamares-3.2.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_5,3_6} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN};
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep kpackage)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep linguist-tools)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   dev-cpp/yaml-cpp:=
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   dev-libs/libpwquality[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5(+)]
+   >=sys-libs/kpmcore-3.0.3:5=
+   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-libs/timezone-data
+   virtual/udev
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   cmake-utils_src_prepare
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DWITH_PYTHONQT=$(usex pythonqt)
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2018-09-27 Thread Ettore Di Giacinto

commit: cf9062ee5a7ffb0c88ede086f187f795599ec912
Author: Ettore Di Giacinto  gentoo  org>
AuthorDate: Thu Sep 27 18:58:19 2018 +
Commit: Ettore Di Giacinto  gentoo  org>
CommitDate: Thu Sep 27 20:29:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf9062ee

app-admin/calamares: revision bump

Add missing RDEPEND on sys-libs/timezone-data.
Timezone otherwise is not selectable and installation fails.
Thanks to @joostruis for pointing that out.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../calamares/{calamares-3.2.0.ebuild => calamares-3.2.0-r1.ebuild}  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-admin/calamares/calamares-3.2.0.ebuild 
b/app-admin/calamares/calamares-3.2.0-r1.ebuild
similarity index 98%
rename from app-admin/calamares/calamares-3.2.0.ebuild
rename to app-admin/calamares/calamares-3.2.0-r1.ebuild
index a0864c5ac07..2d482b898d0 100644
--- a/app-admin/calamares/calamares-3.2.0.ebuild
+++ b/app-admin/calamares/calamares-3.2.0-r1.ebuild
@@ -53,6 +53,7 @@ RDEPEND="${DEPEND}
|| ( sys-boot/grub:2 sys-boot/systemd-boot )
sys-boot/os-prober
sys-fs/squashfs-tools
+   sys-libs/timezone-data
virtual/udev
networkmanager? ( net-misc/networkmanager )
upower? ( sys-power/upower )

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

2018-05-19 Thread Johannes Huber

commit: 91ce9f03eecb36bd2d4b138cb506dedb5612c458
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat May 19 10:46:02 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat May 19 10:47:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91ce9f03

app-admin/calamares: Version bump 3.2.0

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 app-admin/calamares/Manifest   |  1 +
 app-admin/calamares/calamares-3.2.0.ebuild | 84 ++
 2 files changed, 85 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 21c218a2d05..57c83e0098e 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
 DIST calamares-3.1.13.tar.gz 2279516 BLAKE2B 
ff2c81e81086d53c205c25dbdb7e8b1b60f5f10c979e9afd85c02426cd38037c6fbbf76e21fa5fb152ea9bf1c47658563ba5b2fb7e84b4e2734d6269584315df
 SHA512 
451e04fe41448976e612b2a682cf38ed2683b490bb195ba82ad97d47dfd3eb808f8c25251be00104e3f3b4086ab37be462034bbd2866e64536e90f7ebcfb0d7a
+DIST calamares-3.2.0.tar.gz 2488863 BLAKE2B 
6941cdd7eb381a6ee4f7bc2628605ee5a670de0d839b5797cec930737ec5fc09e214c484c2e8398ab2f12669bbc64768d5ee20b2aa1adae799fb96373a0b07df
 SHA512 
0b502749ace48ce56f2bb364d265c5b9197cca2b27115663f928cb58d02ba43e93b80b5022053bca5899ce6ee35146992157408fc5af017da6d61abdcdbc4e1d

diff --git a/app-admin/calamares/calamares-3.2.0.ebuild 
b/app-admin/calamares/calamares-3.2.0.ebuild
new file mode 100644
index 000..a0864c5ac07
--- /dev/null
+++ b/app-admin/calamares/calamares-3.2.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_5,3_6} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN};
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep kpackage)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   dev-cpp/yaml-cpp:=
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   dev-libs/libpwquality[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5(+)]
+   >=sys-libs/kpmcore-3.0.3:5=
+   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   virtual/udev
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   cmake-utils_src_prepare
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DWITH_PYTHONQT=$(usex pythonqt)
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2018-05-07 Thread Johannes Huber

commit: 01c20e365470501db34314fa0e1ce32ee4bdd5c0
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon May  7 16:37:04 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon May  7 16:38:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01c20e36

app-admin/calamares: Version bump 3.1.13

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 app-admin/calamares/Manifest|  1 +
 app-admin/calamares/calamares-3.1.13.ebuild | 79 +
 2 files changed, 80 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index a60cebdc428..057005f5852 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
 DIST calamares-3.1.12.tar.gz 2272996 BLAKE2B 
f9fd2edd6922262b2a0e5a28818c79e477c9cc2105a4d4d3cb8367cb6a399af1011f6333f43790699aea04d31668e7fa2b9b79225098af6b1f31093de8988e87
 SHA512 
10ab898c06d4d936c5bf25e5d461e40d98914636b2fddca22b80b949b6a1225170887ffc6ceebb3848276b6d4812db863751b608b6671bb829a98a0dc6e7bf72
+DIST calamares-3.1.13.tar.gz 2279516 BLAKE2B 
ff2c81e81086d53c205c25dbdb7e8b1b60f5f10c979e9afd85c02426cd38037c6fbbf76e21fa5fb152ea9bf1c47658563ba5b2fb7e84b4e2734d6269584315df
 SHA512 
451e04fe41448976e612b2a682cf38ed2683b490bb195ba82ad97d47dfd3eb808f8c25251be00104e3f3b4086ab37be462034bbd2866e64536e90f7ebcfb0d7a

diff --git a/app-admin/calamares/calamares-3.1.13.ebuild 
b/app-admin/calamares/calamares-3.1.13.ebuild
new file mode 100644
index 000..261aa9e0169
--- /dev/null
+++ b/app-admin/calamares/calamares-3.1.13.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN};
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   dev-cpp/yaml-cpp:=
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5(+)]
+   >=sys-libs/kpmcore-3.0.3:5=
+   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   virtual/udev
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   cmake-utils_src_prepare
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DWITH_PYTHONQT=$(usex pythonqt)
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2018-05-07 Thread Johannes Huber

commit: 060384b97950b7be10ee002513d56b022635eceb
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon May  7 16:37:57 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon May  7 16:38:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=060384b9

app-admin/calamares: Remove 3.1.12-r1

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 app-admin/calamares/Manifest   |  1 -
 app-admin/calamares/calamares-3.1.12-r1.ebuild | 79 --
 2 files changed, 80 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 057005f5852..21c218a2d05 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
-DIST calamares-3.1.12.tar.gz 2272996 BLAKE2B 
f9fd2edd6922262b2a0e5a28818c79e477c9cc2105a4d4d3cb8367cb6a399af1011f6333f43790699aea04d31668e7fa2b9b79225098af6b1f31093de8988e87
 SHA512 
10ab898c06d4d936c5bf25e5d461e40d98914636b2fddca22b80b949b6a1225170887ffc6ceebb3848276b6d4812db863751b608b6671bb829a98a0dc6e7bf72
 DIST calamares-3.1.13.tar.gz 2279516 BLAKE2B 
ff2c81e81086d53c205c25dbdb7e8b1b60f5f10c979e9afd85c02426cd38037c6fbbf76e21fa5fb152ea9bf1c47658563ba5b2fb7e84b4e2734d6269584315df
 SHA512 
451e04fe41448976e612b2a682cf38ed2683b490bb195ba82ad97d47dfd3eb808f8c25251be00104e3f3b4086ab37be462034bbd2866e64536e90f7ebcfb0d7a

diff --git a/app-admin/calamares/calamares-3.1.12-r1.ebuild 
b/app-admin/calamares/calamares-3.1.12-r1.ebuild
deleted file mode 100644
index 261aa9e0169..000
--- a/app-admin/calamares/calamares-3.1.12-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN};
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   dev-cpp/yaml-cpp:=
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5(+)]
-   >=sys-libs/kpmcore-3.0.3:5=
-   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   virtual/udev
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   cmake-utils_src_prepare
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   -DWITH_PYTHONQT=$(usex pythonqt)
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2018-03-29 Thread Johannes Huber

commit: dad354885303fbc1394d7ef78cdf7365ef76e2df
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Mar 29 19:25:20 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Mar 29 19:25:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dad35488

app-admin/calamares: Add missing cmake-utils_src_prepare call

Package-Manager: Portage-2.3.26, Repoman-2.3.7

 app-admin/calamares/calamares-3.1.12-r1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-admin/calamares/calamares-3.1.12-r1.ebuild 
b/app-admin/calamares/calamares-3.1.12-r1.ebuild
index 52dd0d46e51..261aa9e0169 100644
--- a/app-admin/calamares/calamares-3.1.12-r1.ebuild
+++ b/app-admin/calamares/calamares-3.1.12-r1.ebuild
@@ -54,13 +54,12 @@ RDEPEND="${DEPEND}
 "
 
 src_prepare() {
+   cmake-utils_src_prepare
python_setup
export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
   PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
   PYTHON_CFLAGS="$(python_get_CFLAGS)"\
   PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
 }
 
 src_configure() {

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

2018-03-29 Thread Johannes Huber

commit: 7c2d281489ef500c350371ee598c27878cd1afdb
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Mar 29 18:25:50 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Mar 29 18:38:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c2d2814

app-admin/calamares: Remove 3.1.12 (r0)

Package-Manager: Portage-2.3.26, Repoman-2.3.7

 app-admin/calamares/calamares-3.1.12.ebuild | 80 -
 1 file changed, 80 deletions(-)

diff --git a/app-admin/calamares/calamares-3.1.12.ebuild 
b/app-admin/calamares/calamares-3.1.12.ebuild
deleted file mode 100644
index 80d1eb1af83..000
--- a/app-admin/calamares/calamares-3.1.12.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN};
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5(+)]
-   >=sys-libs/kpmcore-3.0.3:5=
-   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   virtual/udev
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   -DWITH_PYTHONQT=$(usex pythonqt)
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2018-03-29 Thread Johannes Huber

commit: 13e9e9d71b0a43cc5840460aa8e9cde6ef887db8
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Mar 29 18:24:15 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Mar 29 18:38:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13e9e9d7

app-admin/calamares: Use subslot on yaml-cpp

Package-Manager: Portage-2.3.26, Repoman-2.3.7

 app-admin/calamares/calamares-3.1.12-r1.ebuild | 80 ++
 1 file changed, 80 insertions(+)

diff --git a/app-admin/calamares/calamares-3.1.12-r1.ebuild 
b/app-admin/calamares/calamares-3.1.12-r1.ebuild
new file mode 100644
index 000..52dd0d46e51
--- /dev/null
+++ b/app-admin/calamares/calamares-3.1.12-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN};
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   dev-cpp/yaml-cpp:=
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5(+)]
+   >=sys-libs/kpmcore-3.0.3:5=
+   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   virtual/udev
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DWITH_PYTHONQT=$(usex pythonqt)
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2018-02-08 Thread Johannes Huber

commit: b4c34f50bdd858f9b400af8e41e3d2aa2a2848f0
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Feb  8 20:21:54 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Feb  8 20:22:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4c34f50

app-admin/calamares: Remove 3.1.11

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-admin/calamares/Manifest|  1 -
 app-admin/calamares/calamares-3.1.11.ebuild | 80 -
 2 files changed, 81 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 7b11de25114..a60cebdc428 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
-DIST calamares-3.1.11.tar.gz 2273213 BLAKE2B 
da746957ca583db2cf2b89814e9b6b8a94130b890263a851248aa83ebb0ac481805a4193e2ca2fc6fdae3e86c871a6dd9b922aa3f06b4af73db28dd6bdc093cc
 SHA512 
5aa47b07c238d7de89aac4417b577fb6cf87d2ede7fd3d4e272381cb1f90ce967f5478134e9fe728adaf32361335f2f590956200c8daf265bfeab9d979057e8c
 DIST calamares-3.1.12.tar.gz 2272996 BLAKE2B 
f9fd2edd6922262b2a0e5a28818c79e477c9cc2105a4d4d3cb8367cb6a399af1011f6333f43790699aea04d31668e7fa2b9b79225098af6b1f31093de8988e87
 SHA512 
10ab898c06d4d936c5bf25e5d461e40d98914636b2fddca22b80b949b6a1225170887ffc6ceebb3848276b6d4812db863751b608b6671bb829a98a0dc6e7bf72

diff --git a/app-admin/calamares/calamares-3.1.11.ebuild 
b/app-admin/calamares/calamares-3.1.11.ebuild
deleted file mode 100644
index 80d1eb1af83..000
--- a/app-admin/calamares/calamares-3.1.11.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN};
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5(+)]
-   >=sys-libs/kpmcore-3.0.3:5=
-   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   virtual/udev
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   -DWITH_PYTHONQT=$(usex pythonqt)
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2018-01-24 Thread Johannes Huber

commit: d293d7ab5be2d6cc5fe0499cf4a5a2742317b1ec
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Jan 24 18:26:02 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Jan 24 18:30:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d293d7ab

app-admin/calamares: Version bump 3.1.12

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 app-admin/calamares/Manifest|  1 +
 app-admin/calamares/calamares-3.1.12.ebuild | 80 +
 2 files changed, 81 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index ecd7ea3bbe8..c94a1e47aeb 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1,3 @@
 DIST calamares-3.1.11.tar.gz 2273213 BLAKE2B 
da746957ca583db2cf2b89814e9b6b8a94130b890263a851248aa83ebb0ac481805a4193e2ca2fc6fdae3e86c871a6dd9b922aa3f06b4af73db28dd6bdc093cc
 SHA512 
5aa47b07c238d7de89aac4417b577fb6cf87d2ede7fd3d4e272381cb1f90ce967f5478134e9fe728adaf32361335f2f590956200c8daf265bfeab9d979057e8c
+DIST calamares-3.1.12.tar.gz 2272996 BLAKE2B 
f9fd2edd6922262b2a0e5a28818c79e477c9cc2105a4d4d3cb8367cb6a399af1011f6333f43790699aea04d31668e7fa2b9b79225098af6b1f31093de8988e87
 SHA512 
10ab898c06d4d936c5bf25e5d461e40d98914636b2fddca22b80b949b6a1225170887ffc6ceebb3848276b6d4812db863751b608b6671bb829a98a0dc6e7bf72
 DIST calamares-3.1.7.tar.gz 2275893 BLAKE2B 
b60127a34b2f79be78540c5fd9affabde2889d335a3a41a61950adc48c9200e357f3e0b23e6c94f117c64a08fa4312ae8cbcb5e42e0ea5893d38378a583e4b7e
 SHA512 
eaf516db4d97b89a5854c5dac5fd556a2deb47bebb88e7c55e2bb7d4ce050e913afbf08c6536503f5c3af7427a43b75f67bfa317e1601bb5a6f05f17c5bf6760

diff --git a/app-admin/calamares/calamares-3.1.12.ebuild 
b/app-admin/calamares/calamares-3.1.12.ebuild
new file mode 100644
index 000..80d1eb1af83
--- /dev/null
+++ b/app-admin/calamares/calamares-3.1.12.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN};
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5(+)]
+   >=sys-libs/kpmcore-3.0.3:5=
+   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   virtual/udev
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DWITH_PYTHONQT=$(usex pythonqt)
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2018-01-24 Thread Johannes Huber

commit: 41eeb5f913628df8c66ef349ba7e392b32443607
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Jan 24 18:26:46 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Jan 24 18:30:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41eeb5f9

app-admin/calamares: Remove 3.1.7

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 app-admin/calamares/Manifest   |  1 -
 app-admin/calamares/calamares-3.1.7.ebuild | 80 --
 2 files changed, 81 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index c94a1e47aeb..7b11de25114 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,3 +1,2 @@
 DIST calamares-3.1.11.tar.gz 2273213 BLAKE2B 
da746957ca583db2cf2b89814e9b6b8a94130b890263a851248aa83ebb0ac481805a4193e2ca2fc6fdae3e86c871a6dd9b922aa3f06b4af73db28dd6bdc093cc
 SHA512 
5aa47b07c238d7de89aac4417b577fb6cf87d2ede7fd3d4e272381cb1f90ce967f5478134e9fe728adaf32361335f2f590956200c8daf265bfeab9d979057e8c
 DIST calamares-3.1.12.tar.gz 2272996 BLAKE2B 
f9fd2edd6922262b2a0e5a28818c79e477c9cc2105a4d4d3cb8367cb6a399af1011f6333f43790699aea04d31668e7fa2b9b79225098af6b1f31093de8988e87
 SHA512 
10ab898c06d4d936c5bf25e5d461e40d98914636b2fddca22b80b949b6a1225170887ffc6ceebb3848276b6d4812db863751b608b6671bb829a98a0dc6e7bf72
-DIST calamares-3.1.7.tar.gz 2275893 BLAKE2B 
b60127a34b2f79be78540c5fd9affabde2889d335a3a41a61950adc48c9200e357f3e0b23e6c94f117c64a08fa4312ae8cbcb5e42e0ea5893d38378a583e4b7e
 SHA512 
eaf516db4d97b89a5854c5dac5fd556a2deb47bebb88e7c55e2bb7d4ce050e913afbf08c6536503f5c3af7427a43b75f67bfa317e1601bb5a6f05f17c5bf6760

diff --git a/app-admin/calamares/calamares-3.1.7.ebuild 
b/app-admin/calamares/calamares-3.1.7.ebuild
deleted file mode 100644
index 80d1eb1af83..000
--- a/app-admin/calamares/calamares-3.1.7.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN};
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5(+)]
-   >=sys-libs/kpmcore-3.0.3:5=
-   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   virtual/udev
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   -DWITH_PYTHONQT=$(usex pythonqt)
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2018-01-02 Thread Johannes Huber

commit: 56c8464350f076cc6c2f7f79779c0ff1de945e1a
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Jan  2 13:38:42 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Jan  2 13:39:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56c84643

app-admin/calamares: Add Python 3.6 support

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-admin/calamares/calamares-3.1.11.ebuild | 2 +-
 app-admin/calamares/calamares-3.1.7.ebuild  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-admin/calamares/calamares-3.1.11.ebuild 
b/app-admin/calamares/calamares-3.1.11.ebuild
index 4ad1a07e9d4..80d1eb1af83 100644
--- a/app-admin/calamares/calamares-3.1.11.ebuild
+++ b/app-admin/calamares/calamares-3.1.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 inherit kde5 python-r1
 
 DESCRIPTION="Distribution-independent installer framework"

diff --git a/app-admin/calamares/calamares-3.1.7.ebuild 
b/app-admin/calamares/calamares-3.1.7.ebuild
index 780fcfe4fd0..80d1eb1af83 100644
--- a/app-admin/calamares/calamares-3.1.7.ebuild
+++ b/app-admin/calamares/calamares-3.1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 inherit kde5 python-r1
 
 DESCRIPTION="Distribution-independent installer framework"

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

2018-01-02 Thread Johannes Huber

commit: 74a84718f8bf92c8ba5f022e6b5a3fd3fb694954
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Jan  2 13:32:17 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Jan  2 13:32:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74a84718

app-admin/calamares: Version bump 3.1.11

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-admin/calamares/Manifest|  1 +
 app-admin/calamares/calamares-3.1.11.ebuild | 80 +
 2 files changed, 81 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 0647ce67ef2..ecd7ea3bbe8 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
+DIST calamares-3.1.11.tar.gz 2273213 BLAKE2B 
da746957ca583db2cf2b89814e9b6b8a94130b890263a851248aa83ebb0ac481805a4193e2ca2fc6fdae3e86c871a6dd9b922aa3f06b4af73db28dd6bdc093cc
 SHA512 
5aa47b07c238d7de89aac4417b577fb6cf87d2ede7fd3d4e272381cb1f90ce967f5478134e9fe728adaf32361335f2f590956200c8daf265bfeab9d979057e8c
 DIST calamares-3.1.7.tar.gz 2275893 BLAKE2B 
b60127a34b2f79be78540c5fd9affabde2889d335a3a41a61950adc48c9200e357f3e0b23e6c94f117c64a08fa4312ae8cbcb5e42e0ea5893d38378a583e4b7e
 SHA512 
eaf516db4d97b89a5854c5dac5fd556a2deb47bebb88e7c55e2bb7d4ce050e913afbf08c6536503f5c3af7427a43b75f67bfa317e1601bb5a6f05f17c5bf6760

diff --git a/app-admin/calamares/calamares-3.1.11.ebuild 
b/app-admin/calamares/calamares-3.1.11.ebuild
new file mode 100644
index 000..4ad1a07e9d4
--- /dev/null
+++ b/app-admin/calamares/calamares-3.1.11.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN};
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5(+)]
+   >=sys-libs/kpmcore-3.0.3:5=
+   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   virtual/udev
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DWITH_PYTHONQT=$(usex pythonqt)
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2017-11-13 Thread Johannes Huber

commit: 1d6d0d8caf9726b09903a4000f9393952d8876ac
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Nov 13 18:17:10 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Nov 13 18:17:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d6d0d8c

app-admin/calamares: Remove 3.1.6

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 app-admin/calamares/Manifest   |  1 -
 app-admin/calamares/calamares-3.1.6.ebuild | 80 --
 2 files changed, 81 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 5d8c240f081..b26c70d0815 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
-DIST calamares-3.1.6.tar.gz 2266993 SHA256 
d18d50aca6dc8b8d4d4933b507fdaabeb607adc9c9c14646f1031c005aeaaf98 SHA512 
d6e7fa5a040e507141bbd6b3863f5743b9646e503cfec26ed710718835a782b0acf582f24959eb52d906eeca60061d39e01b4a542c3d83535efa17eb4a5b0b85
 WHIRLPOOL 
3fc71da001282cbe7c670b192335ddac460f3fb053849a51d95d9113b6c31a27ff65ce64811ca26c456ec01911ce8685d73c793183e71bc696cd896f9bf38507
 DIST calamares-3.1.7.tar.gz 2275893 SHA256 
91ffee72df1d222c50db81c3f48d44e617019db95d1f58ab16a962b1fb47d749 SHA512 
eaf516db4d97b89a5854c5dac5fd556a2deb47bebb88e7c55e2bb7d4ce050e913afbf08c6536503f5c3af7427a43b75f67bfa317e1601bb5a6f05f17c5bf6760
 WHIRLPOOL 
71e248e3dd8a9e05b5a0d25807607c3d026ba896835edd559ce716c9edf5ae8b840570ae453772558cd05757d99acc09c90f23423045f1754cd56b8693b99a4d

diff --git a/app-admin/calamares/calamares-3.1.6.ebuild 
b/app-admin/calamares/calamares-3.1.6.ebuild
deleted file mode 100644
index 780fcfe4fd0..000
--- a/app-admin/calamares/calamares-3.1.6.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN};
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5(+)]
-   >=sys-libs/kpmcore-3.0.3:5=
-   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   virtual/udev
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   -DWITH_PYTHONQT=$(usex pythonqt)
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2017-10-27 Thread Johannes Huber

commit: 64cc8aff6cc94339eaf5e1b20bec272fe1174249
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Oct 27 21:08:33 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Oct 27 21:09:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64cc8aff

app-admin/calamares: Version bump 3.1.7

Package-Manager: Portage-2.3.12, Repoman-2.3.4

 app-admin/calamares/Manifest   |  1 +
 app-admin/calamares/calamares-3.1.7.ebuild | 80 ++
 2 files changed, 81 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index ade563741b0..8644924beae 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1,3 @@
 DIST calamares-3.1.5.tar.gz 2266110 SHA256 
02bd3c10e06ac207cdee0ee29f8d20bfe48eba491800e3eab704e1d294736260 SHA512 
92e29668ddab880b76319fbf4eeffea21bfa0bd5b8807cb5a2c2786eafe4921f442a9a5773243fafe5942a346d46b89285e9472d4c8da70b70979a049923df06
 WHIRLPOOL 
74b396551aee5c7831b05a0c40df56f047bf6bd1fb0c9e3e51b2791696b9e19eb1db78128c1167a668d0d4e412cddbb819c807dfb52cc8bea667307921752a80
 DIST calamares-3.1.6.tar.gz 2266993 SHA256 
d18d50aca6dc8b8d4d4933b507fdaabeb607adc9c9c14646f1031c005aeaaf98 SHA512 
d6e7fa5a040e507141bbd6b3863f5743b9646e503cfec26ed710718835a782b0acf582f24959eb52d906eeca60061d39e01b4a542c3d83535efa17eb4a5b0b85
 WHIRLPOOL 
3fc71da001282cbe7c670b192335ddac460f3fb053849a51d95d9113b6c31a27ff65ce64811ca26c456ec01911ce8685d73c793183e71bc696cd896f9bf38507
+DIST calamares-3.1.7.tar.gz 2275893 SHA256 
91ffee72df1d222c50db81c3f48d44e617019db95d1f58ab16a962b1fb47d749 SHA512 
eaf516db4d97b89a5854c5dac5fd556a2deb47bebb88e7c55e2bb7d4ce050e913afbf08c6536503f5c3af7427a43b75f67bfa317e1601bb5a6f05f17c5bf6760
 WHIRLPOOL 
71e248e3dd8a9e05b5a0d25807607c3d026ba896835edd559ce716c9edf5ae8b840570ae453772558cd05757d99acc09c90f23423045f1754cd56b8693b99a4d

diff --git a/app-admin/calamares/calamares-3.1.7.ebuild 
b/app-admin/calamares/calamares-3.1.7.ebuild
new file mode 100644
index 000..780fcfe4fd0
--- /dev/null
+++ b/app-admin/calamares/calamares-3.1.7.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN};
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5(+)]
+   >=sys-libs/kpmcore-3.0.3:5=
+   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   virtual/udev
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DWITH_PYTHONQT=$(usex pythonqt)
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2017-10-27 Thread Johannes Huber

commit: d64e99d9c8bbd9dba39e0c022581321e791fe81a
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Oct 27 21:09:12 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Oct 27 21:09:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d64e99d9

app-admin/calamares: Remove 3.1.5

Package-Manager: Portage-2.3.12, Repoman-2.3.4

 app-admin/calamares/Manifest   |  1 -
 app-admin/calamares/calamares-3.1.5.ebuild | 80 --
 2 files changed, 81 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 8644924beae..5d8c240f081 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,3 +1,2 @@
-DIST calamares-3.1.5.tar.gz 2266110 SHA256 
02bd3c10e06ac207cdee0ee29f8d20bfe48eba491800e3eab704e1d294736260 SHA512 
92e29668ddab880b76319fbf4eeffea21bfa0bd5b8807cb5a2c2786eafe4921f442a9a5773243fafe5942a346d46b89285e9472d4c8da70b70979a049923df06
 WHIRLPOOL 
74b396551aee5c7831b05a0c40df56f047bf6bd1fb0c9e3e51b2791696b9e19eb1db78128c1167a668d0d4e412cddbb819c807dfb52cc8bea667307921752a80
 DIST calamares-3.1.6.tar.gz 2266993 SHA256 
d18d50aca6dc8b8d4d4933b507fdaabeb607adc9c9c14646f1031c005aeaaf98 SHA512 
d6e7fa5a040e507141bbd6b3863f5743b9646e503cfec26ed710718835a782b0acf582f24959eb52d906eeca60061d39e01b4a542c3d83535efa17eb4a5b0b85
 WHIRLPOOL 
3fc71da001282cbe7c670b192335ddac460f3fb053849a51d95d9113b6c31a27ff65ce64811ca26c456ec01911ce8685d73c793183e71bc696cd896f9bf38507
 DIST calamares-3.1.7.tar.gz 2275893 SHA256 
91ffee72df1d222c50db81c3f48d44e617019db95d1f58ab16a962b1fb47d749 SHA512 
eaf516db4d97b89a5854c5dac5fd556a2deb47bebb88e7c55e2bb7d4ce050e913afbf08c6536503f5c3af7427a43b75f67bfa317e1601bb5a6f05f17c5bf6760
 WHIRLPOOL 
71e248e3dd8a9e05b5a0d25807607c3d026ba896835edd559ce716c9edf5ae8b840570ae453772558cd05757d99acc09c90f23423045f1754cd56b8693b99a4d

diff --git a/app-admin/calamares/calamares-3.1.5.ebuild 
b/app-admin/calamares/calamares-3.1.5.ebuild
deleted file mode 100644
index 780fcfe4fd0..000
--- a/app-admin/calamares/calamares-3.1.5.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN};
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5(+)]
-   >=sys-libs/kpmcore-3.0.3:5=
-   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   virtual/udev
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   -DWITH_PYTHONQT=$(usex pythonqt)
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2017-10-15 Thread Johannes Huber

commit: 187cb5f76ace026745e963d432538e24aa7ac05c
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Oct 15 16:41:17 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Oct 15 16:42:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=187cb5f7

app-admin/calamares: Version bump 3.1.6

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 app-admin/calamares/Manifest   |  1 +
 app-admin/calamares/calamares-3.1.6.ebuild | 80 ++
 2 files changed, 81 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index b6ceec15424..8d1f7ecd3a4 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1,3 @@
 DIST calamares-3.1.4.tar.gz 4958385 SHA256 
8255eb9b001b9b1271771c1796eb8217be78299c0a4e7f20e432b3dd4f5d371f SHA512 
d3ced4222e21e6e9ab18fb90d4d591b1b59b5fd44841e56e41b2902d00f33a910e0ae287a6777c5d71eb08757cfca31d9210f6eabd00b3dd1dc6377413b54bb2
 WHIRLPOOL 
622122d9092bb4fff3fa40b0a08d5d71780da962c3fedd2d3c2336ff00242b25f2ba524b6ebdce48155ce0a9729a830b03d9aa3ad4c86bde3d3c26ab83574393
 DIST calamares-3.1.5.tar.gz 2266110 SHA256 
02bd3c10e06ac207cdee0ee29f8d20bfe48eba491800e3eab704e1d294736260 SHA512 
92e29668ddab880b76319fbf4eeffea21bfa0bd5b8807cb5a2c2786eafe4921f442a9a5773243fafe5942a346d46b89285e9472d4c8da70b70979a049923df06
 WHIRLPOOL 
74b396551aee5c7831b05a0c40df56f047bf6bd1fb0c9e3e51b2791696b9e19eb1db78128c1167a668d0d4e412cddbb819c807dfb52cc8bea667307921752a80
+DIST calamares-3.1.6.tar.gz 2266993 SHA256 
d18d50aca6dc8b8d4d4933b507fdaabeb607adc9c9c14646f1031c005aeaaf98 SHA512 
d6e7fa5a040e507141bbd6b3863f5743b9646e503cfec26ed710718835a782b0acf582f24959eb52d906eeca60061d39e01b4a542c3d83535efa17eb4a5b0b85
 WHIRLPOOL 
3fc71da001282cbe7c670b192335ddac460f3fb053849a51d95d9113b6c31a27ff65ce64811ca26c456ec01911ce8685d73c793183e71bc696cd896f9bf38507

diff --git a/app-admin/calamares/calamares-3.1.6.ebuild 
b/app-admin/calamares/calamares-3.1.6.ebuild
new file mode 100644
index 000..780fcfe4fd0
--- /dev/null
+++ b/app-admin/calamares/calamares-3.1.6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN};
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5(+)]
+   >=sys-libs/kpmcore-3.0.3:5=
+   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   virtual/udev
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DWITH_PYTHONQT=$(usex pythonqt)
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2017-10-15 Thread Johannes Huber

commit: f6654ad73d925e2ecd77969740321eea9bf0fa0e
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Oct 15 16:41:48 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Oct 15 16:42:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6654ad7

app-admin/calamares: Remove 3.1.4

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 app-admin/calamares/Manifest   |  1 -
 app-admin/calamares/calamares-3.1.4.ebuild | 80 --
 2 files changed, 81 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 8d1f7ecd3a4..ade563741b0 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,3 +1,2 @@
-DIST calamares-3.1.4.tar.gz 4958385 SHA256 
8255eb9b001b9b1271771c1796eb8217be78299c0a4e7f20e432b3dd4f5d371f SHA512 
d3ced4222e21e6e9ab18fb90d4d591b1b59b5fd44841e56e41b2902d00f33a910e0ae287a6777c5d71eb08757cfca31d9210f6eabd00b3dd1dc6377413b54bb2
 WHIRLPOOL 
622122d9092bb4fff3fa40b0a08d5d71780da962c3fedd2d3c2336ff00242b25f2ba524b6ebdce48155ce0a9729a830b03d9aa3ad4c86bde3d3c26ab83574393
 DIST calamares-3.1.5.tar.gz 2266110 SHA256 
02bd3c10e06ac207cdee0ee29f8d20bfe48eba491800e3eab704e1d294736260 SHA512 
92e29668ddab880b76319fbf4eeffea21bfa0bd5b8807cb5a2c2786eafe4921f442a9a5773243fafe5942a346d46b89285e9472d4c8da70b70979a049923df06
 WHIRLPOOL 
74b396551aee5c7831b05a0c40df56f047bf6bd1fb0c9e3e51b2791696b9e19eb1db78128c1167a668d0d4e412cddbb819c807dfb52cc8bea667307921752a80
 DIST calamares-3.1.6.tar.gz 2266993 SHA256 
d18d50aca6dc8b8d4d4933b507fdaabeb607adc9c9c14646f1031c005aeaaf98 SHA512 
d6e7fa5a040e507141bbd6b3863f5743b9646e503cfec26ed710718835a782b0acf582f24959eb52d906eeca60061d39e01b4a542c3d83535efa17eb4a5b0b85
 WHIRLPOOL 
3fc71da001282cbe7c670b192335ddac460f3fb053849a51d95d9113b6c31a27ff65ce64811ca26c456ec01911ce8685d73c793183e71bc696cd896f9bf38507

diff --git a/app-admin/calamares/calamares-3.1.4.ebuild 
b/app-admin/calamares/calamares-3.1.4.ebuild
deleted file mode 100644
index 780fcfe4fd0..000
--- a/app-admin/calamares/calamares-3.1.4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN};
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5(+)]
-   >=sys-libs/kpmcore-3.0.3:5=
-   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   virtual/udev
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   -DWITH_PYTHONQT=$(usex pythonqt)
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2017-10-07 Thread Johannes Huber

commit: 3c65fb9883d5283c664af60b5fa9362eb77fa9b2
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Oct  7 16:46:39 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Oct  7 16:47:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c65fb98

app-admin/calamares: Version bump 3.1.5

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 app-admin/calamares/Manifest   |  1 +
 app-admin/calamares/calamares-3.1.5.ebuild | 80 ++
 2 files changed, 81 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index dda04d011ed..27fe11c7941 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1,3 @@
 DIST calamares-3.1.3.tar.gz 4944637 SHA256 
9a43dbe465f64f3f286bd13d2eea6a6cb790a561cf477521ae7dc54d49298c17 SHA512 
2a8e38234b60aaf8f82cf146e79c364055485a3a50f385d7ff6744df973a67de390223a8fa7e3b5ffb854f997cd0de7e93c1c912dd5739d56dca92528d9522c0
 WHIRLPOOL 
524ef6dc5528e83ecad4d98f8d7ebb4398f50d683c30c13c4b2aeba1797d3aa725158e80b3a3d25fd6d2071a579882231b78f56f9f2bb1fdf46a3cbb88d10713
 DIST calamares-3.1.4.tar.gz 4958385 SHA256 
8255eb9b001b9b1271771c1796eb8217be78299c0a4e7f20e432b3dd4f5d371f SHA512 
d3ced4222e21e6e9ab18fb90d4d591b1b59b5fd44841e56e41b2902d00f33a910e0ae287a6777c5d71eb08757cfca31d9210f6eabd00b3dd1dc6377413b54bb2
 WHIRLPOOL 
622122d9092bb4fff3fa40b0a08d5d71780da962c3fedd2d3c2336ff00242b25f2ba524b6ebdce48155ce0a9729a830b03d9aa3ad4c86bde3d3c26ab83574393
+DIST calamares-3.1.5.tar.gz 2266110 SHA256 
02bd3c10e06ac207cdee0ee29f8d20bfe48eba491800e3eab704e1d294736260 SHA512 
92e29668ddab880b76319fbf4eeffea21bfa0bd5b8807cb5a2c2786eafe4921f442a9a5773243fafe5942a346d46b89285e9472d4c8da70b70979a049923df06
 WHIRLPOOL 
74b396551aee5c7831b05a0c40df56f047bf6bd1fb0c9e3e51b2791696b9e19eb1db78128c1167a668d0d4e412cddbb819c807dfb52cc8bea667307921752a80

diff --git a/app-admin/calamares/calamares-3.1.5.ebuild 
b/app-admin/calamares/calamares-3.1.5.ebuild
new file mode 100644
index 000..780fcfe4fd0
--- /dev/null
+++ b/app-admin/calamares/calamares-3.1.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN};
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5(+)]
+   >=sys-libs/kpmcore-3.0.3:5=
+   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   virtual/udev
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DWITH_PYTHONQT=$(usex pythonqt)
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2017-10-07 Thread Johannes Huber

commit: 5740505cfb06831e0f84cdc66013079ba8a1f69d
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Oct  7 16:47:10 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Oct  7 16:47:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5740505c

app-admin/calamares: Remove 3.1.3

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 app-admin/calamares/Manifest   |  1 -
 app-admin/calamares/calamares-3.1.3.ebuild | 80 --
 2 files changed, 81 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 27fe11c7941..b6ceec15424 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,3 +1,2 @@
-DIST calamares-3.1.3.tar.gz 4944637 SHA256 
9a43dbe465f64f3f286bd13d2eea6a6cb790a561cf477521ae7dc54d49298c17 SHA512 
2a8e38234b60aaf8f82cf146e79c364055485a3a50f385d7ff6744df973a67de390223a8fa7e3b5ffb854f997cd0de7e93c1c912dd5739d56dca92528d9522c0
 WHIRLPOOL 
524ef6dc5528e83ecad4d98f8d7ebb4398f50d683c30c13c4b2aeba1797d3aa725158e80b3a3d25fd6d2071a579882231b78f56f9f2bb1fdf46a3cbb88d10713
 DIST calamares-3.1.4.tar.gz 4958385 SHA256 
8255eb9b001b9b1271771c1796eb8217be78299c0a4e7f20e432b3dd4f5d371f SHA512 
d3ced4222e21e6e9ab18fb90d4d591b1b59b5fd44841e56e41b2902d00f33a910e0ae287a6777c5d71eb08757cfca31d9210f6eabd00b3dd1dc6377413b54bb2
 WHIRLPOOL 
622122d9092bb4fff3fa40b0a08d5d71780da962c3fedd2d3c2336ff00242b25f2ba524b6ebdce48155ce0a9729a830b03d9aa3ad4c86bde3d3c26ab83574393
 DIST calamares-3.1.5.tar.gz 2266110 SHA256 
02bd3c10e06ac207cdee0ee29f8d20bfe48eba491800e3eab704e1d294736260 SHA512 
92e29668ddab880b76319fbf4eeffea21bfa0bd5b8807cb5a2c2786eafe4921f442a9a5773243fafe5942a346d46b89285e9472d4c8da70b70979a049923df06
 WHIRLPOOL 
74b396551aee5c7831b05a0c40df56f047bf6bd1fb0c9e3e51b2791696b9e19eb1db78128c1167a668d0d4e412cddbb819c807dfb52cc8bea667307921752a80

diff --git a/app-admin/calamares/calamares-3.1.3.ebuild 
b/app-admin/calamares/calamares-3.1.3.ebuild
deleted file mode 100644
index 780fcfe4fd0..000
--- a/app-admin/calamares/calamares-3.1.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN};
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5(+)]
-   >=sys-libs/kpmcore-3.0.3:5=
-   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   virtual/udev
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   -DWITH_PYTHONQT=$(usex pythonqt)
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2017-09-15 Thread Johannes Huber

commit: e6982bfe643618404c655543fc7986ce74974f74
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Sep 15 18:42:19 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Sep 15 18:42:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6982bfe

app-admin/calamares: Version bump 3.1.4

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-admin/calamares/Manifest   |  1 +
 app-admin/calamares/calamares-3.1.4.ebuild | 80 ++
 2 files changed, 81 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 32245a6c115..dda04d011ed 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
 DIST calamares-3.1.3.tar.gz 4944637 SHA256 
9a43dbe465f64f3f286bd13d2eea6a6cb790a561cf477521ae7dc54d49298c17 SHA512 
2a8e38234b60aaf8f82cf146e79c364055485a3a50f385d7ff6744df973a67de390223a8fa7e3b5ffb854f997cd0de7e93c1c912dd5739d56dca92528d9522c0
 WHIRLPOOL 
524ef6dc5528e83ecad4d98f8d7ebb4398f50d683c30c13c4b2aeba1797d3aa725158e80b3a3d25fd6d2071a579882231b78f56f9f2bb1fdf46a3cbb88d10713
+DIST calamares-3.1.4.tar.gz 4958385 SHA256 
8255eb9b001b9b1271771c1796eb8217be78299c0a4e7f20e432b3dd4f5d371f SHA512 
d3ced4222e21e6e9ab18fb90d4d591b1b59b5fd44841e56e41b2902d00f33a910e0ae287a6777c5d71eb08757cfca31d9210f6eabd00b3dd1dc6377413b54bb2
 WHIRLPOOL 
622122d9092bb4fff3fa40b0a08d5d71780da962c3fedd2d3c2336ff00242b25f2ba524b6ebdce48155ce0a9729a830b03d9aa3ad4c86bde3d3c26ab83574393

diff --git a/app-admin/calamares/calamares-3.1.4.ebuild 
b/app-admin/calamares/calamares-3.1.4.ebuild
new file mode 100644
index 000..780fcfe4fd0
--- /dev/null
+++ b/app-admin/calamares/calamares-3.1.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN};
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5(+)]
+   >=sys-libs/kpmcore-3.0.3:5=
+   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   virtual/udev
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DWITH_PYTHONQT=$(usex pythonqt)
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2017-09-06 Thread Johannes Huber

commit: 59e34efc41d89aba4100952ff1f91b82c8caf9fd
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Sep  6 17:20:12 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Sep  6 17:20:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59e34efc

app-admin/calamares: Remove 3.1.1

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-admin/calamares/Manifest   |  1 -
 app-admin/calamares/calamares-3.1.1.ebuild | 80 --
 2 files changed, 81 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 123d1e83db3..32245a6c115 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
-DIST calamares-3.1.1.tar.gz 4895018 SHA256 
1644f28f0ee166411dafc849d1d1c9b5bf4f7346ebaf430ee3cf1a7d330a85aa SHA512 
4c45f949075a46c6b1de14b322f7d124b4346b11c112b410a216359530d055d21ae8357609d2279614da5490f72f38aebf7844942a2e8a8c2a244cf31350720c
 WHIRLPOOL 
8be229cdcbea88c396a98f42232b0dcb30df81895f927ef45c815be618f5d094f85e2b0fdda7cdf93d6a953d785a7c45bd3f0eae70d2e8775a0bccb8d0a19b3e
 DIST calamares-3.1.3.tar.gz 4944637 SHA256 
9a43dbe465f64f3f286bd13d2eea6a6cb790a561cf477521ae7dc54d49298c17 SHA512 
2a8e38234b60aaf8f82cf146e79c364055485a3a50f385d7ff6744df973a67de390223a8fa7e3b5ffb854f997cd0de7e93c1c912dd5739d56dca92528d9522c0
 WHIRLPOOL 
524ef6dc5528e83ecad4d98f8d7ebb4398f50d683c30c13c4b2aeba1797d3aa725158e80b3a3d25fd6d2071a579882231b78f56f9f2bb1fdf46a3cbb88d10713

diff --git a/app-admin/calamares/calamares-3.1.1.ebuild 
b/app-admin/calamares/calamares-3.1.1.ebuild
deleted file mode 100644
index 780fcfe4fd0..000
--- a/app-admin/calamares/calamares-3.1.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="https://github.com/${PN}/${PN};
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5(+)]
-   >=sys-libs/kpmcore-3.0.3:5=
-   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   virtual/udev
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   -DWITH_PYTHONQT=$(usex pythonqt)
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2017-09-04 Thread Johannes Huber

commit: bbbe001072a0401be6fd88f4cbde72aeff3e560f
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Sep  4 19:50:09 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Sep  4 19:50:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbbe0010

app-admin/calamares: Version bump 3.1.3

Gentoo-bug: 628740
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-admin/calamares/Manifest   |  1 +
 app-admin/calamares/calamares-3.1.3.ebuild | 80 ++
 2 files changed, 81 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 5641d7b840e..123d1e83db3 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
 DIST calamares-3.1.1.tar.gz 4895018 SHA256 
1644f28f0ee166411dafc849d1d1c9b5bf4f7346ebaf430ee3cf1a7d330a85aa SHA512 
4c45f949075a46c6b1de14b322f7d124b4346b11c112b410a216359530d055d21ae8357609d2279614da5490f72f38aebf7844942a2e8a8c2a244cf31350720c
 WHIRLPOOL 
8be229cdcbea88c396a98f42232b0dcb30df81895f927ef45c815be618f5d094f85e2b0fdda7cdf93d6a953d785a7c45bd3f0eae70d2e8775a0bccb8d0a19b3e
+DIST calamares-3.1.3.tar.gz 4944637 SHA256 
9a43dbe465f64f3f286bd13d2eea6a6cb790a561cf477521ae7dc54d49298c17 SHA512 
2a8e38234b60aaf8f82cf146e79c364055485a3a50f385d7ff6744df973a67de390223a8fa7e3b5ffb854f997cd0de7e93c1c912dd5739d56dca92528d9522c0
 WHIRLPOOL 
524ef6dc5528e83ecad4d98f8d7ebb4398f50d683c30c13c4b2aeba1797d3aa725158e80b3a3d25fd6d2071a579882231b78f56f9f2bb1fdf46a3cbb88d10713

diff --git a/app-admin/calamares/calamares-3.1.3.ebuild 
b/app-admin/calamares/calamares-3.1.3.ebuild
new file mode 100644
index 000..780fcfe4fd0
--- /dev/null
+++ b/app-admin/calamares/calamares-3.1.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="https://github.com/${PN}/${PN};
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5(+)]
+   >=sys-libs/kpmcore-3.0.3:5=
+   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   virtual/udev
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DWITH_PYTHONQT=$(usex pythonqt)
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

[gentoo-commits] repo/gentoo:master commit in: app-admin/calamares/, net-firewall/pglinux/, lxqt-base/lxqt-policykit/, ...

2017-09-01 Thread Andreas Sturmlechner

commit: 291ab3d74fa7035a74238b3b89574d5c341f361a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 31 22:23:43 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Sep  1 21:34:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=291ab3d7

sys-auth/polkit-qt: Prepare rdeps for dropping USE=qt5

 app-admin/calamares/calamares-3.1.1.ebuild | 2 +-
 kde-frameworks/kauth/kauth-5.34.0.ebuild   | 2 +-
 kde-frameworks/kauth/kauth-5.37.0.ebuild   | 2 +-
 kde-plasma/polkit-kde-agent/polkit-kde-agent-5.10.4.ebuild | 2 +-
 kde-plasma/polkit-kde-agent/polkit-kde-agent-5.10.5.ebuild | 2 +-
 lxqt-base/lxqt-policykit/lxqt-policykit-0.10.0.ebuild  | 2 +-
 lxqt-base/lxqt-policykit/lxqt-policykit-0.11.0.ebuild  | 2 +-
 net-firewall/pglinux/pglinux-2.3.1.ebuild  | 2 +-
 sys-auth/fingerprint-gui/fingerprint-gui-1.07.ebuild   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app-admin/calamares/calamares-3.1.1.ebuild 
b/app-admin/calamares/calamares-3.1.1.ebuild
index 2f8dcae242f..780fcfe4fd0 100644
--- a/app-admin/calamares/calamares-3.1.1.ebuild
+++ b/app-admin/calamares/calamares-3.1.1.ebuild
@@ -35,7 +35,7 @@ DEPEND="${PYTHON_DEPS}
>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
sys-apps/dbus
sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5]
+   sys-auth/polkit-qt[qt5(+)]
>=sys-libs/kpmcore-3.0.3:5=
pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
 "

diff --git a/kde-frameworks/kauth/kauth-5.34.0.ebuild 
b/kde-frameworks/kauth/kauth-5.34.0.ebuild
index d8041e355f9..337ed3ca199 100644
--- a/kde-frameworks/kauth/kauth-5.34.0.ebuild
+++ b/kde-frameworks/kauth/kauth-5.34.0.ebuild
@@ -17,7 +17,7 @@ RDEPEND="
$(add_qt_dep qtdbus '' '' '5=')
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
-   policykit? ( sys-auth/polkit-qt[qt5] )
+   policykit? ( sys-auth/polkit-qt[qt5(+)] )
 "
 DEPEND="${RDEPEND}
nls? ( $(add_qt_dep linguist-tools) )

diff --git a/kde-frameworks/kauth/kauth-5.37.0.ebuild 
b/kde-frameworks/kauth/kauth-5.37.0.ebuild
index 0b7ce29ed9c..4852c2fb783 100644
--- a/kde-frameworks/kauth/kauth-5.37.0.ebuild
+++ b/kde-frameworks/kauth/kauth-5.37.0.ebuild
@@ -16,7 +16,7 @@ RDEPEND="
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
-   policykit? ( sys-auth/polkit-qt[qt5] )
+   policykit? ( sys-auth/polkit-qt[qt5(+)] )
 "
 DEPEND="${RDEPEND}
nls? ( $(add_qt_dep linguist-tools) )

diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.10.4.ebuild 
b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.10.4.ebuild
index 7c0a6a461f8..b3dc601bc2e 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.10.4.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.10.4.ebuild
@@ -22,7 +22,7 @@ DEPEND="
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
-   || ( $(add_frameworks_dep polkit-qt) >=sys-auth/polkit-qt-0.112.0[qt5] )
+   || ( $(add_frameworks_dep polkit-qt) 
>=sys-auth/polkit-qt-0.112.0[qt5(+)] )
 "
 RDEPEND="${DEPEND}
!sys-auth/polkit-kde-agent:4[-minimal(-)]

diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.10.5.ebuild 
b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.10.5.ebuild
index cd45f320916..750ab00830d 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.10.5.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.10.5.ebuild
@@ -22,7 +22,7 @@ DEPEND="
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
-   || ( $(add_frameworks_dep polkit-qt) >=sys-auth/polkit-qt-0.112.0[qt5] )
+   || ( $(add_frameworks_dep polkit-qt) 
>=sys-auth/polkit-qt-0.112.0[qt5(+)] )
 "
 RDEPEND="${DEPEND}
!sys-auth/polkit-kde-agent:4[-minimal(-)]

diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-0.10.0.ebuild 
b/lxqt-base/lxqt-policykit/lxqt-policykit-0.10.0.ebuild
index f758d566c12..e948c748b90 100644
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-0.10.0.ebuild
+++ b/lxqt-base/lxqt-policykit/lxqt-policykit-0.10.0.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
dev-qt/qtxml:5
~lxqt-base/liblxqt-${PV}
>=dev-libs/libqtxdg-1.0.0
-   sys-auth/polkit-qt[qt5(-)]"
+   sys-auth/polkit-qt[qt5(+)]"
 DEPEND="${RDEPEND}
dev-qt/linguist-tools:5
virtual/pkgconfig"

diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-0.11.0.ebuild 
b/lxqt-base/lxqt-policykit/lxqt-policykit-0.11.0.ebuild
index 8e0fb7de51f..81201d0cb42 100644
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-0.11.0.ebuild
+++ b/lxqt-base/lxqt-policykit/lxqt-policykit-0.11.0.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
dev-qt/qtxml:5
~lxqt-base/liblxqt-${PV}
>=dev-libs/libqtxdg-1.0.0
-   sys-auth/polkit-qt[qt5(-)]"
+   sys-auth/polkit-qt[qt5(+)]"
 DEPEND="${RDEPEND}

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

2017-07-30 Thread Michał Górny

commit: 383b46fc5381630cceb6cfce5a81887f9b436cbf
Author: David Hicks  hicks  id  au>
AuthorDate: Fri Jul 28 23:24:26 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jul 30 08:35:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=383b46fc

app-admin/calamares: use HTTPS for GitHub and HOMEPAGE domain

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 app-admin/calamares/calamares-3.1.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/calamares/calamares-3.1.1.ebuild 
b/app-admin/calamares/calamares-3.1.1.ebuild
index 24ee1588108..2f8dcae242f 100644
--- a/app-admin/calamares/calamares-3.1.1.ebuild
+++ b/app-admin/calamares/calamares-3.1.1.ebuild
@@ -7,9 +7,9 @@ PYTHON_COMPAT=( python{3_4,3_5} )
 inherit kde5 python-r1
 
 DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="http://calamares.io;
+HOMEPAGE="https://calamares.io;
 if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
+   EGIT_REPO_URI="https://github.com/${PN}/${PN};
 else

SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
KEYWORDS="~amd64"

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

2017-07-14 Thread Johannes Huber

commit: 51fe378cb9d486e078319651e05157f8b72398fe
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Jul 14 17:33:44 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Jul 14 17:34:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51fe378c

app-admin/calamares: Version bump 3.1.1

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-admin/calamares/Manifest   |  1 +
 app-admin/calamares/calamares-3.1.1.ebuild | 80 ++
 2 files changed, 81 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index a09258eb1f7..40002916c43 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
 DIST calamares-3.1.0.tar.gz 2215820 SHA256 
7b4c74fc350624a17eb8b8187ade490711bfdc608d2be07322c8a3fc0a449276 SHA512 
17c15aafbc811f42246f8300f64ffe7d44b43ac24f5b6ced15c83715c5fff9644060964de82cc3e7021c710e6eebbc124785d9d7b85613c5f190ec0f8d5d5389
 WHIRLPOOL 
6c8e46aff3700d26e876dd6f02bf28e55ea59cebe46438e64a8d04e921df9e35d0c1c3077479767b67284805103c16cda7ef5e1a2ec50d9e735093cb9e04b886
+DIST calamares-3.1.1.tar.gz 4895018 SHA256 
1644f28f0ee166411dafc849d1d1c9b5bf4f7346ebaf430ee3cf1a7d330a85aa SHA512 
4c45f949075a46c6b1de14b322f7d124b4346b11c112b410a216359530d055d21ae8357609d2279614da5490f72f38aebf7844942a2e8a8c2a244cf31350720c
 WHIRLPOOL 
8be229cdcbea88c396a98f42232b0dcb30df81895f927ef45c815be618f5d094f85e2b0fdda7cdf93d6a953d785a7c45bd3f0eae70d2e8775a0bccb8d0a19b3e

diff --git a/app-admin/calamares/calamares-3.1.1.ebuild 
b/app-admin/calamares/calamares-3.1.1.ebuild
new file mode 100644
index 000..24ee1588108
--- /dev/null
+++ b/app-admin/calamares/calamares-3.1.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="http://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5]
+   >=sys-libs/kpmcore-3.0.3:5=
+   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   virtual/udev
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DWITH_PYTHONQT=$(usex pythonqt)
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2017-07-14 Thread Johannes Huber

commit: edf9bcea8249280dca33d0e4cc17ea8e59397ea5
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Jul 14 17:34:19 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Jul 14 17:34:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edf9bcea

app-admin/calamares: Remove 3.1.0

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-admin/calamares/Manifest   |  1 -
 app-admin/calamares/calamares-3.1.0.ebuild | 82 --
 2 files changed, 83 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 40002916c43..5641d7b840e 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
-DIST calamares-3.1.0.tar.gz 2215820 SHA256 
7b4c74fc350624a17eb8b8187ade490711bfdc608d2be07322c8a3fc0a449276 SHA512 
17c15aafbc811f42246f8300f64ffe7d44b43ac24f5b6ced15c83715c5fff9644060964de82cc3e7021c710e6eebbc124785d9d7b85613c5f190ec0f8d5d5389
 WHIRLPOOL 
6c8e46aff3700d26e876dd6f02bf28e55ea59cebe46438e64a8d04e921df9e35d0c1c3077479767b67284805103c16cda7ef5e1a2ec50d9e735093cb9e04b886
 DIST calamares-3.1.1.tar.gz 4895018 SHA256 
1644f28f0ee166411dafc849d1d1c9b5bf4f7346ebaf430ee3cf1a7d330a85aa SHA512 
4c45f949075a46c6b1de14b322f7d124b4346b11c112b410a216359530d055d21ae8357609d2279614da5490f72f38aebf7844942a2e8a8c2a244cf31350720c
 WHIRLPOOL 
8be229cdcbea88c396a98f42232b0dcb30df81895f927ef45c815be618f5d094f85e2b0fdda7cdf93d6a953d785a7c45bd3f0eae70d2e8775a0bccb8d0a19b3e

diff --git a/app-admin/calamares/calamares-3.1.0.ebuild 
b/app-admin/calamares/calamares-3.1.0.ebuild
deleted file mode 100644
index 9fef434bba7..000
--- a/app-admin/calamares/calamares-3.1.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="http://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
-else
-   inherit versionator
-   MAJOR_PV=$(get_version_component_range 1-2)
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MAJOR_PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5]
-   >=sys-libs/kpmcore-3.0.2:5=
-   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   virtual/udev
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   -DWITH_PYTHONQT=$(usex pythonqt)
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2017-06-04 Thread Johannes Huber

commit: 907ab8308b9e1e87402c8aa6f7ee54458b77b62c
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Jun  4 12:03:59 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Jun  4 12:04:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=907ab830

app-admin/calamares: Remove 3.0.1

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-admin/calamares/Manifest   |  1 -
 app-admin/calamares/calamares-3.0.1.ebuild | 80 --
 2 files changed, 81 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 5385b33559c..a09258eb1f7 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
-DIST calamares-3.0.1.tar.gz 2213505 SHA256 
2c0f4f04d1520186ef0b30584daa73c32dce99603bb4d8f6880497ee3f2322b5 SHA512 
9d6dfae611211bffae5509e97fdd1363701a2db675224badf058a4d22c395e150cf91d148fcfbe49fa7aef8c81049a331a91a3b350cb47acbb9af934e3c96f22
 WHIRLPOOL 
d8fb6c7fe6a594055f3ba0be9fd9e46833b590accc58ffb36ef852bad3dbbb67560b021747f81f1f115d7622df0be1ab776d696d5ed818269badc9b3b47b721d
 DIST calamares-3.1.0.tar.gz 2215820 SHA256 
7b4c74fc350624a17eb8b8187ade490711bfdc608d2be07322c8a3fc0a449276 SHA512 
17c15aafbc811f42246f8300f64ffe7d44b43ac24f5b6ced15c83715c5fff9644060964de82cc3e7021c710e6eebbc124785d9d7b85613c5f190ec0f8d5d5389
 WHIRLPOOL 
6c8e46aff3700d26e876dd6f02bf28e55ea59cebe46438e64a8d04e921df9e35d0c1c3077479767b67284805103c16cda7ef5e1a2ec50d9e735093cb9e04b886

diff --git a/app-admin/calamares/calamares-3.0.1.ebuild 
b/app-admin/calamares/calamares-3.0.1.ebuild
deleted file mode 100644
index 02e122fac8c..000
--- a/app-admin/calamares/calamares-3.0.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="http://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5]
-   >=sys-libs/kpmcore-3.0.2:5=
-   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   virtual/udev
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   -DWITH_PYTHONQT=$(usex pythonqt)
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2017-06-04 Thread Johannes Huber

commit: ec77e21c1a56ada22df9b83099e29fe013f4634c
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Jun  4 12:03:09 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Jun  4 12:04:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec77e21c

app-admin/calamares: Remove 2.4.6

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-admin/calamares/Manifest   |  1 -
 app-admin/calamares/calamares-2.4.6.ebuild | 79 --
 2 files changed, 80 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 5c95ea9227c..5385b33559c 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,3 +1,2 @@
-DIST calamares-2.4.6.tar.gz 2143386 SHA256 
c091ad0db9b69b7552d7f282317ba4a4453d7e5ca7ee4bf98f605fe43c63597e SHA512 
d2ba4675a846095c437231eb1d59f86668f7c65e2f9bda9681cd4de60324b8d8007f4337f8cd93ca71a303812ecdb8c55935805adc8fd25bb98f1e39432be009
 WHIRLPOOL 
b54ac8347604942a00293c23e766142af867ac37dc3e910d93a07fc909eefb70bd9dc7744270320fcda10b25c3db50476f35074122ae60ee2243e46ab14ea206
 DIST calamares-3.0.1.tar.gz 2213505 SHA256 
2c0f4f04d1520186ef0b30584daa73c32dce99603bb4d8f6880497ee3f2322b5 SHA512 
9d6dfae611211bffae5509e97fdd1363701a2db675224badf058a4d22c395e150cf91d148fcfbe49fa7aef8c81049a331a91a3b350cb47acbb9af934e3c96f22
 WHIRLPOOL 
d8fb6c7fe6a594055f3ba0be9fd9e46833b590accc58ffb36ef852bad3dbbb67560b021747f81f1f115d7622df0be1ab776d696d5ed818269badc9b3b47b721d
 DIST calamares-3.1.0.tar.gz 2215820 SHA256 
7b4c74fc350624a17eb8b8187ade490711bfdc608d2be07322c8a3fc0a449276 SHA512 
17c15aafbc811f42246f8300f64ffe7d44b43ac24f5b6ced15c83715c5fff9644060964de82cc3e7021c710e6eebbc124785d9d7b85613c5f190ec0f8d5d5389
 WHIRLPOOL 
6c8e46aff3700d26e876dd6f02bf28e55ea59cebe46438e64a8d04e921df9e35d0c1c3077479767b67284805103c16cda7ef5e1a2ec50d9e735093cb9e04b886

diff --git a/app-admin/calamares/calamares-2.4.6.ebuild 
b/app-admin/calamares/calamares-2.4.6.ebuild
deleted file mode 100644
index f4d00d9a242..000
--- a/app-admin/calamares/calamares-2.4.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="http://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5]
-   sys-libs/kpmcore:5=
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   sys-fs/udisks:2[systemd]
-   virtual/udev[systemd]
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2017-03-03 Thread Johannes Huber

commit: d0de530532917f65222ec4eebeba331c0fbe24ce
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Mar  3 18:18:39 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Mar  3 18:18:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0de5305

app-admin/calamares: Version bump 3.1.0

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-admin/calamares/Manifest   |  1 +
 app-admin/calamares/calamares-3.1.0.ebuild | 82 ++
 2 files changed, 83 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index c2154b9e36b..5c95ea9227c 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1,3 @@
 DIST calamares-2.4.6.tar.gz 2143386 SHA256 
c091ad0db9b69b7552d7f282317ba4a4453d7e5ca7ee4bf98f605fe43c63597e SHA512 
d2ba4675a846095c437231eb1d59f86668f7c65e2f9bda9681cd4de60324b8d8007f4337f8cd93ca71a303812ecdb8c55935805adc8fd25bb98f1e39432be009
 WHIRLPOOL 
b54ac8347604942a00293c23e766142af867ac37dc3e910d93a07fc909eefb70bd9dc7744270320fcda10b25c3db50476f35074122ae60ee2243e46ab14ea206
 DIST calamares-3.0.1.tar.gz 2213505 SHA256 
2c0f4f04d1520186ef0b30584daa73c32dce99603bb4d8f6880497ee3f2322b5 SHA512 
9d6dfae611211bffae5509e97fdd1363701a2db675224badf058a4d22c395e150cf91d148fcfbe49fa7aef8c81049a331a91a3b350cb47acbb9af934e3c96f22
 WHIRLPOOL 
d8fb6c7fe6a594055f3ba0be9fd9e46833b590accc58ffb36ef852bad3dbbb67560b021747f81f1f115d7622df0be1ab776d696d5ed818269badc9b3b47b721d
+DIST calamares-3.1.0.tar.gz 2215820 SHA256 
7b4c74fc350624a17eb8b8187ade490711bfdc608d2be07322c8a3fc0a449276 SHA512 
17c15aafbc811f42246f8300f64ffe7d44b43ac24f5b6ced15c83715c5fff9644060964de82cc3e7021c710e6eebbc124785d9d7b85613c5f190ec0f8d5d5389
 WHIRLPOOL 
6c8e46aff3700d26e876dd6f02bf28e55ea59cebe46438e64a8d04e921df9e35d0c1c3077479767b67284805103c16cda7ef5e1a2ec50d9e735093cb9e04b886

diff --git a/app-admin/calamares/calamares-3.1.0.ebuild 
b/app-admin/calamares/calamares-3.1.0.ebuild
new file mode 100644
index 000..9fef434bba7
--- /dev/null
+++ b/app-admin/calamares/calamares-3.1.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="http://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
+else
+   inherit versionator
+   MAJOR_PV=$(get_version_component_range 1-2)
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MAJOR_PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5]
+   >=sys-libs/kpmcore-3.0.2:5=
+   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   virtual/udev
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DWITH_PYTHONQT=$(usex pythonqt)
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2017-02-16 Thread Ettore Di Giacinto

commit: 3174f603c042cb486b54a668a14182c3617b31e5
Author: Ettore Di Giacinto  gentoo  org>
AuthorDate: Thu Feb 16 18:01:28 2017 +
Commit: Ettore Di Giacinto  gentoo  org>
CommitDate: Thu Feb 16 18:32:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3174f603

app-admin/calamares: version bump to 3.0.1

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-admin/calamares/Manifest   |  1 +
 app-admin/calamares/calamares-3.0.1.ebuild | 82 ++
 app-admin/calamares/metadata.xml   |  3 ++
 3 files changed, 86 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index c3bdca772c..c2154b9e36 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
 DIST calamares-2.4.6.tar.gz 2143386 SHA256 
c091ad0db9b69b7552d7f282317ba4a4453d7e5ca7ee4bf98f605fe43c63597e SHA512 
d2ba4675a846095c437231eb1d59f86668f7c65e2f9bda9681cd4de60324b8d8007f4337f8cd93ca71a303812ecdb8c55935805adc8fd25bb98f1e39432be009
 WHIRLPOOL 
b54ac8347604942a00293c23e766142af867ac37dc3e910d93a07fc909eefb70bd9dc7744270320fcda10b25c3db50476f35074122ae60ee2243e46ab14ea206
+DIST calamares-3.0.1.tar.gz 2213505 SHA256 
2c0f4f04d1520186ef0b30584daa73c32dce99603bb4d8f6880497ee3f2322b5 SHA512 
9d6dfae611211bffae5509e97fdd1363701a2db675224badf058a4d22c395e150cf91d148fcfbe49fa7aef8c81049a331a91a3b350cb47acbb9af934e3c96f22
 WHIRLPOOL 
d8fb6c7fe6a594055f3ba0be9fd9e46833b590accc58ffb36ef852bad3dbbb67560b021747f81f1f115d7622df0be1ab776d696d5ed818269badc9b3b47b721d

diff --git a/app-admin/calamares/calamares-3.0.1.ebuild 
b/app-admin/calamares/calamares-3.0.1.ebuild
new file mode 100644
index 00..d40894d9ba
--- /dev/null
+++ b/app-admin/calamares/calamares-3.0.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="http://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5]
+   >=sys-libs/kpmcore-3.0.2:5=
+   pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-fs/udisks:2[systemd]
+   virtual/udev[systemd]
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   -DWITH_PYTHONQT=$(usex pythonqt)
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

diff --git a/app-admin/calamares/metadata.xml b/app-admin/calamares/metadata.xml
index 8c2f796487..bc9aeb3299 100644
--- a/app-admin/calamares/metadata.xml
+++ b/app-admin/calamares/metadata.xml
@@ -21,4 +21,7 @@

calamares/calamares

+   
+   Enable PythonQt-based module 
interface
+

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

2017-02-16 Thread Ettore Di Giacinto

commit: 0e489d5b5c87af07bb133543504fa545f3c051ff
Author: Ettore Di Giacinto  gentoo  org>
AuthorDate: Thu Feb 16 09:54:03 2017 +
Commit: Ettore Di Giacinto  gentoo  org>
CommitDate: Thu Feb 16 10:43:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e489d5b

app-admin/calamares: add myself to maintainers

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-admin/calamares/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/app-admin/calamares/metadata.xml b/app-admin/calamares/metadata.xml
index f28035634d..8c2f796487 100644
--- a/app-admin/calamares/metadata.xml
+++ b/app-admin/calamares/metadata.xml
@@ -5,6 +5,10 @@
j...@gentoo.org
Johannes Huber

+   
+   mud...@gentoo.org
+   Ettore Di Giacinto
+   

Calamares is a distribution-independent system installer, with 
an
advanced partitioning feature for both manual and automated

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

2017-01-19 Thread Johannes Huber

commit: 44f3faa912e6ecea32c53375a80cf31fae0465d4
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Jan 19 17:54:57 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Jan 19 17:54:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44f3faa9

app-admin/calamares: Remove 2.4.5

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-admin/calamares/Manifest   |  1 -
 app-admin/calamares/calamares-2.4.5.ebuild | 81 --
 2 files changed, 82 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index b407262..c3bdca7 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
-DIST calamares-2.4.5.tar.gz 2142339 SHA256 
fe924bf951ea64c92a565195330aff87587b9326c6769f5c8a8e4ee67e20bab5 SHA512 
b55ed22f40116e67fe9bea6f1112fa98538f831886b950097465e171390bbef5773f61c374939c7a7a467a721af5e36c9e9845eb419f7cb015e997f82550998c
 WHIRLPOOL 
33e91c774561eb4687eed94dedb7b2708cb0b2c73522d10061c635c9367807c4a01fdc5aee713668f090dfc204c48cd55ba76353af19e2dfff6bfaffccc6f24a
 DIST calamares-2.4.6.tar.gz 2143386 SHA256 
c091ad0db9b69b7552d7f282317ba4a4453d7e5ca7ee4bf98f605fe43c63597e SHA512 
d2ba4675a846095c437231eb1d59f86668f7c65e2f9bda9681cd4de60324b8d8007f4337f8cd93ca71a303812ecdb8c55935805adc8fd25bb98f1e39432be009
 WHIRLPOOL 
b54ac8347604942a00293c23e766142af867ac37dc3e910d93a07fc909eefb70bd9dc7744270320fcda10b25c3db50476f35074122ae60ee2243e46ab14ea206

diff --git a/app-admin/calamares/calamares-2.4.5.ebuild 
b/app-admin/calamares/calamares-2.4.5.ebuild
deleted file mode 100644
index 476d0a3..
--- a/app-admin/calamares/calamares-2.4.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="http://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
-   KEYWORDS=""
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5]
-

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

2017-01-19 Thread Johannes Huber

commit: 687a09f14cc3274fa400c080a7bd576b93a46005
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Jan 19 17:54:21 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Jan 19 17:54:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=687a09f1

app-admin/calamares: Version 2.4.6

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-admin/calamares/Manifest   |  1 +
 app-admin/calamares/calamares-2.4.6.ebuild | 80 ++
 2 files changed, 81 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 0567d5c..b407262 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
 DIST calamares-2.4.5.tar.gz 2142339 SHA256 
fe924bf951ea64c92a565195330aff87587b9326c6769f5c8a8e4ee67e20bab5 SHA512 
b55ed22f40116e67fe9bea6f1112fa98538f831886b950097465e171390bbef5773f61c374939c7a7a467a721af5e36c9e9845eb419f7cb015e997f82550998c
 WHIRLPOOL 
33e91c774561eb4687eed94dedb7b2708cb0b2c73522d10061c635c9367807c4a01fdc5aee713668f090dfc204c48cd55ba76353af19e2dfff6bfaffccc6f24a
+DIST calamares-2.4.6.tar.gz 2143386 SHA256 
c091ad0db9b69b7552d7f282317ba4a4453d7e5ca7ee4bf98f605fe43c63597e SHA512 
d2ba4675a846095c437231eb1d59f86668f7c65e2f9bda9681cd4de60324b8d8007f4337f8cd93ca71a303812ecdb8c55935805adc8fd25bb98f1e39432be009
 WHIRLPOOL 
b54ac8347604942a00293c23e766142af867ac37dc3e910d93a07fc909eefb70bd9dc7744270320fcda10b25c3db50476f35074122ae60ee2243e46ab14ea206

diff --git a/app-admin/calamares/calamares-2.4.6.ebuild 
b/app-admin/calamares/calamares-2.4.6.ebuild
new file mode 100644
index ..a9c1cec
--- /dev/null
+++ b/app-admin/calamares/calamares-2.4.6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="http://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5]
+   sys-libs/kpmcore:5=
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-fs/udisks:2[systemd]
+   virtual/udev[systemd]
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2016-12-18 Thread Johannes Huber

commit: d2034f8351644cdb842a9db8249f2cabf8daa242
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Dec 18 18:26:39 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Dec 18 18:27:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2034f83

app-admin/calamares: Restrict sys-libs/kpmcore highest version

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-admin/calamares/calamares-2.4.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/calamares/calamares-2.4.5.ebuild 
b/app-admin/calamares/calamares-2.4.5.ebuild
index 71c0873..476d0a3 100644
--- a/app-admin/calamares/calamares-2.4.5.ebuild
+++ b/app-admin/calamares/calamares-2.4.5.ebuild
@@ -38,7 +38,7 @@ DEPEND="${PYTHON_DEPS}
sys-apps/dbus
sys-apps/dmidecode
sys-auth/polkit-qt[qt5]
-   >=sys-libs/kpmcore-2.2.0:5=
+

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

2016-11-28 Thread Johannes Huber

commit: 5f9b7ee275757c218b8002a9a03ea44c0aa18c29
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Nov 28 19:33:30 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Nov 28 19:34:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f9b7ee2

app-admin/calamares: Remove 2.4.4

Package-Manager: portage-2.3.2

 app-admin/calamares/Manifest   |  1 -
 app-admin/calamares/calamares-2.4.4.ebuild | 81 --
 2 files changed, 82 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index e189c31..0567d5c 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
-DIST calamares-2.4.4.tar.gz 2140990 SHA256 
1804356ce1c8f273171c392188e26f3041f4fedb6c959514e49e73cf247e5a7c SHA512 
de74b36acbfe043d8d667a3e4697d6712783353600e93d5dbc7ea9fd27e120f50822c2dee89f9cd6d1115c530d939f63b5fc5c7e9647b1d27b18089b67a184ff
 WHIRLPOOL 
c2fc201ef14eb37c16d3fd7f540043ce19a22ebe8905ef85c3682cc953abf99ca14bd8f13d920105f65903e1cf05aa4ac5cd9503655d3918d2dd7e58a8e45d7b
 DIST calamares-2.4.5.tar.gz 2142339 SHA256 
fe924bf951ea64c92a565195330aff87587b9326c6769f5c8a8e4ee67e20bab5 SHA512 
b55ed22f40116e67fe9bea6f1112fa98538f831886b950097465e171390bbef5773f61c374939c7a7a467a721af5e36c9e9845eb419f7cb015e997f82550998c
 WHIRLPOOL 
33e91c774561eb4687eed94dedb7b2708cb0b2c73522d10061c635c9367807c4a01fdc5aee713668f090dfc204c48cd55ba76353af19e2dfff6bfaffccc6f24a

diff --git a/app-admin/calamares/calamares-2.4.4.ebuild 
b/app-admin/calamares/calamares-2.4.4.ebuild
deleted file mode 100644
index 71c0873..
--- a/app-admin/calamares/calamares-2.4.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="http://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
-   KEYWORDS=""
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5]
-   >=sys-libs/kpmcore-2.2.0:5=
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   sys-fs/udisks:2[systemd]
-   virtual/udev[systemd]
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2016-11-28 Thread Johannes Huber

commit: 82fc80a86a5f215eb88d0641523e038fe6868a5a
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Nov 28 19:32:35 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Nov 28 19:34:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82fc80a8

app-admin/calamares: Version bump 2.4.5

Package-Manager: portage-2.3.2

 app-admin/calamares/Manifest   |  1 +
 app-admin/calamares/calamares-2.4.5.ebuild | 81 ++
 2 files changed, 82 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 0891bff..e189c31 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
 DIST calamares-2.4.4.tar.gz 2140990 SHA256 
1804356ce1c8f273171c392188e26f3041f4fedb6c959514e49e73cf247e5a7c SHA512 
de74b36acbfe043d8d667a3e4697d6712783353600e93d5dbc7ea9fd27e120f50822c2dee89f9cd6d1115c530d939f63b5fc5c7e9647b1d27b18089b67a184ff
 WHIRLPOOL 
c2fc201ef14eb37c16d3fd7f540043ce19a22ebe8905ef85c3682cc953abf99ca14bd8f13d920105f65903e1cf05aa4ac5cd9503655d3918d2dd7e58a8e45d7b
+DIST calamares-2.4.5.tar.gz 2142339 SHA256 
fe924bf951ea64c92a565195330aff87587b9326c6769f5c8a8e4ee67e20bab5 SHA512 
b55ed22f40116e67fe9bea6f1112fa98538f831886b950097465e171390bbef5773f61c374939c7a7a467a721af5e36c9e9845eb419f7cb015e997f82550998c
 WHIRLPOOL 
33e91c774561eb4687eed94dedb7b2708cb0b2c73522d10061c635c9367807c4a01fdc5aee713668f090dfc204c48cd55ba76353af19e2dfff6bfaffccc6f24a

diff --git a/app-admin/calamares/calamares-2.4.5.ebuild 
b/app-admin/calamares/calamares-2.4.5.ebuild
new file mode 100644
index ..71c0873
--- /dev/null
+++ b/app-admin/calamares/calamares-2.4.5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="http://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
+   KEYWORDS=""
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5]
+   >=sys-libs/kpmcore-2.2.0:5=
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-fs/udisks:2[systemd]
+   virtual/udev[systemd]
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2016-11-07 Thread Johannes Huber

commit: 5cdc62b3e78412de8362f9ab7076971bd250cc85
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Nov  7 19:43:11 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Nov  7 19:43:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cdc62b3

app-admin/calamares: Remove 2.4.3

Package-Manager: portage-2.3.2

 app-admin/calamares/Manifest   |  1 -
 app-admin/calamares/calamares-2.4.3.ebuild | 82 --
 2 files changed, 83 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 0eae558..0891bff 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
-DIST calamares-2.4.3.tar.gz 2141015 SHA256 
b4ce2d41feefcfc34d9f14758423307bf3c713f645066cbb028b78df6bba032a SHA512 
7a69ee101fc6ad4356a8ad076e6333a1437dff8e1b66bc746241667c837f0816ee0394d397bf6c4a0c4de50f8cc87bef836ce96e409a8a56c5f52dd1635ddf96
 WHIRLPOOL 
a7b88cb548d5e2eb667b2b9106d20ccf218c85546545b1e1f686fef2e0c0c2cfab79b1b95bb2ec4bcbc88a9705e4879a29d87f8e8cfccb8ece2dd34ee77fce17
 DIST calamares-2.4.4.tar.gz 2140990 SHA256 
1804356ce1c8f273171c392188e26f3041f4fedb6c959514e49e73cf247e5a7c SHA512 
de74b36acbfe043d8d667a3e4697d6712783353600e93d5dbc7ea9fd27e120f50822c2dee89f9cd6d1115c530d939f63b5fc5c7e9647b1d27b18089b67a184ff
 WHIRLPOOL 
c2fc201ef14eb37c16d3fd7f540043ce19a22ebe8905ef85c3682cc953abf99ca14bd8f13d920105f65903e1cf05aa4ac5cd9503655d3918d2dd7e58a8e45d7b

diff --git a/app-admin/calamares/calamares-2.4.3.ebuild 
b/app-admin/calamares/calamares-2.4.3.ebuild
deleted file mode 100644
index 82cbaba..
--- a/app-admin/calamares/calamares-2.4.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="http://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
-   KEYWORDS=""
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5]
-   >=sys-libs/kpmcore-2.2.0:5=
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   sys-apps/gptfdisk
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   sys-fs/udisks:2[systemd]
-   virtual/udev[systemd]
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2016-11-07 Thread Johannes Huber

commit: 67c305d73070fe13b5e7a0da31927aa21da87c01
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Nov  7 19:42:01 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Nov  7 19:43:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67c305d7

app-admin/calamares: Version bump 2.4.4

Package-Manager: portage-2.3.2

 app-admin/calamares/Manifest   |  1 +
 app-admin/calamares/calamares-2.4.4.ebuild | 81 ++
 2 files changed, 82 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index ac97878..560926f 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1,3 @@
 DIST calamares-2.4.2.tar.gz 2137039 SHA256 
4620fd4e9c2d9868e6c20a5c600f123e91080f7ef3a7c6ea55314aa57841b96a SHA512 
152857f256f15ff72c44087baf8d4d9d452c5692e131334dd429f40c0e212eac01178352fd17f4020a128f880d3a91dbd634500384d53752d4313a08de816112
 WHIRLPOOL 
1aa6919a461d5b02a43a4cdbd580a9e7fc9bdc3b048f467f082c4d053c83e5bae5f5777439870828d12153789aac2e4f3b4b6868732dd7c70b0baec3ad4d65c3
 DIST calamares-2.4.3.tar.gz 2141015 SHA256 
b4ce2d41feefcfc34d9f14758423307bf3c713f645066cbb028b78df6bba032a SHA512 
7a69ee101fc6ad4356a8ad076e6333a1437dff8e1b66bc746241667c837f0816ee0394d397bf6c4a0c4de50f8cc87bef836ce96e409a8a56c5f52dd1635ddf96
 WHIRLPOOL 
a7b88cb548d5e2eb667b2b9106d20ccf218c85546545b1e1f686fef2e0c0c2cfab79b1b95bb2ec4bcbc88a9705e4879a29d87f8e8cfccb8ece2dd34ee77fce17
+DIST calamares-2.4.4.tar.gz 2140990 SHA256 
1804356ce1c8f273171c392188e26f3041f4fedb6c959514e49e73cf247e5a7c SHA512 
de74b36acbfe043d8d667a3e4697d6712783353600e93d5dbc7ea9fd27e120f50822c2dee89f9cd6d1115c530d939f63b5fc5c7e9647b1d27b18089b67a184ff
 WHIRLPOOL 
c2fc201ef14eb37c16d3fd7f540043ce19a22ebe8905ef85c3682cc953abf99ca14bd8f13d920105f65903e1cf05aa4ac5cd9503655d3918d2dd7e58a8e45d7b

diff --git a/app-admin/calamares/calamares-2.4.4.ebuild 
b/app-admin/calamares/calamares-2.4.4.ebuild
new file mode 100644
index ..71c0873
--- /dev/null
+++ b/app-admin/calamares/calamares-2.4.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="http://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
+   KEYWORDS=""
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5]
+   >=sys-libs/kpmcore-2.2.0:5=
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-fs/udisks:2[systemd]
+   virtual/udev[systemd]
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2016-11-07 Thread Johannes Huber

commit: faba771f0a6ad184dbb1a622399805036110c8d3
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Nov  7 19:42:32 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Nov  7 19:43:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faba771f

app-admin/calamares: Remove 2.4.2

Package-Manager: portage-2.3.2

 app-admin/calamares/Manifest   |  1 -
 app-admin/calamares/calamares-2.4.2.ebuild | 82 --
 2 files changed, 83 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 560926f..0eae558 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,3 +1,2 @@
-DIST calamares-2.4.2.tar.gz 2137039 SHA256 
4620fd4e9c2d9868e6c20a5c600f123e91080f7ef3a7c6ea55314aa57841b96a SHA512 
152857f256f15ff72c44087baf8d4d9d452c5692e131334dd429f40c0e212eac01178352fd17f4020a128f880d3a91dbd634500384d53752d4313a08de816112
 WHIRLPOOL 
1aa6919a461d5b02a43a4cdbd580a9e7fc9bdc3b048f467f082c4d053c83e5bae5f5777439870828d12153789aac2e4f3b4b6868732dd7c70b0baec3ad4d65c3
 DIST calamares-2.4.3.tar.gz 2141015 SHA256 
b4ce2d41feefcfc34d9f14758423307bf3c713f645066cbb028b78df6bba032a SHA512 
7a69ee101fc6ad4356a8ad076e6333a1437dff8e1b66bc746241667c837f0816ee0394d397bf6c4a0c4de50f8cc87bef836ce96e409a8a56c5f52dd1635ddf96
 WHIRLPOOL 
a7b88cb548d5e2eb667b2b9106d20ccf218c85546545b1e1f686fef2e0c0c2cfab79b1b95bb2ec4bcbc88a9705e4879a29d87f8e8cfccb8ece2dd34ee77fce17
 DIST calamares-2.4.4.tar.gz 2140990 SHA256 
1804356ce1c8f273171c392188e26f3041f4fedb6c959514e49e73cf247e5a7c SHA512 
de74b36acbfe043d8d667a3e4697d6712783353600e93d5dbc7ea9fd27e120f50822c2dee89f9cd6d1115c530d939f63b5fc5c7e9647b1d27b18089b67a184ff
 WHIRLPOOL 
c2fc201ef14eb37c16d3fd7f540043ce19a22ebe8905ef85c3682cc953abf99ca14bd8f13d920105f65903e1cf05aa4ac5cd9503655d3918d2dd7e58a8e45d7b

diff --git a/app-admin/calamares/calamares-2.4.2.ebuild 
b/app-admin/calamares/calamares-2.4.2.ebuild
deleted file mode 100644
index 82cbaba..
--- a/app-admin/calamares/calamares-2.4.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="http://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
-   KEYWORDS=""
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5]
-   >=sys-libs/kpmcore-2.2.0:5=
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   sys-apps/gptfdisk
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   sys-fs/udisks:2[systemd]
-   virtual/udev[systemd]
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2016-11-01 Thread Johannes Huber

commit: 7423275dc27751b54118da979d646ad662fcdc36
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Nov  1 21:12:05 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Nov  1 21:12:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7423275d

app-admin/calamares: Remove 2.4.1

Package-Manager: portage-2.3.2

 app-admin/calamares/Manifest   |  1 -
 app-admin/calamares/calamares-2.4.1.ebuild | 82 --
 2 files changed, 83 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index da5b49e..ac97878 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,3 +1,2 @@
-DIST calamares-2.4.1.tar.gz 2135702 SHA256 
ab1ea9c57bfeccea1282813fa67d3ee97ee03f8673af002c13fdda8dc75ef028 SHA512 
8720c04cdd6ccc8f18f4a81e9ae213aa1e049f5bcd0af2521161b1adb9faebb217a6a06a30ca37ee7096b200984f271863752cca29f5225196f0306a8ef2ec2c
 WHIRLPOOL 
12be30182b2d2c1c959743d84a0212a9db8ae93ad93c1e377e359a54617914183008b5a4ad6cedce482968bf7b71faa87097c21b8358b3d09ff9258de9223e1a
 DIST calamares-2.4.2.tar.gz 2137039 SHA256 
4620fd4e9c2d9868e6c20a5c600f123e91080f7ef3a7c6ea55314aa57841b96a SHA512 
152857f256f15ff72c44087baf8d4d9d452c5692e131334dd429f40c0e212eac01178352fd17f4020a128f880d3a91dbd634500384d53752d4313a08de816112
 WHIRLPOOL 
1aa6919a461d5b02a43a4cdbd580a9e7fc9bdc3b048f467f082c4d053c83e5bae5f5777439870828d12153789aac2e4f3b4b6868732dd7c70b0baec3ad4d65c3
 DIST calamares-2.4.3.tar.gz 2141015 SHA256 
b4ce2d41feefcfc34d9f14758423307bf3c713f645066cbb028b78df6bba032a SHA512 
7a69ee101fc6ad4356a8ad076e6333a1437dff8e1b66bc746241667c837f0816ee0394d397bf6c4a0c4de50f8cc87bef836ce96e409a8a56c5f52dd1635ddf96
 WHIRLPOOL 
a7b88cb548d5e2eb667b2b9106d20ccf218c85546545b1e1f686fef2e0c0c2cfab79b1b95bb2ec4bcbc88a9705e4879a29d87f8e8cfccb8ece2dd34ee77fce17

diff --git a/app-admin/calamares/calamares-2.4.1.ebuild 
b/app-admin/calamares/calamares-2.4.1.ebuild
deleted file mode 100644
index 82cbaba..
--- a/app-admin/calamares/calamares-2.4.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="http://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
-   KEYWORDS=""
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5]
-   >=sys-libs/kpmcore-2.2.0:5=
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   sys-apps/gptfdisk
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   sys-fs/udisks:2[systemd]
-   virtual/udev[systemd]
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2016-11-01 Thread Johannes Huber

commit: 97096aa781cf8ea1e6ee730c3cb8657e89eaa9ad
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Nov  1 21:11:20 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Nov  1 21:12:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97096aa7

app-admin/calamares: Version bump 2.4.3

Package-Manager: portage-2.3.2

 app-admin/calamares/Manifest   |  1 +
 app-admin/calamares/calamares-2.4.3.ebuild | 82 ++
 2 files changed, 83 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 367e7ba..da5b49e 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1,3 @@
 DIST calamares-2.4.1.tar.gz 2135702 SHA256 
ab1ea9c57bfeccea1282813fa67d3ee97ee03f8673af002c13fdda8dc75ef028 SHA512 
8720c04cdd6ccc8f18f4a81e9ae213aa1e049f5bcd0af2521161b1adb9faebb217a6a06a30ca37ee7096b200984f271863752cca29f5225196f0306a8ef2ec2c
 WHIRLPOOL 
12be30182b2d2c1c959743d84a0212a9db8ae93ad93c1e377e359a54617914183008b5a4ad6cedce482968bf7b71faa87097c21b8358b3d09ff9258de9223e1a
 DIST calamares-2.4.2.tar.gz 2137039 SHA256 
4620fd4e9c2d9868e6c20a5c600f123e91080f7ef3a7c6ea55314aa57841b96a SHA512 
152857f256f15ff72c44087baf8d4d9d452c5692e131334dd429f40c0e212eac01178352fd17f4020a128f880d3a91dbd634500384d53752d4313a08de816112
 WHIRLPOOL 
1aa6919a461d5b02a43a4cdbd580a9e7fc9bdc3b048f467f082c4d053c83e5bae5f5777439870828d12153789aac2e4f3b4b6868732dd7c70b0baec3ad4d65c3
+DIST calamares-2.4.3.tar.gz 2141015 SHA256 
b4ce2d41feefcfc34d9f14758423307bf3c713f645066cbb028b78df6bba032a SHA512 
7a69ee101fc6ad4356a8ad076e6333a1437dff8e1b66bc746241667c837f0816ee0394d397bf6c4a0c4de50f8cc87bef836ce96e409a8a56c5f52dd1635ddf96
 WHIRLPOOL 
a7b88cb548d5e2eb667b2b9106d20ccf218c85546545b1e1f686fef2e0c0c2cfab79b1b95bb2ec4bcbc88a9705e4879a29d87f8e8cfccb8ece2dd34ee77fce17

diff --git a/app-admin/calamares/calamares-2.4.3.ebuild 
b/app-admin/calamares/calamares-2.4.3.ebuild
new file mode 100644
index ..82cbaba
--- /dev/null
+++ b/app-admin/calamares/calamares-2.4.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="http://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
+   KEYWORDS=""
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5]
+   >=sys-libs/kpmcore-2.2.0:5=
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   sys-apps/gptfdisk
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-fs/udisks:2[systemd]
+   virtual/udev[systemd]
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2016-10-17 Thread Johannes Huber

commit: ab27e2e6c5ac34a06cd5112da515fa8718461bd5
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Oct 17 17:56:01 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Oct 17 17:56:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab27e2e6

app-admin/calamares: Remove 2.4

Package-Manager: portage-2.3.2

 app-admin/calamares/Manifest |  1 -
 app-admin/calamares/calamares-2.4.ebuild | 82 
 2 files changed, 83 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 275975e..367e7ba 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,3 +1,2 @@
 DIST calamares-2.4.1.tar.gz 2135702 SHA256 
ab1ea9c57bfeccea1282813fa67d3ee97ee03f8673af002c13fdda8dc75ef028 SHA512 
8720c04cdd6ccc8f18f4a81e9ae213aa1e049f5bcd0af2521161b1adb9faebb217a6a06a30ca37ee7096b200984f271863752cca29f5225196f0306a8ef2ec2c
 WHIRLPOOL 
12be30182b2d2c1c959743d84a0212a9db8ae93ad93c1e377e359a54617914183008b5a4ad6cedce482968bf7b71faa87097c21b8358b3d09ff9258de9223e1a
 DIST calamares-2.4.2.tar.gz 2137039 SHA256 
4620fd4e9c2d9868e6c20a5c600f123e91080f7ef3a7c6ea55314aa57841b96a SHA512 
152857f256f15ff72c44087baf8d4d9d452c5692e131334dd429f40c0e212eac01178352fd17f4020a128f880d3a91dbd634500384d53752d4313a08de816112
 WHIRLPOOL 
1aa6919a461d5b02a43a4cdbd580a9e7fc9bdc3b048f467f082c4d053c83e5bae5f5777439870828d12153789aac2e4f3b4b6868732dd7c70b0baec3ad4d65c3
-DIST calamares-2.4.tar.gz 2134756 SHA256 
5519077c79fe1964dd9bf1ae6aedff202bb3c2e3289398affd7e7946672f7f3e SHA512 
5119f2203358a794a66aa26e052bdd58e0d5197d1dcd5cd7be83a3e3f7c466096221e3f4b0cd89b5205fcbf3c1fe1cd19aea77facae4980a78ef1f7943cbaac2
 WHIRLPOOL 
51a5ccd8403baffc7b1365a456ed807b5f43fc6dc1a789566344c8ef7426e340481dab8707caf836392a84ea4ebb58bd48695cf27d7f2755426f429da8fb

diff --git a/app-admin/calamares/calamares-2.4.ebuild 
b/app-admin/calamares/calamares-2.4.ebuild
deleted file mode 100644
index 82cbaba..
--- a/app-admin/calamares/calamares-2.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="http://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
-   KEYWORDS=""
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5]
-   >=sys-libs/kpmcore-2.2.0:5=
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   sys-apps/gptfdisk
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   sys-fs/udisks:2[systemd]
-   virtual/udev[systemd]
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2016-10-17 Thread Johannes Huber

commit: cba7ebbf52fba32fad39c7460a25a20055a23bcc
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Oct 17 17:54:49 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Oct 17 17:56:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cba7ebbf

app-admin/calamares: Version bump 2.4.2

Package-Manager: portage-2.3.2

 app-admin/calamares/Manifest   |  1 +
 app-admin/calamares/calamares-2.4.2.ebuild | 82 ++
 2 files changed, 83 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 2b7ed55..275975e 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1,3 @@
 DIST calamares-2.4.1.tar.gz 2135702 SHA256 
ab1ea9c57bfeccea1282813fa67d3ee97ee03f8673af002c13fdda8dc75ef028 SHA512 
8720c04cdd6ccc8f18f4a81e9ae213aa1e049f5bcd0af2521161b1adb9faebb217a6a06a30ca37ee7096b200984f271863752cca29f5225196f0306a8ef2ec2c
 WHIRLPOOL 
12be30182b2d2c1c959743d84a0212a9db8ae93ad93c1e377e359a54617914183008b5a4ad6cedce482968bf7b71faa87097c21b8358b3d09ff9258de9223e1a
+DIST calamares-2.4.2.tar.gz 2137039 SHA256 
4620fd4e9c2d9868e6c20a5c600f123e91080f7ef3a7c6ea55314aa57841b96a SHA512 
152857f256f15ff72c44087baf8d4d9d452c5692e131334dd429f40c0e212eac01178352fd17f4020a128f880d3a91dbd634500384d53752d4313a08de816112
 WHIRLPOOL 
1aa6919a461d5b02a43a4cdbd580a9e7fc9bdc3b048f467f082c4d053c83e5bae5f5777439870828d12153789aac2e4f3b4b6868732dd7c70b0baec3ad4d65c3
 DIST calamares-2.4.tar.gz 2134756 SHA256 
5519077c79fe1964dd9bf1ae6aedff202bb3c2e3289398affd7e7946672f7f3e SHA512 
5119f2203358a794a66aa26e052bdd58e0d5197d1dcd5cd7be83a3e3f7c466096221e3f4b0cd89b5205fcbf3c1fe1cd19aea77facae4980a78ef1f7943cbaac2
 WHIRLPOOL 
51a5ccd8403baffc7b1365a456ed807b5f43fc6dc1a789566344c8ef7426e340481dab8707caf836392a84ea4ebb58bd48695cf27d7f2755426f429da8fb

diff --git a/app-admin/calamares/calamares-2.4.2.ebuild 
b/app-admin/calamares/calamares-2.4.2.ebuild
new file mode 100644
index ..82cbaba
--- /dev/null
+++ b/app-admin/calamares/calamares-2.4.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="http://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
+   KEYWORDS=""
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5]
+   >=sys-libs/kpmcore-2.2.0:5=
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   sys-apps/gptfdisk
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-fs/udisks:2[systemd]
+   virtual/udev[systemd]
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2016-10-14 Thread Johannes Huber

commit: ee45f43600433b16afeac15a13f944b875bb07c5
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Oct 14 06:13:07 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Oct 14 06:13:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee45f436

app-admin/calamares: Remove 2.3

Package-Manager: portage-2.3.2

 app-admin/calamares/Manifest |  1 -
 app-admin/calamares/calamares-2.3.ebuild | 82 
 2 files changed, 83 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 0d2b5d9..2b7ed55 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,3 +1,2 @@
-DIST calamares-2.3.tar.gz 2029483 SHA256 
c499a8a8ea1573c6f0323398fb092f8978958202e11c9d339202c35c73276f9f SHA512 
be0b1e328ebd6bddab3a163bf38649fd4f64cfe74213946f00b0d05c76fba870662386328c0ccb7656dc63975a1b28058be7eda56b2cee792fba78443ab6d36e
 WHIRLPOOL 
aa1602aa06a4320f5a263c24e17c322bbdfcd83b7f11012e4b2cec895d6a18cdbf627d82f614ace60c62572374a9fb247216619fa0a4de207e3f8267bf51cd9e
 DIST calamares-2.4.1.tar.gz 2135702 SHA256 
ab1ea9c57bfeccea1282813fa67d3ee97ee03f8673af002c13fdda8dc75ef028 SHA512 
8720c04cdd6ccc8f18f4a81e9ae213aa1e049f5bcd0af2521161b1adb9faebb217a6a06a30ca37ee7096b200984f271863752cca29f5225196f0306a8ef2ec2c
 WHIRLPOOL 
12be30182b2d2c1c959743d84a0212a9db8ae93ad93c1e377e359a54617914183008b5a4ad6cedce482968bf7b71faa87097c21b8358b3d09ff9258de9223e1a
 DIST calamares-2.4.tar.gz 2134756 SHA256 
5519077c79fe1964dd9bf1ae6aedff202bb3c2e3289398affd7e7946672f7f3e SHA512 
5119f2203358a794a66aa26e052bdd58e0d5197d1dcd5cd7be83a3e3f7c466096221e3f4b0cd89b5205fcbf3c1fe1cd19aea77facae4980a78ef1f7943cbaac2
 WHIRLPOOL 
51a5ccd8403baffc7b1365a456ed807b5f43fc6dc1a789566344c8ef7426e340481dab8707caf836392a84ea4ebb58bd48695cf27d7f2755426f429da8fb

diff --git a/app-admin/calamares/calamares-2.3.ebuild 
b/app-admin/calamares/calamares-2.3.ebuild
deleted file mode 100644
index 82cbaba..
--- a/app-admin/calamares/calamares-2.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="http://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
-   KEYWORDS=""
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5]
-   >=sys-libs/kpmcore-2.2.0:5=
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   sys-apps/gptfdisk
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/systemd-boot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   sys-fs/udisks:2[systemd]
-   virtual/udev[systemd]
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2016-10-14 Thread Johannes Huber

commit: b75121ce1f7b96b78f83b31139ef7c5d9456bb74
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Oct 14 06:12:28 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Oct 14 06:13:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b75121ce

app-admin/calamares: Version bump 2.4.1

Package-Manager: portage-2.3.2

 app-admin/calamares/Manifest | 1 +
 app-admin/calamares/calamares-2.3.ebuild | 2 +-
 app-admin/calamares/{calamares-2.3.ebuild => calamares-2.4.1.ebuild} | 2 +-
 app-admin/calamares/calamares-2.4.ebuild | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 0d15120..0d2b5d9 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1,3 @@
 DIST calamares-2.3.tar.gz 2029483 SHA256 
c499a8a8ea1573c6f0323398fb092f8978958202e11c9d339202c35c73276f9f SHA512 
be0b1e328ebd6bddab3a163bf38649fd4f64cfe74213946f00b0d05c76fba870662386328c0ccb7656dc63975a1b28058be7eda56b2cee792fba78443ab6d36e
 WHIRLPOOL 
aa1602aa06a4320f5a263c24e17c322bbdfcd83b7f11012e4b2cec895d6a18cdbf627d82f614ace60c62572374a9fb247216619fa0a4de207e3f8267bf51cd9e
+DIST calamares-2.4.1.tar.gz 2135702 SHA256 
ab1ea9c57bfeccea1282813fa67d3ee97ee03f8673af002c13fdda8dc75ef028 SHA512 
8720c04cdd6ccc8f18f4a81e9ae213aa1e049f5bcd0af2521161b1adb9faebb217a6a06a30ca37ee7096b200984f271863752cca29f5225196f0306a8ef2ec2c
 WHIRLPOOL 
12be30182b2d2c1c959743d84a0212a9db8ae93ad93c1e377e359a54617914183008b5a4ad6cedce482968bf7b71faa87097c21b8358b3d09ff9258de9223e1a
 DIST calamares-2.4.tar.gz 2134756 SHA256 
5519077c79fe1964dd9bf1ae6aedff202bb3c2e3289398affd7e7946672f7f3e SHA512 
5119f2203358a794a66aa26e052bdd58e0d5197d1dcd5cd7be83a3e3f7c466096221e3f4b0cd89b5205fcbf3c1fe1cd19aea77facae4980a78ef1f7943cbaac2
 WHIRLPOOL 
51a5ccd8403baffc7b1365a456ed807b5f43fc6dc1a789566344c8ef7426e340481dab8707caf836392a84ea4ebb58bd48695cf27d7f2755426f429da8fb

diff --git a/app-admin/calamares/calamares-2.3.ebuild 
b/app-admin/calamares/calamares-2.3.ebuild
index 4a10aeb..82cbaba 100644
--- a/app-admin/calamares/calamares-2.3.ebuild
+++ b/app-admin/calamares/calamares-2.3.ebuild
@@ -47,7 +47,7 @@ RDEPEND="${DEPEND}
net-misc/rsync
sys-apps/gptfdisk
>=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/gummiboot )
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
sys-boot/os-prober
sys-fs/squashfs-tools
sys-fs/udisks:2[systemd]

diff --git a/app-admin/calamares/calamares-2.3.ebuild 
b/app-admin/calamares/calamares-2.4.1.ebuild
similarity index 97%
copy from app-admin/calamares/calamares-2.3.ebuild
copy to app-admin/calamares/calamares-2.4.1.ebuild
index 4a10aeb..82cbaba 100644
--- a/app-admin/calamares/calamares-2.3.ebuild
+++ b/app-admin/calamares/calamares-2.4.1.ebuild
@@ -47,7 +47,7 @@ RDEPEND="${DEPEND}
net-misc/rsync
sys-apps/gptfdisk
>=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/gummiboot )
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
sys-boot/os-prober
sys-fs/squashfs-tools
sys-fs/udisks:2[systemd]

diff --git a/app-admin/calamares/calamares-2.4.ebuild 
b/app-admin/calamares/calamares-2.4.ebuild
index 4a10aeb..82cbaba 100644
--- a/app-admin/calamares/calamares-2.4.ebuild
+++ b/app-admin/calamares/calamares-2.4.ebuild
@@ -47,7 +47,7 @@ RDEPEND="${DEPEND}
net-misc/rsync
sys-apps/gptfdisk
>=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/gummiboot )
+   || ( sys-boot/grub:2 sys-boot/systemd-boot )
sys-boot/os-prober
sys-fs/squashfs-tools
sys-fs/udisks:2[systemd]

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

2016-08-28 Thread Johannes Huber

commit: 58c4367d87930570fd1bc5c0533921fdde6cd1a6
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Aug 28 16:36:10 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Aug 28 16:36:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58c4367d

app-admin/calamares: Remove 2.2.3

Package-Manager: portage-2.3.0

 app-admin/calamares/Manifest   |  1 -
 app-admin/calamares/calamares-2.2.3.ebuild | 82 --
 2 files changed, 83 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index cf8c92d..0d15120 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,3 +1,2 @@
-DIST calamares-2.2.3.tar.gz 2016706 SHA256 
29478a25db155ba2eb9294d626d9b1f22961d3009e0f850ba039595c33c2ef4b SHA512 
a13827b890a39684ff7233c19f2ff0e18f5efb7fb5c9b6ff38da9db6c454ec03c9c356ac0edebcc4598e95100a3aae51c3d7980e593e19642aa306cbe64bcc21
 WHIRLPOOL 
6547eb29714009afc8ba9b9810d02b5e88b460d2e3f62befa8e2f23115d73ebc70bb597bec96baa9d13d924a1ab05aadbdc60db39d5df05c7616c1a7c41ce4cf
 DIST calamares-2.3.tar.gz 2029483 SHA256 
c499a8a8ea1573c6f0323398fb092f8978958202e11c9d339202c35c73276f9f SHA512 
be0b1e328ebd6bddab3a163bf38649fd4f64cfe74213946f00b0d05c76fba870662386328c0ccb7656dc63975a1b28058be7eda56b2cee792fba78443ab6d36e
 WHIRLPOOL 
aa1602aa06a4320f5a263c24e17c322bbdfcd83b7f11012e4b2cec895d6a18cdbf627d82f614ace60c62572374a9fb247216619fa0a4de207e3f8267bf51cd9e
 DIST calamares-2.4.tar.gz 2134756 SHA256 
5519077c79fe1964dd9bf1ae6aedff202bb3c2e3289398affd7e7946672f7f3e SHA512 
5119f2203358a794a66aa26e052bdd58e0d5197d1dcd5cd7be83a3e3f7c466096221e3f4b0cd89b5205fcbf3c1fe1cd19aea77facae4980a78ef1f7943cbaac2
 WHIRLPOOL 
51a5ccd8403baffc7b1365a456ed807b5f43fc6dc1a789566344c8ef7426e340481dab8707caf836392a84ea4ebb58bd48695cf27d7f2755426f429da8fb

diff --git a/app-admin/calamares/calamares-2.2.3.ebuild 
b/app-admin/calamares/calamares-2.2.3.ebuild
deleted file mode 100644
index d95d1f4..
--- a/app-admin/calamares/calamares-2.2.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="http://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
-   KEYWORDS=""
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5]
-   >=sys-libs/kpmcore-2.1.0:5=
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   sys-apps/gptfdisk
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/gummiboot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   sys-fs/udisks:2[systemd]
-   virtual/udev[systemd]
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2016-08-28 Thread Johannes Huber

commit: 1300fc2bd97ba045df11dc8daaeae31dda8ebb39
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Aug 28 16:34:03 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Aug 28 16:34:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1300fc2b

app-admin/calamares: Version bump 2.4

Package-Manager: portage-2.3.0

 app-admin/calamares/Manifest |  1 +
 app-admin/calamares/calamares-2.4.ebuild | 82 
 2 files changed, 83 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index f9d8313..cf8c92d 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1,3 @@
 DIST calamares-2.2.3.tar.gz 2016706 SHA256 
29478a25db155ba2eb9294d626d9b1f22961d3009e0f850ba039595c33c2ef4b SHA512 
a13827b890a39684ff7233c19f2ff0e18f5efb7fb5c9b6ff38da9db6c454ec03c9c356ac0edebcc4598e95100a3aae51c3d7980e593e19642aa306cbe64bcc21
 WHIRLPOOL 
6547eb29714009afc8ba9b9810d02b5e88b460d2e3f62befa8e2f23115d73ebc70bb597bec96baa9d13d924a1ab05aadbdc60db39d5df05c7616c1a7c41ce4cf
 DIST calamares-2.3.tar.gz 2029483 SHA256 
c499a8a8ea1573c6f0323398fb092f8978958202e11c9d339202c35c73276f9f SHA512 
be0b1e328ebd6bddab3a163bf38649fd4f64cfe74213946f00b0d05c76fba870662386328c0ccb7656dc63975a1b28058be7eda56b2cee792fba78443ab6d36e
 WHIRLPOOL 
aa1602aa06a4320f5a263c24e17c322bbdfcd83b7f11012e4b2cec895d6a18cdbf627d82f614ace60c62572374a9fb247216619fa0a4de207e3f8267bf51cd9e
+DIST calamares-2.4.tar.gz 2134756 SHA256 
5519077c79fe1964dd9bf1ae6aedff202bb3c2e3289398affd7e7946672f7f3e SHA512 
5119f2203358a794a66aa26e052bdd58e0d5197d1dcd5cd7be83a3e3f7c466096221e3f4b0cd89b5205fcbf3c1fe1cd19aea77facae4980a78ef1f7943cbaac2
 WHIRLPOOL 
51a5ccd8403baffc7b1365a456ed807b5f43fc6dc1a789566344c8ef7426e340481dab8707caf836392a84ea4ebb58bd48695cf27d7f2755426f429da8fb

diff --git a/app-admin/calamares/calamares-2.4.ebuild 
b/app-admin/calamares/calamares-2.4.ebuild
new file mode 100644
index ..4a10aeb
--- /dev/null
+++ b/app-admin/calamares/calamares-2.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="http://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
+   KEYWORDS=""
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5]
+   >=sys-libs/kpmcore-2.2.0:5=
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   sys-apps/gptfdisk
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/gummiboot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-fs/udisks:2[systemd]
+   virtual/udev[systemd]
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2016-07-25 Thread Johannes Huber

commit: e8039214ebe591f89b410e835bbf38fd716e4e5a
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Jul 25 22:10:44 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Jul 25 22:10:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8039214

app-admin/calamares: Drop QT_MINIMAL handled by eclass

Package-Manager: portage-2.3.0

 app-admin/calamares/calamares-2.2.3.ebuild | 1 -
 app-admin/calamares/calamares-2.3.ebuild   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app-admin/calamares/calamares-2.2.3.ebuild 
b/app-admin/calamares/calamares-2.2.3.ebuild
index a9cb0d6..d95d1f4 100644
--- a/app-admin/calamares/calamares-2.2.3.ebuild
+++ b/app-admin/calamares/calamares-2.2.3.ebuild
@@ -4,7 +4,6 @@
 
 EAPI=6
 
-QT_MINIMAL="5.6.0"
 PYTHON_COMPAT=( python{3_4,3_5} )
 inherit kde5 python-r1
 

diff --git a/app-admin/calamares/calamares-2.3.ebuild 
b/app-admin/calamares/calamares-2.3.ebuild
index 3265c24..4a10aeb 100644
--- a/app-admin/calamares/calamares-2.3.ebuild
+++ b/app-admin/calamares/calamares-2.3.ebuild
@@ -4,7 +4,6 @@
 
 EAPI=6
 
-QT_MINIMAL="5.6.0"
 PYTHON_COMPAT=( python{3_4,3_5} )
 inherit kde5 python-r1

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

2016-07-01 Thread Johannes Huber

commit: 73b05644b49ae377692ef2c40ff9469643c1807a
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Jul  1 17:20:04 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Jul  1 17:20:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73b05644

app-admin/calamares: Remove 2.2.2 (r1)

Package-Manager: portage-2.3.0

 app-admin/calamares/Manifest  |  1 -
 app-admin/calamares/calamares-2.2.2-r1.ebuild | 83 ---
 2 files changed, 84 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 94d2938..f9d8313 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,3 +1,2 @@
-DIST calamares-2.2.2.tar.gz 2015468 SHA256 
d9cf132ae263a48455596d4a7e522d5199c7717dc9b7f3568cefe588082667a9 SHA512 
f78dc1a4a5fc9911c4ac78f36b3e7ccb7ccf10d690778662871cc6d1010ce0fce295171a949eb6613c42d4c8a3689234138984ec7846d492a5c854f1fe513f38
 WHIRLPOOL 
1f9579acf64813675b076ab3efa2cc31f742cb89d53c15f1103e681af0e988df6ad086c738c56e533744b31d48afdfa2dc2a196328720a89bad557aa43202f27
 DIST calamares-2.2.3.tar.gz 2016706 SHA256 
29478a25db155ba2eb9294d626d9b1f22961d3009e0f850ba039595c33c2ef4b SHA512 
a13827b890a39684ff7233c19f2ff0e18f5efb7fb5c9b6ff38da9db6c454ec03c9c356ac0edebcc4598e95100a3aae51c3d7980e593e19642aa306cbe64bcc21
 WHIRLPOOL 
6547eb29714009afc8ba9b9810d02b5e88b460d2e3f62befa8e2f23115d73ebc70bb597bec96baa9d13d924a1ab05aadbdc60db39d5df05c7616c1a7c41ce4cf
 DIST calamares-2.3.tar.gz 2029483 SHA256 
c499a8a8ea1573c6f0323398fb092f8978958202e11c9d339202c35c73276f9f SHA512 
be0b1e328ebd6bddab3a163bf38649fd4f64cfe74213946f00b0d05c76fba870662386328c0ccb7656dc63975a1b28058be7eda56b2cee792fba78443ab6d36e
 WHIRLPOOL 
aa1602aa06a4320f5a263c24e17c322bbdfcd83b7f11012e4b2cec895d6a18cdbf627d82f614ace60c62572374a9fb247216619fa0a4de207e3f8267bf51cd9e

diff --git a/app-admin/calamares/calamares-2.2.2-r1.ebuild 
b/app-admin/calamares/calamares-2.2.2-r1.ebuild
deleted file mode 100644
index a9cb0d6..000
--- a/app-admin/calamares/calamares-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-QT_MINIMAL="5.6.0"
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="http://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
-   KEYWORDS=""
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5]
-   >=sys-libs/kpmcore-2.1.0:5=
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   sys-apps/gptfdisk
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/gummiboot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   sys-fs/udisks:2[systemd]
-   virtual/udev[systemd]
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2016-07-01 Thread Johannes Huber

commit: d294cca444e8c4e9c681be746deb53e680c75a70
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Jul  1 17:19:21 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Jul  1 17:20:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d294cca4

app-admin/calamares: Version bump 2.3

Package-Manager: portage-2.3.0

 app-admin/calamares/Manifest |  1 +
 app-admin/calamares/calamares-2.3.ebuild | 83 
 2 files changed, 84 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 1c1e5d6..94d2938 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1,3 @@
 DIST calamares-2.2.2.tar.gz 2015468 SHA256 
d9cf132ae263a48455596d4a7e522d5199c7717dc9b7f3568cefe588082667a9 SHA512 
f78dc1a4a5fc9911c4ac78f36b3e7ccb7ccf10d690778662871cc6d1010ce0fce295171a949eb6613c42d4c8a3689234138984ec7846d492a5c854f1fe513f38
 WHIRLPOOL 
1f9579acf64813675b076ab3efa2cc31f742cb89d53c15f1103e681af0e988df6ad086c738c56e533744b31d48afdfa2dc2a196328720a89bad557aa43202f27
 DIST calamares-2.2.3.tar.gz 2016706 SHA256 
29478a25db155ba2eb9294d626d9b1f22961d3009e0f850ba039595c33c2ef4b SHA512 
a13827b890a39684ff7233c19f2ff0e18f5efb7fb5c9b6ff38da9db6c454ec03c9c356ac0edebcc4598e95100a3aae51c3d7980e593e19642aa306cbe64bcc21
 WHIRLPOOL 
6547eb29714009afc8ba9b9810d02b5e88b460d2e3f62befa8e2f23115d73ebc70bb597bec96baa9d13d924a1ab05aadbdc60db39d5df05c7616c1a7c41ce4cf
+DIST calamares-2.3.tar.gz 2029483 SHA256 
c499a8a8ea1573c6f0323398fb092f8978958202e11c9d339202c35c73276f9f SHA512 
be0b1e328ebd6bddab3a163bf38649fd4f64cfe74213946f00b0d05c76fba870662386328c0ccb7656dc63975a1b28058be7eda56b2cee792fba78443ab6d36e
 WHIRLPOOL 
aa1602aa06a4320f5a263c24e17c322bbdfcd83b7f11012e4b2cec895d6a18cdbf627d82f614ace60c62572374a9fb247216619fa0a4de207e3f8267bf51cd9e

diff --git a/app-admin/calamares/calamares-2.3.ebuild 
b/app-admin/calamares/calamares-2.3.ebuild
new file mode 100644
index 000..3265c24
--- /dev/null
+++ b/app-admin/calamares/calamares-2.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+QT_MINIMAL="5.6.0"
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="http://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
+   KEYWORDS=""
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5]
+   >=sys-libs/kpmcore-2.2.0:5=
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   sys-apps/gptfdisk
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/gummiboot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-fs/udisks:2[systemd]
+   virtual/udev[systemd]
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2016-06-06 Thread Johannes Huber

commit: b16468d2e4bf6763477d6063f0345a49ac3ecd55
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Jun  6 18:39:59 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Jun  6 18:40:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b16468d2

app-admin/calamares: Remove 2.2.2 (r0)

Package-Manager: portage-2.3.0_rc1

 app-admin/calamares/calamares-2.2.2.ebuild | 83 --
 1 file changed, 83 deletions(-)

diff --git a/app-admin/calamares/calamares-2.2.2.ebuild 
b/app-admin/calamares/calamares-2.2.2.ebuild
deleted file mode 100644
index c228134..000
--- a/app-admin/calamares/calamares-2.2.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-QT_MINIMAL="5.6.0"
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="http://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
-   KEYWORDS=""
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5]
-   >=sys-libs/kpmcore-2.1.0:5
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   sys-apps/gptfdisk
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/gummiboot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   sys-fs/udisks:2[systemd]
-   virtual/udev[systemd]
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2016-06-06 Thread Johannes Huber

commit: 481c33529613030b19adbb799883cb75e2802007
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Jun  6 18:39:08 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Jun  6 18:40:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=481c3352

app-admin/calamares: Version bump 2.2.3

Package-Manager: portage-2.3.0_rc1

 app-admin/calamares/Manifest   |  1 +
 app-admin/calamares/calamares-2.2.3.ebuild | 83 ++
 2 files changed, 84 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 8168b92..1c1e5d6 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
 DIST calamares-2.2.2.tar.gz 2015468 SHA256 
d9cf132ae263a48455596d4a7e522d5199c7717dc9b7f3568cefe588082667a9 SHA512 
f78dc1a4a5fc9911c4ac78f36b3e7ccb7ccf10d690778662871cc6d1010ce0fce295171a949eb6613c42d4c8a3689234138984ec7846d492a5c854f1fe513f38
 WHIRLPOOL 
1f9579acf64813675b076ab3efa2cc31f742cb89d53c15f1103e681af0e988df6ad086c738c56e533744b31d48afdfa2dc2a196328720a89bad557aa43202f27
+DIST calamares-2.2.3.tar.gz 2016706 SHA256 
29478a25db155ba2eb9294d626d9b1f22961d3009e0f850ba039595c33c2ef4b SHA512 
a13827b890a39684ff7233c19f2ff0e18f5efb7fb5c9b6ff38da9db6c454ec03c9c356ac0edebcc4598e95100a3aae51c3d7980e593e19642aa306cbe64bcc21
 WHIRLPOOL 
6547eb29714009afc8ba9b9810d02b5e88b460d2e3f62befa8e2f23115d73ebc70bb597bec96baa9d13d924a1ab05aadbdc60db39d5df05c7616c1a7c41ce4cf

diff --git a/app-admin/calamares/calamares-2.2.3.ebuild 
b/app-admin/calamares/calamares-2.2.3.ebuild
new file mode 100644
index 000..a9cb0d6
--- /dev/null
+++ b/app-admin/calamares/calamares-2.2.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+QT_MINIMAL="5.6.0"
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="http://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
+   KEYWORDS=""
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5]
+   >=sys-libs/kpmcore-2.1.0:5=
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   sys-apps/gptfdisk
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/gummiboot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-fs/udisks:2[systemd]
+   virtual/udev[systemd]
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2016-05-22 Thread Johannes Huber

commit: b7d201a999c90cabe84077a2a5a56af7d1890006
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun May 22 18:44:30 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun May 22 19:09:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7d201a9

app-admin/calamares: Use subslot on sys-libs/kpmcore

Package-Manager: portage-2.3.0_rc1

 app-admin/calamares/calamares-2.2.2-r1.ebuild | 83 +++
 1 file changed, 83 insertions(+)

diff --git a/app-admin/calamares/calamares-2.2.2-r1.ebuild 
b/app-admin/calamares/calamares-2.2.2-r1.ebuild
new file mode 100644
index 000..a9cb0d6
--- /dev/null
+++ b/app-admin/calamares/calamares-2.2.2-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+QT_MINIMAL="5.6.0"
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="http://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
+   KEYWORDS=""
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5]
+   >=sys-libs/kpmcore-2.1.0:5=
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   sys-apps/gptfdisk
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/gummiboot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-fs/udisks:2[systemd]
+   virtual/udev[systemd]
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2016-05-15 Thread Johannes Huber

commit: dd4485cff5aaa36bd3f8ee4c8b492b6c719c5b48
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun May 15 11:39:59 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun May 15 11:39:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd4485cf

app-admin/calamares: Remove 2.2.1

Package-Manager: portage-2.2.28

 app-admin/calamares/Manifest   |  1 -
 app-admin/calamares/calamares-2.2.1.ebuild | 83 --
 2 files changed, 84 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 4bc0e78..8168b92 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
-DIST calamares-2.2.1.tar.gz 4733060 SHA256 
1775444f286b37994a6970e878db09bf48dfa687c57435eed05c27d3064f34fa SHA512 
f6864277857cef616598526936ee91b01245aac8c4fa67cbb69bf365523177d0042c46846af4116496974d74672582a7b6b6b925a9da0aa7819ad6b238ec7980
 WHIRLPOOL 
0ddc38a2c8ac06892e0dbee2117e100479c28548fed792c9be9ccc547fb49247cc4c69fd88e5d503786ba93d1a1f28ef84979c2a32a97c5fb94a3952f29e9535
 DIST calamares-2.2.2.tar.gz 2015468 SHA256 
d9cf132ae263a48455596d4a7e522d5199c7717dc9b7f3568cefe588082667a9 SHA512 
f78dc1a4a5fc9911c4ac78f36b3e7ccb7ccf10d690778662871cc6d1010ce0fce295171a949eb6613c42d4c8a3689234138984ec7846d492a5c854f1fe513f38
 WHIRLPOOL 
1f9579acf64813675b076ab3efa2cc31f742cb89d53c15f1103e681af0e988df6ad086c738c56e533744b31d48afdfa2dc2a196328720a89bad557aa43202f27

diff --git a/app-admin/calamares/calamares-2.2.1.ebuild 
b/app-admin/calamares/calamares-2.2.1.ebuild
deleted file mode 100644
index c228134..000
--- a/app-admin/calamares/calamares-2.2.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-QT_MINIMAL="5.6.0"
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="http://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
-   KEYWORDS=""
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebengine 'widgets')
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5]
-   >=sys-libs/kpmcore-2.1.0:5
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   sys-apps/gptfdisk
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/gummiboot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   sys-fs/udisks:2[systemd]
-   virtual/udev[systemd]
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWEBVIEW_FORCE_WEBKIT=OFF
-   )
-
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2016-05-15 Thread Johannes Huber

commit: 3e5c34b1697a929b72682992c01326a7f6355c6c
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun May 15 11:39:13 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun May 15 11:39:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e5c34b1

app-admin/calamares: Version bump 2.2.2

Package-Manager: portage-2.2.28

 app-admin/calamares/Manifest   |  1 +
 app-admin/calamares/calamares-2.2.2.ebuild | 83 ++
 2 files changed, 84 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index c2e3aa9..4bc0e78 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
 DIST calamares-2.2.1.tar.gz 4733060 SHA256 
1775444f286b37994a6970e878db09bf48dfa687c57435eed05c27d3064f34fa SHA512 
f6864277857cef616598526936ee91b01245aac8c4fa67cbb69bf365523177d0042c46846af4116496974d74672582a7b6b6b925a9da0aa7819ad6b238ec7980
 WHIRLPOOL 
0ddc38a2c8ac06892e0dbee2117e100479c28548fed792c9be9ccc547fb49247cc4c69fd88e5d503786ba93d1a1f28ef84979c2a32a97c5fb94a3952f29e9535
+DIST calamares-2.2.2.tar.gz 2015468 SHA256 
d9cf132ae263a48455596d4a7e522d5199c7717dc9b7f3568cefe588082667a9 SHA512 
f78dc1a4a5fc9911c4ac78f36b3e7ccb7ccf10d690778662871cc6d1010ce0fce295171a949eb6613c42d4c8a3689234138984ec7846d492a5c854f1fe513f38
 WHIRLPOOL 
1f9579acf64813675b076ab3efa2cc31f742cb89d53c15f1103e681af0e988df6ad086c738c56e533744b31d48afdfa2dc2a196328720a89bad557aa43202f27

diff --git a/app-admin/calamares/calamares-2.2.2.ebuild 
b/app-admin/calamares/calamares-2.2.2.ebuild
new file mode 100644
index 000..c228134
--- /dev/null
+++ b/app-admin/calamares/calamares-2.2.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+QT_MINIMAL="5.6.0"
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="http://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
+   KEYWORDS=""
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5]
+   >=sys-libs/kpmcore-2.1.0:5
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   sys-apps/gptfdisk
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/gummiboot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-fs/udisks:2[systemd]
+   virtual/udev[systemd]
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   )
+
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2016-04-25 Thread Johannes Huber

commit: 7ef33fac334b797ea96be7f17f003a045f82409e
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Apr 25 15:48:05 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Apr 25 15:48:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ef33fac

app-admin/calamares: Use qtwebengine

Package-Manager: portage-2.2.28

 app-admin/calamares/calamares-2.2.1.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app-admin/calamares/calamares-2.2.1.ebuild 
b/app-admin/calamares/calamares-2.2.1.ebuild
index 221ae71..c228134 100644
--- a/app-admin/calamares/calamares-2.2.1.ebuild
+++ b/app-admin/calamares/calamares-2.2.1.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=6
 
+QT_MINIMAL="5.6.0"
 PYTHON_COMPAT=( python{3_4,3_5} )
 inherit kde5 python-r1
 
@@ -31,7 +32,7 @@ DEPEND="${PYTHON_DEPS}
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtsvg)
-   $(add_qt_dep qtwebkit)
+   $(add_qt_dep qtwebengine 'widgets')
$(add_qt_dep qtwidgets)
>=dev-cpp/yaml-cpp-0.5.1
>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
@@ -67,7 +68,10 @@ src_prepare() {
 }
 
 src_configure() {
-   local mycmakeargs=( "-DWITH_PARTITIONMANAGER=1" )
+   local mycmakeargs=(
+   -DWEBVIEW_FORCE_WEBKIT=OFF
+   )
+
kde5_src_configure
sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop

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

2016-04-12 Thread Johannes Huber

commit: 0ec2958458c70c7d210a01902dfefd834726d5de
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Apr 12 17:47:34 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Apr 12 17:48:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ec29584

app-admin/calamares: Pin slot on sys-libs/kpmcore

Package-Manager: portage-2.2.28

 app-admin/calamares/calamares-2.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/calamares/calamares-2.2.1.ebuild 
b/app-admin/calamares/calamares-2.2.1.ebuild
index 04e486e..221ae71 100644
--- a/app-admin/calamares/calamares-2.2.1.ebuild
+++ b/app-admin/calamares/calamares-2.2.1.ebuild
@@ -38,7 +38,7 @@ DEPEND="${PYTHON_DEPS}
sys-apps/dbus
sys-apps/dmidecode
sys-auth/polkit-qt[qt5]
-   >=sys-libs/kpmcore-2.1.0
+   >=sys-libs/kpmcore-2.1.0:5
 "
 
 RDEPEND="${DEPEND}

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

2016-04-10 Thread Johannes Huber

commit: 5d25974014285c6ffa92cb0134d260700be9379a
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Apr 10 19:06:27 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Apr 10 19:06:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d259740

app-admin/calamares: Update dependencies

Package-Manager: portage-2.2.28

 app-admin/calamares/calamares-2.2.1.ebuild | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app-admin/calamares/calamares-2.2.1.ebuild 
b/app-admin/calamares/calamares-2.2.1.ebuild
index 9a0efdd..04e486e 100644
--- a/app-admin/calamares/calamares-2.2.1.ebuild
+++ b/app-admin/calamares/calamares-2.2.1.ebuild
@@ -23,17 +23,15 @@ IUSE="+networkmanager +upower"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kconfig)
$(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep ki18n)
$(add_frameworks_dep kparts)
$(add_frameworks_dep kservice)
-   $(add_frameworks_dep solid)
-   $(add_qt_dep linguist-tools)
$(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
$(add_qt_dep qtgui)
-   $(add_qt_dep qtquick1)
+   $(add_qt_dep qtnetwork)
$(add_qt_dep qtsvg)
+   $(add_qt_dep qtwebkit)
$(add_qt_dep qtwidgets)
>=dev-cpp/yaml-cpp-0.5.1
>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]

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

2016-04-08 Thread Johannes Huber

commit: 051791f1b86007c9701a04ff0e4e8302c43b3dba
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Apr  8 18:21:31 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Apr  8 18:21:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051791f1

app-admin/calamares: Version bump 2.2.1

Package-Manager: portage-2.2.28

 app-admin/calamares/Manifest   |  1 +
 app-admin/calamares/calamares-2.2.1.ebuild | 81 ++
 2 files changed, 82 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 6bb8362f..908ee33 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
+DIST calamares-2.2.1.tar.gz 4733060 SHA256 
1775444f286b37994a6970e878db09bf48dfa687c57435eed05c27d3064f34fa SHA512 
f6864277857cef616598526936ee91b01245aac8c4fa67cbb69bf365523177d0042c46846af4116496974d74672582a7b6b6b925a9da0aa7819ad6b238ec7980
 WHIRLPOOL 
0ddc38a2c8ac06892e0dbee2117e100479c28548fed792c9be9ccc547fb49247cc4c69fd88e5d503786ba93d1a1f28ef84979c2a32a97c5fb94a3952f29e9535
 DIST calamares-2.2.tar.gz 4728472 SHA256 
b75d1462a8a7bd2bdc57ec38bd3b2e0485be573d8af13d05f44df2fc7a7dcaa4 SHA512 
1b612f10cba059f8991d4e0afc06a742495929ae20daf8e57d4bca94b5836cd7cd3f3db1cbf08850c8ed55a7dd5f28f42198b6e40392b3f8cc36e8da55b95ffc
 WHIRLPOOL 
b1aeb6ff5df865c679d080f6482c50c85a6aa75768729c2194a775182f98d8b78627c66e8b49063c8f60bdec1c2f56a1fd627528fbc2a13fe8117d6c933bb212

diff --git a/app-admin/calamares/calamares-2.2.1.ebuild 
b/app-admin/calamares/calamares-2.2.1.ebuild
new file mode 100644
index 000..9a0efdd
--- /dev/null
+++ b/app-admin/calamares/calamares-2.2.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="http://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
+   KEYWORDS=""
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep solid)
+   $(add_qt_dep linguist-tools)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtquick1)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5]
+   >=sys-libs/kpmcore-2.1.0
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   sys-apps/gptfdisk
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/gummiboot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-fs/udisks:2[systemd]
+   virtual/udev[systemd]
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=( "-DWITH_PARTITIONMANAGER=1" )
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2016-04-08 Thread Johannes Huber

commit: be8d4642cce849c6a1202871c3dea4db07739061
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Apr  8 18:21:59 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Apr  8 18:21:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be8d4642

app-admin/calamares: Remove 2.2

Package-Manager: portage-2.2.28

 app-admin/calamares/Manifest |  1 -
 app-admin/calamares/calamares-2.2.ebuild | 81 
 2 files changed, 82 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 908ee33..c2e3aa9 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
 DIST calamares-2.2.1.tar.gz 4733060 SHA256 
1775444f286b37994a6970e878db09bf48dfa687c57435eed05c27d3064f34fa SHA512 
f6864277857cef616598526936ee91b01245aac8c4fa67cbb69bf365523177d0042c46846af4116496974d74672582a7b6b6b925a9da0aa7819ad6b238ec7980
 WHIRLPOOL 
0ddc38a2c8ac06892e0dbee2117e100479c28548fed792c9be9ccc547fb49247cc4c69fd88e5d503786ba93d1a1f28ef84979c2a32a97c5fb94a3952f29e9535
-DIST calamares-2.2.tar.gz 4728472 SHA256 
b75d1462a8a7bd2bdc57ec38bd3b2e0485be573d8af13d05f44df2fc7a7dcaa4 SHA512 
1b612f10cba059f8991d4e0afc06a742495929ae20daf8e57d4bca94b5836cd7cd3f3db1cbf08850c8ed55a7dd5f28f42198b6e40392b3f8cc36e8da55b95ffc
 WHIRLPOOL 
b1aeb6ff5df865c679d080f6482c50c85a6aa75768729c2194a775182f98d8b78627c66e8b49063c8f60bdec1c2f56a1fd627528fbc2a13fe8117d6c933bb212

diff --git a/app-admin/calamares/calamares-2.2.ebuild 
b/app-admin/calamares/calamares-2.2.ebuild
deleted file mode 100644
index 9a0efdd..000
--- a/app-admin/calamares/calamares-2.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="http://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
-   KEYWORDS=""
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_frameworks_dep solid)
-   $(add_qt_dep linguist-tools)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtquick1)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwidgets)
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5]
-   >=sys-libs/kpmcore-2.1.0
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   sys-apps/gptfdisk
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/gummiboot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   sys-fs/udisks:2[systemd]
-   virtual/udev[systemd]
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=( "-DWITH_PARTITIONMANAGER=1" )
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2016-04-07 Thread Johannes Huber

commit: 0c0d012d0bf2f9fb660edda3f9bc6d1c20b693db
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Apr  7 18:35:46 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Apr  7 18:37:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c0d012d

app-admin/calamares: Version bump 2.2

Package-Manager: portage-2.2.28

 app-admin/calamares/Manifest |  1 +
 app-admin/calamares/calamares-2.2.ebuild | 81 
 2 files changed, 82 insertions(+)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 7ae91e5..e3400e6 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
 DIST calamares-2.1.tar.gz 2000234 SHA256 
77bfdc8fe202cd1c068680d41d3df113bd9ee28362aeded63a113bdbaa76d362 SHA512 
3e90376ea7d7cc2d2bf6d7b5efffcd74c486c366964bb25e9d7243a2139f5b04007de28a1c5d60463342ed4ad2beda60360a9f117ab94aee20cb49e3d2202bb6
 WHIRLPOOL 
d8934c6043278f292f1b4dbad14038f9afc66d77bd089fb9258dbb080d2a4a5dddea03a3527a056856413ce8f18d0af8c77287147ffd5e38231a290249d43b22
+DIST calamares-2.2.tar.gz 4728472 SHA256 
b75d1462a8a7bd2bdc57ec38bd3b2e0485be573d8af13d05f44df2fc7a7dcaa4 SHA512 
1b612f10cba059f8991d4e0afc06a742495929ae20daf8e57d4bca94b5836cd7cd3f3db1cbf08850c8ed55a7dd5f28f42198b6e40392b3f8cc36e8da55b95ffc
 WHIRLPOOL 
b1aeb6ff5df865c679d080f6482c50c85a6aa75768729c2194a775182f98d8b78627c66e8b49063c8f60bdec1c2f56a1fd627528fbc2a13fe8117d6c933bb212

diff --git a/app-admin/calamares/calamares-2.2.ebuild 
b/app-admin/calamares/calamares-2.2.ebuild
new file mode 100644
index 000..9a0efdd
--- /dev/null
+++ b/app-admin/calamares/calamares-2.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="http://calamares.io;
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
+   KEYWORDS=""
+else
+   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep solid)
+   $(add_qt_dep linguist-tools)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtquick1)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwidgets)
+   >=dev-cpp/yaml-cpp-0.5.1
+   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+   sys-apps/dbus
+   sys-apps/dmidecode
+   sys-auth/polkit-qt[qt5]
+   >=sys-libs/kpmcore-2.1.0
+"
+
+RDEPEND="${DEPEND}
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   sys-apps/gptfdisk
+   >=sys-block/parted-3.0
+   || ( sys-boot/grub:2 sys-boot/gummiboot )
+   sys-boot/os-prober
+   sys-fs/squashfs-tools
+   sys-fs/udisks:2[systemd]
+   virtual/udev[systemd]
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+"
+
+src_prepare() {
+   python_setup
+   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+  PYTHON_LIBS="$(python_get_LIBS)"
+
+   eapply_user
+}
+
+src_configure() {
+   local mycmakeargs=( "-DWITH_PARTITIONMANAGER=1" )
+   kde5_src_configure
+   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
+   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
+}
+
+src_install() {
+   kde5_src_install
+   dobin "${FILESDIR}"/calamares-pkexec
+}

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

2016-04-07 Thread Johannes Huber

commit: 6b0d13ab6d933b7bf23d8fbbc7a2c3ebf68a0027
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Apr  7 18:37:07 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Apr  7 18:37:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b0d13ab

app-admin/calamares: Remove 2.1

Package-Manager: portage-2.2.28

 app-admin/calamares/Manifest |  1 -
 app-admin/calamares/calamares-2.1.ebuild | 81 
 2 files changed, 82 deletions(-)

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index e3400e6..6bb8362f 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
-DIST calamares-2.1.tar.gz 2000234 SHA256 
77bfdc8fe202cd1c068680d41d3df113bd9ee28362aeded63a113bdbaa76d362 SHA512 
3e90376ea7d7cc2d2bf6d7b5efffcd74c486c366964bb25e9d7243a2139f5b04007de28a1c5d60463342ed4ad2beda60360a9f117ab94aee20cb49e3d2202bb6
 WHIRLPOOL 
d8934c6043278f292f1b4dbad14038f9afc66d77bd089fb9258dbb080d2a4a5dddea03a3527a056856413ce8f18d0af8c77287147ffd5e38231a290249d43b22
 DIST calamares-2.2.tar.gz 4728472 SHA256 
b75d1462a8a7bd2bdc57ec38bd3b2e0485be573d8af13d05f44df2fc7a7dcaa4 SHA512 
1b612f10cba059f8991d4e0afc06a742495929ae20daf8e57d4bca94b5836cd7cd3f3db1cbf08850c8ed55a7dd5f28f42198b6e40392b3f8cc36e8da55b95ffc
 WHIRLPOOL 
b1aeb6ff5df865c679d080f6482c50c85a6aa75768729c2194a775182f98d8b78627c66e8b49063c8f60bdec1c2f56a1fd627528fbc2a13fe8117d6c933bb212

diff --git a/app-admin/calamares/calamares-2.1.ebuild 
b/app-admin/calamares/calamares-2.1.ebuild
deleted file mode 100644
index f7c4b14..000
--- a/app-admin/calamares/calamares-2.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="http://calamares.io;
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-   EGIT_REPO_URI="git://github.com/${PN}/${PN}"
-   KEYWORDS=""
-else
-   
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-   >=dev-cpp/yaml-cpp-0.5.1
-   >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-   $(add_frameworks_dep kconfig)
-   $(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
-   dev-qt/qtgui:5
-   dev-qt/qtquick1:5
-   dev-qt/qtsvg:5
-   dev-qt/qtwidgets:5
-   sys-apps/dbus
-   sys-apps/dmidecode
-   sys-auth/polkit-qt[qt5]
-   >=sys-libs/kpmcore-2.1.0
-"
-
-RDEPEND="${DEPEND}
-   app-admin/sudo
-   dev-libs/libatasmart
-   net-misc/rsync
-   sys-apps/gptfdisk
-   >=sys-block/parted-3.0
-   || ( sys-boot/grub:2 sys-boot/gummiboot )
-   sys-boot/os-prober
-   sys-fs/squashfs-tools
-   sys-fs/udisks:2[systemd]
-   virtual/udev[systemd]
-   networkmanager? ( net-misc/networkmanager )
-   upower? ( sys-power/upower )
-"
-
-src_prepare() {
-   python_setup
-   export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-  PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-  PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-  PYTHON_LIBS="$(python_get_LIBS)"
-
-   eapply_user
-}
-
-src_configure() {
-   local mycmakeargs=( "-DWITH_PARTITIONMANAGER=1" )
-   kde5_src_configure
-   sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' 
"${S}"/calamares.desktop
-   sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' 
"${S}"/calamares.desktop
-}
-
-src_install() {
-   kde5_src_install
-   dobin "${FILESDIR}"/calamares-pkexec
-}

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

2016-03-15 Thread Johannes Huber

commit: be8a82d14c87213de01e326a37de98e27f1edb5c
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Mar 15 16:03:48 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Mar 15 16:03:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be8a82d1

app-admin/calamares: Update python targets

Package-Manager: portage-2.2.28

 app-admin/calamares/calamares-2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/calamares/calamares-2.1.ebuild 
b/app-admin/calamares/calamares-2.1.ebuild
index 73af205..f7c4b14 100644
--- a/app-admin/calamares/calamares-2.1.ebuild
+++ b/app-admin/calamares/calamares-2.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_3,3_4} )
+PYTHON_COMPAT=( python{3_4,3_5} )
 inherit kde5 python-r1
 
 DESCRIPTION="Distribution-independent installer framework"

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

2016-03-13 Thread Johannes Huber

commit: 9e51ef982b6d5ee64385554af86c03a8e9944e0c
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Mar 13 11:11:21 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Mar 13 11:11:21 2016 +
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() {

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

2016-03-12 Thread Johannes Huber

commit: 95fe17899a0b823306910cd1e1d969751b91d8ec
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Mar 12 13:40:11 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Mar 12 13:40:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95fe1789

app-admin/calamares: Drop QT_SELECT

Gentoo-bug: 563496
Reported-by: Michael Palimaka  gentoo.org>

Package-Manager: portage-2.2.28

 app-admin/calamares/calamares-1.1.2-r1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-admin/calamares/calamares-1.1.2-r1.ebuild 
b/app-admin/calamares/calamares-1.1.2-r1.ebuild
index 5f732d8..3d29dd3 100644
--- a/app-admin/calamares/calamares-1.1.2-r1.ebuild
+++ b/app-admin/calamares/calamares-1.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -61,7 +61,6 @@ src_prepare() {
   PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
   PYTHON_CFLAGS="$(python_get_CFLAGS)"\
   PYTHON_LIBS="$(python_get_LIBS)"
-   export QT_SELECT=qt5
 }
 
 src_configure() {

96 matches

Mail list logo