gentoo resync : 15.12.2019

6 files changed, 136 insertions, 58 deletions

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 989d47be2539..bb59b5718566 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,3 +1,6 @@
+AUX cherrytree-0.38.9_update_setup_py.patch 748 BLAKE2B de89314f017fed48e2433bfbffd47b117234e779e80c9c2a8eebe80371be95a2b8f8fa4941544c674695121396e34e8b65c558ff3e642f74eab83d693fc22a78 SHA512 26a2f7e92717cd2e0e2f60b6df2ed2a861ba77a94b957e1841cd57f3377044ee1b52e179d3566795c9501472a76530a25f4c752a9046ac341bb533ead86c7d41
 DIST cherrytree-0.37.0.tar.gz 8888703 BLAKE2B 737c0c247c581086e23e4c3e5fba0b18459788b385078ec8092af8b7352d77c8b273c939f702178d0ae59c8633bf996a7a7e5223e22da703ced3c8bf1d7cbde3 SHA512 a1aaf92657c58c70430a45adaa771050b43476bc2a33dc929b108842d5ef46aa83c4fa4cfe8c4f54a9a3656fc0d30046fae34cbac5aa9fe3f32aa539058636f5
-EBUILD cherrytree-0.37.0.ebuild 1191 BLAKE2B 106630e09107a750bed11980bcb458fc39e194e7a6b03a3bd2d0a045ca84ba5e34f1337f92f3dad2e36a4f2c1cb979e6dfafa6a6434febf569ae482747ad26a5 SHA512 2cdb77421a542d6070be7fa933de3c083c0865f6cc58d93815ee9faf52c47f34154eb4acd7f0c6edea7c091e243789ee7824256ef947c725c3c78b5248de5e19
-MISC metadata.xml 250 BLAKE2B 9676935c062d76f3e06a49612672d533ba7f431e0819084758da368a632e3cdfbaa68da7e367b0847ed2e66db4e5a41377dd80819cca08af3dbce53fb3622d36 SHA512 c9d9bb6db803a0958073fb76a3d26192374ec85b66ccddaac01829afea556302126f99dc6158d71ae4cc9e5152da0ce203ad527ffe923edb6239c7ff43e19a76
+DIST cherrytree-0.38.9.tar.gz 9928805 BLAKE2B 4de4187ae7e650090d82de5e8b1b7f85c4af6dbb2c9b2bc67f10b074db4c08c4b4593c4769708bfaf584958eefe083a3626f7e9c4d7736bc53d143528c754e09 SHA512 40c1c26fa1a6868b447d31625c14b10cf712185289cf97b71881c253d2f72c58f51b974a1615fca5b532099c4741c56f8419df2d02e4ca821b2a1b909152e56b
+EBUILD cherrytree-0.37.0-r1.ebuild 1132 BLAKE2B e5ae77a4c323746f0a868ddb93ad875e1002096f584702a85953843a27ad87ceb15acde9526fc7bade6aa5c064d8aab667bbae4cc8fb372d1a950124925fd26a SHA512 387fd2dca8b5eaa9e633652ef969ddbb448ca3a50028afc26bba5a6020a5b150a5961dc9c7e3ed8f2d08fecf0694830898d1b6cc391ede10a57ddc80524f24ca
+EBUILD cherrytree-0.38.9.ebuild 1215 BLAKE2B 8c2ace0779ac24e801a5c70cca565bdd0022035dd8de2483fb2969662021e6ff838166c21738ba167c470bd495741362b8ac067bad7cc7f5138e8b58ef2867f0 SHA512 8271aad0b8dd6c8cac7d59ff0ea9e83b212f2513ca62971f31ba5abb87f7aebc5b3c3e2fce80ef1ce515ef7e051da58be17905769997196de033cf287ebf8d66
+MISC metadata.xml 444 BLAKE2B d40087a12c79b778c4af5cd9b7eea1299941df716a11351acb087ad6ff3bc64e271bc54014b4fd9402fc679cd15d63a91ab5c1b8a838a9203b463e0ed21e4b60 SHA512 f3a43e7c407bbc442b165e5fe5401a1a0090f925bfb34b1e1fb6e46a068c274c5202f32f5e733b8abcfbee33e59677cd0b85017fc544f5fc1cfb7a0ea5156448
diff --git a/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild b/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild
new file mode 100644
index 000000000000..b7c0b37e37f2
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A hierarchical note taking application"
+HOMEPAGE="https://www.giuspen.com/cherrytree"
+SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="nls"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	dev-python/pygtksourceview:2[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+python_prepare_all() {
+	sed -r -i \
+		-e '/\bupdate-desktop-database\b/d' \
+		setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	use nls || mydistutilsargs+=( --without-gettext )
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/cherrytree/cherrytree-0.37.0.ebuild b/app-text/cherrytree/cherrytree-0.37.0.ebuild
deleted file mode 100644
index 70d1db48a137..000000000000
--- a/app-text/cherrytree/cherrytree-0.37.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=true
-
-inherit xdg distutils-r1
-
-DESCRIPTION="A hierarchical note taking application"
-HOMEPAGE="https://www.giuspen.com/cherrytree"
-LICENSE="GPL-3"
-
-SLOT="0"
-SRC_URI="https://github.com/giuspen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	x11-libs/libX11
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.16:2[${PYTHON_USEDEP}]
-	dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-PLOCALES="cs de es fr hy it ja lt nl pl pt_BR ru sl tr uk zh_CN"
-inherit l10n
-
-python_prepare_all() {
-	xdg_src_prepare
-
-	if use nls ; then
-		l10n_find_plocales_changes 'locale' '' '.po'
-
-		rm_loc() {
-			rm -v -f "locale/${1}.po" || return 1
-		}
-		l10n_for_each_disabled_locale_do rm_loc
-	fi
-
-	sed -r -e '/\bupdate-desktop-database\b/d' -i -- 'setup.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	use nls || mydistutilsargs+=( --without-gettext )
-}
diff --git a/app-text/cherrytree/cherrytree-0.38.9.ebuild b/app-text/cherrytree/cherrytree-0.38.9.ebuild
new file mode 100644
index 000000000000..80af20d9208c
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.38.9.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A hierarchical note taking application"
+HOMEPAGE="https://www.giuspen.com/cherrytree"
+SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="nls"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=( "${FILESDIR}"/${P}_update_setup_py.patch )
+
+python_configure_all() {
+	use nls || mydistutilsargs+=( --without-gettext )
+}
+
+src_install() {
+	distutils-r1_src_install
+	python_optimize "${D}/usr/share/${PN}/modules"
+
+	dodoc README.md changelog.txt
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/cherrytree/files/cherrytree-0.38.9_update_setup_py.patch b/app-text/cherrytree/files/cherrytree-0.38.9_update_setup_py.patch
new file mode 100644
index 000000000000..aad93f93a154
--- /dev/null
+++ b/app-text/cherrytree/files/cherrytree-0.38.9_update_setup_py.patch
@@ -0,0 +1,17 @@
+diff -ur a/setup.py b/setup.py
+--- a/setup.py	2019-08-17 14:23:16.000000000 +0300
++++ b/setup.py	2019-11-17 15:33:44.243070851 +0300
+@@ -195,7 +195,7 @@
+                       ("share/mime-info", ["linux/cherrytree.mime", "linux/cherrytree.keys"]),
+                       ("share/application-registry", ["linux/cherrytree.applications"]),
+                       ("share/metainfo", ["linux/cherrytree.appdata.xml"]),
+-                      ("share/man/man1", ["linux/cherrytree.1.gz"])
++                      ("share/man/man1", ["linux/cherrytree.1"])
+                    ],
+        cmdclass={
+             'build': BuildData,
+@@ -205,4 +205,3 @@
+           },
+        distclass=CherryTreeDist
+     )
+-    subprocess.call("update-desktop-database")
diff --git a/app-text/cherrytree/metadata.xml b/app-text/cherrytree/metadata.xml
index e69a8d811bcb..92aea49ad5a3 100644
--- a/app-text/cherrytree/metadata.xml
+++ b/app-text/cherrytree/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>email@linxon.ru</email>
+		<name>Yury Martynov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">giuspen/cherrytree</remote-id>
 	</upstream>