Version bump for Gnome 3.6. Fix license.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

5 files changed, 78 insertions, 59 deletions

diff --git a/gnome-extra/gnome-contacts/ChangeLog b/gnome-extra/gnome-contacts/ChangeLog
index 677ded9f794f..95a5abd3f65f 100644
--- a/gnome-extra/gnome-contacts/ChangeLog
+++ b/gnome-extra/gnome-contacts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-contacts
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/ChangeLog,v 1.4 2012/05/14 01:39:48 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/ChangeLog,v 1.5 2012/12/18 23:04:45 eva Exp $
+
+*gnome-contacts-3.6.2 (18 Dec 2012)
+
+  18 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-contacts-3.2.2.ebuild, +gnome-contacts-3.6.2.ebuild, metadata.xml:
+  Version bump for Gnome 3.6. Fix license.
 
 *gnome-contacts-3.4.1 (14 May 2012)
 
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 26525a9a8110..7427df7e274d 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST gnome-contacts-3.2.2.tar.xz 475824 RMD160 b546e666cc04ee55b5b7f855c09c76f1deadc25b SHA1 c044b7f67b402a0bb9246b4a8ea4143ab4e6d89f SHA256 9dfd56a40f3b89512a09d9e54c18227ae4bfe9b4cff87a72f7e17f6a35367d88
-DIST gnome-contacts-3.4.1.tar.xz 592392 RMD160 6d963e42490397cfe36e0f5ace7825cacddd9210 SHA1 4782fe1bec23d691d7c3e940d31eaca221f22c9c SHA256 673614fe6cd5f986132819eeb21d67c40af336ffd2c4ca4c3e99365114f13523
-EBUILD gnome-contacts-3.2.2.ebuild 1188 RMD160 c9b5b331386e86f34b122bed0c3466e386901bbd SHA1 dc8e9be19969069f25f8d7e221ba9fd9c9ce73e6 SHA256 c758d246ae43b644bc91ec624b7b83c2428eca4bc13d641121d94d4921a778da
-EBUILD gnome-contacts-3.4.1.ebuild 1214 RMD160 96dbb84c6b49c5d8b5e903fffcd4736b3c68c304 SHA1 a03b59a6cd5b57f06aa9ca5b6bcbb72b66475a56 SHA256 e28cebdd78a099aea4e907452f53dc5f10d743083a1c503a3a58b9610d66cb66
-MISC ChangeLog 958 RMD160 e3669b1b17963abc6193942ff5a9bdae3dc7087f SHA1 05a6b4f5e95d0ce8b3d6150bdb61be9b9073cfda SHA256 ac91e769abc48757b97512d1684b122967dda419d2836d2a504194c862ce9fb2
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+DIST gnome-contacts-3.4.1.tar.xz 592392 SHA256 673614fe6cd5f986132819eeb21d67c40af336ffd2c4ca4c3e99365114f13523 SHA512 21a302694737bc7bc01fdbdaff1975248993af0dff5a48440cce0935ea9083293c2ace8ba904a585536f7bf5b8300c61d72cb9aa63bc3557b4e5b4b08ef304d4 WHIRLPOOL 9ff7dd0ac416773cb01b3293fb979bb869af28e5ba4959c6219c3687b8494e1e3b8222be07d39e06409cecfd29ce3d695a4483e07470f5838c2ec9dd4288cff6
+DIST gnome-contacts-3.6.2.tar.xz 610024 SHA256 7d1b6a8e395b15bf150062f332348549cf9deb38dfa3aad9994f70e71d8449fa SHA512 0db305697c420ac958273d24e46afa2421d43c34fd31e5d20f95d333092ce6d894abe56208cf312133e4a062d0092b1b5f3dcc2c79c1e431f3439ab9a4b81ca1 WHIRLPOOL 3659e0f0851879b5db38c822acdc000e1aa88e7b146467f70f1d1e350ef7ea93262e0ea7aee58cfcba6422afe758be70748a3439b3e300b541971f582ee68306
+EBUILD gnome-contacts-3.4.1.ebuild 1214 SHA256 e28cebdd78a099aea4e907452f53dc5f10d743083a1c503a3a58b9610d66cb66 SHA512 8d8f96f4a1b5a3dd1cf53cb08f56096e40c9669281520188a3fdc88448ba91bc8fb3163adc9ac4e928cc844a0d35fd9dd671ddbb7d2ec5b864445f54770c24b3 WHIRLPOOL a3a5501d99b526477cad106c88c8a5b3a83269fe8e2b4149b42bb253472645c679bb399c1471d1f65b93fe0070ad911ea13a6b90e5841ed3c0925c0d225a6bd7
+EBUILD gnome-contacts-3.6.2.ebuild 1525 SHA256 9cb89f0d9d32c3ac2799e78c3c6461a179ac7b9ce172c8011b74c1ba906b9fba SHA512 97798df5e052a7f272ae0ce341efaaf855840da281437b32a610c88ee74168f3f614a64bb25c05c593f86783669adfc35bdb5d005250bb6cc10e4cabcc6ab739 WHIRLPOOL 8355d335d38a1a735c1fb8d788966f73045fde477a820db46aca66d9cc118cead3a65a371ddce41be23d10dab2f676612fa17f61a1d783248dd8c0863a399989
+MISC ChangeLog 1163 SHA256 e3285fedb4fa3981e61a3286cac62f967f64495d545712e869a25f86ddb8c3d5 SHA512 c2107ae24a99df1a161447e467a28d2627cb95f9e91aede43cbbeb016871ce1c1422c029f670a9db3c926eda66a3ce032773d3fd51801dd7686c5da68f4020d6 WHIRLPOOL a155067d816e90db5e9cb0b3f61e63ae6a55c65a027ad58cdc43d516a957b16c1d5fed0c5da8c7cefcbd6fd7e4411b1a01ced88154bd2c61d70f1e8aa713e0c2
+MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPsGJpAAoJEJ0WA1zPCt1hO0QH/iu1TZplAroEClWn5kvgbPC0
-gdzWLO0hygRoY0XFXarnoiS+hShOZfkrtHNszGpdTFsBeftLWJDuFheTh7OhcJPu
-23eKGzbShM32WyLFBccMRjMVfDL5S4QBJeHWAb+eL7eaAC6p+mYITk3Nn/LWRQBv
-a5p6XLMsJ7JWMjT8fwA9oxRQTUNZiptHi0X34V0KvnmorH1mlchu8y6npQj7N/NW
-3eHbcDuSqjQJiyRwxlF+5v1iWu8q5PYfD+JPBSSIuVK/AhnL/SEW78Z8b6uRw+J1
-7MtH8rybXWYsycED9PJMVvo7nqVVKIxDmRTv6zxhdZljO78vX3wdDa+alT6fBAQ=
-=5xFO
+iEYEAREIAAYFAlDQ9o4ACgkQ1fmVwcYIWAZEDQCgkP3ST9QD91Co+0vlyyGTM8dS
+g3cAn3iYPn+MPXdqIYDZF36nV2V9aqou
+=1lNH
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.2.2.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.2.2.ebuild
deleted file mode 100644
index b654c46ac1aa..000000000000
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.2.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/gnome-contacts-3.2.2.ebuild,v 1.3 2012/05/05 06:25:18 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="GNOME contact management application"
-HOMEPAGE="https://live.gnome.org/Design/Apps/Contacts"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-libs/folks-0.6.1.1
-	>=dev-libs/glib-2.29.12:2
-	dev-libs/libgee:0
-	>=gnome-extra/evolution-data-server-3[gnome-online-accounts]
-	>=gnome-base/gnome-desktop-3.0:3
-	net-libs/gnome-online-accounts
-	net-libs/telepathy-glib
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.0:3
-	x11-libs/libnotify
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17"
-# Regenerating C from vala sources requires:
-#	>=dev-lang/vala-0.14.0:0.14
-#	net-libs/telepathy-glib[vala]
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS" # README is empty
-	# We do not need valac when building from pre-generated C sources,
-	# but configure checks for it anyway
-	G2CONF="${G2CONF} VALAC=$(type -P true)"
-}
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.6.2.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.6.2.ebuild
new file mode 100644
index 000000000000..e7925875de80
--- /dev/null
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.6.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/gnome-contacts-3.6.2.ebuild,v 1.1 2012/12/18 23:04:45 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.18"
+
+inherit gnome2 vala
+
+DESCRIPTION="GNOME contact management application"
+HOMEPAGE="https://live.gnome.org/Design/Apps/Contacts"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="v4l"
+KEYWORDS="~amd64 ~x86"
+
+VALA_DEPEND="$(vala_depend)
+	dev-libs/folks[vala]
+	gnome-base/gnome-desktop[introspection]
+	gnome-extra/evolution-data-server[vala]
+	net-libs/telepathy-glib[vala]
+	x11-libs/libnotify[introspection]"
+
+# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
+RDEPEND="
+	>=dev-libs/folks-0.7.3[eds,telepathy]
+	>=dev-libs/glib-2.31.10:2
+	dev-libs/libgee:0
+	>=gnome-extra/evolution-data-server-3.5.3[gnome-online-accounts]
+	>=gnome-base/gnome-desktop-3.0:3
+	net-libs/gnome-online-accounts
+	>=net-libs/telepathy-glib-0.17.5
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libnotify
+	>=x11-libs/gtk+-3.4:3
+	x11-libs/pango
+	v4l? ( >=media-video/cheese-3.5.91 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	!v4l? ( ${VALA_DEPEND} )"
+# When !v4l, we regenerate the .c sources
+
+src_prepare() {
+	G2CONF="${G2CONF}
+		$(use_with v4l cheese)"
+	# FIXME: Fails to compile with USE=-v4l
+
+	# Regenerate the pre-generated C sources
+	if ! use v4l; then
+		touch src/*.vala
+		vala_src_prepare
+	fi
+	gnome2_src_prepare
+}
diff --git a/gnome-extra/gnome-contacts/metadata.xml b/gnome-extra/gnome-contacts/metadata.xml
index da6fd63d0085..6e0e2ecb48ca 100644
--- a/gnome-extra/gnome-contacts/metadata.xml
+++ b/gnome-extra/gnome-contacts/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+  <herd>gnome</herd>
 </pkgmetadata>