gentoo resync : 28.04.2018

6 files changed, 2 insertions, 284 deletions

diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index adcf477e9d89..c087b2dc24ff 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,10 +1,5 @@
-AUX texmaker-4.5-modern-styles.patch 658 BLAKE2B d77df38dca7aa2327c5054ee587bc52ba0c829340ab98fe4c2b59ca79d72d06c844ceac5fed88c63300d87366c3fce07e80fd41a1f6731363b5de9e869e36492 SHA512 2b9a5577f7f385eabacb3ed1fb8ebb9665395021fcbf2dab9f960f2607b54bb62eae230e38df8686f3196ab8f1366bee6a012663a9a415a8a133658c3ca8ce27
-AUX texmaker-4.5-unbundle.patch 2672 BLAKE2B 7f3152a9b8ddee4441aae2f27dba7e48847c78971880a1da134f65c7d6fb0fd9c2de2a021434dafdd1874ce26637c486de3621f7396c50d9f7a4e0b2a5cb341c SHA512 121a582394f9d7a89d41b73ec5a8b2206f076a08ba01f91b82155d9b20efbab413431587edf41386e1147324fcc5093db022a43ccf5f62758276c228387e6692
 AUX texmaker-5.0-unbundle-hunspell-singleapp.patch 1886 BLAKE2B 62c66e1e2868f40b243caecaf3f61a283355427a96aa51934e5302e42cb8ee1d816ad080e13b7bb281d1402e032fbb7eac34fd83a7e876856a6d87ad64adc2a0 SHA512 cb944695a1661b067aef0e45dc6dac8cf7d6f589c7f69be49cf7bad2c51899e0cf3f4ed0881899c8185af10f5e36523a6be0a335f6b7668240fb0ec9ae4ca404
 AUX texmakerx_my.pri 128 BLAKE2B 2821eff5f67ac93334518b84b7e1a9b8157de8be13b3d6e801f57ce9937e5586ddbc34fc5ace9706419b79472d660860c36c35a7ae216cea8ff59d54f8b8e8a8 SHA512 ce03623e219b43eca4bcd07b78566d55af78f41483a2659479a9118ffd1a987b77e38c32fa3a9ff2b35556191b708f198668956181e01272f2bc39a828f9277e
-DIST texmaker-4.5.tar.bz2 11287724 BLAKE2B 9138e4765e439419384573aed210b1df30890a1b8f3493e89f85c187bca56791dbdfb4805853dff6335cfeb2fc3ba7a00039927d3476c2c90aaa6d6213ba32b3 SHA512 623ae1496f11e5cd1328b997dbb29ec7188d6c1b256b6370c6fdd4fcda4bfc4b301d29cfa3b2ce529391b8f9913ea4678a6895abfb4fa6f9820e7177c676ab11
 DIST texmaker-5.0.tar.bz2 15728938 BLAKE2B 14d0ea9e7f8b5f4b4e40bfdbe706b585215d0df8546aeb5d614c73314f41b3f0d443ccf5d4ddb0d7eab00bf76a358cbd51e14ff21ac15e0f8e89b884f12719df SHA512 2473e0ad701da399f428caf8b067129c069a86d8cc5f1d0993ba53025961f7caab816195495d63788d58dafa7a208ca8fbcebbac118a49b20f3f639ee377a636
-EBUILD texmaker-4.5-r2.ebuild 1740 BLAKE2B cbcb8086313b36cc4cf8f178932dda1d8d700a75d74e95303872acd59acbb5eef49f24cb81ef3033da79dbf718112986ed04cfafa61c4b0ce4cbdc4c977b10c2 SHA512 1d6025872c47fc3432e886df10c7580ba386316d9a67d022f9806001aef30ae9159a04894a5fcf557245a0f9a872daa4c930a3be6ccaa7ef8b243cb08b879c18
-EBUILD texmaker-4.5-r3.ebuild 1745 BLAKE2B bb45d7ae2a12a02ff08cc6807c4cd62a5eedcedef694244f26b25ba74245a8111f6b60918590d7a65af3ec24345664cff3969e524320763b9d00f317123caadc SHA512 7b8c330700dff8f5fe3e69ff09369983729e2ecd780e31989c8f418f6aa367c7eabcf77aaa736139203bef7f4e58e85d47c1251457d47fe57eb1925a03dfa799
-EBUILD texmaker-5.0-r1.ebuild 1732 BLAKE2B 2cd5841255f7d0d7f82941c1d4a71f6e32e3773370d1194a412328f01f1599204f8406127db5d2038e86e326bec87ef8d4e78a2c3167752b19d6ea92e64a83e7 SHA512 1b1d1581daa0ec5f740f122506e5dc473f71c5401220f78841e075951d50af9ca682b9b6c8ce74beee6530a68611e19192adc19a0b027c0e1f6e5cc4c99f8b50
+EBUILD texmaker-5.0-r1.ebuild 1730 BLAKE2B 0bd989c9a7a357e0756f0d3b905f4d47e4f4c3341524157dea3b250cb1af52a30a18c1406dc6b620d192c9f7dfe3d5a138cd516d134aeb88195392985cdb9298 SHA512 597bd61ec9eda702949cd879b8d31c73514d3db1f4339b17edba53420009d5acf9f834104f910d6d38cdd6598ea29b17a39761e70e44d392827bdcece99fd820
 MISC metadata.xml 371 BLAKE2B 5e48352072e5e7318de74bfd9e5d2fbd6c746092f7a3d89ecd0f60f3c781993f1af0a37754073f5d31d480feb45992d7939ac7c230167650d4a7c859ee4b5f7d SHA512 fc327d181a4a8194af71244eb082e8e9c749b250687f038b740d1f5f62cac02f300becdbaca84b997edf8372b3352a8d840eadc2f06c8171fef339ac5537914c
diff --git a/app-office/texmaker/files/texmaker-4.5-modern-styles.patch b/app-office/texmaker/files/texmaker-4.5-modern-styles.patch
deleted file mode 100644
index 73c3b92f761b..000000000000
--- a/app-office/texmaker/files/texmaker-4.5-modern-styles.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/texmaker.cpp	2014-11-26 09:06:56.000000000 -0300
-+++ b/texmaker.cpp	2015-06-19 20:49:58.801377000 -0300
-@@ -4451,7 +4451,12 @@
- #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
- if (modern_style)
-     {
--qApp->setStyle(new ManhattanStyle(QLatin1String("fusion")));
-+		if(desktop_env == 1){
-+			if (styles.contains("GTK+")) qApp->setStyle(new ManhattanStyle(QLatin1String("gtkstyle")));
-+			else if (styles.contains("Windows")) qApp->setStyle(new ManhattanStyle(QLatin1String("windows")));
-+			else qApp->setStyle(new ManhattanStyle(QLatin1String("fusion")));
-+		}
-+		else qApp->setStyle(new ManhattanStyle(QLatin1String("fusion")));
-     }
- // else
- // {
diff --git a/app-office/texmaker/files/texmaker-4.5-unbundle.patch b/app-office/texmaker/files/texmaker-4.5-unbundle.patch
deleted file mode 100644
index 607b2c8b7e41..000000000000
--- a/app-office/texmaker/files/texmaker-4.5-unbundle.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/configdialog.cpp b/configdialog.cpp
-index dddb11e..9a1aee7 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -222,7 +222,7 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir(PREFIX"/share/myspell");
- #else
- QDir spelldir(PREFIX"/share/texmaker");
- #endif
-diff --git a/texmaker.cpp b/texmaker.cpp
-index b8a2143..a8bcd46 100644
---- a/texmaker.cpp
-+++ b/texmaker.cpp
-@@ -2787,7 +2787,7 @@ if (hasDecodingError)
- QString dicDir=QCoreApplication::applicationDirPath() + "/";
- #else
- #ifdef DEBIAN_SPELLDIR
--QString dicDir=PREFIX"/share/myspell/dicts/";
-+QString dicDir=PREFIX"/share/myspell/";
- #else
- QString dicDir=PREFIX"/share/texmaker/";
- #endif
-diff --git a/texmaker.pro b/texmaker.pro
-index 7e9b706..909eb62 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -98,29 +98,6 @@ HEADERS	+= texmaker.h \
- 	unicodeview.h \
- 	quickbeamerdialog.h \
- 	svnhelper.h \
--	hunspell/affentry.hxx \
--	hunspell/affixmgr.hxx \
--	hunspell/atypes.hxx \
--	hunspell/baseaffix.hxx \
--	hunspell/csutil.hxx \
--	hunspell/dictmgr.hxx \
--	hunspell/hashmgr.hxx \
--	hunspell/htypes.hxx \
--	hunspell/hunspell.hxx \
--	hunspell/hunspell.h \
--	hunspell/langnum.hxx \
--	hunspell/license.hunspell \
--	hunspell/phonet.hxx \
--	hunspell/suggestmgr.hxx \
--	hunspell/license.myspell \
--	hunspell/filemgr.hxx \
--	hunspell/hunzip.hxx \
--	hunspell/replist.hxx \
--	hunspell/w_char.hxx \
--	singleapp/qtlocalpeer.h \
--	singleapp/qtlockedfile.h \
--	singleapp/qtsingleapplication.h \
--	singleapp/qtsinglecoreapplication.h \
- 	encodingprober/CharDistribution.h \
- 	encodingprober/ChineseGroupProber.h \
- 	encodingprober/ctype_test_p.h \
-@@ -210,22 +187,6 @@ SOURCES	+= main.cpp \
- 	unicodeview.cpp \
- 	quickbeamerdialog.cpp \
- 	svnhelper.cpp \
--	hunspell/affentry.cxx \
--	hunspell/affixmgr.cxx \
--	hunspell/csutil.cxx \
--	hunspell/dictmgr.cxx \
--	hunspell/hashmgr.cxx \
--	hunspell/hunspell.cxx \
--	hunspell/phonet.cxx \
--	hunspell/suggestmgr.cxx \
--	hunspell/utf_info.cxx \
--	hunspell/filemgr.cxx \
--	hunspell/replist.cxx \
--	hunspell/hunzip.cxx \
--	singleapp/qtlocalpeer.cpp \
--	singleapp/qtlockedfile.cpp \
--	singleapp/qtsingleapplication.cpp \
--	singleapp/qtsinglecoreapplication.cpp \
- 	encodingprober/CharDistribution.cpp \
- 	encodingprober/ChineseGroupProber.cpp \
- 	encodingprober/JapaneseGroupProber.cpp \
-@@ -336,8 +297,7 @@ icon.path = $${ICONDIR}
- 
- INSTALLS = target
- HEADERS	+= x11fontdialog.h 
--SOURCES	+= x11fontdialog.cpp \
--	  singleapp/qtlockedfile_unix.cpp
-+SOURCES	+= x11fontdialog.cpp 
- FORMS += x11fontdialog.ui
- 
- utilities.files = doc/doc1.png \
diff --git a/app-office/texmaker/texmaker-4.5-r2.ebuild b/app-office/texmaker/texmaker-4.5-r2.ebuild
deleted file mode 100644
index 2c65b02c9180..000000000000
--- a/app-office/texmaker/texmaker-4.5-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qmake-utils readme.gentoo
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEPEND="
-	app-text/hunspell
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXext
-	app-text/poppler[qt5]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtsingleapplication[X,qt5]
-	dev-qt/qtwebkit:5[printsupport]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl
-	app-text/psutils
-	media-libs/netpbm
-	virtual/latex-base"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-unbundle.patch
-	"${FILESDIR}"/${P}-modern-styles.patch
-	)
-
-DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	find singleapp hunspell -delete || die
-
-	epatch "${PATCHES[@]}"
-
-	cat >> ${PN}.pro <<- EOF
-	exists(texmakerx_my.pri):include(texmakerx_my.pri)
-	EOF
-
-	cp "${FILESDIR}"/texmakerx_my.pri . || die
-
-	sed \
-		-e '/^#include/s:hunspell/::g' \
-		-e '/^#include/s:singleapp/::g' \
-		-i *.cpp *.h || die
-
-	DOC_CONTENTS="A user manual with many screenshots is available at:
-	${EPREFIX}/usr/share/${PN}/usermanual_en.html"
-}
-
-src_configure() {
-	local myeqmakeargs=(
-		${PN}.pro
-		PREFIX="${EPREFIX}/usr"
-		DESKTOPDIR="${EPREFIX}/usr/share/applications"
-		ICONDIR="${EPREFIX}/usr/share/pixmaps"
-		)
-		eqmake5 ${myeqmakeargs[@]}
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-	readme.gentoo_create_doc
-}
diff --git a/app-office/texmaker/texmaker-4.5-r3.ebuild b/app-office/texmaker/texmaker-4.5-r3.ebuild
deleted file mode 100644
index 79f1a8da1221..000000000000
--- a/app-office/texmaker/texmaker-4.5-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qmake-utils readme.gentoo-r1
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEPEND="
-	app-text/hunspell
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXext
-	app-text/poppler[qt5]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtsingleapplication[X,qt5]
-	dev-qt/qtwebkit:5[printsupport]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl
-	app-text/psutils
-	media-libs/netpbm
-	virtual/latex-base"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-unbundle.patch
-	"${FILESDIR}"/${P}-modern-styles.patch
-	)
-
-DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
-HTML_DOCS=( doc/. )
-
-src_prepare() {
-	find singleapp hunspell -delete || die
-
-	epatch "${PATCHES[@]}"
-
-	cat >> ${PN}.pro <<- EOF
-	exists(texmakerx_my.pri):include(texmakerx_my.pri)
-	EOF
-
-	cp "${FILESDIR}"/texmakerx_my.pri . || die
-
-	sed \
-		-e '/^#include/s:hunspell/::g' \
-		-e '/^#include/s:singleapp/::g' \
-		-i *.cpp *.h || die
-
-	DOC_CONTENTS="A user manual with many screenshots is available at:
-	${EPREFIX}/usr/share/${PN}/usermanual_en.html"
-}
-
-src_configure() {
-	local myeqmakeargs=(
-		${PN}.pro
-		PREFIX="${EPREFIX}/usr"
-		DESKTOPDIR="${EPREFIX}/usr/share/applications"
-		ICONDIR="${EPREFIX}/usr/share/pixmaps"
-		)
-		eqmake5 ${myeqmakeargs[@]}
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-	readme.gentoo_create_doc
-}
diff --git a/app-office/texmaker/texmaker-5.0-r1.ebuild b/app-office/texmaker/texmaker-5.0-r1.ebuild
index f16ec154c5c3..f05efde98875 100644
--- a/app-office/texmaker/texmaker-5.0-r1.ebuild
+++ b/app-office/texmaker/texmaker-5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 COMMON_DEPEND="