Make sure prepare phase from both eclasses are run (reported by ibqn), drop old.

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

3 files changed, 12 insertions, 28 deletions

diff --git a/gnome-extra/gnome-clocks/ChangeLog b/gnome-extra/gnome-clocks/ChangeLog
index d56aff8c99d8..4fb50040aa00 100644
--- a/gnome-extra/gnome-clocks/ChangeLog
+++ b/gnome-extra/gnome-clocks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gnome-clocks
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-clocks/ChangeLog,v 1.3 2013/04/22 17:57:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-clocks/ChangeLog,v 1.4 2013/05/09 16:42:34 pacho Exp $
+
+  09 May 2013; Pacho Ramos <pacho@gentoo.org> -gnome-clocks-3.8.0.ebuild,
+  gnome-clocks-3.8.1.ebuild:
+  Make sure prepare phase from both eclasses are run (reported by ibqn), drop
+  old.
 
 *gnome-clocks-3.8.1 (22 Apr 2013)
 
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.8.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.8.0.ebuild
deleted file mode 100644
index 3e83df186a78..000000000000
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.8.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-clocks/gnome-clocks-3.8.0.ebuild,v 1.1 2013/03/28 17:17:41 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.18"
-inherit gnome2 vala
-
-DESCRIPTION="Clocks applications for GNOME"
-HOMEPAGE="http://live.gnome.org/GnomeClocks"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.30:2
-	>=x11-libs/gtk+-3.7.12:3
-	>=media-libs/libcanberra-0.30
-	>=dev-libs/libgweather-3.7.90
-	>=gnome-base/gnome-desktop-3.7.90
-	>=x11-libs/libnotify-0.7
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.8.1.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.8.1.ebuild
index 38aef2ddc764..5e3b19c037b6 100644
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.8.1.ebuild
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.8.1.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/gnome-extra/gnome-clocks/gnome-clocks-3.8.1.ebuild,v 1.1 2013/04/22 17:57:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-clocks/gnome-clocks-3.8.1.ebuild,v 1.2 2013/05/09 16:42:34 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -26,3 +26,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	$(vala_depend)"
+
+src_prepare() {
+	gnome2_src_prepare
+	vala_src_prepare
+}