Version bump. Include patches from r1, plus i18n updates. Clean up old revisions.

(Portage version: 2.2_rc88/cvs/Linux x86_64)

3 files changed, 12 insertions, 71 deletions

diff --git a/app-accessibility/gnome-mag/ChangeLog b/app-accessibility/gnome-mag/ChangeLog
index ed96cac229a1..3a1e7a8af732 100644
--- a/app-accessibility/gnome-mag/ChangeLog
+++ b/app-accessibility/gnome-mag/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-accessibility/gnome-mag
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/ChangeLog,v 1.175 2010/09/11 18:38:21 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/ChangeLog,v 1.176 2010/09/29 22:16:14 eva Exp $
+
+*gnome-mag-0.16.2 (29 Sep 2010)
+
+  29 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-mag-0.15.9-r1.ebuild, -gnome-mag-0.16.0.ebuild,
+  +gnome-mag-0.16.2.ebuild:
+  Version bump. Include patches from r1, plus i18n updates. Clean up old
+  revisions.
 
   11 Sep 2010; Joseph Jezak <josejx@gentoo.org> gnome-mag-0.16.1.ebuild:
   Marked ppc for bug #324077.
diff --git a/app-accessibility/gnome-mag/gnome-mag-0.15.9-r1.ebuild b/app-accessibility/gnome-mag/gnome-mag-0.15.9-r1.ebuild
deleted file mode 100644
index d937e9b0a168..000000000000
--- a/app-accessibility/gnome-mag/gnome-mag-0.15.9-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/gnome-mag-0.15.9-r1.ebuild,v 1.2 2010/07/20 01:54:53 jer Exp $
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="Gnome magnification service definition"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.11.1
-	>=x11-libs/gtk+-2.6"
-
-# FIXME: need libcolorblind (debian package)
-# python deps are for applets
-#	applet? (
-#		>=dev-python/pygtk-2.6
-#		dev-python/pygobject
-#
-#		>=dev-python/libbonobo-python-2.10
-#		>=dev-python/gconf-python-2.10
-#		>=dev-python/libgnome-python-2.10
-#		>=dev-python/gnome-applets-python-2.10 )
-
-RDEPEND="${RDEPEND}
-	>=gnome-base/libbonobo-1.107
-	>=gnome-extra/at-spi-1.5.2
-	>=gnome-base/orbit-2.3.100
-
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXcomposite"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-
-	x11-proto/xextproto
-	x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-#pkg_setup() {
-#	G2CONF="${G2CONF} $(use_enable applet colorblind-applet)"
-#}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix some ugly warnings, originally per upstream bug #578798
-	epatch "${FILESDIR}/${P}-magnifier-fix-warnings.patch"
-}
-
-src_test() {
-	Xemake check || die "emake check failed"
-
-}
diff --git a/app-accessibility/gnome-mag/gnome-mag-0.16.0.ebuild b/app-accessibility/gnome-mag/gnome-mag-0.16.2.ebuild
index 6ef56ff64aa0..3ba854f17102 100644
--- a/app-accessibility/gnome-mag/gnome-mag-0.16.0.ebuild
+++ b/app-accessibility/gnome-mag/gnome-mag-0.16.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/gnome-mag-0.16.0.ebuild,v 1.2 2010/07/20 01:54:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/gnome-mag-0.16.2.ebuild,v 1.1 2010/09/29 22:16:14 eva Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit eutils gnome2 virtualx
 
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.11.1
-	>=x11-libs/gtk+-2.6"
+	>=x11-libs/gtk+-2.14"
 
 # FIXME: need libcolorblind (debian package)
 # python deps are for applets
@@ -58,9 +58,6 @@ DOCS="AUTHORS ChangeLog NEWS README"
 src_prepare() {
 	gnome2_src_prepare
 
-	# Fix some ugly warnings, originally per upstream bug #578798
-	epatch "${FILESDIR}/${PN}-0.15.9-magnifier-fix-warnings.patch"
-
 	# Workaround intltool tests failure
 	echo "colorblind/GNOME_Magnifier_ColorblindApplet.server.in.in
 colorblind/data/Colorblind_Applet.xml