Version bump, drop old.

Package-Manager: portage-2.1.11.23/cvs/Linux x86_64

3 files changed, 24 insertions, 19 deletions

diff --git a/sys-apps/accountsservice/ChangeLog b/sys-apps/accountsservice/ChangeLog
index d59a06aeb89f..047b71e36a4d 100644
--- a/sys-apps/accountsservice/ChangeLog
+++ b/sys-apps/accountsservice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/accountsservice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/ChangeLog,v 1.19 2012/09/23 06:17:18 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/ChangeLog,v 1.20 2012/09/30 09:14:01 pacho Exp $
+
+*accountsservice-0.6.25 (30 Sep 2012)
+
+  30 Sep 2012; Pacho Ramos <pacho@gentoo.org> +accountsservice-0.6.25.ebuild,
+  -accountsservice-0.6.22-r10.ebuild:
+  Version bump, drop old.
 
   23 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
   accountsservice-0.6.24.ebuild:
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index db83eee26b27..75cbe0620574 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -5,15 +5,16 @@ AUX accountsservice-0.6.21-gentoo-system-users.patch 1320 SHA256 c8b8961cf9825c4
 AUX accountsservice-0.6.24-dont-delete-root.patch 1273 SHA256 e55bef968ccf438a196453220d52b2d53b4c53d5810fdc678914163f64b55045 SHA512 bbcbbddd1257f04f541754f140d17c6df215990928cb23fed8a4a651e29c5382f39b7d3f79dc044ae6bf60fa8266ef56291d58c0015ff417d89645f3dac6d861 WHIRLPOOL 4109dd90387889428720ec32545f80eca69a8dc15a24165ab4b89ac7dae6a52cf139c8cb335a590905eefbd400ee0ddc546a8329df03789452f4e697762b88cb
 DIST accountsservice-0.6.22.tar.xz 331028 SHA256 851e05aa593cd8e3ed5c635a7fee3ffc0f418d3db2f28c5ebd6b7503294e3bdd SHA512 984f5180310683af0320d0294e97556a87658dc773e64d3105825ce7111d82e4370d8cf5172c6a6074eeca96aa158e8120d2a1092040313f482d051fa1e8ab1f WHIRLPOOL 68c1255131a7e4e03f2a6fa763ac89f53feb6697a3e8481a68ef77976bb694a296f18cd9df9828351fe201f4842369d40518093d78e47cd1c91e166061866c0e
 DIST accountsservice-0.6.24.tar.xz 332928 SHA256 f2c0886c5d6d80453eebd4a91e6081231cde6cc436d55b9425d2cc0332a85623 SHA512 10910973e7f3bd8884e1c7dd5e4b6c1c9d1b2e0559a7360385024def7184e7f13bacec5ffb91826a0ffdfb7bd545448a3af0354d84ad298723a3f50ef52aceea WHIRLPOOL 301da844bdb37df2d41839bb294d0d802230f42f9991cf1e105e15e02a73834924e166973b6a48781b26fa26f46ed56109a5e583541b2651a986d5ebdedb4baf
-EBUILD accountsservice-0.6.22-r10.ebuild 1885 SHA256 256933c92344fdcc28507d86ed5cf6ddbcdd9c24f8cdd03b5154f8ead793623c SHA512 83664b80a62b8096bd165f8bce8c747ed9342b76ea275382c0b73a712f8865cbca5f948f400412e613a439e2d171cfd299e5f6347c2bd4d3f12d1c0462cfdb26 WHIRLPOOL 31e98782239ba4c8b899bb9027b3a1c6b702231cd15bff12fcdf05169913fbd394d15e9323870a0c6c89e29822b6608f05210c96ca37a79602bc2db62dc5c4b3
+DIST accountsservice-0.6.25.tar.xz 334628 SHA256 5600a8ffe946d5cef63988767f221bc338b79f3012188d9dff6caa5f7b25fe6c SHA512 7cca2a0e773b68b5a5daefbf540dde02b29b6647c278a3411a501cef366a05ad5e64bbe713175ecb28352ba5052b7897536735cdc5790ee49a8499e84a56ba73 WHIRLPOOL fb99df6c16d87cbc3d21019c90bc0875319a4aa26b7aedbc8c2f386ab2044adc8e319dda0db8be02bc692d2026b316a6fa51d693b74f65a940855948ce4942f1
 EBUILD accountsservice-0.6.22.ebuild 1921 SHA256 faf7b4b1df83c01043720ae1763d9dc9f903fcf6fbbe960048324d043c18d57e SHA512 9524c878545d8f9cb90800c320548bbca75126cd682d69486647f702f4aec82263073da3f6d0d2c776933353ca65b46e198a1ab0eb036fe2a4abd459136caf29 WHIRLPOOL b75394dca979809a9edc4ec7776d4ea86906cd06fea4759b23e3094624bbc8e6a7abec7b9edf4a0e9011ce1ac4ec70ef2211b6d966c8fb64285471159c46e288
 EBUILD accountsservice-0.6.24.ebuild 1724 SHA256 8bdf4fe1e00c5848e231757155c55da50cf3d67b6234665ba9be81f654672f4e SHA512 05cfc6026f9fd6a9c684b5d730ffabb862fe3cf949c0055ac489c6f9fc427b4eccb4e4aa1c2aadcee0795c566762ba5cd14d27071738506337fb581fefa46255 WHIRLPOOL 0c3e4aa0e7106707c33a4814f8aaca40bcb5673c89ddbf66a9546f0dfc3c4880b58d0a0232550c0f01937432c54d3f1719479c387c8a977740516e537994a11f
-MISC ChangeLog 4066 SHA256 a8c071318a0d4086a4b5900a037dea16a391fda04cfc7a6133b6e11d85f31b3c SHA512 135bd98087b4fe55918a797ca64a17ea9cf9dc5ccff62c6ff2548e5c06050c24ce30061593a52232065aa0114a54132ed50f927601e789c49ab7cebf1b00b1c6 WHIRLPOOL 82f93650a1994d21b2c99afbb23c4fdd5e6e6882bf2b0557a2a0fc518ca10ed468b2f11c23170de773343c6d462368dc4b5ee754fc919e54e2d064b1b11a99a1
+EBUILD accountsservice-0.6.25.ebuild 1656 SHA256 68609964e605071c6d5ec9771bf70ef0a37cadae5278d4973c2e329d79ac2923 SHA512 83d10a9cf429cafc75755476e9a099b2308a12318d59117d0ac0129628ded9969b1ec1354aa0f27ed0d2aa7f5b8c44a373ce7d309f6b2340284d62dfe5df5871 WHIRLPOOL ca5517c42a34e532ba0a02c8718cadd2fa8b07a7b15aca4b5b770dfe00d5e54cd36b1fbd599908f8c9531582711b8b3ca2d1564591432142cdcae0b1ec6e2a0e
+MISC ChangeLog 4245 SHA256 0870e189b3c5f0dcbf4dba5b490f5105a5928fca1f68296b55d97719324bd017 SHA512 89114d58622796e7997049b669e46f8621939b75c05c9b4b706edc66f3f10653c6279faa0538e588a37eed74c24acb97f0d6602be51d7218138d6306e4b270ac WHIRLPOOL d4f0a204ae8d216afd9eb2541200b5135bf470a9a3f67d861aaa3966daf54a9ed72f56e6f499739dab7b0c7cc99f630315a2b917c2d55412cbfb668478f5cb6e
 MISC metadata.xml 477 SHA256 cfe68d08f14d29166ff46c0e1187002e7c895307deab521b2b78637cbe45e8ac SHA512 d60228f73ebf1a56d604b152d928ebfe5f81d7d777f471f4808a07aa9c6fc3460d7c7d71d183c4566def28a2b1319da4e9dfd71886d8a8d85ddf3c57e4de2b13 WHIRLPOOL 6562e107ed6dd93aac173cb28a532cd1ee06a2d1378a8d552234d41e615ff8f9c0d219aa016a85cb776cb2c3c0ebbad84de2331e809157e64f96604eef863e86
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBeqXMACgkQl5yvQNBFVTU9LQCghpRjaWtO++HXAiPD1yiH11gX
-80AAoIvpFum2JThlp92Z1h79IyLpleSa
-=2voy
+iEYEAREIAAYFAlBoDV4ACgkQCaWpQKGI+9RlBgCfbWh194yMUbrJvmku0pbAegQt
+QlYAn33qjzE159rpkYM8l7HnI3EMIwpH
+=yQ7N
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/accountsservice/accountsservice-0.6.22-r10.ebuild b/sys-apps/accountsservice/accountsservice-0.6.25.ebuild
index ad41d6910108..67d7fc624be4 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.22-r10.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.25.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.22-r10.ebuild,v 1.2 2012/07/05 21:23:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.25.ebuild,v 1.1 2012/09/30 09:14:01 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.16"
+VALA_USE_DEPEND="vapigen"
 
-inherit eutils gnome2 systemd
+inherit eutils gnome2 systemd vala
 
 DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
 HOMEPAGE="http://www.fedoraproject.org/wiki/Features/UserAccountDialog"
@@ -14,7 +16,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="doc +introspection systemd vala"
 REQUIRED_USE="vala? ( introspection )"
 
@@ -33,14 +35,16 @@ DEPEND="${RDEPEND}
 	doc? (
 		app-text/docbook-xml-dtd:4.1.2
 		app-text/xmlto )
-	vala? ( >=dev-lang/vala-0.16.1-r1:0.16[vapigen] )"
+	vala? (
+		>=dev-lang/vala-0.16.1-r1
+		$(vala_depend) )"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-more-warnings
-		--localstatedir=${EPREFIX}/var
-		--docdir=${EPREFIX}/usr/share/doc/${PF}
+		--localstatedir="${EPREFIX}"/var
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		$(use_enable doc docbook-docs)
 		$(use_enable introspection)
 		$(use_enable vala)
@@ -51,12 +55,6 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.6.21-gentoo-system-users.patch"
+	use vala && vala_src_prepare
 	gnome2_src_prepare
-
-	# FIXME: write a sane version of vapigen.m4 that properly deals with
-	# versioned vapigen pkgconfig files, submit to vala upstream, and get
-	# ${PN} upstream to use it.
-	sed -e 's:vapigen_pkg_name=vapigen$:vapigen_pkg_name=vapigen-0.16:' \
-		-e 's: vapigen\([^a-z_-]\): $vapigen_pkg_name\1:' \
-		-i configure || die 'sed failed'
 }