gentoo resync : 08.05.2018

17 files changed, 76 insertions, 365 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index d1702bce1361..4bd4f619f59f 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 9ac9965049cf..50cad8267b1c 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,3 +1,5 @@
 DIST gnumeric-1.12.38.tar.xz 19807364 BLAKE2B 5b250991d2a635334d1799b421733a50cbe5dc92c3b792f0c8f3635a37bb72601f62e444ed7cb705ae7456b804fd16e8ab7c1b6567db27a9f12b4b5407b30e1b SHA512 71cf29355b865a3c0f966482ef0cbc90553326fcdc10103762d6c35c1f932371b5dffa3d3d89cd575d3f202ba041e4caaf987db08051b700757ea165508ea217
+DIST gnumeric-1.12.39.tar.xz 20040688 BLAKE2B 5d99da20b567a939208881b962de3c79ab115a24953dc04d6c882e9a54946e5c5fbd32808a8006e396d70bc9a2a9783b20106536da1c19f7ed7dccd3b12c2fff SHA512 8ae09ea857989e65a8fe2070b30c2309d82daa4142816ef3a1b107035aea0d71498d84eaeeaa870a1587e3785146fad3304321a531c75f6e2f200def53a8e898
 EBUILD gnumeric-1.12.38.ebuild 1481 BLAKE2B b276ce951f9fe55b64c122dbbeef2bba20cfa60c8401c0f6d334a7578b7fb4d4470e79ff811072720e0523235ecf164cc1384a7fa31baed9eef09737413d9e8a SHA512 3d07d4c973902f3b8ad45bb5ceb0c7173ea7d6ee90e604043d04457dbab7b82d29c223f4a1b87e402eac5d1668ed3a631cafa535cbe7b7485639bb9a53ff0c4f
+EBUILD gnumeric-1.12.39.ebuild 1483 BLAKE2B 348c5face71c7d5b3fdb17542e9e10e5fedbcdd9e288b1a026ea2f74983aaa7e4dcdd3e0b310707739ad2d16459daa6755abcffd632d46a6f0cb8c90445a87c2 SHA512 8b209d8b0614a5f587daa8dabbbfbf39d1be558191abd0d169bf9fda53315cdad74dfef24f6a0113956f65eef87877814fb1a177d00834abcde003c9c4dfa4e9
 MISC metadata.xml 465 BLAKE2B c246609f5d6b20c968faeb36a0c6e33df41ae8a373360ed003541fdf816ff9399f62ababfc4aea5c557bcf9dac83a71357ce9e789ca08d94e83cdeda83aaa275 SHA512 753783aee82021a573093a0ecb7807bdf56d037032fb1afa5559db44b1d06f72bdf9aedfead48cae9917d78aaa7c39d19e528946ef45b51fd6cf5357b9b020fa
diff --git a/app-office/gnumeric/gnumeric-1.12.39.ebuild b/app-office/gnumeric/gnumeric-1.12.39.ebuild
new file mode 100644
index 000000000000..4c5b03f89eb7
--- /dev/null
+++ b/app-office/gnumeric/gnumeric-1.12.39.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 flag-o-matic python-single-r1
+
+DESCRIPTION="The GNOME Spreadsheet"
+HOMEPAGE="http://www.gnumeric.org/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="+introspection libgda perl python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Missing gnome-extra/libgnomedb required version in tree
+# but its upstream is dead and will be dropped soon.
+
+# lots of missing files, also fails tests due to 80-bit long story
+# upstream bug #721556
+RESTRICT="test"
+
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	>=dev-libs/glib-2.38.0:2
+	>=gnome-extra/libgsf-1.14.33:=
+	>=x11-libs/goffice-0.10.38:0.10
+	>=dev-libs/libxml2-2.4.12:2
+	>=x11-libs/pango-1.24.0:=
+
+	>=x11-libs/gtk+-3.8.7:3
+	x11-libs/cairo:=[svg]
+
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS}
+		>=dev-python/pygobject-3:3[${PYTHON_USEDEP}] )
+	libgda? ( gnome-extra/libgda:5[gtk] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.0
+	app-text/yelp-tools
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-zlib \
+		$(use_with libgda gda) \
+		$(use_enable introspection) \
+		$(use_with perl) \
+		$(use_with python)
+}
diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest
index d309adc6b160..6c69c11d9a9f 100644
--- a/app-office/kexi/Manifest
+++ b/app-office/kexi/Manifest
@@ -2,5 +2,5 @@ AUX kexi-3.1.0-qt-5.11.patch 724 BLAKE2B 8571c381220f163685017a5f6ed74cae80042e2
 DIST kexi-3.0.2.tar.xz 3676556 BLAKE2B 2d1d08904c4459362d7e0d2f79bd9ae0dce2bf11c18e6a9c3a68276bbd8c2fa67075c5d0739f7ecbb853802791df8676b76b0900eda396b62d0e09cb7f3a2107 SHA512 ef1da2e4a7b9d1f80200feb111f5dcedf8e3422e797bba4ac45744cb4b2f948cf3190aa0d126d0a3bb2bfb88f8fa112919e3dbb191bfcedd03e8e4512d1cf74e
 DIST kexi-3.1.0.tar.xz 3028492 BLAKE2B 8af7105ba570af225e7e2cbea2ab15d0c6e4997414c321654691af1329930754bea8a52c3ce5abb246c6a47e17473c462b9212eab8ef30fc23e4691f2ab8c9b2 SHA512 538b8b2c021bababb59a05cd477aa4414df76f84a9ae88244afe6f3dc29751257bfee2586279ee8ee7800d939702c3a81f71562039a6f97132f2cba4e9018118
 EBUILD kexi-3.0.2.ebuild 2076 BLAKE2B cd375cffc042e1b3a2f12896b9a5b4ce3a53363ad05264e7b7fb8be7ab28b2ff38e617da4e97807f11519da7687f8dd66f1b564982b994122eea4e2cc627abdd SHA512 d24fcd511261340f6efc35c5a6179d102f905e9f61df808d80cc77e79e09fc0234c47d6b0c624b3ae349d173ff96a5885b87446fe2cf20b83a63bff2ebccfa15
-EBUILD kexi-3.1.0.ebuild 2387 BLAKE2B 718a49a42c1895f747d89a30d76f0a95dfeacaab981cd51b30cda70c7703c0bdbeb55c15a00d4ba19134def2f791365ea61b35432a2aaa1160f376f1d583424b SHA512 f1bfcc7abce347c1d855ce79740af600911a398ecd8fa5a7e7e62b84fa34213c7a5dfdd3e417fde7f3fb0897440e9d85b7d1846541143e9212159ccbb712af69
+EBUILD kexi-3.1.0.ebuild 2385 BLAKE2B fd7a0627ebf0d073102aaef30cd88cf5be1699507e4b8aee3b8666d095eb3c11967cea140db81ab5d45953faa6013a796aa8afbc619e2313523005ceedc84e56 SHA512 d205bdf08b3394f34d27ffc4edc2152c88b76bdd63cc3c1c38391f667076856b7675d13a685a47b6068d1f1325ddd05008060c8630216d205b9fc8184eab89ac
 MISC metadata.xml 600 BLAKE2B 383b28f24ff8522330ed843789c30ac771b4ecb03f45f7f60503463ead5e6a6fd4480eea83be7904d3e0cfecaca73c6fc9d8d29214fbfb2082aa97c45ba607ff SHA512 fc7615150e90fb963d4ae2775b5d0dda7667c0fd975cdcd8e5d52a87d01935471c37c9256e894c68fe88268d61d7a3cde42f36171f9160dae20ce8140eaab22f
diff --git a/app-office/kexi/kexi-3.1.0.ebuild b/app-office/kexi/kexi-3.1.0.ebuild
index 8ceeaf7b7c77..8074480ced66 100644
--- a/app-office/kexi/kexi-3.1.0.ebuild
+++ b/app-office/kexi/kexi-3.1.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Visual database applications creator"
 HOMEPAGE="https://www.kde.org/applications/office/kexi/ http://www.kexi-project.org/"
 [[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug experimental marble mdb mysql postgres sqlite webkit"
 
 COMMON_DEPEND="
diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index 507f1f3854ed..c0cb0427cea7 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,17 +1,9 @@
 AUX texmacs-1.99-remove-new-declaration.patch 842 BLAKE2B d460a29e2c25467083f3dce164bc194aa49b7621188a701b057918a99ed377cd3467e8eec6b0c6988269454950a8750498fe0bb0bbf001eaf434221cfbe695cb SHA512 2296a42b907577f44e3b498ffa95cf1a1cc1dc729e340d3238b1e19796854d7405fbab888910f1f305a87477cdd40648a7bd2c5651f65bc642273ef4310df9a9
 AUX texmacs-1.99.2-desktop.patch 632 BLAKE2B cecbcf2b6cd731ef6e710d6e361af138a7ecc3f799fa1a046239319f481eac5a7ad4a7c40ab77e4c18809b9d80e51cb3b4815465e29d7e4597cbba1575fca885 SHA512 b523cde99001915ea83b1dfc644f1d4189b7c04ca11d7504e4f63dad1c19c6bb23af1d6b028ff9635594146c7263730a843b833cd77bf9a91023102f68e7cac3
-AUX texmacs-1.99.2-norpath.patch 428 BLAKE2B 3af37ef5c77816f15a46cf373d2052675e451ab78f13ca55f86da8f32a4327a17c850b7b533c72e0c94d1fdde22df306ac6fdf718ecd8045f603a1f26a3857c7 SHA512 7cd81f6199823fb1a50af697d9456db53db18ffb8de84bbbbd35a58020d288239dc7ab5e4e13b7db19189393292cb2d312bae52540999898342f7a505c9eb21d
-AUX texmacs-1.99.2-underlinking.patch 559 BLAKE2B 5f72d821cba36b3d7100233146f0f64ef1e8e74a75cc4f8c4bf3fc20315438c11c434d3223fd27b7f58ea3583caa3f1977b8b31ef4628c395a05f2d31c0ed858 SHA512 4d8805895b02adf107acc32e434a28f7def6fffe0d69d1b49f0d6cffbe94d55dbe31ee4c4c2ae7709313c6ce7b0d5c9cebb11004cf6e9f6a08f46cf3725a223b
 AUX texmacs-1.99.6-guile-size_t.patch 777 BLAKE2B de238311e50465a7644cd2b38dcdab093e7607edfb1b256b691a440c10254417c57c1cabcab694ff2e2001fe7772d23f0fbc0d75bd89807434805030adc60c5f SHA512 646123b545eb64c5af8041c0d93498ea8f984a6ac6c9820288c3e9a0e78a4dc3ef85665839aa48af02078aa41cf3ff60af6d759f5e16ad3a85f1a0dcf964c1ec
 AUX texmacs-1.99.6-math_util.patch 635 BLAKE2B 6846fbfc616937f09588520a0ea4a495edaeb93698068c3fd17c6705b3e70f571f28fb51e62e9568b22c77b8f20a59253bc9d994b890f555cf30ab58df84bf89 SHA512 9bc920c80ad5e68bf2262c1f808ac71b04fdeb301f0daa884ee1049c668f80151c4ab94972f902ec7417f6fed3057e5373673c0507597dcacc97b932bdf8ced5
 AUX texmacs-plugins-1.patch 2920 BLAKE2B b0b19c3e573b6d8d4a10b128feee839bd991eab46d39b5959d3afce3a02ccc471a6db9b5807523f35fb23dae87957b19fce1181296453fb19e2538c720798a38 SHA512 e8d9617166b712dfdf72b4c7b97a8945cbd5d505c092eb59a31de05b44b48d75839cb6344ba96ec378cca322a3fc17d99cb7f8e27c1fed86dc0d3329b02c1ca6
 AUX texmacs-updates.patch 1387 BLAKE2B 4a6014fb55e912611aab02fc27970aad58183f3cabded7f773def36c56a0dd1ae6e16c955c7b6ee37a696470e04219dfb5abaf64885c3d1af9c8dc792f73511f SHA512 209c5f64e21ae76fe41419101afb98ce4f61f040e9d29e3dbe37ec5bb0e16a1f3dd5aebe381db99e8d7278c5c36cd1654f78ba4af69e032670b1fdb62aafbda1
-DIST TeXmacs-1.99.2-src.tar.gz 18957858 BLAKE2B e109f012158d3382d26c52db2695df3d15fcbf45b85437e4bde0854a52762c6fd3ac630408d3e1e6cd29cb121def3bd6ce217464fc638c99fa120718ab7b7a5e SHA512 e9d2dd0aab2e66470c4ae860e13b6fad2cc07913f14f7bca042c703d4d8b4a62fafafa711b81a0d8f8c125a3641b8bb5f38cd3adac74ec18895671423aa60be9
-DIST TeXmacs-1.99.5-src.tar.gz 25014543 BLAKE2B 22c6f876015e6641959cded32dae93eda7e1c153f82c2fb60c026c9243c6e35d4b29df42c265a947e64a07cb72de6436e066713b200e3ec66bd4f1f274473807 SHA512 a7d846fd8823e486cf724bfcbe04ae877dd64995d6131af59b49427a1178e36b52b9fcd9109783b9ae1e39c988ae9ed497b1540dce29645ebf2c4301ca7357a8
 DIST TeXmacs-1.99.6-src.tar.gz 25081652 BLAKE2B 08d0a141ff1b8ab59def50c636d917f9290488031d6f7f4343be4a04af44d8994dc791eb23a2a2b71b7a853a3a90482313062fbfc045cf585afdf8f1f8d2a5f3 SHA512 2e262037654493075cc4a3d47b93de08c3ad2d6f10ce5fe814a8046b38d327c5dd88c1575dff7e2145f1541f9765dc50ec5abcd63146090eea98ab5db9d103ee
-EBUILD texmacs-1.99.2-r1.ebuild 1862 BLAKE2B cd1461aabf07e1d05a017262ffd2af2dc603072b6e463c04f9ddc29788fddc7f07ee5f8cd95be7c4bef3ed19cc4a3dee0e2ab140449acb9b8969faff57a363ce SHA512 bc3aaef39f89cafc1c400901968afb80b75cedca5770a4d3a5d1d9543695d5346f4f38c4035a7b8576a3dd16a5d128dedf646ecd4d49a9ddbe64206b4ce4ee24
-EBUILD texmacs-1.99.5.ebuild 1843 BLAKE2B 9f0b108f28f5b87385bd2fc1dd08ed126b9b4e746aef03e966c5d7fbf89fe033da68fdf775e27385ccc416064dc2d5297282fc7628a431a82a97043fc298ad67 SHA512 ae3bc96c6f1ee161fdf6208098cfde2973f952b598de191ca9c663f1d0e2d9485ea191fc5b77c6f04ec0f876f2db3c5c8df7e7021c1d477abe3e92483f5a7368
-EBUILD texmacs-1.99.6-r1.ebuild 1622 BLAKE2B 3319e55f13cf44b4c4b369f6d7285aea29d3ab6461b307abbb6703b6fb0933b72042ea3615e92a210ac0ba6700e8063f2a5d4308aa3847fcd123778dfdd0357f SHA512 e1185f7d064e3385e4f9f90a56dffb9611f4f5e5f88f3716bd47a2b3a875d2cc948a71206c6cf939bcc78d686db3160340b0cc230e494b626355d03c93d1ca32
 EBUILD texmacs-1.99.6-r2.ebuild 1785 BLAKE2B 6fb9540ef2c46708964b09fc23b5a74e6ea118c305ce8854b5de63e006031ed15b23c0a3f0ac8f4c3f33992893107352344c55188d56e5f8903179ecefc1bba6 SHA512 8cfd5382dae4077521cef701d4035091dd3bb747bc228014317fb239ca956866203003e73c45dd23923f0f538ae7426793eb1c9e071cb8c9c455cf6281759af9
-EBUILD texmacs-1.99.6.ebuild 1728 BLAKE2B 224d270304193f3a72f120dec1601d7c97bf02e3d776ed1d0d6d9a3ed818cd8bd83a21464c12bd2f943b8efb020106984f7b920c33adcb5ff8dace528c1f1916 SHA512 14c8ef5ab2859752524efa4f507966d48d148c6930b964d49a25699b2e25644c2d0ab5692eecd9d9965166731719b526e2fcedfa6649837cf4cd6e309eee76d0
-MISC metadata.xml 532 BLAKE2B 8f4a56ce00b94350aa8597db3fa2f65d676675ee212040b1bd5518563cf7c13e9499d2cb800b4e03e5159280ef17c6ca389b151833e587efe710835cc49ac1f4 SHA512 f7a15d31b19285e863c32dbe1a6e77b10d4a9295dc2f9444a69173eb13e5334acedb0b547253dbe0734a33402e11cd9859c07d8d5db1be3370e547cd96266601
+MISC metadata.xml 465 BLAKE2B 83db49ca728b78d790abe6b985aa080aeeef8c053a11b3528ae5ffceaf9869412e54811869126783ab342b39664413ff8c456677234e6ee7b0e16284c4006a05 SHA512 265d5a99f3545c420a002d757a136dc4bfd320af5420d70b723b023274ee7a44ed47e26735cec36775130f4a0dcc984f29239514780e3a8e86cbae00c93e9610
diff --git a/app-office/texmacs/files/texmacs-1.99.2-norpath.patch b/app-office/texmacs/files/texmacs-1.99.2-norpath.patch
deleted file mode 100644
index b210a78c6d01..000000000000
--- a/app-office/texmacs/files/texmacs-1.99.2-norpath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- configure.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index d79d4b2..8a558af 100644
---- a/configure.in
-+++ b/configure.in
-@@ -691,7 +691,7 @@ CONFIG_CXXOPTIMIZE="-O2"
- CONFIG_BSTATIC="-lXdmcp -lXau -lXrender"
- CONFIG_BSHARED="-Wl,-Bdynamic"
- CONFIG_BFLAGS=""
--CONFIG_BPATH="-Wl,-rpath,"
-+CONFIG_BPATH=""
- CONFIG_LDRT=""
- CONFIG_WORD_LENGTH="4"
- CONFIG_WORD_LENGTH_INC="3"
diff --git a/app-office/texmacs/files/texmacs-1.99.2-underlinking.patch b/app-office/texmacs/files/texmacs-1.99.2-underlinking.patch
deleted file mode 100644
index 69a37aae71e5..000000000000
--- a/app-office/texmacs/files/texmacs-1.99.2-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/makefile.in b/src/makefile.in
-index f5666c2..b9a10d6 100644
---- a/src/makefile.in
-+++ b/src/makefile.in
-@@ -399,7 +399,7 @@ TEXMACS_objects := $(strip $(call uses,system kernel data graphics\
- 
- link_options:=-L$(tmsrc)/lib $(LDRT) -lm $(LDPATH) $(LDGUI) $(LDICONV) \
-    $(LDGUILE) $(LDAXEL) $(LDCAIRO) $(LDIMLIB2) $(LDSQLITE3) $(LDFREETYPE) \
--   $(LDDL) $(LDSPARKLE)
-+   $(LDDL) $(LDSPARKLE) -lz
- 
- $(tmsrc)/bin/texmacs.bin: Objects/texmacs-$(link).bin
- 	$(CP) $^ $@
diff --git a/app-office/texmacs/metadata.xml b/app-office/texmacs/metadata.xml
index d6df84643b71..ba45e88b5f02 100644
--- a/app-office/texmacs/metadata.xml
+++ b/app-office/texmacs/metadata.xml
@@ -11,6 +11,5 @@
   </maintainer>
   <use>
     <flag name="netpbm">Add support for <pkg>media-libs/netpbm</pkg></flag>
-    <flag name="pdf">Add the experimental native pdf export</flag>
   </use>
 </pkgmetadata>
diff --git a/app-office/texmacs/texmacs-1.99.2-r1.ebuild b/app-office/texmacs/texmacs-1.99.2-r1.ebuild
deleted file mode 100644
index b699dc377ee2..000000000000
--- a/app-office/texmacs/texmacs-1.99.2-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils fdo-mime gnome2-utils
-
-MY_P=${P/tex/TeX}-src
-
-DESCRIPTION="Wysiwyg text processor with high-quality maths"
-HOMEPAGE="http://www.texmacs.org/"
-SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="imlib jpeg netpbm pdf qt4 svg spell"
-KEYWORDS="alpha amd64 ppc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	dev-scheme/guile:12[deprecated]
-	media-libs/freetype
-	x11-apps/xmodmap
-	x11-libs/libXext
-	virtual/latex-base
-	imlib? ( media-libs/imlib2 )
-	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
-	netpbm? ( media-libs/netpbm )
-	qt4? ( dev-qt/qtgui:4 )
-	spell? ( app-text/aspell )
-	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# respect LDFLAGS, bug #338459
-	"${FILESDIR}"/${PN}-plugins-1.patch
-
-	# dont update mime and desktop databases and icon cache
-	"${FILESDIR}"/${PN}-updates.patch
-
-	# underlinking 540600
-	"${FILESDIR}"/${P}-underlinking.patch
-
-	# scanelf: rpath_security_checks(): Security problem NULL DT_RUNPATH
-	"${FILESDIR}"/${P}-norpath.patch
-
-	"${FILESDIR}"/${P}-desktop.patch
-
-	# remove new/delete declarations, bug 590002
-	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	mv configure.{in,ac} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-optimize="${CXXFLAGS}" \
-		$(use_with imlib imlib2) \
-		$(use_enable qt4 qt) \
-		$(use_enable pdf pdf-renderer)
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-office/texmacs/texmacs-1.99.5.ebuild b/app-office/texmacs/texmacs-1.99.5.ebuild
deleted file mode 100644
index 879508352d2e..000000000000
--- a/app-office/texmacs/texmacs-1.99.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools fdo-mime gnome2-utils qmake-utils
-
-MY_P=${P/tex/TeX}-src
-
-DESCRIPTION="Wysiwyg text processor with high-quality maths"
-HOMEPAGE="http://www.texmacs.org/"
-SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="imlib jpeg netpbm pdf svg spell"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	<dev-scheme/guile-1.9[deprecated]
-	media-libs/freetype
-	x11-apps/xmodmap
-	x11-libs/libXext
-	virtual/latex-base
-	dev-qt/qtgui:4
-	imlib? ( media-libs/imlib2 )
-	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
-	netpbm? ( media-libs/netpbm )
-	spell? ( app-text/aspell )
-	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# respect LDFLAGS, bug #338459
-	"${FILESDIR}"/${PN}-plugins-1.patch
-
-	# dont update mime and desktop databases and icon cache
-	"${FILESDIR}"/${PN}-updates.patch
-
-	"${FILESDIR}"/${PN}-1.99.2-desktop.patch
-
-	# remove new/delete declarations, bug 590002
-	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.{in,ac} || die
-
-	eautoreconf
-
-	# delete files that contain binary
-	# headers only used on OS X
-	rm src/{Plugins/Ghostscript/._ghostscript.cpp,System/Misc/._sys_utils.cpp} || die
-}
-
-src_configure() {
-	econf \
-		--enable-optimize="${CXXFLAGS}" \
-		--with-qt="$(qt4_get_bindir)" \
-		$(use_with imlib imlib2) \
-		$(use_enable pdf pdf-renderer)
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-office/texmacs/texmacs-1.99.6-r1.ebuild b/app-office/texmacs/texmacs-1.99.6-r1.ebuild
deleted file mode 100644
index 22770bc0ecc5..000000000000
--- a/app-office/texmacs/texmacs-1.99.6-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils gnome2-utils qmake-utils
-
-MY_P=${P/tex/TeX}-src
-
-DESCRIPTION="Wysiwyg text processor with high-quality maths"
-HOMEPAGE="http://www.texmacs.org/"
-SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="jpeg netpbm sqlite svg spell"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	<dev-scheme/guile-1.9[deprecated]
-	media-libs/freetype
-	x11-apps/xmodmap
-	x11-libs/libXext
-	virtual/latex-base
-	dev-qt/qtwidgets:5
-	dev-qt/qtprintsupport:5
-	sqlite? ( dev-db/sqlite )
-	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
-	netpbm? ( media-libs/netpbm )
-	spell? ( app-text/aspell )
-	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# respect LDFLAGS, bug #338459
-	"${FILESDIR}"/${PN}-plugins-1.patch
-
-	# dont update mime and desktop databases and icon cache
-	"${FILESDIR}"/${PN}-updates.patch
-
-	"${FILESDIR}"/${PN}-1.99.2-desktop.patch
-
-	# remove new/delete declarations, bug 590002
-	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch
-
-	"${FILESDIR}"/${PN}-1.99.6-math_util.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SQLITE=$(usex sqlite sqlite3)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-office/texmacs/texmacs-1.99.6.ebuild b/app-office/texmacs/texmacs-1.99.6.ebuild
deleted file mode 100644
index c4e5c3f4e6fe..000000000000
--- a/app-office/texmacs/texmacs-1.99.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools xdg-utils gnome2-utils qmake-utils
-
-MY_P=${P/tex/TeX}-src
-
-DESCRIPTION="Wysiwyg text processor with high-quality maths"
-HOMEPAGE="http://www.texmacs.org/"
-SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="imlib jpeg netpbm pdf svg spell"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	<dev-scheme/guile-1.9[deprecated]
-	media-libs/freetype
-	x11-apps/xmodmap
-	x11-libs/libXext
-	virtual/latex-base
-	dev-qt/qtgui:4
-	imlib? ( media-libs/imlib2 )
-	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
-	netpbm? ( media-libs/netpbm )
-	spell? ( app-text/aspell )
-	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# respect LDFLAGS, bug #338459
-	"${FILESDIR}"/${PN}-plugins-1.patch
-
-	# dont update mime and desktop databases and icon cache
-	"${FILESDIR}"/${PN}-updates.patch
-
-	"${FILESDIR}"/${PN}-1.99.2-desktop.patch
-
-	# remove new/delete declarations, bug 590002
-	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch
-
-	"${FILESDIR}"/${PN}-1.99.6-math_util.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.{in,ac} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-optimize="${CXXFLAGS}" \
-		--with-qt="$(qt4_get_bindir)" \
-		$(use_with imlib imlib2) \
-		$(use_enable pdf pdf-renderer)
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index e10e92ad817c..fa6847cad962 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -4,9 +4,9 @@ DIST texstudio-2.12.2.tar.gz 26311798 BLAKE2B 1eb3add771a28918f39c69bb167eee3145
 DIST texstudio-2.12.4.tar.gz 26401510 BLAKE2B 53f1aca4f28154c5ae0f941e074e2da6d727dedf6b5604b301efccd95eea256a6cb91bf887985d81c65964c0e407cd1a8c2037a3bd73559aa115bec3954df744 SHA512 6e1d114ae87c854231399004504e460d078b9bf26ceb25c7fc592b79d3234f9880f8c021c3ddb2ef26a883dbddc2b94f98f368c976aa16973d3c1a6823a4150d
 DIST texstudio-2.12.6.tar.gz 26511069 BLAKE2B 95f2043222e15f96ed56dabb9bbbb937e3f8f1869cb667897bbdb48b99626089bf14a5e321c57ca5c9196d1cf2ce0beaad322b04d90f8a0b62189ff7c5be0d33 SHA512 16e846137b529f89f10dba3f847afe5a875ce1bc4029d002f76a1bcde491dd44756b27e38b4c5c159fcdb12b025759c8a0ebbbb8d8bd296e954b53032434170a
 DIST texstudio-2.12.8.tar.gz 26555418 BLAKE2B 172c36aed91d273629109412e43f947c00e7d37d392098cc012826391c88f461659764b6b8c4fcff3d84e6ba7b10a4adddcc4298267e0fa0448a61f4c9b9da15 SHA512 0076617f6421fa959c8c327bc81d4d27779358481b377d83856fe26b963d7c3c1e04d3b11e8f7eeb99cab9c089c8e7afcbb9c93a5aaccd00cf493792b802bfcb
-EBUILD texstudio-2.11.2-r1.ebuild 2113 BLAKE2B 123caf206da0d34921034d24ac523c285c660b5fc009a10bb956d90612dfbd7759cc8cd945f56bd4e3e7f1af97413353abaa78717c8845ae9493f7fd18ac7357 SHA512 2541f1968678b19f968d7aa72160d353c3a15d188eb629c0e713e06cc763016225e790062b33db64786a29890c4f07970c2cd6edd060dadad1a47e1aeeeeaa8a
-EBUILD texstudio-2.12.2.ebuild 2005 BLAKE2B 91e574cd0e5b203401f325696eccd0af0838257c040613f526d795196465a2a745be40748c025ecc880ebac28757a12e398b2286fd6904fb5309b7f900eb2888 SHA512 e2e89de904974450994b081f66667f7a56fd70813cde1619394c7ba94e5468a4d55a18c89318a03d36176fb04d6862b1a230dd5ecc9eb3c116cc7879a79b1d22
-EBUILD texstudio-2.12.4.ebuild 2005 BLAKE2B 91e574cd0e5b203401f325696eccd0af0838257c040613f526d795196465a2a745be40748c025ecc880ebac28757a12e398b2286fd6904fb5309b7f900eb2888 SHA512 e2e89de904974450994b081f66667f7a56fd70813cde1619394c7ba94e5468a4d55a18c89318a03d36176fb04d6862b1a230dd5ecc9eb3c116cc7879a79b1d22
+EBUILD texstudio-2.11.2-r2.ebuild 2118 BLAKE2B ef3cf0188f7be031583769e3936f91b8c40514bb7f308abeb568e2b1061f3683c62d35301969f30356f62c477ec65a429d97d69138a9b5f90c12949fb88d485b SHA512 18e063c1bd1927d0b433a3eef4739507921e44d028e3816f12736bacd68d4d64eb91db17efd55e108372ccc2dd0c0cdf760eb2b14c606a9613166caa2e1011fd
+EBUILD texstudio-2.12.2-r1.ebuild 2008 BLAKE2B f1f75a8bd3aa0e7670f07ca4d8e1f277efe73571d41defd0d9aba41135724e2f416c3c8ec42ac3789d822de27ea043c926c033076aa795181f730139a0f900ea SHA512 c9c41476e79ec6a18504df3374f2c9548993e7880d4d4ce78e986704f2785fd7a4eeba939b9dca7bd7c2ef800d62c046b52a73768bd19bd204cc739180047b3a
+EBUILD texstudio-2.12.4-r1.ebuild 2008 BLAKE2B f1f75a8bd3aa0e7670f07ca4d8e1f277efe73571d41defd0d9aba41135724e2f416c3c8ec42ac3789d822de27ea043c926c033076aa795181f730139a0f900ea SHA512 c9c41476e79ec6a18504df3374f2c9548993e7880d4d4ce78e986704f2785fd7a4eeba939b9dca7bd7c2ef800d62c046b52a73768bd19bd204cc739180047b3a
 EBUILD texstudio-2.12.6-r1.ebuild 2287 BLAKE2B 2c3382c11397fe7d66f36afd2f0add6b5c1cae1d9253212a546c4d23d9097f182a53046756d35fb5135bbb08b0525c3769f2ddedd02d8fc4beb047f64ee4bda8 SHA512 2a49c0caf28da9b255ea4ccd729544bdd610bedfafde221babd4af540e459e6e0169cef7056b4e77054cabc7743449389f258b001726aa53466b9273a2ebd31e
 EBUILD texstudio-2.12.8-r1.ebuild 2008 BLAKE2B 4d4207f8ac211ad6db04b7ce4d5e4334414c2d8891496047952b4e47ce90045c3b523580a31e8a915e11330d1b438f873a8da040c41721c873795faea40bd8ff SHA512 7a0b9faaa1b4ec009c2ae5e3de5b2caefed838bfc1c2c7ffe0cce4f6fbea83be625ea38bc3c732a477db3540b979d5dad5dcd047bf5972273a6adf590c869874
 MISC metadata.xml 402 BLAKE2B 175128174922bf7356817c3752f7207f5c6b2827c0d52e8e0d837fbd19b4429eb6d0154b729d89ff5eff2ed777fad5f05b43c52a3bd5d57ebca3d31c09439964 SHA512 f587cb59a103c39e4685815677a9cc6de4b0db189332b520aaefb3011fe1537485f184395e19f2c18a24dd7f2101e5d5dc2f3eed38f18623cb7a69ebd52da41f
diff --git a/app-office/texstudio/texstudio-2.11.2-r1.ebuild b/app-office/texstudio/texstudio-2.11.2-r2.ebuild
index 4a09a12f83d9..2fd2e68965da 100644
--- a/app-office/texstudio/texstudio-2.11.2-r1.ebuild
+++ b/app-office/texstudio/texstudio-2.11.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="video"
 
 COMMON_DEPEND="
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtscript:5
-	dev-qt/qtsingleapplication[qt5,X]
+	dev-qt/qtsingleapplication[qt5(+),X]
 	dev-qt/qtsvg:5
 	dev-qt/qttest:5
 	dev-qt/qtwidgets:5
diff --git a/app-office/texstudio/texstudio-2.12.4.ebuild b/app-office/texstudio/texstudio-2.12.2-r1.ebuild
index 2e154f9ff33c..d7e445fa62a4 100644
--- a/app-office/texstudio/texstudio-2.12.4.ebuild
+++ b/app-office/texstudio/texstudio-2.12.2-r1.ebuild
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtscript:5
-	dev-qt/qtsingleapplication[qt5,X]
+	dev-qt/qtsingleapplication[qt5(+),X]
 	dev-qt/qtsvg:5
 	dev-qt/qttest:5
 	dev-qt/qtwidgets:5
diff --git a/app-office/texstudio/texstudio-2.12.2.ebuild b/app-office/texstudio/texstudio-2.12.4-r1.ebuild
index 2e154f9ff33c..d7e445fa62a4 100644
--- a/app-office/texstudio/texstudio-2.12.2.ebuild
+++ b/app-office/texstudio/texstudio-2.12.4-r1.ebuild
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtscript:5
-	dev-qt/qtsingleapplication[qt5,X]
+	dev-qt/qtsingleapplication[qt5(+),X]
 	dev-qt/qtsvg:5
 	dev-qt/qttest:5
 	dev-qt/qtwidgets:5