gentoo resync : 09.03.2018

3 files changed, 41 insertions, 3 deletions

diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index e4ad8d4b9b63..c2365819b8ab 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,3 +1,4 @@
+AUX highlight-3.42-qmake-fix.patch 1051 BLAKE2B ad9436c010cb1f9b8db5a21234ec6b80ae73bf49cd165f99638c93b251a53db4918bc1fd70260a5a9310f9d28b86b25190ec5b21cda09b7f4138c3f39dc6088d SHA512 5f74b45995b953c815c9e820fbb73693f3f28927b5785fbc86537f55d2f411f9a6b420e45a4834babda54fddf44c1640bc32cc2cd35d3ec22be07781f05108fc
 DIST highlight-3.17.tar.bz2 617834 BLAKE2B 0098eebe14fd9325b3cad3028821326404dc8e22b896d51d44a1e9fb8386b16d9294da7de91a81bc7f01c8f93c7aab13569401249132d6a94a8c787016626e0d SHA512 27d5391339e80b616146489e97f63bca336f18b26c2ff5b94ae5bf183d3d1cdbfba202ab36d8eac86dee98ff49c6cc6c41dcf31860f0277f0327688e622d954e
 DIST highlight-3.33.tar.bz2 620644 BLAKE2B e1d6836801c772a1004d0a6bbed72ddbba65463b416d6503d66b1d96d4887eca15d63191dbea7bc9867442d4030765c39ebb42af6ec74b97b00ec9c42ce0b100 SHA512 12dc233e91380d762cafdc8a685fe6063e2b115d4df5e7ed83c4e880076a8b4fd3d41bf3631a9840600ae3012a87c64c31667b0f81655dd2ad10f26c563cce83
 DIST highlight-3.34.tar.bz2 622273 BLAKE2B 7eb98843f369f21a115c6d5d3def4930a5763932fd6df65044681e85c82fb01ea9f5eff48f7e00aef48c31bd6dcc0ed0c2658f654e2f2df4177760f80168ac96 SHA512 f052adfe2b78d6cc28f23e303a0b2d5fd7d86aa261a3a40cca5e07fd7867eee3da415204194387d0e9818860b22ba2578fe200ee783e9cc07a5e30d94431ab51
@@ -7,5 +8,5 @@ EBUILD highlight-3.17.ebuild 1671 BLAKE2B 5130d3eeff4f695456d0b8ba5ffef82d1df518
 EBUILD highlight-3.33.ebuild 1703 BLAKE2B 89ca400f6c460d4faacaae353c48a402353f1b2fa1f4b6fcb0f2fa08d6a020b41cd03ea16af536e800392575d7a2d61af0a34100189531f8ff13fadff822e106 SHA512 a05064a3bcb5111e8dee23d7d59ef4d6bb68c150f6af6589bf765010f3c7973e33b7e37227d67537e344c2622a8463bc398759182d4549ef3e56c2915194d73f
 EBUILD highlight-3.34.ebuild 1874 BLAKE2B 6cef640fce6fe138c254e7604dd9765d7717a689d49a4f8f92cfbcb232d4fbf59880a171f34e175ed08917682ae46d790a26a509d35592f262873c77888c10d9 SHA512 a096bddb1e73adfbee46d5c85f6d96a8a7fc7bf8166de352d518249c249b34812f1c518f77ff9b815685ac117b525cb247fcb0e567abf8d68bb35615f7365630
 EBUILD highlight-3.35.ebuild 1881 BLAKE2B 095b28d5bed378f606f1370a62710b916e266b90c2b0e279c1596333a36f45b30f3ce6a59b05099742d3fd822c68f68f4710f0c2bc477de2131e0a52d9a5b245 SHA512 ef89032b8570768becdf30112bf1d914d9b7d18957c4d15e1ad41fc759ee6b2ff36477f7489d9f526103b6fb8e22514432d40968316316bc381f5e9811306400
-EBUILD highlight-3.42.ebuild 2088 BLAKE2B 2f021a1ad506c3661e94aef1d4eb5fecb8f77974d5682676728795a4b281b4e1dc104e08c0ab5f4b75e69926c49aa6e68592d5d71dadc3298693b5c7a2124f8c SHA512 72067f88143f967677fbd989a7959f0e40626ca5a4c7b0d103240faad68cbd340b79249227e647277f368e572fbffcfbaf0f222c2dca16fd6a2c91d8fb115a90
+EBUILD highlight-3.42-r1.ebuild 2232 BLAKE2B 067794dda5692496e8772f83c05226b97dfec0fb5d7b128ff16c9e4eaef2e487c0244b2a550085b731d7ee0c5ee79480a1ac0c8ef7e6b2eaf66bdf29bcd4fdc8 SHA512 9c39d8b5c419944e984b222f3b91ecc6749cdb1c1e345b85ed3abc67e2b67516722de508d34b5254f800d4e01f9af88db12a18e1e52de8ef2c43ae05541644f9
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/highlight/files/highlight-3.42-qmake-fix.patch b/app-text/highlight/files/highlight-3.42-qmake-fix.patch
new file mode 100644
index 000000000000..31970057d9a6
--- /dev/null
+++ b/app-text/highlight/files/highlight-3.42-qmake-fix.patch
@@ -0,0 +1,32 @@
+From 8464afed560fa1096d37aa82aef99c00819fec87 Mon Sep 17 00:00:00 2001
+From: Chris Mayo <aklhfex@gmail.com>
+Date: Fri, 2 Mar 2018 19:15:35 +0000
+Subject: [PATCH] fix directories passed to qmake being ignored
+
+contains() matches the whole value, add regular expressions for the path
+components.
+---
+ src/gui-qt/highlight.pro | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/gui-qt/highlight.pro b/src/gui-qt/highlight.pro
+index bae8d7c..0380a90 100644
+--- a/src/gui-qt/highlight.pro
++++ b/src/gui-qt/highlight.pro
+@@ -43,13 +43,13 @@ unix {
+     PKGCONFIG += lua
+ 
+     # to make it run within Qt Creator
+-    !contains(DEFINES, DATA_DIR) {
++    !contains(DEFINES, DATA_DIR.*) {
+         DEFINES+=DATA_DIR=\\\"/usr/share/highlight/\\\"
+     }
+-    !contains(DEFINES, CONFIG_DIR) {
++    !contains(DEFINES, CONFIG_DIR.*) {
+         DEFINES+=CONFIG_DIR=\\\"/etc/highlight/\\\"
+     }
+-    !contains(DEFINES, DOC_DIR) {
++    !contains(DEFINES, DOC_DIR.*) {
+         DEFINES+=DOC_DIR=\\\"/usr/share/doc/highlight/\\\"
+     }
+ }
diff --git a/app-text/highlight/highlight-3.42.ebuild b/app-text/highlight/highlight-3.42-r1.ebuild
index 72295826fe12..be5cbcc97902 100644
--- a/app-text/highlight/highlight-3.42.ebuild
+++ b/app-text/highlight/highlight-3.42-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt5"
 
 RDEPEND="
@@ -42,6 +42,8 @@ myhlopts=(
 	"conf_dir=${EPREFIX}/etc/highlight/"
 )
 
+PATCHES=( "${FILESDIR}"/${P}-qmake-fix.patch ) # bug 649398
+
 src_prepare() {
 	default
 
@@ -78,7 +80,10 @@ src_compile() {
 
 src_install() {
 	emake -f makefile "${myhlopts[@]}" install
-	use qt5 && emake -f makefile "${myhlopts[@]}" install-gui
+	if use qt5; then
+		emake -f makefile "${myhlopts[@]}" install-gui
+		docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
+	fi
 
 	if ! use examples ; then
 		rm -r "${ED}"/usr/share/doc/${PF}/extras || die