gentoo resync : 10.04.2018

10 files changed, 101 insertions, 32 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index e1687464587c..6b24539afc24 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calcurse/Manifest b/app-office/calcurse/Manifest
index f9751737eaf5..c06600dcefe9 100644
--- a/app-office/calcurse/Manifest
+++ b/app-office/calcurse/Manifest
@@ -1,9 +1,8 @@
 AUX calcurse-4.2.1-tinfo.patch 644 BLAKE2B e304953d56dc8891138e909f0b7b31b85b89a16800a1e8efc64a199cb884b730c3123f902ffe2095d392c41cbf0f65b88d440fff2133816b2763ea74a5e44770 SHA512 099ead1b288717e9d9eff331c2fbb9ff8deb19b1843109549ebdab30e8e59cc9cbb01a89c87e84e9283003ce70fc595e2305936a8a0918b0996b5fab1854cb5f
-AUX calcurse-4.2.2-tinfo.patch 644 BLAKE2B e304953d56dc8891138e909f0b7b31b85b89a16800a1e8efc64a199cb884b730c3123f902ffe2095d392c41cbf0f65b88d440fff2133816b2763ea74a5e44770 SHA512 099ead1b288717e9d9eff331c2fbb9ff8deb19b1843109549ebdab30e8e59cc9cbb01a89c87e84e9283003ce70fc595e2305936a8a0918b0996b5fab1854cb5f
 DIST calcurse-4.2.1.tar.gz 612593 BLAKE2B 7c8fb995ea16abcdd5ae768cda09298e4bdeb64d8476657b3d1320394a269add3b1c4279e8a6b7a089f27404d43ec3acfbab6222cfce74dc422042247109fb00 SHA512 77f7fd23fe28e34ace29239530948c7576196339e4c603952dd5d48a201fa2e52bfcfaf411edf3f299c9d8b30d659febade68679fc65a2b87afb305bbf5db8df
 DIST calcurse-4.2.2.tar.gz 612456 BLAKE2B b73e876f671b75d362bf32bfc341fd985796a6be6b5c4164464bdef1f35d26fbecec3bb7f5dcd54a1ab9e3405186ea2d791484902643362738db38d647d786b3 SHA512 d54d5a1ca457499ff82fe0b6a945f5f54c0f93f84b34d5a69579dd42d4d44edda0b81a165d29b4f3d77ef7219b2e815b5858eaa744eb418e9549abf58eb2f958
 DIST calcurse-4.3.0.tar.gz 597490 BLAKE2B 7fe31fc09cae12438173d4846a1e4b0a55f9e9416ab23ffc8b78e9d0f621072d8aca96b4161d5659db088e1007f685228e9669aae2d5606939c6564252826e1d SHA512 d948354b512d406f4915ce37107d3f529031e7698d7b38465913ff37120a93283e01f09f5267ebb19bf39ea133d6fac579b218d6dfd6056003b6222f9038f4b3
-EBUILD calcurse-4.2.1.ebuild 746 BLAKE2B 94eaa97681fb0457d9b0174489ba54ac6f88423525fdbba95bdca3d7b04d5bafb22cac0326e3328959634932cb578d5fec0d5fa419210cde70eba63c362d0659 SHA512 7801a2c2b438bc1b8445b889a49e96c224de3ce7eb1ad1b93872abdd773757991f04c6a3216b1b5fd8ec74bc91ce42b3dba6611b69d502fed34b8a93acacd266
-EBUILD calcurse-4.2.2.ebuild 750 BLAKE2B df5bdf8cfb996a9aaf988070806d051de2f078182c237f5773135ae63d79331a007d160ae2de1183ab820f6051f9689f8e0efb83070df85bdedbc4b9e7f2f19f SHA512 88127c3a377944f6ecf57243675793ea57c5ccba6ea2a52a21f5b065a4d7968af80cc272decd8e8bf312d79aae29f968d7b4721b6282fc555b03b45ea0cf0767
+EBUILD calcurse-4.2.1.ebuild 753 BLAKE2B 887f074217c25fecdb8371f3f39ab385e4bb1a00669006579bae4cbc82de2bd2d17bcb9a17e23484a4991662a955c54477fc9560c9bd973daa44f1d500033516 SHA512 bbb022efef48be9a1b5af2cf507f3f27fbcad4d92e6aff2ee7a81da8b0db6df2470ef2fa2edbd93bca57b85591729cc43bc817f1352e63140ae87861185c6b2f
+EBUILD calcurse-4.2.2.ebuild 757 BLAKE2B 022c02f259d9aaaca16af2828ceaabc74ad018dbc331197b2e654d053cd4bce7f9fca42626304c557d32863f0cfff571c6ed51cf5ef82a2ecbc18da65f608894 SHA512 f5feb455b786a468278a3787c6be46939a401ac87c53ac539441cfd574dffe8f7a8dad2ad811c368e8441fb5161b13e1451314684cf0146a2805522e6b4136b4
 EBUILD calcurse-4.3.0.ebuild 595 BLAKE2B 5fda7c84ae551dff89ed88b6c425114f72ad6dcd74b8f513bb8d7ced6ee1cbaa3dbb62feb4cf7b0cb15fda6891af03b4d005a151cb67215396e60ab779317965 SHA512 21ec3c14523bc61f7b37404ca5aa9894e6516eb338350cc445db6fb0a76a921adeb3672217eb5460d4ffa923da9cab1319c73488281f2c6ed011bc9e1eefc970
 MISC metadata.xml 593 BLAKE2B 313dee286f4f73406dc3a9a00c8bb59df524df4ac3ced089fea16522d22d99580972c1e52822df1d4c7b527b3c48dce3b825d662458e6194343ec66f2024f73b SHA512 41f0c2a630723427fb5f4033b928c1dc0e4c7bd08f301240458129b08e9baab02141e214b73a393a8c7af58ef1b6f785f701407e111a49b825e5006078caa9a8
diff --git a/app-office/calcurse/calcurse-4.2.1.ebuild b/app-office/calcurse/calcurse-4.2.1.ebuild
index 533762c2e262..47cddd1eb692 100644
--- a/app-office/calcurse/calcurse-4.2.1.ebuild
+++ b/app-office/calcurse/calcurse-4.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS NEWS README )
 
-PATCHES=( "${FILESDIR}"/"${P}-tinfo.patch" )
+PATCHES=( "${FILESDIR}"/"${PN}-4.2.1-tinfo.patch" )
 
 src_prepare() {
 	default
diff --git a/app-office/calcurse/calcurse-4.2.2.ebuild b/app-office/calcurse/calcurse-4.2.2.ebuild
index 8e6722e27efe..109005b664a8 100644
--- a/app-office/calcurse/calcurse-4.2.2.ebuild
+++ b/app-office/calcurse/calcurse-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS NEWS README )
 
-PATCHES=( "${FILESDIR}"/"${P}-tinfo.patch" )
+PATCHES=( "${FILESDIR}"/"${PN}-4.2.1-tinfo.patch" )
 
 src_prepare() {
 	default
diff --git a/app-office/calcurse/files/calcurse-4.2.2-tinfo.patch b/app-office/calcurse/files/calcurse-4.2.2-tinfo.patch
deleted file mode 100644
index f3d2aac897e9..000000000000
--- a/app-office/calcurse/files/calcurse-4.2.2-tinfo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -3,7 +3,7 @@
- #-------------------------------------------------------------------------------
- AC_PREREQ(2.59)
- AC_INIT([calcurse],
--        m4_esyscmd([build-aux/git-version-gen .version]),
-+        m4_esyscmd_s([cat .version]),
-         [bugs@calcurse.org])
- AM_INIT_AUTOMAKE
- #m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-@@ -51,6 +51,9 @@
-   LIBS="$LIBS -l$available_ncurses"
- ])
- 
-+AC_SEARCH_LIBS([cbreak], [tinfow tinfo],,
-+    AC_MSG_ERROR([Cannot find a library providing cbreak]))
-+
- AC_CHECK_HEADERS([pthread.h], [
-     AC_CHECK_LIB(pthread, pthread_create, [
- 	LIBS="$LIBS -pthread"
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 598fae4c5453..85d8229b3f0e 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -4,6 +4,6 @@ AUX lyx-2.3.0-python.patch 1049 BLAKE2B 94591099e6b0d52429fa1e066475283ae35ba89a
 AUX lyx-2.3.0-qt-5.11.patch 481 BLAKE2B 86883721e9d59d0b05d465419e93038c64ee5b473e32cd182487661383ad4921e92d89fe24610046b9434c87b361e66927db385fb9faf0bc2c7e5a85fb84f416 SHA512 aac667b6b28c2053eabbd66516e59970ccfec26504185e8ebc481427c159255ef3e2434bd57aa45a9960fabf7e36549f44302c3fa146f26009e0582ee0cfa8f4
 DIST lyx-2.2.3.tar.xz 15501856 BLAKE2B 08606f0c18d9cb5891bd7d612361597e3efc7e7855f7607c2620f10ddb22b7078d5085f725911496198d2d8a47ece54cbfe67cfbf4ec8eb15450271cd133b095 SHA512 b5a4a16b22680022651a0f3911c2c24bcd3541a573e672e541cb0af6572089e4b0e0ec1cafb40850e75c377e7da5b286d0314886e0c57d55f57645d8e4a07708
 DIST lyx-2.3.0.tar.xz 15676680 BLAKE2B 4b09f4c3979f51a8b30825c07fe3b24f080bfc8f42d54e94809e342087b683ca24edcb835994583b28d5b9c13868736f850d6c88b229e2d7f6f6bc0fd64c722c SHA512 77366d365f600069564b6d508ba2169744bbc7bc4dc9cb7e9d5f44941796dd7a027ca9ad08f5a67fd6863cbd1f6308ce5233b6e8685ebc6cf78ed19eef84ccb5
-EBUILD lyx-2.2.3-r4.ebuild 4369 BLAKE2B 139a8f7198de12dde8b5ac21e185b4ee3ff239e4f7a0bbfbc615585166a15fa7adc346028d2b8ec41c97401a1c359bfed0f72a69a947b21364e780ae52c3e2bd SHA512 5a7e911ff23ff6a3839cc873d6c15fdbb921c6675c8e3ed0e5cd609fcf2316dda1beb0f63dbad4bc898b4c5b6842cbbd269fe84e2ebb07dbcab0407b38b78143
-EBUILD lyx-2.3.0.ebuild 4230 BLAKE2B 3392f7489de81959ae5fe644c7df008756737ea0860619c654b0c074175d5fe9b2f48e01454d4902f29b557a69a2d161f3eeb64137e67bd52402c485b21e3608 SHA512 e916c74140da2c775f90c3e05c5019b0b87ebc0c7aa1476d7572251e54b0219249be31d3f2575cc6d6fa527b946b8f1164dbc4ce8291127e01ab8170d7e9f01e
+EBUILD lyx-2.2.3-r4.ebuild 4334 BLAKE2B 9542d5a125f9ebf6f9ddedf01f2964e959205befef45f89389af8b44db68a20c86cdd724d8041e2c883511781b747e070ed75c43bac1b30d8b1a3b8d3e62fbff SHA512 42380981edccfa4cf79a03f4786895bce552e23949303eec158d4752540075424a9c3923f08b4896c91e8af8cfc8f4bfc6fd14ae99098c988f7139312caee2a9
+EBUILD lyx-2.3.0.ebuild 4195 BLAKE2B 2a27101426cfe87c3a6c3b1e51737f7cee1f5177d3fbb3d0d1582aca9cb39df28f647dcfa002a307909a5e4bff1dde4d09c3ae631edfc01f176d688ced9a5b38 SHA512 e7dfa822506b96f82dca5bd69c780e534a17d90c2eb34a0420db315c4646c568a2f085593b0347db243a127cacfec7b1fe88906e034fe913dce1665a8ffb2d1f
 MISC metadata.xml 1539 BLAKE2B 124b453cd6f7a6eccaa0e4db033edf451f9e21f16915de2576fb8c8920af472fe330e4b3bde2c7659d57a512f571b543b745bdb2177f6bd28b29da7e9fa703af SHA512 603a568a98ca584f5baebdfbdb6c83c892fba1df71fab12449d625e5c58b8961322bbdf1263d2493dbb68f61c747655d2b84360b7f34851c235fa10c3f3c2f52
diff --git a/app-office/lyx/lyx-2.2.3-r4.ebuild b/app-office/lyx/lyx-2.2.3-r4.ebuild
index 4b1e740c3f81..fcee37e04bb1 100644
--- a/app-office/lyx/lyx-2.2.3-r4.ebuild
+++ b/app-office/lyx/lyx-2.2.3-r4.ebuild
@@ -46,8 +46,8 @@ RDEPEND="${PYTHON_DEPS}
 		dev-tex/dvipost
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-mathscience
 		dev-texlive/texlive-pictures
-		|| ( dev-texlive/texlive-mathscience dev-texlive/texlive-science )
 		|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra )
 		|| (
 			dev-tex/hevea
diff --git a/app-office/lyx/lyx-2.3.0.ebuild b/app-office/lyx/lyx-2.3.0.ebuild
index 8ae1f6e35db9..dad57fa96596 100644
--- a/app-office/lyx/lyx-2.3.0.ebuild
+++ b/app-office/lyx/lyx-2.3.0.ebuild
@@ -49,8 +49,8 @@ RDEPEND="${PYTHON_DEPS}
 		dev-tex/dvipost
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-mathscience
 		dev-texlive/texlive-pictures
-		|| ( dev-texlive/texlive-mathscience dev-texlive/texlive-science )
 		|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra )
 		|| (
 			dev-tex/hevea
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 1af61c08a472..6a8053798b6d 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -3,8 +3,10 @@ DIST texstudio-2.11.2.tar.gz 24143941 BLAKE2B 2c17b70cd497338ee9c7cd7fda0bdcb877
 DIST texstudio-2.12.2.tar.gz 26311798 BLAKE2B 1eb3add771a28918f39c69bb167eee31456ab87afcff0f4ae66ccd73d96fdfba5cbfbc57666908f7e7ffb5c69fd2d5aebf342338b9e3a56d3c31fb774f9cd1a7 SHA512 255b211fe715ffc91706ab20877ffaa4b8e0710d3e6f381e7a6b8eed19bb889d89d0913756839c1f0c427029c0da9713b78bd1e21769ccc46cf976b65c91c6f6
 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 2078 BLAKE2B 30839bf7a4381478264178bae93d8a27b5685dd166b241254b0550b6d2388bbbf0f965937fd4a7c6123d7988d6df76a72ee450c830446c15dba9e0185772a7fe SHA512 98cf771d4aaaeec2a8ee95dc97c90978f29501e212eeafde332dcd505c2bc65475ddbc4828aa742b2d0b5a910bdf43a358f2aaddbcf8aca2f9f4271cf20e46c1
 EBUILD texstudio-2.12.2.ebuild 1970 BLAKE2B 41567a33175fe3bc434f64a861b5e9a0f15ad2a49a834f1a2c8aa1d4d73ea231557c399d04067031ef10f88dac35926561be6c7533819e3c0431db8eedae16cb SHA512 be81a9aafadd25daec6248bd09bf31cf9c9611b49d3996c79caf912e70d47a16f5430a0b37e25fee408374309130b924f1fd58e8ffcd6ea69e98d8b1175ff8ec
 EBUILD texstudio-2.12.4.ebuild 1970 BLAKE2B 41567a33175fe3bc434f64a861b5e9a0f15ad2a49a834f1a2c8aa1d4d73ea231557c399d04067031ef10f88dac35926561be6c7533819e3c0431db8eedae16cb SHA512 be81a9aafadd25daec6248bd09bf31cf9c9611b49d3996c79caf912e70d47a16f5430a0b37e25fee408374309130b924f1fd58e8ffcd6ea69e98d8b1175ff8ec
 EBUILD texstudio-2.12.6-r1.ebuild 2254 BLAKE2B 6866dd55d3dc7ccb8f857e9290379046373179049f738616b3b563a84d2c37663eeded1531e340b8160d63b523f15db02778c31637870c5695582ec556e20a12 SHA512 76f401e2292fc082c3bcfb7d2dd0a98c964935ff1a880feed4dd22169e0305421a9328e95d6052e2c9ed26a973c1e9c120490e5246db9ed6604e34ca30c957b9
+EBUILD texstudio-2.12.8.ebuild 2005 BLAKE2B 5e0898a11436772980dc111ae713a2529888bfbd2ab0401fc7e97f950c737ac7c4d4ddb58901c68b99c2c2c22612fae91680e1bf7ca0a9b505814cf1e7398f8b SHA512 8de09f00a3f8e772fc2ff9f82d795b1e5c043c0361042953bb145c16c252a10c63c485003333506b6c91cbb95e4d6254381579ed39bbf2c0b9560ec7bf99a8c5
 MISC metadata.xml 402 BLAKE2B 175128174922bf7356817c3752f7207f5c6b2827c0d52e8e0d837fbd19b4429eb6d0154b729d89ff5eff2ed777fad5f05b43c52a3bd5d57ebca3d31c09439964 SHA512 f587cb59a103c39e4685815677a9cc6de4b0db189332b520aaefb3011fe1537485f184395e19f2c18a24dd7f2101e5d5dc2f3eed38f18623cb7a69ebd52da41f
diff --git a/app-office/texstudio/texstudio-2.12.8.ebuild b/app-office/texstudio/texstudio-2.12.8.ebuild
new file mode 100644
index 000000000000..7d52ce3ecf47
--- /dev/null
+++ b/app-office/texstudio/texstudio-2.12.8.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils prefix qmake-utils xdg-utils
+
+DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
+HOMEPAGE="http://www.texstudio.org/ https://github.com/texstudio-org/texstudio"
+SRC_URI="https://github.com/texstudio-org/texstudio/archive/2.12.8.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="video"
+
+COMMON_DEPEND="
+	app-text/hunspell:=
+	app-text/poppler[qt5]
+	>=dev-libs/quazip-0.7.2[qt5(+)]
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
+	dev-qt/qtsingleapplication[qt5,X]
+	dev-qt/qtsvg:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	video? ( media-libs/phonon[qt5(+)] )"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	app-text/psutils
+	media-libs/netpbm
+	virtual/latex-base"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	# TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
+
+	if use video; then
+		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
+	fi
+
+	sed \
+		-e '/qtsingleapplication.pri/d' \
+		-i ${PN}.pro || die
+
+	cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die
+	eprefixify ${PN}.pri
+
+	# fix build with quazip-0.7.2 - bug 597930
+	sed -i ${PN}.pro -e "s|include/quazip|&5|" || die
+	sed -i ${PN}.pri -i ${PN}.pro -e "s/-lquazip/&5/" || die
+}
+
+src_configure() {
+	eqmake5 USE_SYSTEM_HUNSPELL=1 USE_SYSTEM_QUAZIP=1
+}
+
+src_install() {
+	local i
+	for i in 16x16 22x22 32x32 48x48 64x64 128x128; do
+		newicon -s ${i} utilities/${PN}${i}.png ${PN}.png
+	done
+	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}