Version bump and take care of orphan package (#533414)

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 29 insertions, 41 deletions

diff --git a/mail-client/geary/ChangeLog b/mail-client/geary/ChangeLog
index 0ee8bd3686e8..3fcf638fa998 100644
--- a/mail-client/geary/ChangeLog
+++ b/mail-client/geary/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/geary
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/ChangeLog,v 1.34 2015/04/18 07:28:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/ChangeLog,v 1.35 2015/06/26 18:14:43 pacho Exp $
+
+*geary-0.10.0 (26 Jun 2015)
+
+  26 Jun 2015; Pacho Ramos <pacho@gentoo.org> +geary-0.10.0.ebuild,
+  -geary-0.8.2.ebuild, metadata.xml:
+  Version bump and take care of orphan package (#533414)
 
   18 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org> -geary-0.7.2-r1.ebuild:
   old
diff --git a/mail-client/geary/geary-0.8.2.ebuild b/mail-client/geary/geary-0.10.0.ebuild
index ae56c0801013..be6b7c59fdf4 100644
--- a/mail-client/geary/geary-0.8.2.ebuild
+++ b/mail-client/geary/geary-0.10.0.ebuild
@@ -1,18 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/geary-0.8.2.ebuild,v 1.2 2014/12/24 16:37:21 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/geary-0.10.0.ebuild,v 1.1 2015/06/26 18:14:43 pacho Exp $
 
 EAPI=5
-
+GCONF_DEBUG="no"
 VALA_MIN_API_VERSION=0.22
 
-inherit eutils fdo-mime gnome2-utils vala cmake-utils
+# Keep cmake-utils at the end
+inherit eutils fdo-mime gnome2 vala cmake-utils
 
-MY_P=${P/_pre/pr}
 DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
-HOMEPAGE="http://www.yorba.org/projects/geary/"
-# FIXME: Possibly use gnome.org.eclass?
-SRC_URI="mirror://gnome/sources/geary/${PV:0:3}/${MY_P}.tar.xz"
+HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -30,25 +28,31 @@ DEPEND="
 	media-libs/libcanberra
 	>=net-libs/webkit-gtk-1.10.0:3[introspection]
 	>=x11-libs/gtk+-3.10.0:3[introspection]
-	x11-libs/libnotify"
+	x11-libs/libnotify
+"
 RDEPEND="${DEPEND}
 	gnome-base/gsettings-desktop-schemas
-	nls? ( virtual/libintl )"
+	nls? ( virtual/libintl )
+"
 DEPEND="${DEPEND}
 	app-text/gnome-doc-utils
 	dev-util/desktop-file-utils
 	nls? ( sys-devel/gettext )
 	$(vala_depend)
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 DOCS=( AUTHORS MAINTAINERS README NEWS THANKS )
 
-S=${WORKDIR}/${MY_P}
-
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.2-cflags.patch \
-		"${FILESDIR}"/${PN}-0.5.3-vapigen.patch \
-		"${FILESDIR}"/${PN}-0.6.0-desktopfile.patch
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751556
+	epatch "${FILESDIR}"/${PN}-0.10.0-cflags.patch
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751557
+	epatch "${FILESDIR}"/${PN}-0.5.3-vapigen.patch
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751558
+	epatch "${FILESDIR}"/${PN}-0.6.0-desktopfile.patch
 
 	local i
 	if use nls ; then
@@ -64,6 +68,7 @@ src_prepare() {
 	fi
 
 	cmake-utils_src_prepare
+	gnome2_src_prepare
 	vala_src_prepare
 }
 
@@ -79,24 +84,3 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	elog "For libnotify sounds you will need"
-	elog "\"alsa\" or \"pulseaudio\" useflag of media-libs/libcanberra"
-	elog "enabled."
-
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/mail-client/geary/metadata.xml b/mail-client/geary/metadata.xml
index e96e35b1a37c..e98dd9082dc1 100644
--- a/mail-client/geary/metadata.xml
+++ b/mail-client/geary/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
+<herd>gnome</herd>
 </pkgmetadata>