gentoo resync : 28.04.2019

4 files changed, 4 insertions, 175 deletions

diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index b47a82dbe6bd..0c161b78817d 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,14 +1,8 @@
 AUX separate-new-tab-window.gschema.override 56 BLAKE2B ca7934aa89ddad5bbc86a35c79c8e02215888fea4706df5c2740480d9534980f54bc1b298ac02983a56c2bc5c1fc988d02b5cadb2a8e30d6443577b745a55533 SHA512 09eee78d2756752ce32cc9379f1a445e55c6f5f01bde972a8e5801a5c7bf3b385ab081ebc4a1ddd2bc463a8a67dd1ad03f1d531c99aa36eb6e850bf4f2a2b265
 DIST gnome-terminal-3.24.2.tar.xz 1960952 BLAKE2B c94303cd8b322a37c70487fbab0f6ecd27b8e831cf44cdc80c82b31d2758f7c6927704d31c229cbbe41be565748238bbfcfae72470f273f7f3a9378c218af8b5 SHA512 08cd7b1b08cf22618554b1a051dcfee4a967165bfe93b77a6bc8b0c935695101e773e8d53a482d71aadb9ba7be7ac991d82dbf53b7a6f74f1f5144e4158f8a93
-DIST gnome-terminal-3.28.1-notify-open-title-transparency.patch.xz 33036 BLAKE2B 76c35db10664e02d1537aae586b47062b2ad85a48279426478ab2c9a9a659f728a7c01af2caaf058a71f4918d3d1e35a14c01dd7c67a2cf1aa368b4f4bc6eae7 SHA512 87d77fe8d9ab5b9ca3ff7eddcd462bf718b0f2d9dc1a60a2744ef8015b0910b588e0dc57ab10964602efa47465fd59f91381969157d9255fb5370039319a5f44
-DIST gnome-terminal-3.28.2.tar.xz 2094920 BLAKE2B 02f6e9b7273247169966e3125931e452ee4ac4669c53c79c93f49073511ef25a3f21df60510df0e7aefffad5e3ea14acdd1338a1c7ce934439863728e2d709ec SHA512 a20fe13fd2e533a90236410ce6ddd11e4da9da13f2d8952baa3cbf07379dbe253cf897b596421852084bbfc000264de11fb605c73909af8188baa93e46ddae8f
-DIST gnome-terminal-3.30.1-notify-open-title-transparency.patch.xz 32204 BLAKE2B d32cabea06df4290c592814a60443c3fb627ae7e837560bffdd0f803fd970b2962d7fc1d57a53f9bc62bd0ceb23ccade623e0d7099cb2610e599d9c2243c3ec2 SHA512 14e6e9baf1cd3fdd34ba320502de0ba99b0259598947562b5057472b099e85bcb6c60be8e5f58296c222deb85c35ddf5feefd1dbfac83710050e038f6e1b3a28
-DIST gnome-terminal-3.30.1.tar.xz 2099736 BLAKE2B a3100c7faf10f5d8ed3f16ae3ee28a7850e181dcf97ed52c0509143aa88114583466ddd3dfa1ea61372674cd6f16f9490c5ba9fafa4f5ce56eaeebe33ce259d5 SHA512 486fe7a9841114d49428208fdea195f1ce6a27ecfc66e2c77632385a7b106a28d3e6a0f1a198bd08f3e2a89d201ac49dafa376c002eab6470ff9d64cf30194ec
 DIST gnome-terminal-3.30.2-notify-open-title-transparency.patch.xz 31748 BLAKE2B 6a25547fcdd387ea90c3ba13e53f31a118cc01c50c72f1f597162452ea65509e2fc8adaa2f6487859d8a53e828173d77a6f952d172f5a685e2b51864a82cce7f SHA512 51f32879c93a5ca489db9a604b28585787c9ec1a444c5e8c76bf26edeaa68e35fe9f76f94f32e99716a0d01643ac859475be13232c62675c703b5503781cb8d0
-DIST gnome-terminal-3.30.2.tar.xz 2099952 BLAKE2B e66c2fcb3ed9940435cf4e4940f088f507b836808087ce6da21ac5fabf906bed3e6197a892790819cb5d3fe36841cf5bba1d58fd552bf41544e240c7e4a5183b SHA512 acbc854271b8dd8c60e04277228d5e0d2dbfaff42bc9c002d4bc42bb97052e2e3ab03da130c31c3cc1452644adfafcddd5103a6d79a10a659b4fe20d6063c61e
+DIST gnome-terminal-3.30.3.tar.xz 2102108 BLAKE2B 1930bc97c8d77d0107dbb7e56d849e3941c6821863d25103d8d17135d334b6ceda5b5ef1cad81d02011fb7190fd5b39ce4176083af0af6bebb71f52e30cd2c7b SHA512 54d3b345a23905f65ccc7d238b2f9ebcfebc4ccccf504c41bdb3dc388ceee8e6f2dfbba7c0060ea6bcba8bb541a031fe619d462e024aef277f66b5c49792c291
 DIST gnome-terminal-notify-open-title-transparency.patch.xz 37448 BLAKE2B 159bbcf6ca387af8ae2f05c23b48afcdf11351025420ecfd10d1b8a1dd9c2c8016d1c89c6fca20dde3bf8ffe3a6091232a989cfd520fa6761f65eec29b569d84 SHA512 9af0d56df105a5bdb81b2609794669557a7f442f71b240ee10a6411fab20ad74c14489dbb9a536e208515053ea17776b3a15afb3b949a75a66f8c2ab3dbbff96
 EBUILD gnome-terminal-3.24.2.ebuild 2604 BLAKE2B 5ed19f08bd6f5f0e1cf906d1936cff022af37e2338106e72317354ce2e13e740b3e7e2253b6164517c215687e5af703c144f21800b773ff5f02fb980711b1c7c SHA512 8321fd29e858800cf7b7c71e9e0cdc6cc1bed07cc0841df63fc12a5492e7d3a36bd68221384145b8be9da0af92d1a0e559cac71ccd71130c1433b1209dc75f8e
-EBUILD gnome-terminal-3.28.2.ebuild 2487 BLAKE2B 84deec3d63b57776fa69e418c4a9eba30bfc135d6a3dc51e89e9d542d2c3c30a39092c00dffcf901508b2c0d5956498e5b06e062d192b9d8c8732bcde6d443ee SHA512 d9df4b14da08a36c15860cbbe6bcf4be54bb2dcf95abbd730710e01aebff0200058d9dc2d23112df0ec0eb01174732aa43dd5bb6e70aa4cbbe28b3bc6dcf5ccd
-EBUILD gnome-terminal-3.30.1.ebuild 2699 BLAKE2B dfb6c17fd39d7152cb79cf179d203882e2fbb06dae8abb9935540b77e3736e37524589ad9910550dae454279d8913785dbb6858ac3925aa5d4c205f1bc82c643 SHA512 36f000d88db9ebc3747da6e8b8a7fbc0041e8f037ab1d768d752316c19e76a99785c103ff58ff3d98153f19df3a8f8dd905f627e90861127daeee5488c223d47
-EBUILD gnome-terminal-3.30.2.ebuild 2699 BLAKE2B 085b42a293fcf01ebcafc0c58f575d62696f9ce6159eb15f8b0457cc0d44eaaa30faa790929a302b4ee7ec56e17dfcfd8f06bd2248ae0c463b929c44a7916d02 SHA512 82a2fd300dbc99a7ff1efe1d64fe2fca15fae1a27f4f456e5fb7bfd1341234e671471e8c92feab22f7dd211de63610aff24e897b0ef3c99a8b8f59a1805a063c
+EBUILD gnome-terminal-3.30.3.ebuild 2715 BLAKE2B 02ec19bccbbcdc3db11943c265c604bc7dcb3ed88fec863d7cc15170538e8eabb454aee198e3836fe6bd3a52be539264cb424c3c4ec2e816aa861ebdb11be94f SHA512 58b22cc5ea7de8fd3057863403b0c3360386bdd6e4c0acc2b8a7e0a2b30e54f9c2a365ebd8b09121a85b3d4b4c310d43c51ff4d604c8df12b2c98021a878d6a6
 MISC metadata.xml 417 BLAKE2B ddec99c80b9ff060709ef724996eb8e73a8e587e022947b9f237adcd1ecb049fc48b8f7e8b6cd725d2f5e3276b9aecdcdb5acacddadfbd7edcc61dd9346789ae SHA512 a41ea1b6fc9d3dcbdf296590b206f924cb42c7dea27b68f593eb3e50aa37c6dd3df20b47c34f8cca2671dacd4fba6ec0f86caebebe6f66d496b7936d3cf0a688
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.28.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.28.2.ebuild
deleted file mode 100644
index 35cefbb216de..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.28.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 readme.gentoo-r1
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="debug +gnome-shell +nautilus vanilla"
-SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/gnome-terminal-3.28.1-notify-open-title-transparency.patch.xz )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
-RDEPEND="
-	>=dev-libs/glib-2.42:2
-	>=x11-libs/gtk+-3.20:3
-	>=x11-libs/vte-0.52.2:2.91[!vanilla?]
-	>=dev-libs/libpcre2-10
-	>=gnome-base/dconf-0.14
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
-	sys-apps/util-linux
-	gnome-shell? ( gnome-base/gnome-shell )
-	nautilus? ( >=gnome-base/nautilus-3 )
-"
-# itstool/yelp-tools required for help/* with non-en LINGUAS, see bug #549358
-# xmllint required for glib-compile-resources, see bug #549304
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-libs/libxml2
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
-	notifications of long-running commands finishing, you will need
-	to add the following line to your ~/.bashrc:\n
-	. /etc/profile.d/vte-2.91.sh"
-
-src_prepare() {
-	if ! use vanilla; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=695371
-		# Fedora patches:
-		# Restore transparency support (with compositing WMs only)
-		# OSC 777 desktop notification support (notifications on tabs for long-running commands completing)
-		# Restore separate menuitems for opening tabs and windows
-		# Restore "Set title" support
-		# http://pkgs.fedoraproject.org/cgit/rpms/gnome-terminal.git/plain/gnome-terminal-notify-open-title-transparency.patch
-		# Depends on vte[-vanilla] for OSC 777 patch in VTE
-		eapply "${WORKDIR}"/${PN}-3.28.1-notify-open-title-transparency.patch
-	fi
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-migration \
-		$(use_enable debug) \
-		$(use_enable gnome-shell search-provider) \
-		$(use_with nautilus nautilus-extension)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS"
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.30.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.30.1.ebuild
deleted file mode 100644
index b824aba23f60..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.30.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 readme.gentoo-r1
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="debug +gnome-shell +nautilus vanilla"
-SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${P}-notify-open-title-transparency.patch.xz )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
-RDEPEND="
-	>=dev-libs/glib-2.42:2
-	>=x11-libs/gtk+-3.20:3
-	>=x11-libs/vte-0.54.1:2.91[!vanilla?]
-	>=dev-libs/libpcre2-10
-	>=gnome-base/dconf-0.14
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
-	sys-apps/util-linux
-	gnome-shell? ( gnome-base/gnome-shell )
-	nautilus? ( >=gnome-base/nautilus-3 )
-"
-# itstool required for help/* with non-en LINGUAS, see bug #549358
-# xmllint required for glib-compile-resources, see bug #549304
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.50
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
-	notifications of long-running commands finishing, you will need
-	to add the following line to your ~/.bashrc:\n
-	. /etc/profile.d/vte-2.91.sh"
-
-src_prepare() {
-	if ! use vanilla; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=695371
-		# Fedora patches:
-		# Restore transparency support (with compositing WMs only)
-		# OSC 777 desktop notification support (notifications on tabs for long-running commands completing)
-		# Restore separate menuitems for opening tabs and windows
-		# Restore "Set title" support
-		# http://pkgs.fedoraproject.org/cgit/rpms/gnome-terminal.git/plain/gnome-terminal-notify-open-title-transparency.patch
-		# Depends on vte[-vanilla] for OSC 777 patch in VTE
-		eapply "${WORKDIR}"/${P}-notify-open-title-transparency.patch
-	fi
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable gnome-shell search-provider) \
-		$(use_with nautilus nautilus-extension)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS"
-	gnome2_src_install
-	if ! use vanilla; then
-		# Separate "New Window/Tab" menu entries by default, instead of unified "New Terminal"
-		insinto /usr/share/glib-2.0/schemas
-		newins "${FILESDIR}"/separate-new-tab-window.gschema.override org.gnome.Terminal.gschema.override
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.30.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.30.3.ebuild
index 6a0da47b20ff..611b61475b60 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.30.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.30.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="debug +gnome-shell +nautilus vanilla"
-SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${P}-notify-open-title-transparency.patch.xz )"
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-3.30.2-notify-open-title-transparency.patch.xz )"
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
@@ -55,7 +55,7 @@ src_prepare() {
 		# Restore "Set title" support
 		# http://pkgs.fedoraproject.org/cgit/rpms/gnome-terminal.git/plain/gnome-terminal-notify-open-title-transparency.patch
 		# Depends on vte[-vanilla] for OSC 777 patch in VTE
-		eapply "${WORKDIR}"/${P}-notify-open-title-transparency.patch
+		eapply "${WORKDIR}"/${PN}-3.30.2-notify-open-title-transparency.patch
 	fi
 	gnome2_src_prepare
 }