gentoo resync : 21.07.2018

3 files changed, 140 insertions, 0 deletions

diff --git a/app-office/ledger/Manifest b/app-office/ledger/Manifest
index d638b9ecadaf..28ec2c6f7dce 100644
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@@ -1,5 +1,7 @@
 AUX 50ledger-gentoo-3.1.1.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 ledger-3.1.1.tar.gz 842364 BLAKE2B 83f9008f6daf4da39ece192388e0231719bc7297d2a911f1209662f57d2963b9ea09a5b6de9450ed29c5973efa47d9d6a250e052c155d9ba742cdb3ee075f341 SHA512 3f81b98a414cdfc0e272de4e958770149fb1acc8bda880d270e1459ce35294a220c52820bb9af49a751ac3a80b878f81fc7799ba41e0a1be43eba72081351bf5
+EBUILD ledger-3.1.1-r1.ebuild 2636 BLAKE2B 79c1885af47d053f0a0a5e8f86bc87f7e457095209079ab0bf88d167cb6c9659810b26e3ec14c269e09e309ff3476dcaaf8b3ebef2bc0f49e4c3227748d03112 SHA512 fa6103bb7636ab421c7e805261841d02e1c930fe2a180e7671b87d2d886b289b7d83057d8bd1323e4f3c67ec39bf2fcf1c56d6a0c72ddf4fc15d5c9ff1d5594e
 EBUILD ledger-3.1.1.ebuild 3207 BLAKE2B 7a6764868596f6ba5d807a06abb17123a86ecca02e977d5c5f983b41176f6f5a48947acb0e2084459f44615cb52efe5b0669f1304e7bdc7ec7e86a335fd2efb1 SHA512 d8543a0877eb080b97c01eb5306ad2967dab2cf5d522875cc03d07d4b6f899aaa01cb0333e5e0aaba8341939e09207a4f19acfa62c1ea0c1c67d6afd9b413fde
 MISC metadata.xml 306 BLAKE2B 58c3d0307a4358f50e8ede8ddf3f598a55ad03dd9af3351b4f15a46465a844c24f9d5966ee5fbbcb9a68d65eb509a18a87aa95400094539475f65493e34f1839 SHA512 c83b1be9474bbfa3296040c56bf14e22afd214835a44907bcb4db2a8047f05e1fe49b1d1ebe5bcd72fe5ed2f27c832d20169aa813f0d9bd619fc1f7a1c5e15cb
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
new file mode 100644
index 000000000000..6839b3f60674
--- /dev/null
+++ b/app-office/ledger/files/ledger-3.1.1-r1-boost-python.patch
@@ -0,0 +1,13 @@
+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-r1.ebuild b/app-office/ledger/ledger-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..3618c77570fb
--- /dev/null
+++ b/app-office/ledger/ledger-3.1.1-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="doc emacs python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+SITEFILE=50${PN}-gentoo-${PV}.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}/${PF}-boost-python.patch" # bug 654326
+	)
+
+# 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
+	)
+
+	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