From f9356d7bbfd215c4624db6165c16ec0ba46cebbe Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 9 Jun 2015 15:23:04 +0100 Subject: update calamares ebuild to our new rebased branch --- app-admin/calamares/calamares-999.ebuild | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'app-admin/calamares/calamares-999.ebuild') diff --git a/app-admin/calamares/calamares-999.ebuild b/app-admin/calamares/calamares-999.ebuild index dceb06b2..700ece10 100644 --- a/app-admin/calamares/calamares-999.ebuild +++ b/app-admin/calamares/calamares-999.ebuild @@ -8,9 +8,8 @@ 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="76c10c285c626737ce8c1a47d8116f1e78f8eec9" +EGIT_REPO_URI="https://github.com/Rogentos/calamares.git" DESCRIPTION="Distribution-independent installer framework ( with Kogaion/Sabayon support)" HOMEPAGE="http://calamares.io" @@ -73,8 +72,8 @@ RDEPEND=">=dev-qt/designer-5.4.0:5 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) -- cgit v1.2.3 From e14359f8411d02cf0f6fee62895925037784a85c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 9 Jun 2015 15:33:52 +0100 Subject: update calamares ebuild to our new rebased branch --- app-admin/calamares/calamares-999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app-admin/calamares/calamares-999.ebuild') diff --git a/app-admin/calamares/calamares-999.ebuild b/app-admin/calamares/calamares-999.ebuild index 700ece10..4ef6651a 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="kogaion" -EGIT_COMMIT="76c10c285c626737ce8c1a47d8116f1e78f8eec9" +EGIT_COMMIT="388e3db73f0b783c3f0f7ce376004f959d25fe39" EGIT_REPO_URI="https://github.com/Rogentos/calamares.git" DESCRIPTION="Distribution-independent installer framework ( with Kogaion/Sabayon support)" -- cgit v1.2.3 From ab71b45418e56e53bef5fbcc59c5cd8eb29567c7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 10 Jun 2015 02:40:30 +0100 Subject: calamares 1.1-rc1 --- app-admin/calamares/calamares-999.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'app-admin/calamares/calamares-999.ebuild') diff --git a/app-admin/calamares/calamares-999.ebuild b/app-admin/calamares/calamares-999.ebuild index 4ef6651a..1160599d 100644 --- a/app-admin/calamares/calamares-999.ebuild +++ b/app-admin/calamares/calamares-999.ebuild @@ -8,10 +8,10 @@ PYTHON_COMPAT=( python3_3 ) inherit eutils cmake-utils python-r1 git-2 EGIT_BRANCH="kogaion" -EGIT_COMMIT="388e3db73f0b783c3f0f7ce376004f959d25fe39" +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" @@ -66,7 +66,9 @@ 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]" -- cgit v1.2.3 From 1757d15549a81cf104ba6f4b5c1bbabd09edf9f0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 10 Jun 2015 03:18:42 +0100 Subject: force enable python in our calamares build --- app-admin/calamares/calamares-999.ebuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'app-admin/calamares/calamares-999.ebuild') diff --git a/app-admin/calamares/calamares-999.ebuild b/app-admin/calamares/calamares-999.ebuild index 1160599d..1da39160 100644 --- a/app-admin/calamares/calamares-999.ebuild +++ b/app-admin/calamares/calamares-999.ebuild @@ -74,8 +74,11 @@ RDEPEND=">=dev-qt/designer-5.4.0:5 virtual/udev[systemd]" src_prepare() { - # 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" + # 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" # 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) -- cgit v1.2.3 From 122f484eb2fdad8ae6366f93a6e4ed3ce24cac6b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 10 Jun 2015 21:44:52 +0100 Subject: bump calamares ebuild to 1.1-rc2 --- app-admin/calamares/calamares-999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app-admin/calamares/calamares-999.ebuild') diff --git a/app-admin/calamares/calamares-999.ebuild b/app-admin/calamares/calamares-999.ebuild index 1da39160..7fb2521d 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="kogaion" -EGIT_COMMIT="61da2df0de3a00d6b8cfcfdcd7e1c674c2b3aa21" +EGIT_COMMIT="4aa0f9e1f24bf4700d4998627893344a2511051c" EGIT_REPO_URI="https://github.com/Rogentos/calamares.git" DESCRIPTION="Distribution-independent installer framework" -- cgit v1.2.3 From cde34b808013d6b2f265aa72daed957b3a52b14b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 10 Jun 2015 22:08:43 +0100 Subject: force dev-libs/boost to build against python3.3 even if we have it in make.conf, disable our hackish way to find required libs as it's fixed upstream --- app-admin/calamares/calamares-999.ebuild | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'app-admin/calamares/calamares-999.ebuild') diff --git a/app-admin/calamares/calamares-999.ebuild b/app-admin/calamares/calamares-999.ebuild index 7fb2521d..4373bc4c 100644 --- a/app-admin/calamares/calamares-999.ebuild +++ b/app-admin/calamares/calamares-999.ebuild @@ -22,6 +22,7 @@ IUSE="" S="${WORKDIR}/${PN}-${PV}" DEPEND="dev-vcs/git + >=dev-libs/boost-1.55.0-r2[python_targets_python3_3] >=dev-qt/designer-5.4.0:5 >=dev-qt/linguist-tools-5.4.0:5 >=dev-qt/qtconcurrent-5.4.0:5 @@ -41,7 +42,8 @@ DEPEND="dev-vcs/git >=dev-cpp/yaml-cpp-0.5.1 >=kde-frameworks/extra-cmake-modules-5.10.0" -RDEPEND=">=dev-qt/designer-5.4.0:5 +RDEPEND=">=dev-libs/boost-1.55.0-r2[python_targets_python3_3] + >=dev-qt/designer-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 @@ -78,7 +80,11 @@ src_prepare() { # 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" + # + # 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 # 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) -- cgit v1.2.3 From ec268627ad2cd8390ab7c6a203c31cc624476363 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 11 Jun 2015 15:39:49 +0100 Subject: massive overhaul of calamares ebuild, ready to be upstreamed to gentoo --- app-admin/calamares/calamares-999.ebuild | 50 +++++++++----------------------- 1 file changed, 14 insertions(+), 36 deletions(-) (limited to 'app-admin/calamares/calamares-999.ebuild') diff --git a/app-admin/calamares/calamares-999.ebuild b/app-admin/calamares/calamares-999.ebuild index 4373bc4c..6cf48d0e 100644 --- a/app-admin/calamares/calamares-999.ebuild +++ b/app-admin/calamares/calamares-999.ebuild @@ -7,8 +7,8 @@ PYTHON_COMPAT=( python3_3 ) inherit eutils cmake-utils python-r1 git-2 -EGIT_BRANCH="kogaion" -EGIT_COMMIT="4aa0f9e1f24bf4700d4998627893344a2511051c" +EGIT_BRANCH="master" +EGIT_COMMIT="01cf42c2f9112687bc3928eeabbb426e7de84877" EGIT_REPO_URI="https://github.com/Rogentos/calamares.git" DESCRIPTION="Distribution-independent installer framework" @@ -17,12 +17,15 @@ HOMEPAGE="http://calamares.io" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="+python" S="${WORKDIR}/${PN}-${PV}" DEPEND="dev-vcs/git - >=dev-libs/boost-1.55.0-r2[python_targets_python3_3] + python? ( + >=dev-lang/python-3.3.5-r1:3.3 + >=dev-libs/boost-1.55.0-r2[python_targets_python3_3] + ) >=dev-qt/designer-5.4.0:5 >=dev-qt/linguist-tools-5.4.0:5 >=dev-qt/qtconcurrent-5.4.0:5 @@ -42,38 +45,7 @@ DEPEND="dev-vcs/git >=dev-cpp/yaml-cpp-0.5.1 >=kde-frameworks/extra-cmake-modules-5.10.0" -RDEPEND=">=dev-libs/boost-1.55.0-r2[python_targets_python3_3] - >=dev-qt/designer-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/qtdeclarative-5.4.0:5 - >=dev-qt/qtgui-5.4.0:5 - >=dev-qt/qtnetwork-5.4.0:5 - >=dev-qt/qtopengl-5.4.0:5 - >=dev-qt/qtprintsupport-5.4.0:5 - >=dev-qt/qtscript-5.4.0:5 - >=dev-qt/qtsvg-5.4.0:5 - >=dev-qt/qttest-5.4.0:5 - >=dev-qt/qtwidgets-5.4.0:5 - >=dev-qt/qtxml-5.4.0:5 - >=dev-qt/qtxmlpatterns-5.4.0:5 - >=dev-cpp/yaml-cpp-0.5.1 - >=dev-libs/libatasmart-0.19 - >=kde-frameworks/kconfig-5.10.0 - >=kde-frameworks/ki18n-5.10.0 - >=kde-frameworks/kcoreaddons-5.10.0 - >=kde-frameworks/solid-5.10.0 - >=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]" +RDEPEND=">=app-misc/calamares-runtime-2.0[branding]" src_prepare() { # by default, python support is optional and calamares builds fine if is not found @@ -86,6 +58,12 @@ src_prepare() { # 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" + # 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) export QT_SELECT=qt5 -- cgit v1.2.3 From 75103dafdf6dc8cddbb570f8c3bbbc5dd531073a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 11 Jun 2015 20:21:32 +0100 Subject: upstream fixed building with gcc 4.8, so no longer need to patch debug window out --- app-admin/calamares/calamares-999.ebuild | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'app-admin/calamares/calamares-999.ebuild') 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" -- cgit v1.2.3 From 57b3c458320219e9d12b8641f682eaeddd616cc5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2015 05:17:52 +0100 Subject: less patching is good patching, disable patching of calamares modules configuration && create a sepparate package instead --- app-admin/calamares/calamares-999.ebuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'app-admin/calamares/calamares-999.ebuild') diff --git a/app-admin/calamares/calamares-999.ebuild b/app-admin/calamares/calamares-999.ebuild index 5deea8b6..1d31ab2f 100644 --- a/app-admin/calamares/calamares-999.ebuild +++ b/app-admin/calamares/calamares-999.ebuild @@ -21,7 +21,8 @@ IUSE="+python" S="${WORKDIR}/${PN}-${PV}" -DEPEND="dev-vcs/git +DEPEND=" + dev-vcs/git python? ( >=dev-lang/python-3.3.5-r1:3.3 >=dev-libs/boost-1.55.0-r2[python_targets_python3_3] @@ -45,12 +46,11 @@ DEPEND="dev-vcs/git >=dev-cpp/yaml-cpp-0.5.1 >=kde-frameworks/extra-cmake-modules-5.10.0" -RDEPEND=">=app-misc/calamares-runtime-2.0[branding]" +RDEPEND=" + >=app-misc/calamares-runtime-2.0[branding] + >=app-misc/calamares-config-kogaion-2.0" src_prepare() { - # configure calamares with Kogaion specific paths, binary names && system defaults - epatch "${FILESDIR}/${PN}-kogaion-system-defaults.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) export QT_SELECT=qt5 -- cgit v1.2.3 From fba6ef33a2c66303fc15c5d495485ec984997acc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2015 05:25:43 +0100 Subject: move calamares-config-kogaion dep to calamares-runtime --- app-admin/calamares/calamares-999.ebuild | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'app-admin/calamares/calamares-999.ebuild') diff --git a/app-admin/calamares/calamares-999.ebuild b/app-admin/calamares/calamares-999.ebuild index 1d31ab2f..77c2bc1a 100644 --- a/app-admin/calamares/calamares-999.ebuild +++ b/app-admin/calamares/calamares-999.ebuild @@ -46,9 +46,7 @@ DEPEND=" >=dev-cpp/yaml-cpp-0.5.1 >=kde-frameworks/extra-cmake-modules-5.10.0" -RDEPEND=" - >=app-misc/calamares-runtime-2.0[branding] - >=app-misc/calamares-config-kogaion-2.0" +RDEPEND=">=app-misc/calamares-runtime-2.0[branding]" src_prepare() { # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used. -- cgit v1.2.3