Version bump, drop old

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

3 files changed, 42 insertions, 37 deletions

diff --git a/media-libs/grilo/ChangeLog b/media-libs/grilo/ChangeLog
index 5fd1c8101af9..2ad97cc055e7 100644
--- a/media-libs/grilo/ChangeLog
+++ b/media-libs/grilo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/grilo
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/grilo/ChangeLog,v 1.27 2013/08/02 22:29:55 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/grilo/ChangeLog,v 1.28 2013/09/28 20:15:35 pacho Exp $
+
+*grilo-0.2.7 (28 Sep 2013)
+
+  28 Sep 2013; Pacho Ramos <pacho@gentoo.org> +grilo-0.2.7.ebuild,
+  -grilo-0.2.4.ebuild:
+  Version bump, drop old
 
   02 Aug 2013; Gilles Dartiguelongue <eva@gentoo.org> grilo-0.2.6.ebuild,
   -files/grilo-0.1.16-media-source-infinite-loop.patch:
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index 2d0dd6f4755b..8bdcd0da2906 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -6,18 +6,18 @@ AUX grilo-0.1.16-fix-automagic-test-ui.patch 1085 SHA256 ed4d2d2a907898837db2764
 AUX grilo-0.2.6-testui-crash.patch 1764 SHA256 07eeae01a798e7efca05d9532d6bafff8e031112fe8aa9443f52dc1c094d8c9f SHA512 a0eb23a99d5ace4ac45ffda64bb2e538d83384016d50836fb97955dfb1035aa5333c0121c9e4a244ae07e5e1629bcc14d5bc6642dae362c5e6190a435fc6d753 WHIRLPOOL bd6f7e14ee9460b4f24c03b4cf69039b121fc9d33b536ecdc60060b6c6fe3933348def4aeaa50fa8d6c28dd326fba9c5e56a3f6595098b6465558e29ee7b038d
 DIST grilo-0.1.18.tar.xz 493216 SHA256 dc5bc1ea74ed3d47c4ec2d94886234346671509bdc63ce181f98824e7178ae83 SHA512 61a9d5743aa6476ab33d0352a7e87817b8dd6d14baff43c1faab8578bc0f78990bd44ac4191b684ea0107ba736a759f0487f31f10abc717ee34ef152387a9805 WHIRLPOOL 9bccf95a641f9517d28ec43fcb2b58daf8d3ce7218f417058fc503afab7efce7609010008f858d3403e490856a9903b5c9d0111e180482ed1b098f46f18209cb
 DIST grilo-0.1.20.tar.xz 477860 SHA256 3438e76a61c74302598c86d6978e67ca51e45440029b0440de5519cbd16e6da1 SHA512 552f57b53c6602c9c7dd91ffca143ac4387ce1d4fed838770d9ee56531f400b98d2c0ee664243a6f7d4e5e22f657ff53132f01a189d4ea797ac167d3faafc6ef WHIRLPOOL ca370573e45c7cf652df0bbb340e00ba24cd41e4c8d6c622022f05cf64c8ff2b6181a7f8a23977391bf1078c330091d2862fa1c5f7234460913dc9da994093ab
-DIST grilo-0.2.4.tar.xz 511928 SHA256 20fa8a5d1b89419c44f9b590a5a793e33d43a5e959ec8686111e631a724644fe SHA512 799016639273879b88d7bad0f153ecd5a306380af949b000c2b448750357c0c18a629db14c7c1611281713b37795e9ac94881c01267f85401b5be89a3945afef WHIRLPOOL ca5880ee327fb8e8f9313a192f31c5eb43b8d7d0c944ecde5f6fbb1ef97c1139f9cc3caeb93360e76f13db33f1e9a698e2ee9d1d07160646e76c6b2a935b821f
 DIST grilo-0.2.6.tar.xz 534272 SHA256 601421279753b26bee0b2b5952689f87f7c7836879f7326151a8f8139fa67036 SHA512 4de4c777451cf4f01220d6cdbb68d2a674056f2f52c2d2f82044eaa5d588148df8ef36d4700a907abf1b5ccf5374c8a834d97737895dda2c3e79de702226fb92 WHIRLPOOL f4ecd423a49c1110f86f7077a3eb73544bfca18a4ceaa6dbcc13d129c551fff0fe57b9d8e3466e13c98dc462bdbfcfc301f7122f0d8ea3f8a82ccec7b96b7d4f
+DIST grilo-0.2.7.tar.xz 579464 SHA256 4a854ee6f9a220f05e696813949be94780c12a7fb281253f10a545f30ed596d8 SHA512 19d4b4f5eeed831169d590c1b01a7565e3c10aceb4640012a5477f49b082d2956fa6243d0b2a3845abb96b9594a4a7085ebe0ad5458623bfa30b32f118c6787a WHIRLPOOL 06fb96fb72e075aa83082d79bccef8f223798239ad5da9074bfc5516a4ad1512b5067eee1454f36d7680bed838dd86a1df3af246f6700f2c79b88d08f2709fdb
 EBUILD grilo-0.1.18-r1.ebuild 2278 SHA256 1057a393627da8848b9dc233c1b0d5ac295b4b3c8d625ffc01fd3e70f4f5a81b SHA512 2a5d3c3cab44f9e53e57b8f9e2ebb8428ebf64cd7cce15b00f244dfe8289b1442baeefa4ba0b9f87a2911db4a9706001e891bb00337037d0bbd0ab696813324a WHIRLPOOL b5318e2235be626bad9e81b49fcca270d9a0a956e689daa09963f83081aa2931a674fa659d9c43e82ec07265ea0b461c4bad9ac3015be1a9550ec5240ea05c7a
 EBUILD grilo-0.1.20.ebuild 2277 SHA256 1194f9038a0179ecd79acb5a742ea59c794ed63eeeb67ebe6cfdc8072aca3505 SHA512 74ca97e5a22eaa6f3823b7056c17a9decf2db122ed0a3c27d48b5ff9d03c89288e582131c81a794ffde78f0f4363c7eb577033ab2ba75f9485f1f452179af312 WHIRLPOOL ee611a0a415e0999f2cfe8100cd2a388f6ce73c8c8c8f983dfe5c193fa1c5ae8027e41367c0953109152ae23d99c51cfa19784a09e0d3976daa666b72b886ad1
-EBUILD grilo-0.2.4.ebuild 2389 SHA256 9a8c5a3e85a3433d49cf3823c6db77104fa9bea76faef2af7376ddfe7ef41b7d SHA512 b7bff63382d795ab88580c0ad4e25c042c4b6c3f491047ced430b13efd87a6681a2ba5fc18638a11a7753e85641bc51d4a4ca5cca51afe8b50c5cea8ede999bd WHIRLPOOL a48d7dc50d5a38fc0ed2d754d1898face9f08f946b6ccabb6147fda1334b0eb6c792b35378b4adbe0cee0238e6001adcffc017bdd83e8c285e2bba9764a11303
 EBUILD grilo-0.2.6.ebuild 2529 SHA256 200b05c1e9587d0306ada225fa035d6c8689392cc725364e9f502242b6d381ea SHA512 0c242c5fec67ee6d286faced3d18dd0b8c3b77b04597eea6d3781223a3f2492eab1b7e8e0cae1cf6007c64ab8532a45d1fd73407acd0ab3197de4a612235b612 WHIRLPOOL 2d7e42c62940f6fcef7422e8520de10ac7f4120515f115652e247e9ace9a0ccd3089935b09ece449543807c757c8815fcd68f3b1ac212803d2201d8a470db722
-MISC ChangeLog 4563 SHA256 bf295ac32398ef58e5575862f0e3e889126df07c1a32c4139bd14fd4a9cb81e9 SHA512 92fd39b00b7e4ad37779f86ff810a55e3f221c325d5b9652cf587ecc96cea42840335a9557f8c5e532591d7ccb9f318a68026843f73dc755aa17e821102fc184 WHIRLPOOL 661e8c31bc642314c6e26e37dcd6308a1a9d28b5b1387d6d12cfa156db49cbaff905462fe1853f43b7b39a17e01c1b4245bcd64d814b1d0214cbd6b3184971a4
+EBUILD grilo-0.2.7.ebuild 2367 SHA256 d82e12c212c5d58923ce5bc32d2811f74b396bb0993cacc66e6433fc98e75a06 SHA512 c946e452ac0bd6f5765aaed74ab18f868f7175f48adfa2d84999044de2b74eb46232b56165595942bcc0edb8483738fe2723f01ddc07009e7760712aa4c8ae40 WHIRLPOOL 17d4ddc03e07fa16930480d94b0a8c31b23ea92f83d432e73932fddb1ce22cc76427a16abd991c76e6ca9892e734a98b5e7d69bd9bba85a994bd78cbe6d46831
+MISC ChangeLog 4709 SHA256 214132b55d017323934cb3e2d7f2fd3515972590a50ec06c07e13d1376427941 SHA512 17886db073a18b1a04a1bc3bc7561043bb09dc526e5e78d31c053da3e7bb456e3898f7e725ff7eb90beb587986053c50532c88c00b548ad73c512d254137da1e WHIRLPOOL 091e2c13991db87e6fb2e7d90c81cbfc1c4f92cad587736f48b422aaa753ae9a9505952071ff503187e530ec04c0a4eea454d45d53bcd3b34a52ac68023304ea
 MISC metadata.xml 460 SHA256 01e4884b782156eb41969c4ac3bff2a49f2259cceed928e90e15a470664528af SHA512 2cc40ac45a9058796210394e883c3c859af9f0f22f0c0ed47b570e69a6797cd24102f428abf79cbd375cebf3e57fe03e9323bb5c85353ee5510fffeba60d1d92 WHIRLPOOL e85a6f6742117bbc1015ef44822d2010cd4c258bb01c384588acfc7e05f6267b4544201c03ee8d8408cf3cafaa63ea074bfb7e0bf91a4115e923cec20a37b937
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH8MtIACgkQ1fmVwcYIWAb2LwCg13Lrp3NX2noYEMm6W7IIeGsP
-Wt4AniHbZsbfoOda5YtpJXSAz7v3PwBS
-=KSt8
+iEYEAREIAAYFAlJHOOgACgkQCaWpQKGI+9Q05gCePMben+59w3XDTjcVAeaTPRNj
+QKoAnAo2aQ+PvPiJbocwAyktwj17VKlp
+=Lc0e
 -----END PGP SIGNATURE-----
diff --git a/media-libs/grilo/grilo-0.2.4.ebuild b/media-libs/grilo/grilo-0.2.7.ebuild
index 993b2e6b2f7a..5c911becd566 100644
--- a/media-libs/grilo/grilo-0.2.4.ebuild
+++ b/media-libs/grilo/grilo-0.2.7.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/grilo/grilo-0.2.4.ebuild,v 1.8 2013/02/02 22:47:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/grilo/grilo-0.2.7.ebuild,v 1.1 2013/09/28 20:15:35 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no" # --enable-debug only changes CFLAGS
 GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="test? 2"
+PYTHON_COMPAT=( python2_{6,7} )
 VALA_MIN_API_VERSION="0.12"
-VALA_MAX_API_VERSION="0.18" # explicitly specified in configure
+VALA_MAX_API_VERSION="0.20" # explicitly specified in configure
 VALA_USE_DEPEND="vapigen"
 
-inherit gnome2 vala python
+inherit gnome2 python-any-r1 vala
 
 DESCRIPTION="A framework for easy media discovery and browsing"
 HOMEPAGE="https://live.gnome.org/Grilo"
@@ -18,60 +18,59 @@ HOMEPAGE="https://live.gnome.org/Grilo"
 LICENSE="LGPL-2.1+"
 SLOT="0.2/1" # subslot is libgrilo-0.2 soname suffix
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
 IUSE="gtk examples +introspection +network test vala"
 REQUIRED_USE="test? ( introspection )"
 
-RDEPEND=">=dev-libs/glib-2.29.10:2
+RDEPEND="
+	>=dev-libs/glib-2.29.10:2
 	dev-libs/libxml2:2
+	net-libs/liboauth
 	gtk? ( >=x11-libs/gtk+-3:3 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9 )
-	network? ( >=net-libs/libsoup-2.33.4:2.4 )"
+	network? ( >=net-libs/libsoup-2.41.3:2.4 )
+"
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/intltool-0.40
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 	test? (
+		${PYTHON_DEPS}
 		dev-python/pygobject:2
 		dev-python/pygobject:3
-		media-plugins/grilo-plugins:0.2 )"
+		media-plugins/grilo-plugins:0.2 )
+"
 # eautoreconf requires gnome-common
 
-# Tests fail horribly, but return 0
-RESTRICT="test"
+python_check_deps() {
+	has_version "dev-python/pygobject:2[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+}
 
 pkg_setup() {
-	if use test; then
-		python_pkg_setup
-		python_set_active_version 2
-	fi
+	use test && python-any-r1_pkg_setup
 }
 
 src_prepare() {
-	DOCS="AUTHORS NEWS README TODO"
-	# --enable-debug only changes CFLAGS, useless for us
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-debug
-		$(use_enable gtk test-ui)
-		$(use_enable introspection)
-		$(use_enable network grl-net)
-		$(use_enable test tests)
-		$(use_enable vala)"
-
 	# Don't build examples
 	sed -e '/SUBDIRS/s/examples//' \
 		-i Makefile.am -i Makefile.in || die
 
-	# Add missing file from tarball
-	cp "${FILESDIR}"/${PN}-0.1.16-constants.py \
-		tests/python/constants.py || die
-
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 }
 
-src_test() {
-	emake check PYTHON=$(PYTHON -2)
+src_configure() {
+	# --enable-debug only changes CFLAGS, useless for us
+	gnome2_src_configure \
+		--disable-static \
+		--disable-debug \
+		$(use_enable gtk test-ui) \
+		$(use_enable introspection) \
+		$(use_enable network grl-net) \
+		$(use_enable test tests) \
+		$(use_enable vala)
 }
 
 src_install() {