Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app-i18n/poedit/poedit-1.8.5.ebuild2
-rw-r--r--app-i18n/poedit/poedit-1.8.7.ebuild2
-rw-r--r--app-text/coolreader/coolreader-3.1.2.71-r2.ebuild (renamed from app-text/coolreader/coolreader-3.1.2.71-r1.ebuild)25
-rw-r--r--app-text/coolreader/metadata.xml4
-rw-r--r--dev-cpp/lucene++/lucene++-3.0.7.ebuild2
-rw-r--r--dev-python/spyder/spyder-3.2.3.ebuild1
-rw-r--r--dev-ruby/multi_xml/multi_xml-0.6.0.ebuild2
-rw-r--r--dev-ruby/ox/ox-2.5.0.ebuild2
-rw-r--r--dev-ruby/ox/ox-2.6.0.ebuild2
-rw-r--r--dev-ruby/ox/ox-2.7.0.ebuild2
-rw-r--r--eclass/cmake-utils.eclass17
11 files changed, 32 insertions, 29 deletions
diff --git a/app-i18n/poedit/poedit-1.8.5.ebuild b/app-i18n/poedit/poedit-1.8.5.ebuild
index 814766c84ae3..f704a88dabab 100644
--- a/app-i18n/poedit/poedit-1.8.5.ebuild
+++ b/app-i18n/poedit/poedit-1.8.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 hppa ppc64 x86"
+KEYWORDS="amd64 hppa ~ppc ppc64 x86"
IUSE=""
# db/expat req for legacytm (backwards support for pre 1.6)
diff --git a/app-i18n/poedit/poedit-1.8.7.ebuild b/app-i18n/poedit/poedit-1.8.7.ebuild
index 427ffac73bbf..825517a6b8fa 100644
--- a/app-i18n/poedit/poedit-1.8.7.ebuild
+++ b/app-i18n/poedit/poedit-1.8.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
IUSE=""
# db/expat req for legacytm (backwards support for pre 1.6)
diff --git a/app-text/coolreader/coolreader-3.1.2.71-r1.ebuild b/app-text/coolreader/coolreader-3.1.2.71-r2.ebuild
index 9c28f6c2e25f..afcc1ac458be 100644
--- a/app-text/coolreader/coolreader-3.1.2.71-r1.ebuild
+++ b/app-text/coolreader/coolreader-3.1.2.71-r2.ebuild
@@ -24,25 +24,16 @@ HOMEPAGE="https://sourceforge.net/projects/crengine/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="qt4 qt5 wxwidgets corefonts liberation-fonts"
-REQUIRED_USE="^^ ( qt4 qt5 wxwidgets )
- wxwidgets? (
- || ( corefonts liberation-fonts ) )"
+IUSE="wxwidgets"
DEPEND="sys-libs/zlib
media-libs/libpng:0
virtual/jpeg:0
media-libs/freetype
- wxwidgets? (
- || ( x11-libs/wxGTK:3.0 x11-libs/wxGTK:2.8 ) )
- qt4? ( dev-qt/qtcore:4
- dev-qt/qtgui:4 )
- qt5? ( dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5 )"
+ wxwidgets? ( || ( x11-libs/wxGTK:3.0 x11-libs/wxGTK:2.8 ) )
+ !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
RDEPEND="${DEPEND}
- corefonts? ( media-fonts/corefonts )
- liberation-fonts? ( media-fonts/liberation-fonts )"
+ wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
# 1st patch: To save cr3.ini to ~homedir.
# 2nd patch: To build QT5 and WX GUI version of coolreader3;
@@ -56,16 +47,14 @@ PATCHES=( "${FILESDIR}/cr3ini.diff" "${FILESDIR}/cr3.1.2.71-r1_qt5_wx.diff" )
src_configure() {
CMAKE_USE_DIR="${S}"
CMAKE_BUILD_TYPE="Release"
- if use qt4; then
- local mycmakeargs=(-D GUI=QT)
- elif use qt5; then
- local mycmakeargs=(-D GUI=QT5)
- elif use wxwidgets; then
+ if use wxwidgets; then
. "${ROOT}/var/lib/wxwidgets/current"
if [[ "${WXCONFIG}" -eq "none" ]]; then
die "The wxGTK profile should be selected!"
fi
local mycmakeargs=(-D GUI=WX)
+ else
+ local mycmakeargs=(-D GUI=QT5)
fi
cmake-utils_src_configure
}
diff --git a/app-text/coolreader/metadata.xml b/app-text/coolreader/metadata.xml
index 4676fdbdc32e..afd1b4bc9da9 100644
--- a/app-text/coolreader/metadata.xml
+++ b/app-text/coolreader/metadata.xml
@@ -8,10 +8,6 @@
A fast and small cross-platform XML/CSS based eBook reader for desktops and handheld devices.
Supported formats: FB2, TXT, RTF, DOC, TCR, HTML, EPUB, CHM, PDB, MOBI.
</longdescription>
- <use>
- <flag name="corefonts">Use <pkg>media-fonts/corefonts</pkg></flag>
- <flag name="liberation-fonts">Use <pkg>media-fonts/liberation-fonts</pkg></flag>
- </use>
<upstream>
<remote-id type="sourceforge">crengine</remote-id>
</upstream>
diff --git a/dev-cpp/lucene++/lucene++-3.0.7.ebuild b/dev-cpp/lucene++/lucene++-3.0.7.ebuild
index b06475b036de..ddb0f0570e20 100644
--- a/dev-cpp/lucene++/lucene++-3.0.7.ebuild
+++ b/dev-cpp/lucene++/lucene++-3.0.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_${PV}.tar.
LICENSE="|| ( LGPL-3 Apache-2.0 )"
SLOT="0"
-KEYWORDS="amd64 hppa ppc64 x86"
+KEYWORDS="amd64 hppa ~ppc ppc64 x86"
IUSE="debug"
DEPEND="dev-libs/boost:="
diff --git a/dev-python/spyder/spyder-3.2.3.ebuild b/dev-python/spyder/spyder-3.2.3.ebuild
index c7290c8ba7ab..485bde91fcf7 100644
--- a/dev-python/spyder/spyder-3.2.3.ebuild
+++ b/dev-python/spyder/spyder-3.2.3.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
dev-python/pickleshare[${PYTHON_USEDEP}]
dev-python/pyzmq[${PYTHON_USEDEP}]
dev-python/chardet[${PYTHON_USEDEP}]
+ >=dev-python/pycodestyle-2.3.0
hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )"
DEPEND="${RDEPEND}
app-arch/unzip"
diff --git a/dev-ruby/multi_xml/multi_xml-0.6.0.ebuild b/dev-ruby/multi_xml/multi_xml-0.6.0.ebuild
index dce162cfc6de..f99474a2df51 100644
--- a/dev-ruby/multi_xml/multi_xml-0.6.0.ebuild
+++ b/dev-ruby/multi_xml/multi_xml-0.6.0.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="http://rdoc.info/gems/multi_xml"
SRC_URI="https://github.com/sferik/multi_xml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/ox/ox-2.5.0.ebuild b/dev-ruby/ox/ox-2.5.0.ebuild
index eee48251f7b1..4149119fa08a 100644
--- a/dev-ruby/ox/ox-2.5.0.ebuild
+++ b/dev-ruby/ox/ox-2.5.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/ox/ox-2.6.0.ebuild b/dev-ruby/ox/ox-2.6.0.ebuild
index eee48251f7b1..4149119fa08a 100644
--- a/dev-ruby/ox/ox-2.6.0.ebuild
+++ b/dev-ruby/ox/ox-2.6.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/ox/ox-2.7.0.ebuild b/dev-ruby/ox/ox-2.7.0.ebuild
index d51d9aa48d25..060f1807bc96 100644
--- a/dev-ruby/ox/ox-2.7.0.ebuild
+++ b/dev-ruby/ox/ox-2.7.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
SLOT="0"
IUSE=""
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index dbb12f25f3d9..148fbc3cff33 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -93,6 +93,12 @@ _CMAKE_UTILS_ECLASS=1
# for econf and is needed to pass TRY_RUN results when cross-compiling.
# Should be set by user in a per-package basis in /etc/portage/package.env.
+# @ECLASS-VARIABLE: CMAKE_UTILS_QA_SRC_DIR_READONLY
+# @DESCRIPTION:
+# After running cmake-utils_src_prepare, sets ${S} to read-only. This is
+# a user flag and should under _no circumstances_ be set in the ebuild.
+# Helps in improving QA of build systems that write to source tree.
+
case ${EAPI} in
5) : ${CMAKE_WARN_UNUSED_CLI:=no} ;;
6) : ${CMAKE_WARN_UNUSED_CLI:=yes} ;;
@@ -441,6 +447,13 @@ cmake-utils_src_prepare() {
fi
popd > /dev/null || die
+
+ # make ${S} read-only in order to detect broken build-systems
+ if [[ ${CMAKE_UTILS_QA_SRC_DIR_READONLY} && ! ${CMAKE_IN_SOURCE_BUILD} ]]; then
+ chmod -R a-w "${S}"
+ fi
+
+ _CMAKE_UTILS_SRC_PREPARE_HAS_RUN=1
}
# @VARIABLE: mycmakeargs
@@ -465,6 +478,10 @@ cmake-utils_src_prepare() {
cmake-utils_src_configure() {
debug-print-function ${FUNCNAME} "$@"
+ if [[ ! ${_CMAKE_UTILS_SRC_PREPARE_HAS_RUN} ]]; then
+ eqawarn "cmake-utils_src_prepare has not been run, please open a bug on https://bugs.gentoo.org/"
+ fi
+
[[ ${EAPI} == 5 ]] && _cmake_cleanup_cmake
_cmake_check_build_dir