Version bump for Gnome 3.6.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 15 insertions, 61 deletions

diff --git a/gnome-extra/mousetweaks/ChangeLog b/gnome-extra/mousetweaks/ChangeLog
index 7673474dce7a..fa73771a2502 100644
--- a/gnome-extra/mousetweaks/ChangeLog
+++ b/gnome-extra/mousetweaks/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/mousetweaks
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mousetweaks/ChangeLog,v 1.66 2012/05/20 00:19:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mousetweaks/ChangeLog,v 1.67 2012/12/23 23:34:26 eva Exp $
+
+*mousetweaks-3.6.0 (23 Dec 2012)
+
+  23 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -mousetweaks-3.2.1.ebuild, -mousetweaks-3.2.1-r10.ebuild,
+  +mousetweaks-3.6.0.ebuild:
+  Version bump for Gnome 3.6.
 
 *mousetweaks-3.4.2 (20 May 2012)
 
diff --git a/gnome-extra/mousetweaks/mousetweaks-3.2.1-r10.ebuild b/gnome-extra/mousetweaks/mousetweaks-3.2.1-r10.ebuild
deleted file mode 100644
index ec9e11087801..000000000000
--- a/gnome-extra/mousetweaks/mousetweaks-3.2.1-r10.ebuild
+++ /dev/null
@@ -1,45 +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/mousetweaks/mousetweaks-3.2.1-r10.ebuild,v 1.2 2012/05/05 06:25:17 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Mouse accessibility enhancements for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Mousetweaks/Home"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="" # appet
-
-RDEPEND="
-	>=dev-libs/glib-2.25.9:2
-	>=x11-libs/gtk+-3:3
-	>=gnome-base/gsettings-desktop-schemas-0.1
-
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXfixes
-	x11-libs/libXcursor"
-#	applet? (
-#		>=gnome-base/gnome-panel-2.32
-#		<gnome-base/gnome-panel-2.90 )
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig"
-# eautoreconf needs:
-#	gnome-base/gnome-common
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-	# Disable pointer-capture, dwell-click applets: they require gnome-panel-2
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		--disable-pointer-capture
-		--disable-dwell-click"
-#		$(use_enable applet pointer-capture)
-#		$(use_enable applet dwell-click)
-}
diff --git a/gnome-extra/mousetweaks/mousetweaks-3.2.1.ebuild b/gnome-extra/mousetweaks/mousetweaks-3.6.0.ebuild
index 27b6f10e081f..c1820f5c9787 100644
--- a/gnome-extra/mousetweaks/mousetweaks-3.2.1.ebuild
+++ b/gnome-extra/mousetweaks/mousetweaks-3.6.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mousetweaks/mousetweaks-3.2.1.ebuild,v 1.2 2012/05/05 06:25:17 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mousetweaks/mousetweaks-3.6.0.ebuild,v 1.1 2012/12/23 23:34:26 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 
 inherit gnome2
@@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/Mousetweaks/Home"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="applet"
+IUSE=""
 
 RDEPEND="
 	>=dev-libs/glib-2.25.9:2
@@ -24,21 +24,13 @@ RDEPEND="
 	x11-libs/libXtst
 	x11-libs/libXfixes
 	x11-libs/libXcursor
-
-	applet? (
-		>=gnome-base/gnome-panel-2.32
-		<gnome-base/gnome-panel-2.90 )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
-	virtual/pkgconfig"
-# eautoreconf needs:
-#	gnome-base/gnome-common
+	virtual/pkgconfig
+"
 
-pkg_setup() {
+src_install() {
 	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		$(use_enable applet pointer-capture)
-		$(use_enable applet dwell-click)"
+	gnome2_src_install
 }