gentoo resync : 18.08.2019

6 files changed, 8 insertions, 195 deletions

diff --git a/app-office/ledger/Manifest b/app-office/ledger/Manifest
index a0551da2d304..c0a8f65bfe9a 100644
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@@ -1,9 +1,3 @@
-AUX 50ledger-gentoo.el 166 BLAKE2B f833556da775338829a7dbb288b89f267cbc9723b82fe21a502e96253a132043a12b3737c208f025635cfa8edf8e3d406bc236ad8debf708a66fca3edb162446 SHA512 d5e2450d19d5d24e2db22429fa2ee8d46ae7284c91b1f2ed6eb32a0e6b70e1996f4b2f41812084b0330011d33fbcb2da11bf2d5b9f28a157f4c05d1106c418d5
-AUX ledger-3.1.1-boost.patch 774 BLAKE2B e201dbf7d7af357081112518cf6b615162802307fd708d58df59ad79f12aaf19c3f2ff4645e025145e6afe6078b48f6df27d4128cd71e12e7605c976a4650aa0 SHA512 7f7eaa69ef377df1e9e449981c446ea52ef1d2311a9d96e325bf067af702f0361b05d70d6d52bdeefc7c9471cb68eceaa6fae313976e9b9676110b4e97198ba8
-AUX ledger-3.1.1-r1-boost-python.patch 368 BLAKE2B c9a07bfdf02908bab8f20ebc9da5d9dc21c9fa4f8ffe626b8cb71e9e7d10f675eb1541dd845681839965ae387c5ae9a3244c877e1660f55be467cb4183079964 SHA512 5a63031fd5567234d9f12bc0fecb2e5b92da813c7e528c8e042d55b86d1c177acea4aabc94b6058fead2e8c4f835cd213b67531018e17ee805d7975fb71b50a7
-DIST de1b48a013b6f4bdf68f7edf333db63a0994ef20.patch 4533 BLAKE2B 39a2ef3b9e6a8e495837376c8a36c9276fbf58bd4ff45a07926e71ca40d65ddb5761e107752247fa2986e63d454e6461bdf0a3bc7bc773db97dcd3027091a841 SHA512 019c862fecb3f3a0682c2f1237ecebec40eafae0b38d6b5d8e56f9829155353569f889dac468ff5b1b2e23f15ae9fe538a0b027f628776f27ea818c12fd1d0b2
-DIST ledger-3.1.1.tar.gz 842364 BLAKE2B 83f9008f6daf4da39ece192388e0231719bc7297d2a911f1209662f57d2963b9ea09a5b6de9450ed29c5973efa47d9d6a250e052c155d9ba742cdb3ee075f341 SHA512 3f81b98a414cdfc0e272de4e958770149fb1acc8bda880d270e1459ce35294a220c52820bb9af49a751ac3a80b878f81fc7799ba41e0a1be43eba72081351bf5
 DIST ledger-3.1.2.tar.gz 801112 BLAKE2B 71b907a83fe10857d17de746c0d124572859c9eca237130ebbfa5b730406470a5d31025736e80516feaac7daf14a4edb8b644ed72a0827f9714ac9cb2b79c0fb SHA512 445d9a9c70aa3e59718f8fb75e4110c73f2f476436149fdd456b5fe7b9cee9333c09647080049989599dfac491e5bdd0d143717e58e15989db0fcaad4e5a958d
-EBUILD ledger-3.1.1-r2.ebuild 2822 BLAKE2B 02ee45f98407e32c93a1329529282e2350ca5eff73ea8bea55c649e49907ed164a6d2f50544036fc72ae7b60a28018ab46e376a042810c4a738e0b95c8eff144 SHA512 236d8733fd099ef097abd1d87105cf0c2aa5e2ac6a9068edbf851d2bc5c5ff67c591a667381abc352e49652a30f2a1ed8d512df081ef952e080b9c55c00a31a0
-EBUILD ledger-3.1.2.ebuild 2762 BLAKE2B 60d16871738477b0af27b3739927721b12b124e6d7659f382391bc1910e9afbab6ad9f28a9480df2c5465829f5b7c667b8bc546f85c8348d543616814d75f5b0 SHA512 8b4fbc5ffffca3c0000d21c2e70ca787ceef1f00d96ca691c742c7c4dccb52ce616f9d70c50a45eb52cfdc90ed77479cb2ba1d4161f49b0b0427a77ca3dac2ae
+EBUILD ledger-3.1.2.ebuild 2570 BLAKE2B 2c55c43f52b7ea80e37fbe6f9c50bc567d701b40254143df9828f6343b1b851108a5de040ecb9448f4d8c8f20b329ef9bb6391962fbc23fade4515d09a461f7e SHA512 272b5aa6e203d97355fa2ef982d0745aa9b0b0c68601e81332551a46d83873b873bbbd09d3ba5606b90c96f81b2d5d71874d58113faedf89be6a4ec8ef3eadd4
 MISC metadata.xml 306 BLAKE2B 58c3d0307a4358f50e8ede8ddf3f598a55ad03dd9af3351b4f15a46465a844c24f9d5966ee5fbbcb9a68d65eb509a18a87aa95400094539475f65493e34f1839 SHA512 c83b1be9474bbfa3296040c56bf14e22afd214835a44907bcb4db2a8047f05e1fe49b1d1ebe5bcd72fe5ed2f27c832d20169aa813f0d9bd619fc1f7a1c5e15cb
diff --git a/app-office/ledger/files/50ledger-gentoo.el b/app-office/ledger/files/50ledger-gentoo.el
deleted file mode 100644
index 1c2c5bde2f8b..000000000000
--- a/app-office/ledger/files/50ledger-gentoo.el
+++ /dev/null
@@ -1,5 +0,0 @@
-
-;;; app-office/ledger site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'ledger-mode "ledger-mode" "A mode for editing ledger data files." t)
diff --git a/app-office/ledger/files/ledger-3.1.1-boost.patch b/app-office/ledger/files/ledger-3.1.1-boost.patch
deleted file mode 100644
index b69a42a50113..000000000000
--- a/app-office/ledger/files/ledger-3.1.1-boost.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 1856b8c4902498843f4da37a7aaeb2ce85acc1d3 Mon Sep 17 00:00:00 2001
-From: Denis <dkasak@users.noreply.github.com>
-Date: Mon, 12 Sep 2016 12:49:40 +0200
-Subject: [PATCH] Fix compilation error with boost 1.61
-
----
- src/item.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/item.h b/src/item.h
-index ca16d87b3..4dc6df7e6 100644
---- a/src/item.h
-+++ b/src/item.h
-@@ -92,7 +92,7 @@ class item_t : public supports_flags<uint_least16_t>, public scope_t
- 
-   typedef std::pair<optional<value_t>, bool> tag_data_t;
-   typedef std::map<string, tag_data_t,
--                   function<bool(string, string)> > string_map;
-+                   std::function<bool(string, string)> > string_map;
- 
-   state_t              _state;
-   optional<date_t>     _date;
diff --git a/app-office/ledger/files/ledger-3.1.1-r1-boost-python.patch b/app-office/ledger/files/ledger-3.1.1-r1-boost-python.patch
deleted file mode 100644
index 6839b3f60674..000000000000
--- a/app-office/ledger/files/ledger-3.1.1-r1-boost-python.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f8dbd892..6aacd5b3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -67,7 +67,7 @@ if (USE_PYTHON)
- 
-   find_package(PythonLibs)
-   if (PYTHONLIBS_FOUND)
--    set(BOOST_PYTHON python)
-+    set(BOOST_PYTHON python-2.7)
-     set(HAVE_BOOST_PYTHON 1)
-     include_directories(SYSTEM ${PYTHON_INCLUDE_DIRS})
-   else()
diff --git a/app-office/ledger/ledger-3.1.1-r2.ebuild b/app-office/ledger/ledger-3.1.1-r2.ebuild
deleted file mode 100644
index 9bacf38fd693..000000000000
--- a/app-office/ledger/ledger-3.1.1-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit check-reqs cmake-utils elisp-common python-single-r1
-
-DESCRIPTION="A 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
-		 https://github.com/ledger/ledger/commit/de1b48a013b6f4bdf68f7edf333db63a0994ef20.patch"
-LICENSE="BSD"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="debug doc emacs python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="test"
-
-SITEFILE=50${PN}-gentoo.el
-
-CHECKREQS_MEMORY=8G
-
-RDEPEND="
-	dev-libs/boost:=[python?]
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	emacs? ( virtual/emacs )
-	python? (
-		dev-libs/boost:=[${PYTHON_USEDEP}]
-		dev-python/cheetah
-		${PYTHON_DEPS}
-	)
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/utfcpp
-	doc? (
-		sys-apps/texinfo
-		virtual/texi2dvi
-		dev-texlive/texlive-fontsrecommended
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-${PV}-boost.patch" # bug 609108
-	"${FILESDIR}/${PN}-3.1.1-r1-boost-python.patch" # bug 654326
-	"${DISTDIR}"/de1b48a013b6f4bdf68f7edf333db63a0994ef20.patch
-	)
-
-# Building with python integration seems to fail without 8G available
-# RAM(!)  Since the memory check in check-reqs doesn't count swap, it
-# may be unfair to fail the build entirely on the memory test alone.
-# Therefore check-reqs_pkg_pretend is deliberately omitted so that we
-# ewarn but not eerror.
-pkg_pretend() {
-	:
-}
-
-pkg_setup() {
-	if use python; then
-		check-reqs_pkg_setup
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Want to type "info ledger" not "info ledger3"
-	sed -i -e 's/ledger3/ledger/g' \
-		doc/ledger3.texi \
-		doc/CMakeLists.txt \
-		test/CheckTexinfo.py \
-		tools/cleanup.sh \
-		tools/gendocs.sh \
-		tools/prepare-commit-msg \
-		tools/spellcheck.sh \
-		|| die "Failed to update info file name in file contents"
-
-	mv doc/ledger{3,}.texi || die "Failed to rename info file name"
-
-	eapply_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EMACSLISP="$(usex emacs)"
-		-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)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	use doc && cmake-utils_src_make doc
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	einfo
-	einfo "Since version 3, vim support is released separately."
-	einfo "See https://github.com/ledger/vim-ledger"
-	einfo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
-
-# rainy day TODO:
-# - IUSE test
diff --git a/app-office/ledger/ledger-3.1.2.ebuild b/app-office/ledger/ledger-3.1.2.ebuild
index 15695c673914..38cba372bc38 100644
--- a/app-office/ledger/ledger-3.1.2.ebuild
+++ b/app-office/ledger/ledger-3.1.2.ebuild
@@ -5,27 +5,24 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit check-reqs cmake-utils elisp-common python-single-r1
+inherit check-reqs cmake-utils python-single-r1
 
 DESCRIPTION="A 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"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE="debug doc emacs python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="test"
 
-SITEFILE=50${PN}-gentoo.el
-
 CHECKREQS_MEMORY=8G
 
 RDEPEND="
 	dev-libs/boost:=[python?]
 	dev-libs/gmp:0=
 	dev-libs/mpfr:0=
-	emacs? ( virtual/emacs )
 	python? (
 		dev-libs/boost:=[${PYTHON_USEDEP}]
 		dev-python/cheetah
@@ -42,8 +39,6 @@ DEPEND="
 	)
 "
 
-PATCHES=()
-
 # Building with python integration seems to fail without 8G available
 # RAM(!)  Since the memory check in check-reqs doesn't count swap, it
 # may be unfair to fail the build entirely on the memory test alone.
@@ -82,8 +77,6 @@ src_prepare() {
 		|| die "Failed to update info file name in file contents"
 
 	mv doc/ledger{3,}.texi || die "Failed to rename info file name"
-
-	eapply_user
 }
 
 src_configure() {
@@ -108,21 +101,14 @@ src_compile() {
 
 src_install() {
 	cmake-utils_src_install
-
-	use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	einfo
-	einfo "Since version 3, vim support is released separately."
-	einfo "See https://github.com/ledger/vim-ledger"
-	einfo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
+	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: