Fix vala.eclass usage (the package doesn't have any incompatibility needing to add a MAX version that we would need to update on every vala bump, it only needs vala >= 0.10, also call vala_src_prepare at prepare phase)

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

4 files changed, 22 insertions, 41 deletions

diff --git a/sys-apps/systemd-ui/ChangeLog b/sys-apps/systemd-ui/ChangeLog
index 7c04f138f939..139dd24f03b8 100644
--- a/sys-apps/systemd-ui/ChangeLog
+++ b/sys-apps/systemd-ui/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/systemd-ui
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd-ui/ChangeLog,v 1.5 2013/07/11 08:52:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd-ui/ChangeLog,v 1.6 2013/10/06 12:18:54 pacho Exp $
+
+  06 Oct 2013; Pacho Ramos <pacho@gentoo.org> systemd-ui-2.ebuild,
+  systemd-ui-9999.ebuild:
+  Fix vala.eclass usage (the package doesn't have any incompatibility needing to
+  add a MAX version that we would need to update on every vala bump, it only
+  needs vala >= 0.10, also call vala_src_prepare at prepare phase)
 
   11 Jul 2013; Michał Górny <mgorny@gentoo.org> systemd-ui-2.ebuild,
   systemd-ui-9999.ebuild:
diff --git a/sys-apps/systemd-ui/Manifest b/sys-apps/systemd-ui/Manifest
index cb4ba7843c5c..64b180bdeec9 100644
--- a/sys-apps/systemd-ui/Manifest
+++ b/sys-apps/systemd-ui/Manifest
@@ -2,26 +2,14 @@
 Hash: SHA256
 
 DIST systemd-ui-2.tar.xz 149892 SHA256 fa45819cd9419a8928a49097c879148f195944c9ed2b842310af58ab5254a694 SHA512 f2bd63cf16c63935f3099d896537c43fb0dd1c4840fffb1a602d87f0ceebf74eb256530c3c7121e042107b54a75145cc6922d2754a230a4fd8d7a48b8e8bc682 WHIRLPOOL 092e592cc68a0c02dc3eda4197691f3ff1d12a0e9379872bfe4b6478415081552867e84bc14650d236eae181a7b85ef010d3544f780ae83eda5ee2d498ed1966
-EBUILD systemd-ui-2.ebuild 1106 SHA256 7aef5f63c45f429d0199628a1b6f95a022cfea4ca9ef09da2a1724fe4ad446d1 SHA512 6858af23dbb91f01227e819216f31bab888fc007aa30baa2574776b7d066cee3c7f1876687eac932e64ffc7bf7106f5e04097d6fa70fddb2f11075f06533266b WHIRLPOOL 938c18dd9a4caf20e0ac001353a43f1e917490fd61376064e19e38d2475c8536e42e11f1eb5310861ce5fe305d18416b90317a39f9b1bc3c6be97c561ffaea56
-EBUILD systemd-ui-9999.ebuild 1356 SHA256 c031be1efa1b25bf0fcabeafa0510fbc62fe2c0d18937094111737fa78ea1d48 SHA512 40bbf3dd556c308bba5cee4da4af69659165b17f70a5a5cc0cfb856eafc7eb0c3cfedac8212cbd28b3a779eef55fa608be5abd93f90333b5820ef0d30353a0f9 WHIRLPOOL 2efacb866a317ee33478bad037cdf98a60b5310a116ff2dd621f7994d5b4d024e283773499836c86e866e41b5a9b2c0961e48865ab5a8b398530672ae7687a6a
-MISC ChangeLog 946 SHA256 f339975ceb047aa711fa33ce9bc8136c7ded4524ae88d5da895db97c07aa47c8 SHA512 8385c83456bb6f58912c6395351c383068b8272cccc9535c352dcf16b2b0d2a1aa913d70e6a029a44bf5c10d0e546a48e8fc69f22293a99c1b12144f91eb24d1 WHIRLPOOL 3de6f4a60796beb3eab10c72a01c977eab9e157bbf54deed9aadfebebf844b3c72240e981a5423e3f6b3dbe91efb95c34bc5517776c621d60b84155c0609b1a9
+EBUILD systemd-ui-2.ebuild 1014 SHA256 0edb5d8ef724dbab86317078ffb14efab199d5fd44f9e6c5d768a5a62c612de5 SHA512 b5cafece424fee403ee631be65253e3c87e1bef75986b6bfef3cefde7ea3a5fb38035954d261733e481fead245d2da1e554d494a6a081d9eb4d72e526e2649ca WHIRLPOOL 1b67bc1d95f03d66b6da054c66279044e6523594c8e1f3a66a8916f8557576bf07d7299219dc7f22da8bcd94fd00a6ac560d2e343364ae4058063968f3a42f1e
+EBUILD systemd-ui-9999.ebuild 1260 SHA256 a3e7d18d5026dd5310d7a1f4f56e154fc6b83ad00630120ee81666ec92f49320 SHA512 e4ececb61d5d50d2428a60538bda5c2f79932d4189ee3a666919c2eb8e17824ae0340a03ebe2d2d37ba473e4f04c14daf9ad92cc15056ad3cf0e3474d2165767 WHIRLPOOL 7daae07089672e8b167b5288074efe14224b49ca8a3b2d59a979c2fb3752349b44b8ef42babebe02f908fabdbbb21decba7db812ad9856537e3f8058f5c3c55f
+MISC ChangeLog 1264 SHA256 0d13cfaa396e966559adb5fc1d23e13495f42faa2f578f883f02326812dcaa3b SHA512 de8769944d0f4736803792df68e36efffd8f0eb2525edb436ed15966ec4d3784e87161035423104fbb1d03e6d219041f951a7c88ad5efea5d0a92ce9d453a743 WHIRLPOOL ddb6224b8ef6c59ed47be85233c405b1b5ca9c4064157af80d5c6d441404c68e7d1ef3d79873abfd5251c3feae8f84069be742e69f117f435f52540f2e09d3ab
 MISC metadata.xml 239 SHA256 1731c6552b4584e3ca0d760cb9504233311f18bdd2804cebfc06feb2f60b042b SHA512 3e96d13285d9cb02333157714e2d367beb695bb64cd1738bb4af9f284b7cea33c4d6be69a43b4ba559cc95d165cc007f37a3d3df10c4b0fc9bd6b08e42561ea1 WHIRLPOOL 1a0d71075be6a89d3b0cebff7e7bd474ab71b08d79302cbfc38a33e67cbb6d31d553d18b17993698bebd9fc6c29803be7aff3bffb0f1521022bc5a3c1c8723dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJR3nKnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDMs4P/A3qrALhmwbjva8mddV/zJFe
-qYWVagpcrerGYEZsvUvSbmLu0wHKB5fx/Yi6JR9BVxqBMZNBHb4cWh2ABevsmIpO
-f1KGl6pSb/4q3S3PFmO/9JnVnEfcUfUa6hilZRGDd5yurdPY61plJA/n65mZZXwm
-cvajzpcCVD633s4gWR7fD1eKXJHu5oAIJqdaxYOXeHIiWBwrT1Jl1S/n9kKHong/
-hr5yKKAw0IbkQGckRdeMk0+o4G/YVsLWkAddd6yt6iCfVblD0ejTwZiwbZpujnmu
-D9H4hCQei8dVh+9T2OuQSrIjRIp2l6OxXKsf1GsthIslAEHt1fTf6gOsPh0ZP875
-z3d4Z6yBkKgWds+8GFRKQP1y9WJKMrBeFfO+KZkDzWjWEoYe3EYz0Tf4SwiDDNXj
-Lu1Ew6XEH8uABI4gJcfQCphV3PulEsIW3AaP4J2joZf/uUtEa7Q3V3b4wIF5ulSq
-lJ4tTTBe/uJ4OeIRdtP/Ro4Y+YjFgwrFI7K1lOsl6X3onyMvLF+eIWwawwfG+G7z
-5zh5exOrHFgZXyTEzLtTy6U50/vXbY8wyH82IOH4GnXaIFE+4Yyh8NGHa9jtnKlZ
-DqZJiQAnHUw2RYDEywY0LzafCrH7R+6QbyZDG7asb/AueyL/4FvNNtmTykgg80aL
-ZfdJn9QLFz4PYtKcCvzV
-=Er1+
+iEYEAREIAAYFAlJRVS8ACgkQCaWpQKGI+9QzqACfX8S1S6I8pkbI/diMhYJATjpI
+f7oAn1JbzuKcoffBJNlD9c7vryG9Og1F
+=t8Vv
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd-ui/systemd-ui-2.ebuild b/sys-apps/systemd-ui/systemd-ui-2.ebuild
index 076cd6f09544..d22bfa9c7bb9 100644
--- a/sys-apps/systemd-ui/systemd-ui-2.ebuild
+++ b/sys-apps/systemd-ui/systemd-ui-2.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd-ui/systemd-ui-2.ebuild,v 1.3 2013/07/11 08:52:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd-ui/systemd-ui-2.ebuild,v 1.4 2013/10/06 12:18:54 pacho Exp $
 
 EAPI=4
-
 VALA_MIN_API_VERSION=0.14
-VALA_MAX_API_VERSION=0.20
 
 inherit autotools-utils systemd vala
 
@@ -18,18 +16,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-VALASLOT="0.14"
-
-RDEPEND="!sys-apps/systemd[gtk]
-	>=dev-libs/glib-2.26
+RDEPEND="
+	!sys-apps/systemd[gtk]
+	>=dev-libs/glib-2.26:2
 	dev-libs/libgee:0.8
 	sys-apps/dbus
 	x11-libs/gtk+:2
-	>=x11-libs/libnotify-0.7"
-
+	>=x11-libs/libnotify-0.7
+"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
-	$(vala_depend)"
+	$(vala_depend)
+"
 
 # Due to vala being broken.
 AUTOTOOLS_IN_SOURCE_BUILD=1
@@ -42,9 +40,5 @@ src_prepare() {
 	sed -i -e "s^/lib/systemd^$(systemd_get_utildir)^g" src/*.vala || die
 
 	autotools-utils_src_prepare
-}
-
-src_configure() {
 	vala_src_prepare
-	autotools-utils_src_configure
 }
diff --git a/sys-apps/systemd-ui/systemd-ui-9999.ebuild b/sys-apps/systemd-ui/systemd-ui-9999.ebuild
index e1ff2e08f6ec..8446a933d102 100644
--- a/sys-apps/systemd-ui/systemd-ui-9999.ebuild
+++ b/sys-apps/systemd-ui/systemd-ui-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd-ui/systemd-ui-9999.ebuild,v 1.3 2013/07/11 08:52:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd-ui/systemd-ui-9999.ebuild,v 1.4 2013/10/06 12:18:54 pacho Exp $
 
 EAPI=4
 
@@ -13,7 +13,6 @@ inherit git-2
 #endif
 
 VALA_MIN_API_VERSION=0.14
-VALA_MAX_API_VERSION=0.20
 
 inherit autotools-utils systemd vala
 
@@ -26,8 +25,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-VALASLOT="0.14"
-
 RDEPEND="!sys-apps/systemd[gtk]
 	>=dev-libs/glib-2.26
 	dev-libs/libgee:0.8
@@ -58,9 +55,5 @@ src_prepare() {
 	sed -i -e "s^/lib/systemd^$(systemd_get_utildir)^g" src/*.vala || die
 
 	autotools-utils_src_prepare
-}
-
-src_configure() {
 	vala_src_prepare
-	autotools-utils_src_configure
 }