public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/johu:master commit in: app-admin/calamares/
@ 2015-07-22 20:37 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2015-07-22 20:37 UTC (permalink / raw
  To: gentoo-commits

commit:     3dfc043a8485841416066a9f235066626b561183
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 22 20:37:39 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jul 22 20:38:10 2015 +0000
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-9999.ebuild | 86 +++++++++++++++++++++++++++++++
 app-admin/calamares/metadata.xml          | 10 ++++
 2 files changed, 96 insertions(+)

diff --git a/app-admin/calamares/calamares-9999.ebuild b/app-admin/calamares/calamares-9999.ebuild
new file mode 100644
index 0000000..d12c0d9
--- /dev/null
+++ b/app-admin/calamares/calamares-9999.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} == "9999" ]] ; 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 0000000..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>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
+</pkgmetadata>
+


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] dev/johu:master commit in: app-admin/calamares/
@ 2015-07-22 21:22 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2015-07-22 21:22 UTC (permalink / raw
  To: gentoo-commits

commit:     4a52c6fc3f6c6b5ef697348a8cc350ed52ad5dc3
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 22 20:41:44 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jul 22 20:41:44 2015 +0000
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 @@
 		<email>johu@gentoo.org</email>
 		<name>Johannes Huber</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">calamares/calamares</remote-id>
+	</upstream>
 </pkgmetadata>
 


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] dev/johu:master commit in: app-admin/calamares/
@ 2015-07-22 21:31 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2015-07-22 21:31 UTC (permalink / raw
  To: gentoo-commits

commit:     84db73d31436e01bcbf3e00a5d85fb50382c75c7
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 22 21:33:16 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jul 22 21:33:16 2015 +0000
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>
-	<herd>no-herd</herd>
 	<maintainer>
 		<email>johu@gentoo.org</email>
 		<name>Johannes 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="github">calamares/calamares</remote-id>
 	</upstream>


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] dev/johu:master commit in: app-admin/calamares/
@ 2015-07-26 11:55 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2015-07-26 11:55 UTC (permalink / raw
  To: gentoo-commits

commit:     c8ab2048d3285cf135a2c5396c2892baf425ce1c
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 26 11:57:41 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jul 26 11:57:41 2015 +0000
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-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/calamares/calamares-9999.ebuild b/app-admin/calamares/calamares-9999.ebuild
index 45233df..069381b 100644
--- a/app-admin/calamares/calamares-9999.ebuild
+++ b/app-admin/calamares/calamares-9999.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)


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] dev/johu:master commit in: app-admin/calamares/
@ 2016-03-12 13:44 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2016-03-12 13:44 UTC (permalink / raw
  To: gentoo-commits

commit:     491a41b3e50fafb5a0d4ff32c35b6c598d3f4bc2
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 13:44:34 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 13:44:34 2016 +0000
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-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

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


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] dev/johu:master commit in: app-admin/calamares/
@ 2016-03-13 11:04 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2016-03-13 11:04 UTC (permalink / raw
  To: gentoo-commits

commit:     4d1572d951d9ff57ea4d100af709204a3b11a5d6
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 11:04:23 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 11:04:23 2016 +0000
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-9999.ebuild | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] dev/johu:master commit in: app-admin/calamares/
@ 2016-03-15 16:02 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2016-03-15 16:02 UTC (permalink / raw
  To: gentoo-commits

commit:     18536188288d1f980eb7aca32567ed0717f59439
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 16:01:42 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 16:01:42 2016 +0000
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-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/calamares/calamares-9999.ebuild b/app-admin/calamares/calamares-9999.ebuild
index 73af205..f7c4b14 100644
--- a/app-admin/calamares/calamares-9999.ebuild
+++ b/app-admin/calamares/calamares-9999.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"


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] dev/johu:master commit in: app-admin/calamares/
@ 2016-04-07 18:29 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2016-04-07 18:29 UTC (permalink / raw
  To: gentoo-commits

commit:     d59fabfff7ccdb564b8624d4925fb8cc0cec3b27
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 18:17:13 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 18:17:13 2016 +0000
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-9999.ebuild | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-admin/calamares/calamares-9999.ebuild b/app-admin/calamares/calamares-9999.ebuild
index f7c4b14..9a0efdd 100644
--- a/app-admin/calamares/calamares-9999.ebuild
+++ b/app-admin/calamares/calamares-9999.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]


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] dev/johu:master commit in: app-admin/calamares/
@ 2016-04-10 19:08 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2016-04-10 19:08 UTC (permalink / raw
  To: gentoo-commits

commit:     9ac5691564d399178f5de1eed8abf6653e1cdf45
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 19:08:37 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 19:08:37 2016 +0000
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-9999.ebuild | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app-admin/calamares/calamares-9999.ebuild b/app-admin/calamares/calamares-9999.ebuild
index 9a0efdd..04e486e 100644
--- a/app-admin/calamares/calamares-9999.ebuild
+++ b/app-admin/calamares/calamares-9999.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}]


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] dev/johu:master commit in: app-admin/calamares/
@ 2016-04-12 17:48 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2016-04-12 17:48 UTC (permalink / raw
  To: gentoo-commits

commit:     8bb1eb88f6dfbdf4d42296b754935a4f2b4bbe57
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 17:48:08 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 17:48:08 2016 +0000
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-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/calamares/calamares-9999.ebuild b/app-admin/calamares/calamares-9999.ebuild
index 04e486e..221ae71 100644
--- a/app-admin/calamares/calamares-9999.ebuild
+++ b/app-admin/calamares/calamares-9999.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}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] dev/johu:master commit in: app-admin/calamares/
@ 2016-04-25 15:49 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2016-04-25 15:49 UTC (permalink / raw
  To: gentoo-commits

commit:     bd298c76f93d2ceeeb1bc9cc62da3c2515edec4f
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 15:49:47 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 15:49:47 2016 +0000
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-9999.ebuild | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app-admin/calamares/calamares-9999.ebuild b/app-admin/calamares/calamares-9999.ebuild
index 221ae71..c228134 100644
--- a/app-admin/calamares/calamares-9999.ebuild
+++ b/app-admin/calamares/calamares-9999.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


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] dev/johu:master commit in: app-admin/calamares/
@ 2016-05-22 18:39 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2016-05-22 18:39 UTC (permalink / raw
  To: gentoo-commits

commit:     950f0ec4dd7b597007717653bb978a863a861b4b
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 18:39:35 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun May 22 18:39:35 2016 +0000
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-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/calamares/calamares-9999.ebuild b/app-admin/calamares/calamares-9999.ebuild
index c228134..f5f9ace 100644
--- a/app-admin/calamares/calamares-9999.ebuild
+++ b/app-admin/calamares/calamares-9999.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}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] dev/johu:master commit in: app-admin/calamares/
@ 2016-07-01 17:06 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2016-07-01 17:06 UTC (permalink / raw
  To: gentoo-commits

commit:     8715e0741ed3111862157403a20825604252d039
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  1 17:06:31 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jul  1 17:06:31 2016 +0000
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-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/calamares/calamares-9999.ebuild b/app-admin/calamares/calamares-9999.ebuild
index f5f9ace..3265c24 100644
--- a/app-admin/calamares/calamares-9999.ebuild
+++ b/app-admin/calamares/calamares-9999.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}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] dev/johu:master commit in: app-admin/calamares/
@ 2016-07-25 22:14 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2016-07-25 22:14 UTC (permalink / raw
  To: gentoo-commits

commit:     544e803a2cb704731d67ea3e132d703bbe46c7f0
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 22:13:50 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 22:13:50 2016 +0000
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-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

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


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] dev/johu:master commit in: app-admin/calamares/
@ 2016-10-14  6:15 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2016-10-14  6:15 UTC (permalink / raw
  To: gentoo-commits

commit:     a7176753dbf6a418dd7d00acd137dd5d41c6559b
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 06:15:42 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 06:15:42 2016 +0000
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-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/calamares/calamares-9999.ebuild b/app-admin/calamares/calamares-9999.ebuild
index 4a10aeb..82cbaba 100644
--- a/app-admin/calamares/calamares-9999.ebuild
+++ b/app-admin/calamares/calamares-9999.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]


^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2016-10-14  6:15 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-15 16:02 [gentoo-commits] dev/johu:master commit in: app-admin/calamares/ Johannes Huber
  -- strict thread matches above, loose matches on Subject: below --
2016-10-14  6:15 Johannes Huber
2016-07-25 22:14 Johannes Huber
2016-07-01 17:06 Johannes Huber
2016-05-22 18:39 Johannes Huber
2016-04-25 15:49 Johannes Huber
2016-04-12 17:48 Johannes Huber
2016-04-10 19:08 Johannes Huber
2016-04-07 18:29 Johannes Huber
2016-03-13 11:04 Johannes Huber
2016-03-12 13:44 Johannes Huber
2015-07-26 11:55 Johannes Huber
2015-07-22 21:31 Johannes Huber
2015-07-22 21:22 Johannes Huber
2015-07-22 20:37 Johannes Huber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox