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

2016-10-14 Thread Johannes Huber 
commit: a7176753dbf6a418dd7d00acd137dd5d41c6559b
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Oct 14 06:15:42 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Oct 14 06:15:42 2016 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=a7176753

app-admin/calamares: Fix RDEPEND

Package-Manager: portage-2.3.2

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

diff --git a/app-admin/calamares/calamares-.ebuild 
b/app-admin/calamares/calamares-.ebuild
index 4a10aeb..82cbaba 100644
--- a/app-admin/calamares/calamares-.ebuild
+++ b/app-admin/calamares/calamares-.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] dev/johu:master commit in: app-admin/calamares/

2016-07-25 Thread Johannes Huber 
commit: 544e803a2cb704731d67ea3e132d703bbe46c7f0
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Jul 25 22:13:50 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Jul 25 22:13:50 2016 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=544e803a

app-admin/calamares: Drop QT_MINIMAL handled by eclass

Package-Manager: portage-2.3.0

 app-admin/calamares/calamares-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-admin/calamares/calamares-.ebuild 
b/app-admin/calamares/calamares-.ebuild
index 3265c24..4a10aeb 100644
--- a/app-admin/calamares/calamares-.ebuild
+++ b/app-admin/calamares/calamares-.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] dev/johu:master commit in: app-admin/calamares/

2016-07-01 Thread Johannes Huber 
commit: 8715e0741ed3111862157403a20825604252d039
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Jul  1 17:06:31 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Jul  1 17:06:31 2016 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=8715e074

app-admin/calamares: Require sys-libs/kpmcore-2.2.0

Package-Manager: portage-2.3.0

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

diff --git a/app-admin/calamares/calamares-.ebuild 
b/app-admin/calamares/calamares-.ebuild
index f5f9ace..3265c24 100644
--- a/app-admin/calamares/calamares-.ebuild
+++ b/app-admin/calamares/calamares-.ebuild
@@ -39,7 +39,7 @@ DEPEND="${PYTHON_DEPS}
sys-apps/dbus
sys-apps/dmidecode
sys-auth/polkit-qt[qt5]
-   >=sys-libs/kpmcore-2.1.50:5=
+   >=sys-libs/kpmcore-2.2.0:5=
 "
 
 RDEPEND="${DEPEND}

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

2016-05-22 Thread Johannes Huber 
commit: 950f0ec4dd7b597007717653bb978a863a861b4b
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun May 22 18:39:35 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun May 22 18:39:35 2016 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=950f0ec4

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

Package-Manager: portage-2.3.0_rc1

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

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

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

2016-04-25 Thread Johannes Huber 
commit: bd298c76f93d2ceeeb1bc9cc62da3c2515edec4f
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Apr 25 15:49:47 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Apr 25 15:49:47 2016 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=bd298c76

app-admin/calamares: Use qtwebengine

Package-Manager: portage-2.2.28

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

diff --git a/app-admin/calamares/calamares-.ebuild 
b/app-admin/calamares/calamares-.ebuild
index 221ae71..c228134 100644
--- a/app-admin/calamares/calamares-.ebuild
+++ b/app-admin/calamares/calamares-.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] dev/johu:master commit in: app-admin/calamares/

2016-04-12 Thread Johannes Huber 
commit: 8bb1eb88f6dfbdf4d42296b754935a4f2b4bbe57
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Apr 12 17:48:08 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Apr 12 17:48:08 2016 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=8bb1eb88

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

Package-Manager: portage-2.2.28

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

diff --git a/app-admin/calamares/calamares-.ebuild 
b/app-admin/calamares/calamares-.ebuild
index 04e486e..221ae71 100644
--- a/app-admin/calamares/calamares-.ebuild
+++ b/app-admin/calamares/calamares-.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] dev/johu:master commit in: app-admin/calamares/

2016-04-10 Thread Johannes Huber 
commit: 9ac5691564d399178f5de1eed8abf6653e1cdf45
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Apr 10 19:08:37 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Apr 10 19:08:37 2016 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=9ac56915

app-admin/calamares: Sync with tree

Package-Manager: portage-2.2.28

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

diff --git a/app-admin/calamares/calamares-.ebuild 
b/app-admin/calamares/calamares-.ebuild
index 9a0efdd..04e486e 100644
--- a/app-admin/calamares/calamares-.ebuild
+++ b/app-admin/calamares/calamares-.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] dev/johu:master commit in: app-admin/calamares/

2016-04-07 Thread Johannes Huber 
commit: d59fabfff7ccdb564b8624d4925fb8cc0cec3b27
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Apr  7 18:17:13 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Apr  7 18:17:13 2016 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=d59fabff

app-admin/calamares: Use add_qt_dep

Package-Manager: portage-2.2.28

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

diff --git a/app-admin/calamares/calamares-.ebuild 
b/app-admin/calamares/calamares-.ebuild
index f7c4b14..9a0efdd 100644
--- a/app-admin/calamares/calamares-.ebuild
+++ b/app-admin/calamares/calamares-.ebuild
@@ -23,20 +23,20 @@ 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
+   $(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]

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

2016-03-15 Thread Johannes Huber 
commit: 18536188288d1f980eb7aca32567ed0717f59439
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Mar 15 16:01:42 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Mar 15 16:01:42 2016 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=18536188

app-admin/calamares: Update python targets

Package-Manager: portage-2.2.28

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

diff --git a/app-admin/calamares/calamares-.ebuild 
b/app-admin/calamares/calamares-.ebuild
index 73af205..f7c4b14 100644
--- a/app-admin/calamares/calamares-.ebuild
+++ b/app-admin/calamares/calamares-.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] dev/johu:master commit in: app-admin/calamares/

2016-03-13 Thread Johannes Huber 
commit: 4d1572d951d9ff57ea4d100af709204a3b11a5d6
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Mar 13 11:04:23 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Mar 13 11:04:23 2016 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=4d1572d9

app-admin/calamares: EAPI 6

Package-Manager: portage-2.2.28

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

diff --git a/app-admin/calamares/calamares-.ebuild 
b/app-admin/calamares/calamares-.ebuild
index 3d29dd3..73af205 100644
--- a/app-admin/calamares/calamares-.ebuild
+++ b/app-admin/calamares/calamares-.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] dev/johu:master commit in: app-admin/calamares/

2016-03-12 Thread Johannes Huber 
commit: 491a41b3e50fafb5a0d4ff32c35b6c598d3f4bc2
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Mar 12 13:44:34 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Mar 12 13:44:34 2016 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=491a41b3

app-admin/calamares: Sync with tree

Package-Manager: portage-2.2.28

 app-admin/calamares/calamares-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-admin/calamares/calamares-.ebuild 
b/app-admin/calamares/calamares-.ebuild
index c3cdf2b..3d29dd3 100644
--- a/app-admin/calamares/calamares-.ebuild
+++ b/app-admin/calamares/calamares-.ebuild
@@ -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() {

[gentoo-commits] dev/johu:master commit in: app-admin/calamares/, net-libs/webkit-gtk/, media-sound/tomahawk/, ...

2015-08-08 Thread Johannes Huber 
commit: 5cc426706b8716789dd4ec886d3bbe7c3b158d77
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Sat Aug  8 22:10:02 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Sat Aug  8 22:10:02 2015 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=5cc42670

Update header for the git migration in main tree

 app-admin/calamares/calamares-.ebuild  | 2 +-
 app-emulation/vagrant-bin/vagrant-bin-1.7.4.ebuild | 2 +-
 dev-libs/qtkeychain/qtkeychain-.ebuild | 2 +-
 media-sound/tomahawk/tomahawk-.ebuild  | 2 +-
 net-irc/quassel/files/quasselcore.conf | 4 ++--
 net-irc/quassel/files/quasselcore.init | 2 +-
 net-irc/quassel/quassel-.ebuild| 2 +-
 net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild| 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app-admin/calamares/calamares-.ebuild 
b/app-admin/calamares/calamares-.ebuild
index 069381b..5f732d8 100644
--- a/app-admin/calamares/calamares-.ebuild
+++ b/app-admin/calamares/calamares-.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 

diff --git a/app-emulation/vagrant-bin/vagrant-bin-1.7.4.ebuild 
b/app-emulation/vagrant-bin/vagrant-bin-1.7.4.ebuild
index f6ac165..3b2c9ea 100644
--- a/app-emulation/vagrant-bin/vagrant-bin-1.7.4.ebuild
+++ b/app-emulation/vagrant-bin/vagrant-bin-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 

diff --git a/dev-libs/qtkeychain/qtkeychain-.ebuild 
b/dev-libs/qtkeychain/qtkeychain-.ebuild
index cb23d1e..6902cc9 100644
--- a/dev-libs/qtkeychain/qtkeychain-.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 

diff --git a/media-sound/tomahawk/tomahawk-.ebuild 
b/media-sound/tomahawk/tomahawk-.ebuild
index dbc3200..10d684f 100644
--- a/media-sound/tomahawk/tomahawk-.ebuild
+++ b/media-sound/tomahawk/tomahawk-.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 

diff --git a/net-irc/quassel/files/quasselcore.conf 
b/net-irc/quassel/files/quasselcore.conf
index 6e1304d..3ac5268 100644
--- a/net-irc/quassel/files/quasselcore.conf
+++ b/net-irc/quassel/files/quasselcore.conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 # Loglevel Debug|Info|Warning|Error. Default is: Info
 # The logfile is located at /var/log/quassel.log.
@@ -19,4 +19,4 @@
 #CONFIGDIR=/var/lib/quassel
 
 # File quasselcore will log all its events into.
-#LOGFILE=/var/log/quassel.log
\ No newline at end of file
+#LOGFILE=/var/log/quassel.log

diff --git a/net-irc/quassel/files/quasselcore.init 
b/net-irc/quassel/files/quasselcore.init
index 06d73cb..1cbbc83 100644
--- a/net-irc/quassel/files/quasselcore.init
+++ b/net-irc/quassel/files/quasselcore.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 depend() {
need localmount net

diff --git a/net-irc/quassel/quassel-.ebuild 
b/net-irc/quassel/quassel-.ebuild
index 8f38939..9ce915c 100644
--- a/net-irc/quassel/quassel-.ebuild
+++ b/net-irc/quassel/quassel-.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild 
b/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
index 097e50b..3800e22 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 GCONF_DEBUG=no

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

2015-07-26 Thread Johannes Huber 
commit: c8ab2048d3285cf135a2c5396c2892baf425ce1c
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Sun Jul 26 11:57:41 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Sun Jul 26 11:57:41 2015 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=c8ab2048

[app-admin/calamares] Sync with tree

Package-Manager: portage-2.2.20

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

diff --git a/app-admin/calamares/calamares-.ebuild 
b/app-admin/calamares/calamares-.ebuild
index 45233df..069381b 100644
--- a/app-admin/calamares/calamares-.ebuild
+++ b/app-admin/calamares/calamares-.ebuild
@@ -24,7 +24,7 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 DEPEND=${PYTHON_DEPS}
=dev-cpp/yaml-cpp-0.5.1
-   =dev-libs/boost-1.55[${PYTHON_USEDEP}]
+   =dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
$(add_frameworks_dep kconfig)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kcoreaddons)

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

2015-07-22 Thread Johannes Huber 
commit: 3dfc043a8485841416066a9f235066626b561183
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Wed Jul 22 20:37:39 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Wed Jul 22 20:38:10 2015 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=3dfc043a

[app-admin/calamares] New package

Import ebuild for maintenance from https://github.com/Sabayon/for-gentoo
by Francesco Ferro skullbocks AT dark-lab.net.

Package-Manager: portage-2.2.20

 app-admin/calamares/calamares-.ebuild | 86 +++
 app-admin/calamares/metadata.xml  | 10 
 2 files changed, 96 insertions(+)

diff --git a/app-admin/calamares/calamares-.ebuild 
b/app-admin/calamares/calamares-.ebuild
new file mode 100644
index 000..d12c0d9
--- /dev/null
+++ b/app-admin/calamares/calamares-.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+inherit eutils cmake-utils python-r1
+
+MY_AUTHOR=calamares
+DESCRIPTION=A Distribution-independent installer framework.
+HOMEPAGE=http://${MY_AUTHOR}.io;
+if [[ ${PV} ==  ]] ; then
+   inherit git-r3
+   SRC_URI=
+   EGIT_REPO_URI=git://github.com/${MY_AUTHOR}/${PN}.git
+  https://github.com/${MY_AUTHOR}/${PN}.git;
+   KEYWORDS=
+else
+   inherit git-r3
+   SRC_URI=
+   EGIT_REPO_URI=git://github.com/${MY_AUTHOR}/${PN}.git
+  https://github.com/${MY_AUTHOR}/${PN}.git;
+   EGIT_COMMIT=
+   KEYWORDS=~amd64 ~x86
+fi
+
+LICENSE=GPL-3
+SLOT=0
+IUSE=+networkmanager +upower
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+DEPEND=${PYTHON_DEPS}
+   sys-apps/dbus
+   =dev-qt/qtquick1-5.4.0:5
+   =dev-qt/linguist-tools-5.4.0:5
+   =dev-qt/qtconcurrent-5.4.0:5
+   =dev-qt/qtcore-5.4.0:5
+   =dev-qt/qtdbus-5.4.0:5
+   =dev-qt/qtgui-5.4.0:5
+   =dev-qt/qtsvg-5.4.0:5
+   =dev-qt/qtwidgets-5.4.0:5
+   sys-auth/polkit-qt[qt5]
+   =dev-cpp/yaml-cpp-0.5.1
+   =dev-libs/boost-1.55[${PYTHON_USEDEP}]
+   =kde-frameworks/extra-cmake-modules-5.10.0:5
+   sys-apps/dmidecode
+
+RDEPEND=${DEPEND}
+   =dev-libs/libatasmart-0.19
+   =kde-frameworks/kconfig-5.10.0:5
+   =kde-frameworks/ki18n-5.10.0:5
+   =kde-frameworks/kcoreaddons-5.10.0:5
+   =kde-frameworks/solid-5.10.0:5
+   =sys-block/parted-3.0
+   =sys-apps/gptfdisk-0.8.10
+   sys-fs/udisks:2[systemd]
+   virtual/udev[systemd]
+   || ( sys-boot/grub:2 sys-boot/gummiboot )
+   sys-fs/squashfs-tools
+   networkmanager? ( net-misc/networkmanager )
+   upower? ( sys-power/upower )
+   net-misc/rsync
+   app-admin/sudo
+   sys-boot/os-prober
+
+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)
+   export QT_SELECT=qt5
+}
+
+src_configure() {
+   local mycmakeargs=( -DWITH_PARTITIONMANAGER=1 )
+   cmake-utils_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() {
+   cmake-utils_src_install
+   dobin ${FILESDIR}/calamares-pkexec
+}

diff --git a/app-admin/calamares/metadata.xml b/app-admin/calamares/metadata.xml
new file mode 100644
index 000..1b530c1
--- /dev/null
+++ b/app-admin/calamares/metadata.xml
@@ -0,0 +1,10 @@
+?xml version=1.0 encoding=UTF-8?
+!DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd;
+pkgmetadata
+   herdno-herd/herd
+   maintainer
+   emailj...@gentoo.org/email
+   nameJohannes Huber/name
+   /maintainer
+/pkgmetadata
+

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

2015-07-22 Thread Johannes Huber 
commit: 84db73d31436e01bcbf3e00a5d85fb50382c75c7
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Wed Jul 22 21:33:16 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Wed Jul 22 21:33:16 2015 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=84db73d3

[app-admin/calamares] Update metadata.xml

Package-Manager: portage-2.2.20

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

diff --git a/app-admin/calamares/metadata.xml b/app-admin/calamares/metadata.xml
index 2708661..b719686 100644
--- a/app-admin/calamares/metadata.xml
+++ b/app-admin/calamares/metadata.xml
@@ -1,11 +1,19 @@
 ?xml version=1.0 encoding=UTF-8?
 !DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd;
 pkgmetadata
-   herdno-herd/herd
maintainer
emailj...@gentoo.org/email
nameJohannes Huber/name
/maintainer
+   longdescription
+   Calamares is a distribution-independent system installer, with 
an
+   advanced partitioning feature for both manual and automated
+   partitioning operations. It is the first installer with an 
automated
+   “Replace Partition” option, which makes it easy to reuse a 
partition
+   over and over for distribution testing. Calamares is designed 
to be
+   customizable by distribution maintainers without need for 
cumbersome
+   patching, thanks to third party branding and external modules 
support.
+   /longdescription
upstream
remote-id type=githubcalamares/calamares/remote-id
/upstream

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

2015-07-22 Thread Johannes Huber 
commit: cc241e1f69bd2805a363dac50634fd52c42fd731
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Wed Jul 22 21:23:46 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Wed Jul 22 21:23:46 2015 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=cc241e1f

[app-admin/calamares] Migrate to kde5 eclass

* sort deps
* simplify release/live switch
* update DESCRIPTON
* add missing wrapper script

Package-Manager: portage-2.2.20

 app-admin/calamares/calamares-.ebuild  | 73 +-
 app-admin/calamares/files/calamares-pkexec |  2 +
 2 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/app-admin/calamares/calamares-.ebuild 
b/app-admin/calamares/calamares-.ebuild
index d12c0d9..45233df 100644
--- a/app-admin/calamares/calamares-.ebuild
+++ b/app-admin/calamares/calamares-.ebuild
@@ -5,64 +5,55 @@
 EAPI=5
 
 PYTHON_COMPAT=( python{3_3,3_4} )
-inherit eutils cmake-utils python-r1
+inherit kde5 python-r1
 
-MY_AUTHOR=calamares
-DESCRIPTION=A Distribution-independent installer framework.
-HOMEPAGE=http://${MY_AUTHOR}.io;
-if [[ ${PV} ==  ]] ; then
-   inherit git-r3
-   SRC_URI=
-   EGIT_REPO_URI=git://github.com/${MY_AUTHOR}/${PN}.git
-  https://github.com/${MY_AUTHOR}/${PN}.git;
+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
-   inherit git-r3
-   SRC_URI=
-   EGIT_REPO_URI=git://github.com/${MY_AUTHOR}/${PN}.git
-  https://github.com/${MY_AUTHOR}/${PN}.git;
-   EGIT_COMMIT=
-   KEYWORDS=~amd64 ~x86
+   
SRC_URI=https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+   KEYWORDS=~amd64
 fi
 
 LICENSE=GPL-3
-SLOT=0
 IUSE=+networkmanager +upower
 
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
 DEPEND=${PYTHON_DEPS}
-   sys-apps/dbus
-   =dev-qt/qtquick1-5.4.0:5
-   =dev-qt/linguist-tools-5.4.0:5
-   =dev-qt/qtconcurrent-5.4.0:5
-   =dev-qt/qtcore-5.4.0:5
-   =dev-qt/qtdbus-5.4.0:5
-   =dev-qt/qtgui-5.4.0:5
-   =dev-qt/qtsvg-5.4.0:5
-   =dev-qt/qtwidgets-5.4.0:5
-   sys-auth/polkit-qt[qt5]
=dev-cpp/yaml-cpp-0.5.1
=dev-libs/boost-1.55[${PYTHON_USEDEP}]
-   =kde-frameworks/extra-cmake-modules-5.10.0:5
-   sys-apps/dmidecode
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kcoreaddons)
+   $(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]
+
 
 RDEPEND=${DEPEND}
-   =dev-libs/libatasmart-0.19
-   =kde-frameworks/kconfig-5.10.0:5
-   =kde-frameworks/ki18n-5.10.0:5
-   =kde-frameworks/kcoreaddons-5.10.0:5
-   =kde-frameworks/solid-5.10.0:5
+   app-admin/sudo
+   dev-libs/libatasmart
+   net-misc/rsync
+   sys-apps/gptfdisk
=sys-block/parted-3.0
-   =sys-apps/gptfdisk-0.8.10
-   sys-fs/udisks:2[systemd]
-   virtual/udev[systemd]
|| ( 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 )
-   net-misc/rsync
-   app-admin/sudo
-   sys-boot/os-prober
+
 
 src_prepare() {
python_setup
@@ -75,12 +66,12 @@ src_prepare() {
 
 src_configure() {
local mycmakeargs=( -DWITH_PARTITIONMANAGER=1 )
-   cmake-utils_src_configure
+   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() {
-   cmake-utils_src_install
+   kde5_src_install
dobin ${FILESDIR}/calamares-pkexec
 }

diff --git a/app-admin/calamares/files/calamares-pkexec 
b/app-admin/calamares/files/calamares-pkexec
new file mode 100644
index 000..3300d3b
--- /dev/null
+++ b/app-admin/calamares/files/calamares-pkexec
@@ -0,0 +1,2 @@
+#!/bin/sh
+pkexec /usr/bin/calamares $@

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

2015-07-22 Thread Johannes Huber 
commit: 4a52c6fc3f6c6b5ef697348a8cc350ed52ad5dc3
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Wed Jul 22 20:41:44 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Wed Jul 22 20:41:44 2015 +
URL:https://gitweb.gentoo.org/dev/johu.git/commit/?id=4a52c6fc

[app-admin/calamares] Add github remote id

Package-Manager: portage-2.2.20

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

diff --git a/app-admin/calamares/metadata.xml b/app-admin/calamares/metadata.xml
index 1b530c1..2708661 100644
--- a/app-admin/calamares/metadata.xml
+++ b/app-admin/calamares/metadata.xml
@@ -6,5 +6,8 @@
emailj...@gentoo.org/email
nameJohannes Huber/name
/maintainer
+   upstream
+   remote-id type=githubcalamares/calamares/remote-id
+   /upstream
 /pkgmetadata