| 1 |
commit: cfffa7346dff8c5e47b6ef28ed7c093124009b7d |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 24 19:47:37 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 24 20:28:14 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfffa734 |
| 7 |
|
| 8 |
app-office/ledger: Use CMAKE_REMOVE_MODULES_LIST, fix USE="-python" |
| 9 |
|
| 10 |
Still add python-3.6 for now. |
| 11 |
Sort and streamline ebuild a bit. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
app-office/ledger/ledger-3.2.0.ebuild | 34 ++++++++++++++++------------------ |
| 17 |
1 file changed, 16 insertions(+), 18 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-office/ledger/ledger-3.2.0.ebuild b/app-office/ledger/ledger-3.2.0.ebuild |
| 20 |
index fda15f052db..938e0bf4620 100644 |
| 21 |
--- a/app-office/ledger/ledger-3.2.0.ebuild |
| 22 |
+++ b/app-office/ledger/ledger-3.2.0.ebuild |
| 23 |
@@ -3,18 +3,20 @@ |
| 24 |
|
| 25 |
EAPI=7 |
| 26 |
|
| 27 |
-PYTHON_COMPAT=( python3_{7,8} ) |
| 28 |
- |
| 29 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
| 30 |
+CMAKE_REMOVE_MODULES_LIST=( FindPython Support ) |
| 31 |
inherit bash-completion-r1 check-reqs cmake python-single-r1 |
| 32 |
|
| 33 |
-DESCRIPTION="A double-entry accounting system with a command-line reporting interface" |
| 34 |
+DESCRIPTION="Double-entry accounting system with a command-line reporting interface" |
| 35 |
HOMEPAGE="https://www.ledger-cli.org/" |
| 36 |
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 37 |
+ |
| 38 |
LICENSE="BSD" |
| 39 |
-KEYWORDS="~amd64 ~x86" |
| 40 |
SLOT="0" |
| 41 |
+KEYWORDS="~amd64 ~x86" |
| 42 |
IUSE="debug doc python" |
| 43 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 44 |
+ |
| 45 |
RESTRICT="test" |
| 46 |
|
| 47 |
CHECKREQS_MEMORY=8G |
| 48 |
@@ -31,13 +33,12 @@ RDEPEND=" |
| 49 |
${PYTHON_DEPS} |
| 50 |
) |
| 51 |
" |
| 52 |
-DEPEND=" |
| 53 |
- ${RDEPEND} |
| 54 |
+DEPEND="${RDEPEND} |
| 55 |
dev-libs/utfcpp |
| 56 |
doc? ( |
| 57 |
+ dev-texlive/texlive-fontsrecommended |
| 58 |
sys-apps/texinfo |
| 59 |
virtual/texi2dvi |
| 60 |
- dev-texlive/texlive-fontsrecommended |
| 61 |
) |
| 62 |
" |
| 63 |
|
| 64 |
@@ -59,20 +60,13 @@ src_prepare() { |
| 65 |
|
| 66 |
# Want to type "info ledger" not "info ledger3" |
| 67 |
sed -i -e 's/ledger3/ledger/g' \ |
| 68 |
- doc/ledger3.texi \ |
| 69 |
- doc/CMakeLists.txt \ |
| 70 |
- test/CheckTexinfo.py \ |
| 71 |
- tools/cleanup.sh \ |
| 72 |
- tools/gendocs.sh \ |
| 73 |
- tools/prepare-commit-msg \ |
| 74 |
- tools/spellcheck.sh \ |
| 75 |
+ doc/{CMakeLists.txt,ledger3.texi} test/CheckTexinfo.py \ |
| 76 |
+ tools/{cleanup.sh,gendocs.sh,prepare-commit-msg,spellcheck.sh} \ |
| 77 |
|| die "Failed to update info file name in file contents" |
| 78 |
|
| 79 |
mv doc/ledger{3,}.texi || die "Failed to rename info file name" |
| 80 |
|
| 81 |
rm -r lib/utfcpp || die |
| 82 |
- rm cmake/FindPython.cmake || die |
| 83 |
- rm -r cmake/FindPython || die |
| 84 |
} |
| 85 |
|
| 86 |
src_configure() { |
| 87 |
@@ -80,13 +74,17 @@ src_configure() { |
| 88 |
-DBUILD_DOCS="$(usex doc)" |
| 89 |
-DBUILD_WEB_DOCS="$(usex doc)" |
| 90 |
-DUSE_PYTHON="$(usex python)" |
| 91 |
- -DPython_EXECUTABLE="${PYTHON}" |
| 92 |
- -DPython_INCLUDE_DIR="$(python_get_includedir)" |
| 93 |
-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}" |
| 94 |
-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON |
| 95 |
-DBUILD_DEBUG="$(usex debug)" |
| 96 |
-DUTFCPP_PATH="${ESYSROOT}/usr/include/utf8cpp" |
| 97 |
) |
| 98 |
+ if use python; then |
| 99 |
+ mycmakeargs+=( |
| 100 |
+ -DPython_EXECUTABLE="${PYTHON}" |
| 101 |
+ -DPython_INCLUDE_DIR="$(python_get_includedir)" |
| 102 |
+ ) |
| 103 |
+ fi |
| 104 |
|
| 105 |
cmake_src_configure |
| 106 |
} |
Archives