x11-terms/gnome-terminal: update

Requested by Sholy.

4 files changed, 32 insertions, 29 deletions

diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 4e5c6bde..3cac74d5 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,2 +1,2 @@
-AUX gnome-terminal-2.22.0-default_shell.patch 491 RMD160 211ce1834251f5e4c80ba7511a2cacf8c4c43424 SHA1 47b5cad036c28fc0e750684c42582b9c13609d26 SHA256 efcd9d5074cb4653a3725008290d6b6ae5e8835cfbcbc25f3dfcaf3e7aad2892
-EBUILD gnome-terminal-9999.ebuild 1355 RMD160 6e68a62741aab56b84fb0d2c91d90d96c6e1cc11 SHA1 ad93558eb74224950330723d5723a1af4c1d7b07 SHA256 2933f7ec5d301ce76facff964234e4e73950159cb61219b527cdd279325f8946
+AUX gnome-terminal-3.5.0-default_shell.patch 776 RMD160 87309ff5e25eeccfa66cbcf790e8d9592c8c3640 SHA1 2a6bd54c0d82e7fadb494cd87423e02a31f9c65e SHA256 aec2d2e44c8eca551ecb9493ad93625c6f9246e725837b6d00469711bb597cf3
+EBUILD gnome-terminal-9999.ebuild 1265 RMD160 2d473be7e89cac7dbfda6972dc05052be083245c SHA1 c8954edafdeb971bddcad90033d2c4bed989d6eb SHA256 2524f034ef7bf2dbba697a4a68a072afca64d9ecc571ea6b77056211ebd305d6
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.22.0-default_shell.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.22.0-default_shell.patch
deleted file mode 100644
index 84bac04f..00000000
--- a/x11-terms/gnome-terminal/files/gnome-terminal-2.22.0-default_shell.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gnome-terminal.schemas.in	2003-02-21 20:06:56.000000000 -0600
-+++ src/gnome-terminal.schemas.in	2003-02-21 20:07:13.000000000 -0600
-@@ -341,7 +341,7 @@
-       <applyto>/apps/gnome-terminal/profiles/Default/login_shell</applyto>
-       <owner>gnome-terminal</owner>
-       <type>bool</type>
--      <default>false</default>
-+      <default>true</default>
-       <locale name="C">
-          <short>Whether to launch the command in the terminal as a login shell</short>
-          <long>
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.5.0-default_shell.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.5.0-default_shell.patch
new file mode 100644
index 00000000..92924f66
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.5.0-default_shell.patch
@@ -0,0 +1,13 @@
+diff --git a/src/org.gnome.Terminal.Preferences.gschema.xml.in b/src/org.gnome.Terminal.Preferences.gschema.xml.in
+index 6d28344..1a94921 100644
+--- a/src/org.gnome.Terminal.Preferences.gschema.xml.in
++++ b/src/org.gnome.Terminal.Preferences.gschema.xml.in
+@@ -169,7 +169,7 @@
+       <_description>Possible values are "close" to close the terminal, and "restart" to restart the command.</_description>
+     </key>
+     <key name="login-shell" type="b">
+-      <default>false</default>
++      <default>true</default>
+       <_summary>Whether to launch the command in the terminal as a login shell</_summary>
+       <_description>If true, the command inside the terminal will be launched as a login shell. (argv[0] will have a hyphen in front of it.)</_description>
+     </key>
diff --git a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
index 6bdf9361..d276b68f 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
@@ -20,35 +20,36 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 fi
-IUSE=""
+IUSE="nautilus"
 
 # FIXME: automagic dependency on gtk+[X]
-RDEPEND=">=dev-libs/glib-2.26.0:2
-	>=x11-libs/gtk+-3.3.17:3[X]
-	>=x11-libs/vte-0.30.0:2.90
-	>=gnome-base/gconf-2.31.3
+RDEPEND=">=dev-libs/glib-2.33.1:2
+	>=x11-libs/gtk+-3.5.3:3[X]
+	>=x11-libs/vte-0.32.1:2.90
+	gnome-base/dconf
+	>=gnome-base/gconf-2.31.3:2
 	>=gnome-base/gsettings-desktop-schemas-0.1.0
-	x11-libs/libSM
-	x11-libs/libICE"
-# gtk+:2 needed for gtk-builder-convert, bug 356239
+	sys-apps/dbus
+	nautilus? ( >=gnome-base/nautilus-3 )"
 DEPEND="${RDEPEND}
-	|| ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
 	>=app-text/gnome-doc-utils-0.3.2
 	>=app-text/scrollkeeper-0.3.11
-	sys-devel/gettext"
+	dev-libs/libxml2
+	dev-util/gdbus-codegen
+	dev-util/gtk-builder-convert
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	# FIXME: leave smclient configure unset until it accepts values from the
-	# switch and not from GDK_TARGET, bug #363033
-	G2CONF="${G2CONF} --with-gtk=3.0"
+	G2CONF="${G2CONF}
+		$(use_with nautilus nautilus-extension)"
 }
 
 src_prepare() {
 	# Use login shell by default (#12900)
-	epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch
+	epatch "${FILESDIR}"/${PN}-3.5.0-default_shell.patch
 
 	gnome2_src_prepare
 }