Bump to 2.24.5, remove old

Package-Manager: portage-2.2.0_alpha39_p14/cvs/Linux x86_64

3 files changed, 28 insertions, 23 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 8b494673ea10..d8444e38f259 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.512 2011/06/11 03:05:04 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.513 2011/06/16 07:44:52 nirbheek Exp $
+
+*gtk+-2.24.5 (16 Jun 2011)
+
+  16 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -gtk+-2.24.3.ebuild,
+  +gtk+-2.24.5.ebuild:
+  Bump to 2.24.5, remove old
 
   11 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org> gtk+-3.0.11.ebuild:
   Use xz tarballs
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 18fde0e07b0d..879874204d3d 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -16,32 +16,32 @@ AUX gtkrc 627 RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 SHA1 cdb4665e94e1b
 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 RMD160 fa41bb12e41f0c60c605dbeac03a1aaa905f4333 SHA1 7350d1ed147e52ddc870a4d4b52073f7407d9f0d SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684
 DIST gtk+-1.2.10.tar.gz 2868322 RMD160 9b38310d2768e947c4f6173db009243dd11db288 SHA1 a5adcb909257da01ae4d4761e1d41081d06e4d7c SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34
 DIST gtk+-2.22.1.tar.bz2 18306164 RMD160 f7d5cd312dc982a599e6a834c87c1bc07ff87e2d SHA1 c88d8be4aebd6e59d6ca44d57f6acd18e2be1c08 SHA256 965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07
-DIST gtk+-2.24.3.tar.bz2 17598600 RMD160 63173846e21f782915d5811fb75f455e231f7ad3 SHA1 a139460a34bfb5a2095645ebc634a5754bdb2920 SHA256 336ddf3dd342cc36bee80dd4f86ef036044a2deb10cda67c8eecf5315b279ef7
 DIST gtk+-2.24.4.tar.bz2 17607752 RMD160 56a6f731cfdc47686c71f8f6b4253484e08dd230 SHA1 c15a25ba49eb459b2c4cdc46baedf6cecf08cbcf SHA256 7d3033ad83647079977466d3e8f1a7533f47abd5cc693f01b8797ff43dd407a5
+DIST gtk+-2.24.5.tar.xz 13252580 RMD160 f0eb690c906166c5f0e296faac8fdb983955921b SHA1 eb1200fe42bd2d5e3dc1bdb69b524600cbc06df1 SHA256 d6b30889efbb9fab9aa598092d08887826a7b2a3069b3bd5155dede28d9866f3
 DIST gtk+-3.0.10.tar.bz2 16894706 RMD160 ad5c86cfca724af72c1b48f3e511b45e444b02ac SHA1 5e8e356b87796b0a99f16a01663ec1aa972d19eb SHA256 a217ed31aed9843810eabb241239e0f2c5ca0e14bd91687cf4180b3e346abc30
 DIST gtk+-3.0.11.tar.xz 12673196 RMD160 e7ed69ac6f0876917263dabbae2c8f9fb83325c9 SHA1 5278d6f1dfe1ba8299028704962f5fe2dd41952c SHA256 e2e38b316c4657df0cf376c3b6aad63158a9068c557ad41033a677f29967001b
 EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9bd5 SHA1 93a6ec39cde941b4939c04da955475d017a6ff6f SHA256 e4874d2dd01bc266e7e0f5b691fcf4e54f6bd3a79658dcec6d5374c5910aa78b
 EBUILD gtk+-2.22.1-r1.ebuild 7597 RMD160 03ba03c4ff419e7898fa2d547421727162e76658 SHA1 f5c24e1cd89a41f13ecee6f143859f9f94a5f8e9 SHA256 4224d89c2380fdc57bb15d6af05f6d442cedc21ba99dfc9a3048c33b3b45001a
-EBUILD gtk+-2.24.3.ebuild 7372 RMD160 36846cbbad6f3cfdb96da4c6efce6a9ce4c85eff SHA1 05900b28b32e48dbc887468545339bde704613a3 SHA256 e1431b6c16fd0783702f1d0b20e5431facec7aefafeba69e7816b3cc2e8a372d
 EBUILD gtk+-2.24.4.ebuild 7317 RMD160 50699385a6211efffabaeceef0334688f02fda0c SHA1 af47c6551767d8edc73fd3300683cd14995233c0 SHA256 9a3f363f8ef61d4697ca585619994571fc6abac720925bd9c952e69c767f1087
+EBUILD gtk+-2.24.5.ebuild 7346 RMD160 be52ba12ae76e2808e4d79fc83b264d10606b922 SHA1 c260c09b88d04afc481bc4ab0fc4f884ccd7fb90 SHA256 ccd87418a5ccd649b3e43672c343cd119cb690bf6e6eb71dfd8155c2e364d5a6
 EBUILD gtk+-3.0.10.ebuild 5799 RMD160 593efc5363f470144c83d14803c02c95b5009d56 SHA1 cdcaa3dc8618583958d4172b23a9a49e4f437b4c SHA256 02fe8d1fc8bf2d9611d711725878cf99c690101baad6cc70277a2c0c82d33029
 EBUILD gtk+-3.0.11.ebuild 5825 RMD160 d3bf9a4a28e3e6844f9fb9be3e3fbd006badf134 SHA1 f771faf35e81e98ac83f7ee5f4fad202bd17bc19 SHA256 511a22b7d0bf4619d63a0060346068015ee7521b9b61844207347764397e4c95
-MISC ChangeLog 76541 RMD160 b9b38517b87fad3ac57e8b8b02b3e3e78a453c7e SHA1 7ab0738e903e7ef62bcb42dc18b46af6cc452a84 SHA256 f981265617dc2f2d2559095b841792c79d0ec575ea8107a8daa0dc5727fb5572
+MISC ChangeLog 76697 RMD160 4d185dda228db1fa06e1519afbf5250b830b5986 SHA1 991b5d0074ef6d1f1530bcf1aa53eee533d4b3bc SHA256 359f929dc7393ab3866735f8e6142906af8c232278714053c8ec37f24db50716
 MISC metadata.xml 549 RMD160 8d6692e4cf18e0c75421ddef09e2881624c5ce3e SHA1 ce3ed4bec69816eb61b5ca9d48c2db396085a923 SHA256 2e7f82b302d91c37ecf915de09e4b85ef093b790baacbef0325b6fe9b1bb304b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJN8ttwAAoJEO/kOhxWD91kdhoQALC17CkkDsJPWGqb1Pomcw1k
-GS+z1q1KId/O3NjsPG36I4RnALIJqU04LlCHEsTIyHU5b/3uKzCPVBDobJtqCNJW
-BGAQgqyPuVfMO0z4iktiJkodtg541TFRufftR5OhVZZNibuLzLgpsJi4Gv6xcvqK
-tpeYyxvihNg8pJ2IeSBcou5ov+I4vlrjme2VOYc8k71mDk9KH7Qz5XAab/Xp9SwK
-+/EqjDWYt1/2QNKqZyP1XBj5EBOM2tb0P0YCsEbM4hk/vkBixzxiOKcBGXIysaxL
-YVRm9jQGrH2rjQhtazrQqYkixoPtUqj7scyb1q+HGmnxXvXNJrKiP4I1iTcUoX3z
-JNaUxYC0kw8UVSEGs7IoBENHJrEliKUjg7f6kJGwHdsZhOozPp1U4BFMauQvhup9
-EuRd2SRm7UE5mWUgzR2BUtJcIXIjdXLDs6VJRlZpbTc/PHi9ZPZTpsrvpPwKwkfH
-n4S0b1oU6+ORyjDTOkebCwBxmheqYqCbXdVeVhPnYXugqAuB+q/gKtDwsvJ9PdaU
-wtLJkJLTk20vwcDuiHRZFBnE3uw3IZbY23JGa4SNzEvvGX4ExZsb78Ke7XdKRCzO
-3xGDu3hpFLDMAnwzEySZZiqbe6HfCCW41avbcUu04LcslG9fXrXSCtiub+SKxjFL
-L8qe7WqGDeXmuxkp4cNA
-=/Zl2
+iQIcBAEBAgAGBQJN+bR5AAoJEO/kOhxWD91kfaQP/0hwD8Yin7/Ut8WWbgmZO6/I
+UUOE0MJHup7HsFkSk7jmufrW95J0kYtsgJzTexCAdKPyBrrzXcTwF5tYlC98grmZ
+xaOMepYEl4DHDkgzbKJE7C+NCVknLvneIkXdegUgW0+jBvH3K7t+1OHtAIpFnjYG
+XDYa67FsVPejXcUNMn0p//3w3S4thpPvi9k7rkdQNGzrTlJhTqzGSkkMyiCS2Ew4
+FTPD5YlW5pQ+Kex4gllfTu+ieLKI1paRNLrPBnx8Kz2UOlKtRtBBu/MxvOplqlQP
+zdQpBnnwKVgoXaFcO7bIGqfG10XXYT1gP3AM6xeNp9g5CsgnoPKXbfPp9q3glzHJ
+C1rftGfFtPYqSm/KKgBC5Jh91YEUoO3SKYrM74tv65C2PIPRphBpje8msCr99EGG
+BjHr38iyYp6JNwulM+Q0MoewXCGjtVcPWy1IBCJN+eYddNPzHXBfcoXC6NBPZHyG
+FAajpnHSzlfu1skwKOqKQPMl/pSHMa1deMClswl08HUUI5CWnFtu4epxtcb4opv0
+VouI2lDw8IOCyvTDBeF6OCBNRix3Ro1fXoIYGuzKX5TSm5cHBC8YkIVIVQ5XVtpy
+ElulZLmQFaOCYXjAAOyqvJ/mf8TP4qU7Gr+NKI4NH1E9YejyCnINGkLMnI7EfCxl
+JhiRz4eLbokkIZwi+a8u
+=P0TD
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-2.24.3.ebuild b/x11-libs/gtk+/gtk+-2.24.5.ebuild
index ffbd5488cff3..f4302ae9b74f 100644
--- a/x11-libs/gtk+/gtk+-2.24.3.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.5.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.3.ebuild,v 1.2 2011/04/10 09:30:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.5.ebuild,v 1.1 2011/06/16 07:44:52 nirbheek Exp $
 
 EAPI="3"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="xz"
 PYTHON_DEPEND="2:2.4"
 
 inherit eutils flag-o-matic gnome.org libtool python virtualx autotools
@@ -35,7 +37,7 @@ RDEPEND="!aqua? (
 		x11-libs/gdk-pixbuf:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.27.3
+	>=dev-libs/glib-2.27.3:2
 	>=x11-libs/pango-1.20[introspection?]
 	>=dev-libs/atk-1.29.2[introspection?]
 	media-libs/fontconfig
@@ -87,7 +89,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
 
 	# Create symlinks to old icons until apps are ported, bug #339319
-	epatch "${FILESDIR}/${PN}-2.22.1-old-icons.patch"
+	epatch "${FILESDIR}/${PN}-2.24.4-old-icons.patch"
 
 	# Stop trying to build unmaintained docs, bug #349754
 	strip_builddir SUBDIRS tutorial docs/Makefile.am docs/Makefile.in
@@ -183,9 +185,6 @@ src_install() {
 		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/lib/pkgconfig/$i || die "sed failed"
 	done
 
-	# Clean up useless la files
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
 	python_convert_shebangs 2 "${ED}"usr/bin/gtk-builder-convert
 }