gentoo resync : 02.06.2018

9 files changed, 11 insertions, 15 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 0793866cf3e8..a14a740f0d08 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 7eea8b52e0ca..36049f2ed062 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -7,8 +7,8 @@ DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c
 DIST lightdm-1.18.3.tar.xz 503968 BLAKE2B ec1fa0a62880708d223da972b3d9c2f2961e3e8f8baf6da9012de98818b27e0bc0e37cb6f460a25821779d83e9da1cd632484ad75ba95cb26cb9d23254600024 SHA512 dde34e4969d2f04e6729eb1b30d38bac9a89ff42c46f8a21e94b76beadbde450ffaa377201bd3a56e0d8d95d0640eb312ed11ecf94efb9a5a66777b944d4f234
 DIST lightdm-1.24.0.tar.xz 517552 BLAKE2B b4ab92b313bbb3a7bcc48a1d02b7bfb978bbc5041dbb81ceaa59c4296b2e4b069f90d9f09a4289376cb34e11331c39740f4e5370273d1315c75a9a35bd01cbb0 SHA512 30bad8887928f22bf2cc7ce8d7a323637dec669d47d69fb326cfcf1bb5ee9e52c1232cf680af94a25cf90a9de13d9b5ff73307c1dc8829422600d350401555b8
 DIST lightdm-1.26.0.tar.xz 516092 BLAKE2B 0bbbe11959a2ea0c21e723d10e8831fc0d9e15475a415869634cfb41c6d576b77fd87720be33dae8456063947dd1b551e88c263ed76ef9b120c43df8c42513f3 SHA512 67c0671753587493ed064b66f94be58853028287c914d1101e66499bebf1408e14d33245887ce89d1c4931960225ea3984e5e625b22dc4e3020be34a3087d8e7
-EBUILD lightdm-1.18.3-r1.ebuild 3897 BLAKE2B 05e97d3e9c2c8513d43e7f06c30737d066d9360f3177144bff79eee134d7b8a4b77af929c087c027cbd38b5cf68d34d8a149b6bbfe1c8804472730e4738ce812 SHA512 531f3724cb706a17b7dfc309f7413e1df5ed0e7e9f7da37d3427a5c189a8007cfd598eb370b1a57673033077b1a060cbd083f5088160eb78f788cfb9aebe2897
-EBUILD lightdm-1.24.0-r1.ebuild 3862 BLAKE2B ce4df61efd5edfd3f55507993d5d8d5330ec68466478e7603f881a7ac92168a7cdca1ac4c355000f093adac96baa14167f79da6cb4c1cfd951aaa4c25bb3ef4d SHA512 bb54b9ef6f2405c7fd5fe450ef9f0fde38f1fb0b5183cf37fddb8013019b0c5d30d2f13be64b41cd3a652a4a7c65ef100b327c2abc8ff5fc8884a72bd77ec946
-EBUILD lightdm-1.26.0-r1.ebuild 3939 BLAKE2B 1030ede780282b1d2a0a64069f1ea658a122b8814ab54108ff24705e5111517b7a39bae47480a57ab4bb2dc9b691e0fefa24fb9927815ac146a9d22e83fdf9f0 SHA512 1eba927aac1ea1b4765aaa662045a872522e0d09d49f22b66a27267b4468ad4771b57046e2104454ef27dec2eded14fb0b78c52741e07fb40efe1b4eebe7e214
-EBUILD lightdm-1.26.0.ebuild 3849 BLAKE2B 883cefc8f097c294bcc33f695de248e1549a1a2d4383f48878ae30a33eb6d8fed88d7b60cf0a1c85695f2f223f30ae54d66d5d20d92616875ed277750c0fcdf8 SHA512 a624e845c4e9080658c3e4911158f75b4dbf8fd2f87a5f5d6246352e438c880a9923b35c3521705e93046f7b5812c2c435c5a4c9a37b4c6b1e9af031b5e1090b
+EBUILD lightdm-1.18.3-r1.ebuild 3804 BLAKE2B 0a9e0ac82b6b671ebef81433faa82e0b98cb1e38438c86c9a411d41ab2847956ac34396c5201a1c9ed33932a9fd4c19f700aa12411314ec064e7557df485d1c2 SHA512 f84aba34fe5d2fcd7bdafe1b8c787876b5d99a4276b274d698a91af05f4d149e6ba3f794c4d9bdcabb41da528274ac0c2606cb13a88c6c101bc33481d63d1f84
+EBUILD lightdm-1.24.0-r1.ebuild 3769 BLAKE2B cf78459133c836c6702d362a3977f3149d88d7c31aa950799a6cb3cac2480c592f6a953cc3a437939ab0aedfe06ddb0db60493f3b38a2d3ec3bdffc51325a796 SHA512 68d690c0e7a48b0d5e3db8977f2f48f8041cf298beec1d6d65d3f591676bf960cc54d140a65b9a7874f52d00d8954574258ea5d37d103fb724468d1809b2c650
+EBUILD lightdm-1.26.0-r1.ebuild 3870 BLAKE2B 869f000cf85d211b0c0e5125d196928c2e2fc1eaca43dd8a8be6a5e503f26aff779b4a58f3ef0108999225538ad0e3cbbd9213cb6cdfeb8fa75a7e9b98b6109f SHA512 13c2c39e9c7e5e8923bd24150f47047084a26912dcff8ce96df9bd1002b533ada62827a971fb4f4fa73c67e256cb67c4feb787ef8fbb3daa6b0f549138faeb67
+EBUILD lightdm-1.26.0.ebuild 3780 BLAKE2B bf14b85e4a808d3f0743135c325b5c91289ff80097ac22d968942e520551c8a6176e02a4444032ab4cd917d6c2a264901ba517918baa2d78d24e48c72bbba390 SHA512 6fdeac35cfab56c7df81cbd393b1eca4b39114087593731dcd340c9bb30781404c2365d448002c30f863a9441d3709d0984adaa638740bf1b2facce440cb789e
 MISC metadata.xml 391 BLAKE2B c6a14fded4791158cfe9c26a70c9c4de8638ab6e9ad1f683cbf94a522f456f36f0aaf2db26d88ac9dab5bf7818d18d4dbf793ef7a6970e91f16e9642d8cbc91b SHA512 c3856bf443309731ef7ea0d849f76219f69552475a88e5c5fb54ca73f30f223da44d2f4eb6d37cfc5f305757c6654573f3d639fa87818318f7afa4dc57dce466
diff --git a/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild b/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild
index 0592df3577ea..2cd6c3cd5cd7 100644
--- a/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild
@@ -53,7 +53,6 @@ src_prepare() {
 		data/lightdm.conf || die "Failed to fix lightdm.conf"
 
 	# use correct version of qmake. bug #566950
-	sed -i -e "/AC_CHECK_TOOLS(MOC4/a AC_SUBST(MOC4,$(qt4_get_bindir)/moc)" configure.ac || die
 	sed -i -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" configure.ac || die
 
 	default
diff --git a/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild
index ae3715bded41..21d21a811118 100644
--- a/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild
@@ -55,7 +55,6 @@ src_prepare() {
 		data/lightdm.conf || die "Failed to fix lightdm.conf"
 
 	# use correct version of qmake. bug #566950
-	sed -i -e "/AC_CHECK_TOOLS(MOC4/a AC_SUBST(MOC4,$(qt4_get_bindir)/moc)" configure.ac || die
 	sed -i -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" configure.ac || die
 
 	default
diff --git a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
index bf3d47193355..38662bf9afc7 100644
--- a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
@@ -58,7 +58,6 @@ src_prepare() {
 
 	# use correct version of qmake. bug #566950
 	sed \
-		-e "/AC_CHECK_TOOLS(MOC4/a AC_SUBST(MOC4,$(qt4_get_bindir)/moc)" \
 		-e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \
 		-i configure.ac || die
 
diff --git a/x11-misc/lightdm/lightdm-1.26.0.ebuild b/x11-misc/lightdm/lightdm-1.26.0.ebuild
index efef3f3494bc..4d2efe7088f5 100644
--- a/x11-misc/lightdm/lightdm-1.26.0.ebuild
+++ b/x11-misc/lightdm/lightdm-1.26.0.ebuild
@@ -55,7 +55,6 @@ src_prepare() {
 
 	# use correct version of qmake. bug #566950
 	sed \
-		-e "/AC_CHECK_TOOLS(MOC4/a AC_SUBST(MOC4,$(qt4_get_bindir)/moc)" \
 		-e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \
 		-i configure.ac || die
 
diff --git a/x11-misc/xtermcontrol/Manifest b/x11-misc/xtermcontrol/Manifest
index 4986daae9f4b..0781575f2d1e 100644
--- a/x11-misc/xtermcontrol/Manifest
+++ b/x11-misc/xtermcontrol/Manifest
@@ -1,5 +1,5 @@
 DIST xtermcontrol-3.3.tar.gz 141972 BLAKE2B c357a7c5e236100c77459cba3ff92d7cf9874646f125bf812b48fa66000f751deb00ccd86550cf5da08f40cb7cf359ee4cd913bea5d4b53819cc53ba1f6b187a SHA512 625b1ad93110032244eb277621676d89113a4c45642538b029dd36ab31e2fe9d2603c41236d2a1ffb22b2fd7feb61335f35397814569a634eb0a7d4b71961d1b
 DIST xtermcontrol-3.4.tar.gz 140662 BLAKE2B 8d151cf323899363e094a9d64776a80b700e959601b6c95d81fe251527187a7f5589c000b8593e059e230d46e3286732869b5d0134efdcf893eb7f4fe434e026 SHA512 a3666fc78cd8276443c8b5027ea04fec01f469e44d8b97bb9cff4159e5906e0a6b8b56069aa8d134a9d76fc19de2a7e9bd802e0d1fce6a46e164142766aef513
-EBUILD xtermcontrol-3.3.ebuild 372 BLAKE2B ae6d7e5ba60d93e8f5059519008bfad61ed290512610e2e5c2fff755ced49cf553cd42f2fc5474a7d929d5f939202a339b4ed64064896e332b873414e7bd2dee SHA512 9c12e39bcc1383fed316bf6fbafadeeae9128d3ef60fa7e3a450e61cdb8164e317dd70c64306d2e496f0f818fea4cc21758ea294f9b1783ec2ffb94d63e68ac4
-EBUILD xtermcontrol-3.4.ebuild 377 BLAKE2B 251d467e09ebdcfa6a078f32f2ad8f0d5639f674a9667d58fa1efe30a04c8fb68f284110c17622577dde9353445014f0be273d15f10ec87b55e381bfc8a966c0 SHA512 b45f242002ca350c8b7978d266b8d45d6aa56132a440ba039731a39355fa72033ba04fdc42c74ded5dc656ce0ce5b5ec7b6cc1ca31ce1d2cc3cbb0dc72421b52
+EBUILD xtermcontrol-3.3.ebuild 374 BLAKE2B bf70633c9c4afb87202812152092510c5766ba2df6bbbf31ac7cdb1928ebdb81d4d55316638cb2d9fcf6cd616964cbce8765d3ec3336189d719556d3500b3ba1 SHA512 448e85ed7404095ca0ad64d75b4a713895fc1f2a168d0ed8fc668241c731615c2e7e825078011fede0720ac204dbab792bf8f1da8b91f5ff0af8dcb549c86e91
+EBUILD xtermcontrol-3.4.ebuild 379 BLAKE2B 974b1256314be4e38c1dd3b460a676f14fe96b9251e87c7ff7222412c923c3111eacfa9cb5a837fd1850667f9ce9810246f933954d2e211a47426cbf55a359b4 SHA512 aa9b778ca09a9ee4b1592767e97cbcb48f83c12d8444489ef74667e3beaf652a9ee371231880b5585f3f473bec702c7885a669f8670e5b248c4a0407df66ee05
 MISC metadata.xml 689 BLAKE2B fce013dc9ec9488e94202966a807b7e28491fc553fc243008846f845462034a8645a68a2122832c2118a3911856c0e0fce13c563ead4da707375eaa16cc81fe4 SHA512 ee635786fb7c6876636390fac2aa50cf01946dcbead809021f7bb795ef713bf21ee04123f574d4d7d12402f93c9262f3bcae46fdd0580dd316321cb42421687e
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.3.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.3.ebuild
index 27c24745cf06..f950f851f911 100644
--- a/x11-misc/xtermcontrol/xtermcontrol-3.3.ebuild
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DESCRIPTION="xtermcontrol enables dynamic control of XFree86 xterm properties"
-HOMEPAGE="http://www.thrysoee.dk/xtermcontrol/"
-SRC_URI="http://www.thrysoee.dk/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.thrysoee.dk/xtermcontrol/"
+SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.4.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.4.ebuild
index d8d1c7b33fe6..eb12b3b9f5ff 100644
--- a/x11-misc/xtermcontrol/xtermcontrol-3.4.ebuild
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.4.ebuild
@@ -4,8 +4,8 @@
 EAPI=6
 
 DESCRIPTION="xtermcontrol enables dynamic control of XFree86 xterm properties"
-HOMEPAGE="http://www.thrysoee.dk/xtermcontrol/"
-SRC_URI="http://www.thrysoee.dk/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.thrysoee.dk/xtermcontrol/"
+SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"