Bump to 0.20.4. Backspace patch made it upstream with a soname change.

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

3 files changed, 32 insertions, 10 deletions

diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog
index c28b1e865f53..344677e62d31 100644
--- a/x11-libs/vte/ChangeLog
+++ b/x11-libs/vte/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-libs/vte
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.226 2009/05/28 21:03:34 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.227 2009/06/03 22:25:57 eva Exp $
+
+  03 Jun 2009; Gilles Dartiguelongue <eva@gentoo.org> -vte-0.20.1.ebuild,
+  +vte-0.20.4.ebuild:
+  Bump to 0.20.4. Backspace patch made it upstream with a soname change.
+
+*vte-0.20.4 (03 Jun 2009)
+
+  03 Jun 2009; Gilles Dartiguelongue <eva@gentoo.org> -vte-0.20.1.ebuild,
+  +vte-0.20.4.ebuild:
+  Bump to 0.20.4. Backspace patch made it upstream with a soname change.
 
 *vte-0.20.3 (28 May 2009)
 
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 0e4f58e46765..038f59cb09ac 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -6,20 +6,20 @@ AUX vte-0.17.4-fix-highlighting-on-activity.patch 1536 RMD160 bd992b58360d082877
 AUX vte-0.17.4-no-null-backspace.patch 1704 RMD160 2c4292c7448a5ffafc10b17bde5ea3c3b0fc98b7 SHA1 8974de33ea0b80fb35c5f5658cfaff82f5fd2207 SHA256 89dffab495ad08af010e831e137f161471884ca8badc5051dae641c0c67e2742
 DIST vte-0.16.8.tar.bz2 1112410 RMD160 dc6a5b95596d02c5e55ecbb9e1e58bc64a02e9a8 SHA1 600db1aa27094aaf56241a1e2f8f0476f97ffd40 SHA256 1dc06ad4224c18061b000de0435b81b7c249215da4163edecb62a8d46090098f
 DIST vte-0.17.4.tar.bz2 1084847 RMD160 8fa3ccc35bc9ef8c204b058b180f532ba6fe7a1a SHA1 fe4a3ec476c97d0f385249ee60edb12887b69575 SHA256 50ae10aea7fa99c9ae296031782c18ac15663e84eb6ecd94cd0a18c7843987d2
-DIST vte-0.20.1.tar.bz2 1090308 RMD160 badc94d7f7ea4436fb280059362432837d654c75 SHA1 92715cbf5a51ec42216fdcf6e84a32217b72ca00 SHA256 64a4a05d3072c6c13b47b9d25a58edd7b174c1452540acd6a4dfadcd584ee0ac
 DIST vte-0.20.2.tar.bz2 1325005 RMD160 47782656b2a54d284acb6bfbf794ecf43dc9b499 SHA1 a45131ba3527ecbc6328d0c4d4d1e8d7c222913e SHA256 6939ee6c13d84159937e7bfc08819962fecd87385ca86213274654c53cb1ceea
 DIST vte-0.20.3.tar.bz2 1326992 RMD160 025cb30e36967b4743b6ed2d45fcfb94b45d1245 SHA1 66bb9dc4886474f525557ba2efaed5ffb92bb4c1 SHA256 214a8f76bf02f52df5d2be6ee6de41822abdac8a341ac629ee98c2ba85433e33
+DIST vte-0.20.4.tar.bz2 1327189 RMD160 40824e8c5c48f3df71fcb5cdbe71ad447d640558 SHA1 bd6133338077763fa13fea8e01bf75351a2bf2dc SHA256 416baa507ed5a65126019acc956e858c2299326cbfad8033afc167c15b612e23
 EBUILD vte-0.16.8.ebuild 1306 RMD160 c2b9d5b2a0489d9424c7ea9205ae496606426ca5 SHA1 63f324f349b50b9ce6605758e372f1845a899a1e SHA256 36c5e7b5cb620db4d94a79cbd614eeaf2724498f91931074a9a5f022dc8ba715
 EBUILD vte-0.17.4-r3.ebuild 1234 RMD160 d29ffd397d700fd4303fd1553b536015e6afaf2d SHA1 ab80da1521814d1fd0de2fca08872e501c21f6a1 SHA256 d3e6532ec8d2dcea3474f54b1faac7f4ed38a031a01efd49a1f40406b5857872
-EBUILD vte-0.20.1.ebuild 1129 RMD160 aa4f904bd3d10d8c0ec29c12ac3f8bf10d80de6b SHA1 ba4d56e749df51d417939c941f441b90d66784dc SHA256 9bb03d32ca6d03ba01aaa13fe359b461e148a8f7ce52767f4a3b69800c623174
 EBUILD vte-0.20.2.ebuild 1267 RMD160 a53d181b7f3dd73e5f004e947ebc11818d81111c SHA1 167685b97e2a6dc1af52409d4b8002131967f6c4 SHA256 951c26d2645fc802cac952a843c2062c36caeb1630caf1d0aeeefa76f13defac
 EBUILD vte-0.20.3.ebuild 1267 RMD160 4e1b105f7b5f992e57991de8cfd494bba10a518b SHA1 8d6799eb9057dd326dcfb9b7055cf664ef7bed27 SHA256 0eada931b693725f092759216835fa8723f160aa5b5a1733add7685daf84c091
-MISC ChangeLog 28679 RMD160 fff8d9b34c0880e05cfc3333172bfc96e681dac3 SHA1 deddd67da83edefa38587633371294e46dbf6fa4 SHA256 84316693aa696dc8e4f8850b595fa3dfc8769a0977f5b3b8cccc8e2e65aeca57
+EBUILD vte-0.20.4.ebuild 1458 RMD160 250ad7bd5e5d6bd64601e38194b5a8f1f6dfa2b4 SHA1 1bf280f55bc96ed0a3c8274098c01526f4ad7677 SHA256 0883e17c79b781b0e7f961a2bb76061154c1866c1ee55b306b9c25732d2c938b
+MISC ChangeLog 29046 RMD160 7f91df7dfcda4651c6551a42f503c8e54ce40dc4 SHA1 1d6fc89de9a0735fa70d33adbb84b92f4135efa9 SHA256 703ef8c7d8eae8719feea33398df3c953b3e1cb20f3e28ff433fe90c5f6808e4
 MISC metadata.xml 250 RMD160 4e46249cd3426e09b6f462c29ea489724464f51c SHA1 96ab3cf6c39bb44e33d788425a99ddd337a31eeb SHA256 86cd2180b3599ddb2bef78131a9c86a37fa1ee7247aa3245e11e7ff6a239e2e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoe/D8ACgkQ1fmVwcYIWAYChQCeNaA086Yk4+Z7Oh/YwGA49MXK
-I2wAnjK9GyrP/C/edFBPLolI7SRNYO5V
-=8WsO
+iEYEARECAAYFAkom+HsACgkQ1fmVwcYIWAarwgCeIszIIvgk5cCfCNJKm74qvj0Z
+wqcAoOV8ZCmyJi9aT7Sr9mF23Gmw0dKy
+=Std3
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/vte/vte-0.20.1.ebuild b/x11-libs/vte/vte-0.20.4.ebuild
index 00308c53c0e5..ba230a8ce87d 100644
--- a/x11-libs/vte/vte-0.20.1.ebuild
+++ b/x11-libs/vte/vte-0.20.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.20.1.ebuild,v 1.1 2009/05/03 17:24:56 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.20.4.ebuild,v 1.1 2009/06/03 22:25:57 eva Exp $
 
 EAPI="2"
 
@@ -43,6 +43,18 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	# backspace broken within screen, bug #249618
-	epatch "${FILESDIR}/${PN}-0.17.4-no-null-backspace.patch"
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	preserve_old_lib /usr/$(get_libdir)/libvte.so.9
+	preserve_old_lib /usr/$(get_libdir)/libvte.so.9.5.3
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	preserve_old_lib_notify /usr/$(get_libdir)/libvte.so.9
+	preserve_old_lib_notify /usr/$(get_libdir)/libvte.so.9.5.3
 }