gentoo resync : 05.02.2020

3 files changed, 72 insertions, 60 deletions

diff --git a/app-i18n/pology/Manifest b/app-i18n/pology/Manifest
index 23c4b1abc77e..bc6de0bca5e5 100644
--- a/app-i18n/pology/Manifest
+++ b/app-i18n/pology/Manifest
@@ -1,4 +1,4 @@
 DIST pology-0.12.tar.bz2 1773467 BLAKE2B 7725b6dcb10c0f14533ee31a3d75c78e4fbd12d79ce21017b16d339a880cb73c47c8801e54f5ca0c49d8f364a12179caf6f4100b6eee5b5c47638f61d47a30d0 SHA512 2e23d1dd0c38cc17826908734adf46fb30c30d58f906fc223e2e9251791dad43d02840ae4eca55e04682af574df45a553ccd83faf85a785a1446f645e4222b4f
-EBUILD pology-0.12.ebuild 1518 BLAKE2B 3a06c328587ff66ea3b6de85296e3545c2c51c1fd4fd2487bd0984da799661053b631acfef42e2dcaf40b97313cc96871c8152ecfc265c8d9e234383078c58e0 SHA512 6b2a457f20c3e4fb8300af4b0aff6f502abe0cc405c5faec1111fe62183d9e75d489a9f9467061c8d553ed5777e10b719332a6da5d751b5c993249a525ec37ea
-EBUILD pology-9999.ebuild 1520 BLAKE2B 363e87934d6b2664dcc076611232df108638601ecd925c9df580d30009cc9954b37b41cabcc49ac2a5656eb0c1f42b949fd5c0adcd59b519cd666301739ad8d9 SHA512 17b869529d4dda2adb335a4e1be4999ffcc173c7eed73e88d4889b479a31fe53ca389176114b7f3bc538a9e501c91170f3fca7afceb5724acf1f854ccba186b0
+EBUILD pology-0.12-r1.ebuild 1558 BLAKE2B 0a6385869bbf1c51977ff423d4c3a4e105be43ae11983b07f581937e49e166741d8067a469c2f5b443e000549a1d8928f6624df3c89cd07b696e8df208a92d97 SHA512 b077e75816d0e2267512a03cc74e606238123a100dcc279700554e64c64f7ca682b897482470d0e2e9e6bb15f49dc253e067b6b0b0043d9e3d59e77f5f87422a
+EBUILD pology-9999.ebuild 1560 BLAKE2B c05bef232859bd75de166c8b42506e04dfac28dad26d838ca07ede76f5087c0e04e83086471d1a5bd71428f59c392afe6adf1b3bfca16f2405e171953bac74a3 SHA512 1eaa0871dd39ded1e942de7db9296010a9e19e20e550280155a26d047ca1142d0eac20849b5122f9f9e9eead80fffe48be94261175c67134e61f44a8b3f7b715
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-i18n/pology/pology-0.12.ebuild b/app-i18n/pology/pology-0.12-r1.ebuild
index f30202d5f5e6..da1015d3f26b 100644
--- a/app-i18n/pology/pology-0.12.ebuild
+++ b/app-i18n/pology/pology-0.12-r1.ebuild
@@ -1,61 +1,67 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/l10n-support/pology"
 PYTHON_COMPAT=( python2_7 )
-
-[[ ${PV} == 9999 ]] && VCS_ECLASS="subversion"
-
-inherit python-single-r1 cmake-utils bash-completion-r1 ${VCS_ECLASS}
-unset VCS_ECLASS
+inherit bash-completion-r1 cmake kde.org python-single-r1
 
 DESCRIPTION="A framework for custom processing of PO files"
 HOMEPAGE="http://pology.nedohodnik.net"
-[[ ${PV} == 9999 ]] || SRC_URI="http://pology.nedohodnik.net//release/${P}.tar.bz2"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="http://pology.nedohodnik.net/release/${P}.tar.bz2"
+	KEYWORDS="amd64 x86"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="
-	dev-libs/libxslt
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.5
+"
+RDEPEND="${PYTHON_DEPS}
 	dev-libs/libxml2
+	dev-libs/libxslt
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	sys-devel/gettext
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.5
-	dev-python/epydoc[${PYTHON_USEDEP}]
 "
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+DEPEND="${RDEPEND}"
 
 # Magic on python parsing makes it impossible to make it parallel safe
 MAKEOPTS+=" -j1"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
+	sed -e "/DOC_INSTALL_DIR/s/^/#DONT/" -i CMakeLists.txt || die
 	python_fix_shebang .
 }
 
+src_configure() {
+	local mycmakeargs=(
+		-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Epydoc=ON
+	)
+	cmake_src_configure
+}
+
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
+	python_optimize
 
 	dosym ../../../pology/syntax/kate/synder.xml /usr/share/apps/katepart/syntax/synder.xml
 
 	newbashcomp "${ED}"/usr/share/pology/completion/bash/pology posieve
 	bashcomp_alias {posieve,poediff}{,.py}
 
-	einfo "You should also consider following packages to install:"
-	einfo "    app-text/aspell"
-	einfo "    app-text/hunspell"
-	einfo "    dev-vcs/git"
-	einfo "    dev-vcs/subversion"
-	einfo "    sci-misc/apertium"
+	elog "You should also consider following packages to install:"
+	elog "    app-text/aspell"
+	elog "    app-text/hunspell"
+	elog "    dev-vcs/git"
+	elog "    dev-vcs/subversion"
+	elog "    sci-misc/apertium"
 }
diff --git a/app-i18n/pology/pology-9999.ebuild b/app-i18n/pology/pology-9999.ebuild
index a1c06c9a1711..1670d22e95ef 100644
--- a/app-i18n/pology/pology-9999.ebuild
+++ b/app-i18n/pology/pology-9999.ebuild
@@ -1,61 +1,67 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/l10n-support/pology"
 PYTHON_COMPAT=( python2_7 )
-
-[[ ${PV} == 9999 ]] && VCS_ECLASS="subversion"
-
-inherit python-single-r1 cmake-utils bash-completion-r1 ${VCS_ECLASS}
-unset VCS_ECLASS
+inherit bash-completion-r1 cmake kde.org python-single-r1
 
 DESCRIPTION="A framework for custom processing of PO files"
 HOMEPAGE="http://pology.nedohodnik.net"
-[[ ${PV} == 9999 ]] || SRC_URI="http://pology.nedohodnik.net//release/${P}.tar.bz2"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="http://pology.nedohodnik.net/release/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="
-	dev-libs/libxslt
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.5
+"
+RDEPEND="${PYTHON_DEPS}
 	dev-libs/libxml2
+	dev-libs/libxslt
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	sys-devel/gettext
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.5
-	dev-python/epydoc[${PYTHON_USEDEP}]
 "
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+DEPEND="${RDEPEND}"
 
 # Magic on python parsing makes it impossible to make it parallel safe
 MAKEOPTS+=" -j1"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
+	sed -e "/DOC_INSTALL_DIR/s/^/#DONT/" -i CMakeLists.txt || die
 	python_fix_shebang .
 }
 
+src_configure() {
+	local mycmakeargs=(
+		-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Epydoc=ON
+	)
+	cmake_src_configure
+}
+
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
+	python_optimize
 
 	dosym ../../../pology/syntax/kate/synder.xml /usr/share/apps/katepart/syntax/synder.xml
 
 	newbashcomp "${ED}"/usr/share/pology/completion/bash/pology posieve
 	bashcomp_alias {posieve,poediff}{,.py}
 
-	einfo "You should also consider following packages to install:"
-	einfo "    app-text/aspell"
-	einfo "    app-text/hunspell"
-	einfo "    dev-vcs/git"
-	einfo "    dev-vcs/subversion"
-	einfo "    sci-misc/apertium"
+	elog "You should also consider following packages to install:"
+	elog "    app-text/aspell"
+	elog "    app-text/hunspell"
+	elog "    dev-vcs/git"
+	elog "    dev-vcs/subversion"
+	elog "    sci-misc/apertium"
 }