Version bump, drop old

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 47 insertions, 51 deletions

diff --git a/dev-util/gtk-builder-convert/ChangeLog b/dev-util/gtk-builder-convert/ChangeLog
index 91387f78a399..f8edbbaa25d0 100644
--- a/dev-util/gtk-builder-convert/ChangeLog
+++ b/dev-util/gtk-builder-convert/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/gtk-builder-convert
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-builder-convert/ChangeLog,v 1.32 2013/04/09 16:42:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-builder-convert/ChangeLog,v 1.33 2013/05/13 18:57:39 pacho Exp $
+
+*gtk-builder-convert-2.24.18 (13 May 2013)
+
+  13 May 2013; Pacho Ramos <pacho@gentoo.org>
+  +gtk-builder-convert-2.24.18.ebuild, -gtk-builder-convert-2.24.11.ebuild:
+  Version bump, drop old
 
   09 Apr 2013; Agostino Sarubbo <ago@gentoo.org>
   gtk-builder-convert-2.24.16.ebuild:
diff --git a/dev-util/gtk-builder-convert/Manifest b/dev-util/gtk-builder-convert/Manifest
index c045b8a19aae..cb47010d7930 100644
--- a/dev-util/gtk-builder-convert/Manifest
+++ b/dev-util/gtk-builder-convert/Manifest
@@ -1,28 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST gtk+-2.24.11.tar.xz 13260984 SHA256 328b4ea19a61040145e777e2ac49820968a382ac8581a380c9429897881812a9 SHA512 64b7281e63338bd094b1ee692638484f333b6837c8349c220182f651189c9f9be5a95ba7fb1a9940c74479fef35c3b5eb5bc4f9a9b185bfa36ae905110d4cb22 WHIRLPOOL ab7114019cd9dc62d9a9124701c97f67fb1a7d560cca20c724158f5994d8766ab74b84dd102ab4df759e51e1d272a643e0e00fca1f8cf7e40d82ed50de82a017
 DIST gtk+-2.24.16.tar.xz 13435020 SHA256 93cd69cc2cecf9a3aa31a50caf4a24752a6928a48c527ae967b109df6f9302d3 SHA512 0b3b7be3eea1372b9fe1a9a4ddaaabaf92ed1437d3c3c281f936b847cd9cb5a1e97f4b8496009faec00c182719a16767b9061efffbd03c0770b35c099f43cccf WHIRLPOOL 17057f2b4d5b8f071014adb7e0114fef1406590216e09bf745e205baa1bcd4104559a452b422870472ce3f5b5700dda894ecc2e7914e2fa7ae4d4f86235cf63a
 DIST gtk+-2.24.17.tar.xz 13288028 SHA256 e947b2b460156d98e8e38930b82458e1d613a71eb26e927f966f7081a640f415 SHA512 7a83555b4b6eb534bbdb77eae85164e182d68f786a72dcdbf41e221a25af0981263cc6637427cdf8984f82064927fb38d370d3f8621b7b056b3b5dbd92bcaf79 WHIRLPOOL c4693da71887d5eaaf17bcc60a0e65c60a745eeed5d02534019cae3f9c1baaaae919fdbfa2076999f795aaa2c7be8d1403f2a45a3fc9993eff5a456b0ac0311d
-EBUILD gtk-builder-convert-2.24.11.ebuild 945 SHA256 296d6498e54d633379d31a85fd53d467bff89e75b1186a97ed7ca50c49b6c336 SHA512 9763d65e0cbad7e4859d3c9e66d519565455387aa893cf87f458a71d7bf4313018a9f38359be0dd2f4cea7907cf69c24891327f254570dbf959e3ca55c72b75c WHIRLPOOL aac6bf9e2961bd73653f8078fbc61e20e3b57302ce289e258e3fa703aa2218ea0b50c0c105c338d3ea89c5a1f24176a7a3c2abbecef901b63b610ff559bbc359
+DIST gtk+-2.24.18.tar.xz 13344536 SHA256 6c963101272ff53bb5b01d21bfb86cebba5f0a68f31c5e10523c63f07e762385 SHA512 5250ae00c8d5fcefded54c8476e45f6bcc69d1207457ed53a23cacf3986cbbbcd115c2b5b823c1f90f1e21de4eafb40c7081a7175943ce2adda593bf2759d0da WHIRLPOOL b899c19756ccd8f558ea4da43cf97ddf286c8315836bc6b7457c8a244d9d856d3c5ab62ec1972388ed4f774a1b3c0cdc8cdcba0665d293fc50e1006df1a791ea
 EBUILD gtk-builder-convert-2.24.16.ebuild 1015 SHA256 3e74ae6ee23ce0d9c0db47b69e62f5b2fc2477d77eb07e602a612dc758e18888 SHA512 ed739620d610a757674d6f0eee89ab34870162526da6373356852dc182df9fd8401685ad17e1a3042e95e7b648299e66f22018e6015b42f6f5e5c29f99dd73f0 WHIRLPOOL 49fe2149b4ae51ed89c18515b28b226cbcdfbc3b8a95fa0ae674fe2751c3094daf15a0fc10cc3f7be10189467889a99327c18f19d50799f09d31e41521596d74
 EBUILD gtk-builder-convert-2.24.17.ebuild 1030 SHA256 666e409d776608977ee935afa4d40feffb34d18e6dc2871341d6be71a3ecd758 SHA512 7c498b4332c50a57fb431bec10f930e4d07e6bbf288b6d66944336d32b03e1bacf167f5c747fe918ef5721123eb9bb618b7fbe3a804075f5e2f5335f25cf1910 WHIRLPOOL a0626c3077e0a07b2e198c1fddc30bff78aaa4e4494641ed4447bd9b4c6a56e3c038fb1b7845930dd593c445e2cfc92957700f9ec0a9ab0f6907507e3a7ad0f7
-MISC ChangeLog 4806 SHA256 59bf372a3e2aa37fe51b3b318c0cf633e8fce5563d08cf00383887801d9440f1 SHA512 96dacef583579fd9b1fd2e97dc1907d1181c4c74bd8055d78160c460ecd81aa9fdbc2d8ff74cc4dcd2774bc429012cce70fb141a5f79e5804382624d7d37e314 WHIRLPOOL 2154c93300dc4ed1a6f9305cdd4135303cc3539d6b1d03f1f95ed4a863a7636c40075d8a03e832b1fb8ff72182301dbd1d34914cb4f3c8e8eee6beaf9b90f55d
+EBUILD gtk-builder-convert-2.24.18.ebuild 1025 SHA256 fbd265eea43570ea144bf7a7ce01bd87b712e3a3dd951a586a56680e0a8edbc2 SHA512 a383d5de5166ae4f02a5d01b4d40963dda60f3c79687c18b74bc236777eb59702843f49f209d35b73c10fb63a2ee92ec8008d44251df55a6dd04c899fbe233c4 WHIRLPOOL 5f1d31d0aed1355e6fc9b60ff8bf68ef7a06c978eba7825c0b8a68305fbdd8148244ddcdb666e390425a602eabb5cb189322687addb2d909e3424f18d3fd4b4e
+MISC ChangeLog 5000 SHA256 c75d5d5efa485d077c7aad4c727f163055c9b6724c8f2436739c27263daad882 SHA512 fba975c691929fb09246113c1a20712b60aecd61151384251d15a1a752f40c874652ddf1fdf4becf4bf67c083831ad820652be57d51605e5aef7a4c3277f14bb WHIRLPOOL fe6e7f176eba40d128e361c73797a8cad1aee8b3659775b068af950715e2d9a00f8cd907bb5a947f62126cb308c9545cc4c81a9e12d3dbc0ea20ca94c5f7bb83
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRZERzAAoJELp701BxlEWfm6UQALn3nLnnpRegvYqxzxPmJdXr
-TOMhz/RYvi7XBJyVJlxQMgPnmudmvnNyGhCitT9Ih5Ccos5NCTJzNT6KKQeqRFnZ
-i7bOSHYn4sLHOmztvxy7BYF6BZN54u2r3l798o+P+hmw5MzKwUWScWu2ABBs0Bcv
-gKexpUgQO2j5YG3+NoMzwJ36v+st/GgYw/+N27hFfj/FZyAqNXX7m5f/IjtclZSV
-XBZ8FCTXIJQ2ovmKcI8az+LesPkkypKhU3qvhqcVPz1e+QyeTnkIRLYJasCbqZML
-WjyjpwRHva2GQUSle6+awU1N92bz7AMInnqOISxVcHrBHhdNj9bV+fFzhiwscmnR
-8cJQSY1o/RDj4fx91Qqol6Lipibx3J9X3zPutjIxyMMuapBPGLJXkljcv/iK1I0F
-VEgvOVrO7YySFSDXYmEJj2hGr43FPbDUk7IjWITaq/TFBTkXyTUL7iNcIK4P09TQ
-vjLd8KAvCm+e6bnv28Zi/yAW/38CmLHgx4ufeEjNx4Kz2vBSpT94/CPxsJtdeXx3
-+6Ba0THxI3ayWCdfB/ht26xsSpmWfk4WTrvlY4CeN7wONPhXlTbPbKTdW+6t/6qf
-NYh3RhsDHbwmpQgp07I5KNjDsDoP2pqpYb8SBF82zoikmwijmiwT6QimO2eTtt1n
-SUbO3JXoTyuOp1nSSnw5
-=QdQC
+iEYEAREIAAYFAlGRN6QACgkQCaWpQKGI+9Tm0wCbB+BQlYvZdmihjBfZZ60QHk8+
+ypIAn1sgO+mCd3v5uyK4OZbmysJ4ZJAA
+=T4cX
 -----END PGP SIGNATURE-----
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.11.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.11.ebuild
deleted file mode 100644
index e9839986fed2..000000000000
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.11.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.11.ebuild,v 1.9 2012/12/06 09:05:21 tetromino Exp $
-
-EAPI="4"
-
-GNOME_ORG_MODULE="gtk+"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="xml"
-
-inherit gnome.org python
-
-DESCRIPTION="Converts Glade files to GtkBuilder XML format"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# gtk-builder-convert was part of gtk+ until 2.24.10-r1
-RDEPEND="!<=x11-libs/gtk+-2.24.10:2"
-DEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	cd gtk
-	python_convert_shebangs 2 gtk-builder-convert
-	dobin gtk-builder-convert
-}
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.18.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.18.ebuild
new file mode 100644
index 000000000000..4f7a3e57ba98
--- /dev/null
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.18.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.18.ebuild,v 1.1 2013/05/13 18:57:39 pacho Exp $
+
+EAPI="5"
+GNOME_ORG_MODULE="gtk+"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Converts Glade files to GtkBuilder XML format"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# gtk-builder-convert was part of gtk+ until 2.24.10-r1
+COMMON_DEPEND="${PYTHON_DEPS}"
+RDEPEND="!<=x11-libs/gtk+-2.24.10:2
+	${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}"
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	cd gtk || die
+	python_doscript gtk-builder-convert
+}