summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMamut Ghiunhan <V3n3RiX@users.noreply.github.com>2015-06-10 02:43:22 +0100
committerMamut Ghiunhan <V3n3RiX@users.noreply.github.com>2015-06-10 02:43:22 +0100
commit7768184ca401c1b8b71c0f4f1139cf937cf85ace (patch)
tree55e5c8bb7d10f55bd4a56f97aa09164ef1e32d09
parentf3080181ac22c00831676b3e5f9b9a64a70aab32 (diff)
parentab71b45418e56e53bef5fbcc59c5cd8eb29567c7 (diff)
Merge pull request #34 from V3n3RiX/master
calamares 1.1-rc1
-rw-r--r--app-admin/calamares/calamares-999.ebuild13
1 files changed, 7 insertions, 6 deletions
diff --git a/app-admin/calamares/calamares-999.ebuild b/app-admin/calamares/calamares-999.ebuild
index dceb06b2..1160599d 100644
--- a/app-admin/calamares/calamares-999.ebuild
+++ b/app-admin/calamares/calamares-999.ebuild
@@ -8,11 +8,10 @@ PYTHON_COMPAT=( python3_3 )
inherit eutils cmake-utils python-r1 git-2
EGIT_BRANCH="kogaion"
-EGIT_COMMIT="5ea749b20f0a41b286d6ade6e9fc1b7b48f62632"
-EGIT_REPO_URI="https://gitlab.com/rogentos/calamares.git
- https://github.com/Rogentos/calamares.git"
+EGIT_COMMIT="61da2df0de3a00d6b8cfcfdcd7e1c674c2b3aa21"
+EGIT_REPO_URI="https://github.com/Rogentos/calamares.git"
-DESCRIPTION="Distribution-independent installer framework ( with Kogaion/Sabayon support)"
+DESCRIPTION="Distribution-independent installer framework"
HOMEPAGE="http://calamares.io"
LICENSE="GPL-3"
@@ -67,14 +66,16 @@ RDEPEND=">=dev-qt/designer-5.4.0:5
>=net-misc/rsync-3.1[xattr]
>=sys-block/parted-3.0
>=sys-apps/gptfdisk-0.8.10
+ >=sys-apps/dmidecode-2.12-r1
>=sys-fs/squashfs-tools-4.3:0[xattr]
+ >=sys-power/upower-0.99.0-r1
sys-auth/polkit-qt[qt5]
sys-fs/udisks:2[systemd]
virtual/udev[systemd]"
src_prepare() {
- # cmake cannot find python3 boost libs on gentoo, but with a little help it will
- epatch "${FILESDIR}/cmake-find-gentoo-python3-boost-libs.patch"
+ # cmake cannot find python3 boost libs on gentoo, but with a little help it will (fixes landed upstream, disable this for now)
+ # epatch "${FILESDIR}/cmake-find-gentoo-python3-boost-libs.patch"
# If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used.
# Setting QT_SELECT environment variable will enforce correct binaries (fix taken from vlc ebuild)