gentoo resync : 06.08.2019

4 files changed, 2 insertions, 156 deletions

diff --git a/x11-misc/vym/Manifest b/x11-misc/vym/Manifest
index 641e88dbffb9..abe8fd341f70 100644
--- a/x11-misc/vym/Manifest
+++ b/x11-misc/vym/Manifest
@@ -1,8 +1,4 @@
-DIST vym-2.6.11.tar.bz2 6769869 BLAKE2B a528bb84275800f2aefc8a67b03d7b5dcdfab7e8f0f64f42bba46cda8c9dfad6e16aaeecf778b8bbbd99aac5d28bcbe2ff1c3546806395bbaf40f659e42cd31f SHA512 d6ae8346152ab10e12a68f25b4c13c4d40e1a8471df348ba0df9c05bdbe60f86a97912fcca268ec510246fe655a7dcc2d2e9a9332daee09a2a7dda7d6f880aa1
-DIST vym-2.7.0.tar.bz2 6776315 BLAKE2B 1b25f1fc6b08f9582c2df716db9f9361d89cbe1d96862595eda59708bebc08db1d28755516e4096b63427cd069c59c3542d58c6572ac723a97081033b5e97eaf SHA512 4da1ce7f62e29dca798646a114544b5b4b2d42b0b030113eb231c5cb0d8c990c78fcfb78bd47ce1f3efb43647fa8033d1d8eb87907f6c7f486b4dea552e345e8
 DIST vym-2.7.1.tar.bz2 6718924 BLAKE2B d7be8f2d40cedabb1bfaa3b89aac64de5e579f56ebfd757c22d4393ee712c4c4f5bf4747037683e4c6640ab0556ce4ef34bac5b27ecb747a15e58443d57f229f SHA512 985dbf18f743c36b484050ae24e4392eeae701c6c72fca6bd3dc5b70b38a283211946e279804c66253b5a394a642683ca4e3a66a7288400a9193fbcbfd8c9582
-EBUILD vym-2.6.11.ebuild 1409 BLAKE2B 0603472bb4ae494911dd38511e59e41104abd92b99efaffddff178e5a5b6d7ab5d1d0f31f5d2ade4535221227b2807e411b05e630b8983b8d3284a2ccece6af2 SHA512 de7db950fdde7195193a1be7808caa1d3dd0ca33d66e66c3a388af5096d0527472db5b745c8069b42969f53a3677c451f3eba0579d1306221539b276633967b7
-EBUILD vym-2.7.0.ebuild 1404 BLAKE2B 7a59a7574a500296fdc3ced293d086aa673c0d6640f23242d6fade6d3bbc24ceb0a57b29617dd5a3260af9023c6b695e90932b70d278bffa05c88c584a473944 SHA512 7949993038fd707ce724e5a63e4f4405f20e4ef5b6fa8a4906da67a1ee163ecfaaee1ccdf654e2820739c367ca251b45dd6d4a5fa3828f2beb241198882ce54d
-EBUILD vym-2.7.1.ebuild 1411 BLAKE2B c21f2b833eb6eae27cbb154246189d14f32c4aac7a8996d01e5c0039c76d44b53701c40111e676b1f467644fcd00f27dd394b0ae49aa1a1efaf663d21de78dae SHA512 d8bd941230f65f6cba40baec9c1b68dffe58367a5f060657ffcd6e3fa3ec2dd723db9ba7f1cda8ba25192f9fc1e15e71022e6cee6ba0b323ad86a4b01e46fa5f
+EBUILD vym-2.7.1.ebuild 1430 BLAKE2B d1a9b288dcd069e383da292d4b14ca824e55e71211f379672ee48924818e96fcf668971458b7846e73d231b463443929ecadfb075bfb6e06a0c797652aca25d4 SHA512 cb114cd235eb1670fb35e229cc6b68adc1c6448c48b8414eff33cca06b768d359cd6fd15c52923bc31cdd67f7ab0fafd544645b3f6ffe94221399e6d392b40c1
 EBUILD vym-9999.ebuild 1389 BLAKE2B acc59d6a479129646d31b4e9693ca90a2317ddef792c5a76af2399090e30a69fcb6c09788b3d53b2b6b599192996ca8738433aba0488df32edf6ef7507660181 SHA512 421995c8d0379b65330a6d1e52c57322632bf883e8d628b9ddc60767385e158619f187ba9860a2bb405e297b7cbf67f8330bbfd2dc4f9a88a3494e67f44e6c60
 MISC metadata.xml 349 BLAKE2B 2cddfba3480871cb020e1ea5ac3c8af1f0c5be07b9e41880fbf5a36301cd283e941e8c7d8ac47dc27613364e2a003784811c721d31ce2c768d83ea7d86dd2982 SHA512 968e3560ba95072811086fd007ec5397467a9e520ec3bb368c7c3617b94d222fbb3c3929b5b9694e1bebc6af9e736dd17a43321e38e1999c562192687561cca9
diff --git a/x11-misc/vym/vym-2.6.11.ebuild b/x11-misc/vym/vym-2.6.11.ebuild
deleted file mode 100644
index 5a6721089991..000000000000
--- a/x11-misc/vym/vym-2.6.11.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs_CZ de_DE el es fr ia it ja pt_BR ru sv zh_CN zh_TW"
-
-inherit eutils l10n qmake-utils
-
-DESCRIPTION="View Your Mind, a mindmap tool"
-HOMEPAGE="http://www.insilmaril.de/vym/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtxml:5
-	dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( README.md doc/vym.pdf )
-
-src_prepare() {
-	default
-
-	if has es ${LINGUAS-es} ; then
-		DOCS+=( doc/vym_es.pdf )
-	fi
-	if has fr ${LINGUAS-fr} ; then
-		DOCS+=( doc/vym_fr.pdf )
-	fi
-
-	remove_locale() {
-		sed -i \
-			-e "/TRANSLATIONS += lang\/vym.${1}.ts/d" \
-			vym.pro || die
-	}
-
-	gunzip doc/vym.1.gz || die
-
-	#remove dead en translation
-	rm lang/vym.en.ts || die
-	remove_locale en
-
-	l10n_find_plocales_changes lang ${PN}. .ts
-	l10n_for_each_disabled_locale_do remove_locale
-
-	"$(qt5_get_bindir)"/lrelease vym.pro || die
-}
-
-src_configure() {
-	eqmake5 vym.pro \
-		PREFIX="${EPREFIX}"/usr \
-		DATADIR="${EPREFIX}"/usr/share \
-		$(usex dbus "" NO_DBUS=1 )
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	einstalldocs
-
-	doman doc/vym.1
-
-	make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education
-}
diff --git a/x11-misc/vym/vym-2.7.0.ebuild b/x11-misc/vym/vym-2.7.0.ebuild
deleted file mode 100644
index 8420300310dc..000000000000
--- a/x11-misc/vym/vym-2.7.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PLOCALES="cs_CZ de_DE el es fr ia it ja pt_BR ru sv zh_CN zh_TW"
-inherit desktop l10n qmake-utils
-
-DESCRIPTION="View Your Mind, a mindmap tool"
-HOMEPAGE="http://www.insilmaril.de/vym/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtxml:5
-	dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-DOCS=( README.md doc/vym.pdf )
-
-src_prepare() {
-	default
-
-	if has es ${LINGUAS-es} ; then
-		DOCS+=( doc/vym_es.pdf )
-	fi
-	if has fr ${LINGUAS-fr} ; then
-		DOCS+=( doc/vym_fr.pdf )
-	fi
-
-	remove_locale() {
-		sed -i \
-			-e "/TRANSLATIONS += lang\/vym.${1}.ts/d" \
-			vym.pro || die
-	}
-
-	gunzip doc/vym.1.gz || die
-
-	#remove dead en translation
-	rm lang/vym.en.ts || die
-	remove_locale en
-
-	l10n_find_plocales_changes lang ${PN}. .ts
-	l10n_for_each_disabled_locale_do remove_locale
-
-	"$(qt5_get_bindir)"/lrelease vym.pro || die
-}
-
-src_configure() {
-	eqmake5 vym.pro \
-		PREFIX="${EPREFIX}"/usr \
-		DATADIR="${EPREFIX}"/usr/share \
-		$(usex dbus "" NO_DBUS=1 )
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	einstalldocs
-
-	doman doc/vym.1
-
-	make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education
-}
diff --git a/x11-misc/vym/vym-2.7.1.ebuild b/x11-misc/vym/vym-2.7.1.ebuild
index 7dd60221c778..55b9262e9329 100644
--- a/x11-misc/vym/vym-2.7.1.ebuild
+++ b/x11-misc/vym/vym-2.7.1.ebuild
@@ -18,6 +18,7 @@ RDEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
 	dev-qt/qtsvg:5
 	dev-qt/qtxml:5
 	dbus? ( dev-qt/qtdbus:5 )