summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMamut Ghiunhan <V3n3RiX@users.noreply.github.com>2015-06-11 20:24:01 +0100
committerMamut Ghiunhan <V3n3RiX@users.noreply.github.com>2015-06-11 20:24:01 +0100
commit9a35032797935921c201fb9ad77dba5a9c8ff5f2 (patch)
tree8f3858573c6c4372703daea9cc4534faaf6b93cd
parentb671f4bf39fb5b1308660ca3a83a4bb626ed7a21 (diff)
parent75103dafdf6dc8cddbb570f8c3bbbc5dd531073a (diff)
Merge pull request #40 from V3n3RiX/master
upstream fixed building with gcc 4.8, so no longer need to patch debug window out
-rw-r--r--app-admin/calamares/calamares-999.ebuild15
1 files changed, 1 insertions, 14 deletions
diff --git a/app-admin/calamares/calamares-999.ebuild b/app-admin/calamares/calamares-999.ebuild
index 6cf48d0e..5deea8b6 100644
--- a/app-admin/calamares/calamares-999.ebuild
+++ b/app-admin/calamares/calamares-999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_3 )
inherit eutils cmake-utils python-r1 git-2
EGIT_BRANCH="master"
-EGIT_COMMIT="01cf42c2f9112687bc3928eeabbb426e7de84877"
+EGIT_COMMIT="9e59374bfe0a088c47433bbf209810f89065601b"
EGIT_REPO_URI="https://github.com/Rogentos/calamares.git"
DESCRIPTION="Distribution-independent installer framework"
@@ -48,19 +48,6 @@ DEPEND="dev-vcs/git
RDEPEND=">=app-misc/calamares-runtime-2.0[branding]"
src_prepare() {
- # by default, python support is optional and calamares builds fine if is not found
- # on gentoo finding python && boost libs is sometimes problematic, and we really really
- # want python support in our package
- # this patch helps calamares to find python && boost libs and force-enables python
- #
- # epatch "${FILESDIR}/${PN}-find-gentoo-python3-boost-libs.patch"
- #
- # no longer needed, but keep it around, just in case
- # default interpretor must be set to python3.3 for calamares to find required libs
-
- # debug window causes a build failure with GCC 4.8.4 so disable it
- epatch "${FILESDIR}/${PN}-disable-debug-window.patch"
-
# configure calamares with Kogaion specific paths, binary names && system defaults
epatch "${FILESDIR}/${PN}-kogaion-system-defaults.patch"