gentoo resync : 20.12.2017

3 files changed, 21 insertions, 10 deletions

diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index e13cebd72605..2f81d0a07fe6 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -4,13 +4,14 @@ AUX vte-0.28.2-repaint-after-change-scroll-region.patch 3817 BLAKE2B d57f2041519
 AUX vte-0.30.1-alt-meta.patch 2490 BLAKE2B b5046bea09bb7fee5f03eaaa0c88f88a9e05c3d4f97fa8d6b4ecfbaec8a35bf1989c0461c1ec1d31e1b22c9d35688775a30f34134028bcd4fdcae1b7d40129c4 SHA512 69ed3038f3dcbbd09709667caff5692e4e11e30926bc7692cdbbdef2bb1ae4584ef64b824b5afcb3c57c237a3c0db4d9588ec36778d0994a546b1e6f74c2e430
 DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
 DIST vte-0.36.5.tar.xz 1017504 BLAKE2B a7a94b389660f9bbf7aa8033e4a5e2cc96c39458e43960ad2ce785f2fbe1597c7156d090aab220e909ae31f8731d0d961686dce08aef0f270581c01de4bf19b0 SHA512 43f9211381238ca6cb7f49c8a9dd8f48f702e9968e038fa26ee69228c1fc86061d5dbfabb2c27f677280e89ae9080f20594f3c27481246e3f91dd5f3ea0354f6
-DIST vte-0.46.1.tar.xz 989164 BLAKE2B 0c12b8eb042d4146df2129e7d12a6f028ae8db2be5d22c634ac6f3408063d14090c7f90a4e4252555ef2754e32bb038613709e63f463340955e033bb94398fae SHA512 04b3f8ce922c4326d92bef605a0dbe195764946cd5f1acf28fd6d69c0cdb2ee661cc7e424436c72380da5d0250790ae658ac49d761b567dea88d92157285889d
 DIST vte-0.46.2.tar.xz 989756 BLAKE2B 5b62ca5425604301f748a214610e2e6e2431f9ad9d21b0867e8d8e34910f1b6c4b77029b57b8255dbd04c6e960aaa2583a2ec670f4683b2331290f22ea957454 SHA512 abcf94752094314b01eb14156e894bedb24f959d4faf84bb070b34eb2745f01d029859ef959ddf1475776605a1721e4d011ae7ad57fc4937d8bfcbecc8b0cf61
 DIST vte-0.48.3.tar.xz 1009364 BLAKE2B a16b56ecab0db7ee1a9f8bc9f975ba13fb1dbbdcee77fd6c6f7c11df4680eb644566bc30ffb2ac6009c0ed891bb20598eebaeb87837ae1ac72d7eb8241d2e119 SHA512 3037b61a759cfcf56838bc7804df5a211da416bff9ddc5791f8a8d5157b90926985cfe57d7edbab42de64945d5e668470fe4129a218fb9c7af546648e1660c72
+DIST vte-0.48.4-command-notify.patch.xz 5500 BLAKE2B 88b655403d2bef034604a283b173fece305af35f51b20f9d4811b33265b5a6eb83441e0b978539de501d118a8431c4a9a9a69a111a03c45adc87763b15b09fd2 SHA512 b8ba202aedb5d821962a7cdc89e6ef8ac8a3480dd7681bf8ce708ce511598f3335ba153750d40cb06e9a2c5bab5888b3daef9096458c2889d94028feaa394575
+DIST vte-0.48.4.tar.xz 1008296 BLAKE2B 9f946d6909d38896ec80db2a02666d809155997b27109724fb318d28200220f1514fb23e4cdc90263a756914b5db442c947578c8854a535cb960a06f7bc03a77 SHA512 4b75bd881e58b5043bc44e391ef3a826a2c25d0f1bb5ffb890367e11a60b1bcbce091575ede6972a89ae043b39c51897f91fca1faf6872664d602e503d8020fc
 DIST vte-2.91-command-notify.patch.xz 6012 BLAKE2B 4a37464ed214e80e5db8eb6a9c09a33816d143e081a5391709be3cd3611197f75d5cfe750ecdfdc95199328ae4894d7ad565933338ba5025e108cd8e2720af68 SHA512 e6a8955f99c98183c60df770b5c6826c5a456aaac3c83a8d0fa5037d2dd250450c8287dff335e22ca32332645d13d298cecc5d2c884c7c9da65d09dfd2a79054
 EBUILD vte-0.28.2-r208.ebuild 2973 BLAKE2B 7ee8e830fd6499df69012a9d69cfe21343f46c0c114e47bebba9de573443a60f0def0660e359660d672398c469e61d9804d53e02ebfd6396e28d2fbd361cc821 SHA512 c8711b4777911936c2c2154eaa620f4ccbcb5df491a1943d97bb2bc1179ab333ee422fcf26f56a7f76170941b6d6bdb21b881fffb0c7af96a37cbf7eb63ca560
 EBUILD vte-0.36.5.ebuild 1695 BLAKE2B 3d83e03aa9a8aea1e17db966f44f33e500a60a99c0d2e8fe9113f66ff3b30e8cc9800f5889b6b94140b096bffc8103bc105c6ed9556fa680558b98cdbe52dcb3 SHA512 b0665651664f07d69741836d0e870710ec271807fd2da982b544eab42d48da74bb5800324c91cce1ca21080488606d2f5e3263ed3e73357812d5680f3cad91ba
-EBUILD vte-0.46.1.ebuild 1898 BLAKE2B 663e631d3d2b638b0bc1f1f5d8cd30bf9509bb8419b0293cc14b49b65a0548e2a218ccaf05ef7942210ddb69fb4b21d47e99b7dd16d6e1d6404e048b31d965dd SHA512 e966d45f6d46ca821ee4891fdfc7f03d01db9c64327b2146178407cf1adb8730d02723c205043d7bda68ec49d851d34412d4bb8d35908dcaebaf733e3ee5021d
-EBUILD vte-0.46.2.ebuild 1899 BLAKE2B 15401aaf44f324db6d08c931f907f1985a06ee09b40c45d8515d657b8fbb16a72aa160bf2b7e2e3327a8c51f4d8d93a8d8a682f700704919d11150b562ad0a0d SHA512 166e00bb9e3f2bc37870635379d4176aebeba91c211f5bf736216d3bcfe6d56281ba4851be22095bcef58108066700c7d68d37ebeeca7730daed7e7215364d83
+EBUILD vte-0.46.2.ebuild 1898 BLAKE2B 663e631d3d2b638b0bc1f1f5d8cd30bf9509bb8419b0293cc14b49b65a0548e2a218ccaf05ef7942210ddb69fb4b21d47e99b7dd16d6e1d6404e048b31d965dd SHA512 e966d45f6d46ca821ee4891fdfc7f03d01db9c64327b2146178407cf1adb8730d02723c205043d7bda68ec49d851d34412d4bb8d35908dcaebaf733e3ee5021d
 EBUILD vte-0.48.3.ebuild 2343 BLAKE2B dea244e7833cacf5afd7ee1e4e3f2fcf0a918b925d58e234ad7a8f5b653129284a27ba4600a191649e537e13d96123a9d9659b4f75ccf91a7938b583314ef80d SHA512 33aacf93302abd2f25d7ea7db14e57a30064ad26459077a670ec69dd0b629d37aa5574ae9c2b4b76f83583b411152dd4db6516b4274e059617afcee1dbe27deb
+EBUILD vte-0.48.4.ebuild 2330 BLAKE2B c2c3f23a435b8a4588367fb2fe4bfb809b40c79d1a2d29b4ca653c600b7287a05e638070cb6bdd313c86cdd8ee5143c0ce43848c30cdbf00d0377e935c96ff70 SHA512 1d9cff5330c39461b398bfd4f0d27436524d39715070654761485d8efcd84acf659b3571260066d980dfdc192337078ef25e1134ef747cab5edc1f9353c30753
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.46.2.ebuild b/x11-libs/vte/vte-0.46.2.ebuild
index edf961993ad9..a9cad9a2bd1b 100644
--- a/x11-libs/vte/vte-0.46.2.ebuild
+++ b/x11-libs/vte/vte-0.46.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
 LICENSE="LGPL-2+"
 SLOT="2.91"
 IUSE="+crypt debug glade +introspection vala"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
diff --git a/x11-libs/vte/vte-0.46.1.ebuild b/x11-libs/vte/vte-0.48.4.ebuild
index a9cad9a2bd1b..b26ea8a62fd8 100644
--- a/x11-libs/vte/vte-0.46.1.ebuild
+++ b/x11-libs/vte/vte-0.48.4.ebuild
@@ -3,33 +3,36 @@
 
 EAPI="6"
 VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.24"
+VALA_MIN_API_VERSION="0.32"
 
-inherit eutils gnome2 vala
+inherit gnome2 vala
 
 DESCRIPTION="Library providing a virtual terminal emulator widget"
 HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
 
 LICENSE="LGPL-2+"
 SLOT="2.91"
-IUSE="+crypt debug glade +introspection vala"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="+crypt debug glade +introspection vala vanilla"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~eva/distfiles/${PN}/${P}-command-notify.patch.xz )"
+
 RDEPEND="
 	>=dev-libs/glib-2.40:2
 	>=dev-libs/libpcre2-10.21
-	>=x11-libs/gtk+-3.8:3[introspection?]
+	>=x11-libs/gtk+-3.16:3[introspection?]
 	>=x11-libs/pango-1.22.0
 
 	sys-libs/ncurses:0=
 	sys-libs/zlib
 
-	crypt?  ( >=net-libs/gnutls-3.2.7 )
+	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
 	glade? ( >=dev-util/glade-3.9:3.10 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
 "
 DEPEND="${RDEPEND}
+	dev-util/gperf
 	dev-libs/libxml2
 	>=dev-util/gtk-doc-am-1.13
 	>=dev-util/intltool-0.35
@@ -43,6 +46,12 @@ RDEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	if ! use vanilla; then
+		# First half of http://pkgs.fedoraproject.org/cgit/rpms/vte291.git/tree/vte291-command-notify-scroll-speed.patch
+		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
+		eapply "${WORKDIR}"/${P}-command-notify.patch
+	fi
+
 	use vala && vala_src_prepare
 
 	# build fails because of -Werror with gcc-5.x
@@ -66,6 +75,7 @@ src_configure() {
 	gnome2_src_configure \
 		--disable-test-application \
 		--disable-static \
+		--with-gtk=3.0 \
 		$(use_enable debug) \
 		$(use_enable glade glade-catalogue) \
 		$(use_with crypt gnutls) \