gentoo resync : 29.01.2021

3 files changed, 3 insertions, 118 deletions

diff --git a/app-office/ledger/Manifest b/app-office/ledger/Manifest
index 37c2539f64de..180cce4502c8 100644
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@@ -1,5 +1,3 @@
-DIST ledger-3.2.0.tar.gz 790404 BLAKE2B 081ca5d857238aecbeae5a0ba3267864442a8c1772a71b1894f5a9fb33173f9a0bd488ad4db3844fce8172268e516ebb92ba0556ced6e67b2a089fbb5adfde36 SHA512 580f4f39d7c3cd2bd1d05bcc36b127cfb311219f39fe50dbf23f582f73dd986729d4b5fa76bfd89cd5db9bfdfcdd5dca5b9d6b24766650040e45b881726e65ea
 DIST ledger-3.2.1.tar.gz 790959 BLAKE2B a25b08f37c6bcf409fb60e0bcc6e11021515fe17f7eb6f23781bd7a7c16b58ac92d4684e5936901ed87f2f5be4df427bd95fe856f8e7eff1e2609329866de71a SHA512 526c60cee354c9d2ead38cef3b89b349467e41fa3ec0927b51e7246a3352f19f0f81574211f20ba9bac5915590b870b9f9478a103ab661d3d9a10f41c52f4512
-EBUILD ledger-3.2.0.ebuild 2379 BLAKE2B 9351ffa064c471b465fe239b3cd46c86c01897adf1f83083f1a98d093a0b13c4b5357881c6d905896c499a4aceb9f51b23e5330587dfd73912f2122e76077f86 SHA512 5a5b3fd9cc844ac10c1a9f04b899c756bca2d1b7a08a56efbec5bb0b8702d9bda5a74718e66a5236e2baf8d916dc9ea97d0e86a94ec71ba1867950aeb6cfdc28
-EBUILD ledger-3.2.1.ebuild 2383 BLAKE2B 45385c3ad6a7da805e5aea6ee1a44992021fad56424dfd8844ec98a9a43e9458dfb92afdc3dcedde8c323b72b9d8f7ad6224659d0dc0c93f4188a38242fe56b4 SHA512 f9eaea05a81ab082d0bd5e80eac7f1d77a754697a75312cec60fae3dd4e7d749c82de85dde813372fac9e7893f4a2d9d4052251b85f4912295bf872faef6af35
+EBUILD ledger-3.2.1.ebuild 2381 BLAKE2B 4923556c6ba62f484d3c0f47570f5b48fb51644dfa3d2a5767a1ec247bbc0aa470cd56ffa45c1486c04e1bddc14d19c604fe40b546b4e9e64e9ed376a768539c SHA512 91eedd46b66b677631a03b31f035745ad8c5a76936e9b3f645583f1d38bf42e75772bf1f7838381f0dccf08118009b13970927ade3bf96893295feb32e523f4d
 MISC metadata.xml 306 BLAKE2B 58c3d0307a4358f50e8ede8ddf3f598a55ad03dd9af3351b4f15a46465a844c24f9d5966ee5fbbcb9a68d65eb509a18a87aa95400094539475f65493e34f1839 SHA512 c83b1be9474bbfa3296040c56bf14e22afd214835a44907bcb4db2a8047f05e1fe49b1d1ebe5bcd72fe5ed2f27c832d20169aa813f0d9bd619fc1f7a1c5e15cb
diff --git a/app-office/ledger/ledger-3.2.0.ebuild b/app-office/ledger/ledger-3.2.0.ebuild
deleted file mode 100644
index d9edbeb5e8be..000000000000
--- a/app-office/ledger/ledger-3.2.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-CMAKE_REMOVE_MODULES_LIST=( FindPython Support )
-inherit bash-completion-r1 check-reqs cmake python-single-r1
-
-DESCRIPTION="Double-entry accounting system with a command-line reporting interface"
-HOMEPAGE="https://www.ledger-cli.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="test"
-
-CHECKREQS_MEMORY=8G
-
-RDEPEND="
-	dev-libs/boost:=[python?]
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	python? (
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[${PYTHON_USEDEP}]
-			dev-python/cheetah3:=[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-"
-DEPEND="${RDEPEND}
-	dev-libs/utfcpp
-	doc? (
-		dev-texlive/texlive-fontsrecommended
-		sys-apps/texinfo
-		virtual/texi2dvi
-	)
-"
-
-pkg_pretend() {
-	if use python; then
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if use python; then
-		check-reqs_pkg_setup
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Want to type "info ledger" not "info ledger3"
-	sed -i -e 's/ledger3/ledger/g' \
-		doc/{CMakeLists.txt,ledger3.texi} test/CheckTexinfo.py \
-		tools/{cleanup.sh,gendocs.sh,prepare-commit-msg,spellcheck.sh} \
-		|| die "Failed to update info file name in file contents"
-
-	mv doc/ledger{3,}.texi || die "Failed to rename info file name"
-
-	rm -r lib/utfcpp || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCS="$(usex doc)"
-		-DBUILD_WEB_DOCS="$(usex doc)"
-		-DUSE_PYTHON="$(usex python)"
-		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
-		-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON
-		-DBUILD_DEBUG="$(usex debug)"
-		-DUTFCPP_PATH="${ESYSROOT}/usr/include/utf8cpp"
-	)
-	if use python; then
-		mycmakeargs+=(
-			-DPython_EXECUTABLE="${PYTHON}"
-			-DPython_INCLUDE_DIR="$(python_get_includedir)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	cmake_src_install
-
-	newbashcomp contrib/${PN}-completion.bash ${PN}
-}
-
-pkg_postinst() {
-	elog
-	elog "Since version 3, vim support is released separately."
-	elog "See https://github.com/ledger/vim-ledger"
-	elog
-	elog "For Emacs mode, emerge app-emacs/ledger-mode"
-}
-
-# rainy day TODO:
-# - IUSE test
diff --git a/app-office/ledger/ledger-3.2.1.ebuild b/app-office/ledger/ledger-3.2.1.ebuild
index 04e737f4bf0e..285a750b03b1 100644
--- a/app-office/ledger/ledger-3.2.1.ebuild
+++ b/app-office/ledger/ledger-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"