diff options
| -rw-r--r-- | app-admin/calamares/calamares-999.ebuild | 44 | ||||
| -rw-r--r-- | app-admin/calamares/files/cmake-find-gentoo-python3-boost-libs.patch | 44 |
2 files changed, 69 insertions, 19 deletions
diff --git a/app-admin/calamares/calamares-999.ebuild b/app-admin/calamares/calamares-999.ebuild index 512373e6..9007b142 100644 --- a/app-admin/calamares/calamares-999.ebuild +++ b/app-admin/calamares/calamares-999.ebuild @@ -3,7 +3,7 @@ # $Header: $ EAPI=5 -PYTHON_COMPAT=( python{3_3,3_4} ) +PYTHON_COMPAT=( python3_3 ) inherit eutils cmake-utils python-r1 git-2 @@ -23,30 +23,41 @@ IUSE="" S="${WORKDIR}/${PN}-${PV}" DEPEND="dev-vcs/git + >=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/qtsvg-5.4.0:5 - >=dev-qt/designer-5.4.0:5 + >=dev-qt/qtnetwork-5.4.0:5 >=dev-qt/qtopengl-5.4.0:5 - >=dev-qt/qtwebkit-5.4.0:5 - >=dev-qt/qtscript-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/extra-cmake-modules-5.10.0" -RDEPEND=">=dev-qt/qtcore-5.4.0:5 +RDEPEND=">=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/qtsvg-5.4.0:5 - >=dev-qt/designer-5.4.0:5 + >=dev-qt/qtnetwork-5.4.0:5 >=dev-qt/qtopengl-5.4.0:5 - >=dev-qt/qtwebkit-5.4.0:5 - >=dev-qt/qtscript-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 @@ -60,6 +71,9 @@ RDEPEND=">=dev-qt/qtcore-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" + # 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 @@ -67,11 +81,3 @@ src_prepare() { git submodule init git submodule update } - -src_compile() { - einfo "more work in progress" -} - -src_install() { - einfo "much more work in progress" -} diff --git a/app-admin/calamares/files/cmake-find-gentoo-python3-boost-libs.patch b/app-admin/calamares/files/cmake-find-gentoo-python3-boost-libs.patch new file mode 100644 index 00000000..1756b02f --- /dev/null +++ b/app-admin/calamares/files/cmake-find-gentoo-python3-boost-libs.patch @@ -0,0 +1,44 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 774d301..afd4f80 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -33,34 +33,13 @@ find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED Core Gui Widgets LinguistTools S + find_package( YamlCpp 0.5.1 REQUIRED ) + find_package( PolkitQt5-1 REQUIRED ) + +-option( WITH_PYTHON "Enable Python modules support." ON ) +- +-macro_optional_find_package( PythonLibs 3.3 ) +-macro_log_feature( +- PYTHONLIBS_FOUND +- "Python" +- "C interface libraries for the Python 3 interpreter." +- "http://python.org" +- FALSE "3.3" +- "Python 3 is used for some Calamares job modules." +-) ++find_package( PythonLibs 3.3 REQUIRED ) ++include_directories( ${PYTHON_INCLUDE_DIRS} ) + +-if ( PYTHONLIBS_FOUND ) +- include( BoostPython3 ) +- find_boost_python3( 1.54.0 ${PYTHONLIBS_VERSION_STRING} CALAMARES_BOOST_PYTHON3_FOUND ) +- macro_log_feature( +- CALAMARES_BOOST_PYTHON3_FOUND +- "Boost.Python" +- "A C++ library which enables seamless interoperability between C++ and Python 3." +- "http://www.boost.org" +- FALSE "1.54.0" +- "Boost.Python is used for interfacing with Calamares job modules written in Python 3." +- ) +-endif() ++find_package( Boost COMPONENTS python REQUIRED ) ++include_directories( ${Boost_INCLUDE_DIR}) + +-if ( PYTHONLIBS_NOTFOUND OR NOT CALAMARES_BOOST_PYTHON3_FOUND ) +- set( WITH_PYTHON OFF ) +-endif() ++option( WITH_PYTHON "Enable Python modules support." ON ) + + ### + ### Calamares application info |