Version bump wrt #336068 by "Florian".

Package-Manager: portage-2.2_rc69/cvs/Linux x86_64

5 files changed, 101 insertions, 2 deletions

diff --git a/x11-terms/guake/ChangeLog b/x11-terms/guake/ChangeLog
index a4ba2c4d303a..cac3f1ef573f 100644
--- a/x11-terms/guake/ChangeLog
+++ b/x11-terms/guake/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/guake
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/guake/ChangeLog,v 1.4 2010/08/08 02:05:42 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/guake/ChangeLog,v 1.5 2010/09/05 16:05:08 ssuominen Exp $
+
+*guake-0.4.2 (05 Sep 2010)
+
+  05 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> +guake-0.4.2.ebuild,
+  +files/guake-0.4.2-int-ssl-port.patch,
+  +files/guake-0.4.2-prefs-spinbox.patch:
+  Version bump wrt #336068 by "Florian".
 
   08 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   guake-0.4.1-r1.ebuild:
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 7578c355b5ce..ae158150a6d7 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,5 +1,9 @@
 AUX guake-0.4.1-rename-tab-problem.patch 451 RMD160 1853c45d603bd8a8815c203e05aae5b661806e73 SHA1 f99b8715dae845bc7a75d7204e1d55db568bec5c SHA256 18f17551ec2acfd9c3b860d4c57d07178f1251613e657b2b430ee8313ee1d4c8
+AUX guake-0.4.2-int-ssl-port.patch 579 RMD160 88552d30da020552275af036681cb5c34726208a SHA1 ee1f23ed9d2c0a89df96e215c29c9f39db82f111 SHA256 58064f0cb6482c882e9f586c1920a574db98669dc1e842c1fb0f4e99d9befcea
+AUX guake-0.4.2-prefs-spinbox.patch 661 RMD160 0a28c7f8017c8bf30912326b8b36a542ca8eb093 SHA1 f2f2b025cc57eab5d7c062dcbb96c41477cce0d8 SHA256 4f77de8f86776561148947b0d6d0395cf8e6ac0c2a6eac6953ef78ec58bac833
 DIST guake-0.4.1.tar.gz 435217 RMD160 9ff14670dce38bbbd6009648b449f7926a394dbb SHA1 dca2c16ce22b9d2a01e85428d541b2238e89fbb4 SHA256 28e687147112cf0f0fbfadbcfb84113bedfc81eaca99a55f8ee4c7d55fe371ee
+DIST guake_0.4.2.orig.tar.gz 440653 RMD160 b3effc40905e66532f3fc308ee71d7ff4145aa8b SHA1 97e1adbba7d1ec4569689b1b4a69a8f41421a02d SHA256 03482efacaff18537402e574efd6d804a1af9c3ee5ef87b0acc7a8fd572994bc
 EBUILD guake-0.4.1-r1.ebuild 1242 RMD160 658bcb4a6dd298bc9d42d418fe625ed21a31e83e SHA1 24e743af299cd6feffa4d96215e99842e4fd86ee SHA256 4b7d0ecdc8857a9121fb2a5a8ec2a859b148359331b9cc2dbc09713233458566
-MISC ChangeLog 828 RMD160 e6b3111a0f6ffb4a72e9d8d296aa08286205fb5d SHA1 68747b8a0947306bb73e3587b4740b9ec2070097 SHA256 cd8e45be1fc6fbdf9938395f729b506e078960b669768f470ef6add0e9247e7e
+EBUILD guake-0.4.2.ebuild 1346 RMD160 bcc916bf306103fa1537d23aa9c6a35a0d30ebba SHA1 eea55c4de76b70475b4a3fc1cfb28c3e3cb47d5c SHA256 de5596f98ee23a8099f9dfb2894d6b806ceb26ccb476729d223bd37f15eeb117
+MISC ChangeLog 1055 RMD160 3354c9b89d81a475eae89eb1a373a73b2a7dd3e3 SHA1 659ab71a0833739ede91bbf18fe8a44cf9df943a SHA256 f3f15a62cfd6d3f2f5f0f08639dc042f5b31b3808b66e80eed643b1a338c0a9b
 MISC metadata.xml 167 RMD160 6f174fdd5033945a3da1b7bbea9796fe17ba2bf8 SHA1 26b8b030985c93a71d6d34f25249320a30b22f36 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241
diff --git a/x11-terms/guake/files/guake-0.4.2-int-ssl-port.patch b/x11-terms/guake/files/guake-0.4.2-int-ssl-port.patch
new file mode 100644
index 000000000000..801e76fb10fc
--- /dev/null
+++ b/x11-terms/guake/files/guake-0.4.2-int-ssl-port.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/336068
+https://bugzilla.redhat.com/show_bug.cgi?id=626303
+http://guake.org/ticket/246
+
+--- src/guake.py
++++ src/guake.py
+@@ -1099,7 +1099,7 @@
+                 ssl_port = port
+             else:
+                 ssl_host = self.client.get_string('/system/proxy/secure_host')
+-                ssl_port = self.client.get_string('/system/proxy/secure_port')
++                ssl_port = self.client.get_int('/system/proxy/secure_port')
+ 
+             if self.client.get_bool(proxy + 'use_authentication'):
+                 auth_user = self.client.get_string(
+
diff --git a/x11-terms/guake/files/guake-0.4.2-prefs-spinbox.patch b/x11-terms/guake/files/guake-0.4.2-prefs-spinbox.patch
new file mode 100644
index 000000000000..0446ea14b927
--- /dev/null
+++ b/x11-terms/guake/files/guake-0.4.2-prefs-spinbox.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/336068
+
+--- data/prefs.glade
++++ data/prefs.glade
+@@ -445,7 +445,6 @@
+                                     <property name="visible">True</property>
+                                     <child>
+                                       <widget class="GtkLabel" id="lblChooseShell3">
+-                                        <property name="width_request">120</property>
+                                         <property name="visible">True</property>
+                                         <property name="xalign">0</property>
+                                         <property name="label" translatable="yes">Scrollback lines:</property>
diff --git a/x11-terms/guake/guake-0.4.2.ebuild b/x11-terms/guake/guake-0.4.2.ebuild
new file mode 100644
index 000000000000..e6ef433bac17
--- /dev/null
+++ b/x11-terms/guake/guake-0.4.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/guake/guake-0.4.2.ebuild,v 1.1 2010/09/05 16:05:08 ssuominen Exp $
+
+EAPI=2
+
+GCONF_DEBUG=no
+PYTHON_DEPEND="2:2.6"
+
+inherit eutils gnome2 python multilib
+
+DESCRIPTION="A dropdown terminal made for the GNOME desktop"
+HOMEPAGE="http://guake.org/"
+SRC_URI="mirror://debian/pool/main/g/${PN}/${PN}_${PV}.orig.tar.gz"
+#SRC_URI="http://guake.org/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=x11-libs/gtk+-2.10:2
+	dev-python/pygtk
+	x11-libs/vte[python]
+	dev-python/notify-python
+	dev-python/gconf-python
+	dev-python/dbus-python
+	>=gnome-base/gconf-2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( dev-util/intltool )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	G2CONF="--disable-static
+		--disable-dependency-tracking
+		$(use_enable nls)"
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-int-ssl-port.patch \
+		"${FILESDIR}"/${P}-prefs-spinbox.patch
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	find "${D}" -name '*.la' -delete
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_mod_optimize /usr/$(get_libdir)/${PN}
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/$(get_libdir)/${PN}
+}