Clean up old revision.

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

6 files changed, 15 insertions, 257 deletions

diff --git a/media-gfx/eog/ChangeLog b/media-gfx/eog/ChangeLog
index fb3295a88844..ddf9795e23e3 100644
--- a/media-gfx/eog/ChangeLog
+++ b/media-gfx/eog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/eog
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.303 2013/03/28 17:35:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.304 2013/03/29 23:02:24 eva Exp $
+
+  29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -eog-3.4.3-r1.ebuild,
+  -files/eog-3.4.3-libm.patch, -files/eog-3.4.3-require-librsvg-2.36.2.patch,
+  -files/eog-3.6.0-eog.desktop.patch, eog-3.8.0.ebuild:
+  Clean up old revision.
 
 *eog-3.8.0 (28 Mar 2013)
 
diff --git a/media-gfx/eog/eog-3.4.3-r1.ebuild b/media-gfx/eog/eog-3.4.3-r1.ebuild
deleted file mode 100644
index 1e2d97653651..000000000000
--- a/media-gfx/eog/eog-3.4.3-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-3.4.3-r1.ebuild,v 1.1 2012/10/11 14:08:29 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="http://www.gnome.org/projects/eog/"
-
-LICENSE="GPL-2+"
-SLOT="1"
-IUSE="doc +exif +introspection +jpeg lcms +svg tiff xmp"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-
-RDEPEND=">=x11-libs/gtk+-3.3.6:3[introspection,X]
-	>=dev-libs/glib-2.31.0:2
-	>=dev-libs/libxml2-2:2
-	>=dev-libs/libpeas-0.7.4[gtk]
-	>=gnome-base/gnome-desktop-2.91.2:3
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=x11-themes/gnome-icon-theme-2.19.1
-	>=x11-misc/shared-mime-info-0.20
-
-	x11-libs/gdk-pixbuf:2[jpeg?,tiff?]
-	x11-libs/libX11
-
-	exif? (
-		>=media-libs/libexif-0.6.14
-		virtual/jpeg:0 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-	xmp? ( media-libs/exempi:2 )"
-
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	dev-libs/gobject-introspection-common"
-# eautoreconf requires dev-libs/gobject-introspection-common
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable introspection)
-		$(use_with jpeg libjpeg)
-		$(use_with exif libexif)
-		$(use_with lcms cms)
-		$(use_with xmp)
-		$(use_with svg librsvg)
-		--disable-scrollkeeper
-		--disable-schemas-compile"
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
-}
-
-src_prepare() {
-	# Fix USE=-svg build problems, bug #437880
-	epatch "${FILESDIR}/${P}-require-librsvg-2.36.2.patch"
-	epatch "${FILESDIR}/${P}-libm.patch"
-	# https://bugzilla.gnome.org/show_bug.cgi?id=685923
-	epatch "${FILESDIR}/${PN}-3.6.0-eog.desktop.patch"
-	eautoreconf
-	gnome2_src_prepare
-}
diff --git a/media-gfx/eog/eog-3.8.0.ebuild b/media-gfx/eog/eog-3.8.0.ebuild
index 5710a5dc0eac..b5a0ce1fb02a 100644
--- a/media-gfx/eog/eog-3.8.0.ebuild
+++ b/media-gfx/eog/eog-3.8.0.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/media-gfx/eog/eog-3.8.0.ebuild,v 1.1 2013/03/28 17:35:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-3.8.0.ebuild,v 1.2 2013/03/29 23:02:24 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -46,14 +46,13 @@ DEPEND="${RDEPEND}
 "
 
 src_configure() {
-	G2CONF="${G2CONF}
-		$(use_enable introspection)
-		$(use_with jpeg libjpeg)
-		$(use_with exif libexif)
-		$(use_with lcms cms)
-		$(use_with xmp)
-		$(use_with svg librsvg)
-		ITSTOOL=$(type -P true)"
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
-	gnome2_src_configure
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		$(use_with jpeg libjpeg) \
+		$(use_with exif libexif) \
+		$(use_with lcms cms) \
+		$(use_with xmp) \
+		$(use_with svg librsvg) \
+		ITSTOOL=$(type -P true)
 }
diff --git a/media-gfx/eog/files/eog-3.4.3-libm.patch b/media-gfx/eog/files/eog-3.4.3-libm.patch
deleted file mode 100644
index 2ba1b7d501ff..000000000000
--- a/media-gfx/eog/files/eog-3.4.3-libm.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 749437a34ddc2857f88168fc75f8ac585d5b8ea7 Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalevlember@gmail.com>
-Date: Wed, 19 Sep 2012 21:50:08 +0200
-Subject: [PATCH] Explicitly link against libm
-
-https://bugzilla.gnome.org/show_bug.cgi?id=684401
----
- configure.ac    | 7 +++++++
- src/Makefile.am | 3 ++-
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d13dbc5..8da1759 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -119,6 +119,13 @@ else
- fi
- 
- # ***************
-+# libm (required)
-+# ***************
-+
-+AC_CHECK_LIBM
-+AC_SUBST(LIBM)
-+
-+# ***************
- # ZLIB (required)
- # ***************
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 569cad8..2273bdf 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -150,7 +150,8 @@ libeog_la_CFLAGS =						\
- 	$(WARN_CFLAGS)
- 
- libeog_la_LIBADD = \
--	$(EOG_LIBS)
-+	$(EOG_LIBS) \
-+	$(LIBM)
- 
- if HAVE_LCMS
- libeog_la_CFLAGS += 	\
--- 
-1.7.12
-
diff --git a/media-gfx/eog/files/eog-3.4.3-require-librsvg-2.36.2.patch b/media-gfx/eog/files/eog-3.4.3-require-librsvg-2.36.2.patch
deleted file mode 100644
index 1681db2805fd..000000000000
--- a/media-gfx/eog/files/eog-3.4.3-require-librsvg-2.36.2.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From f33a7b7c5d0690a916908bc033a3ae2f53c1d022 Mon Sep 17 00:00:00 2001
-From: Felix Riemann <friemann@gnome.org>
-Date: Fri, 7 Sep 2012 18:57:15 +0200
-Subject: [PATCH] Raise librsvg dependency to 2.36.2
-
-The old minimum version (2.26.0) is pretty old and behind with
-bugfixes and features. Raising the minimum librsvg version to 2.36.2
-allows dropping some compatibility ifdefs and code. It also fixes
-several compiler warnings when compiling against newer librsvgs.
----
- configure.ac          | 2 +-
- src/eog-image.c       | 1 -
- src/eog-print.c       | 2 +-
- src/eog-scroll-view.c | 1 -
- src/main.c            | 7 -------
- 5 files changed, 2 insertions(+), 11 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 07520f3..c4aed8b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -269,7 +269,7 @@ PKG_CHECK_MODULES(LIBXML2, [libxml-2.0 >= $LIBXML2_REQUIRED])
- # RSVG (optional for scaling svg image)
- # ***************
- 
--LIBRSVG_REQUIRED=2.26.0
-+LIBRSVG_REQUIRED=2.36.2
- 
- AC_ARG_WITH([librsvg], AC_HELP_STRING([--without-librsvg], [disable RSVG support]))
- have_rsvg=no
-diff --git a/src/eog-image.c b/src/eog-image.c
-index f813c2b..9098802 100644
---- a/src/eog-image.c
-+++ b/src/eog-image.c
-@@ -67,7 +67,6 @@
- 
- #ifdef HAVE_RSVG
- #include <librsvg/rsvg.h>
--#include <librsvg/librsvg-features.h>
- #endif
- 
- #define EOG_IMAGE_GET_PRIVATE(object) \
-diff --git a/src/eog-print.c b/src/eog-print.c
-index 6a68c5b..527a7e7 100644
---- a/src/eog-print.c
-+++ b/src/eog-print.c
-@@ -30,7 +30,7 @@
- #include "eog-debug.h"
- 
- #ifdef HAVE_RSVG
--#include <librsvg/rsvg-cairo.h>
-+#include <librsvg/rsvg.h>
- #endif
- 
- #define EOG_PRINT_SETTINGS_FILE "eog-print-settings.ini"
-diff --git a/src/eog-scroll-view.c b/src/eog-scroll-view.c
-index 85b14f0..d63ef25 100644
---- a/src/eog-scroll-view.c
-+++ b/src/eog-scroll-view.c
-@@ -8,7 +8,6 @@
- #include <gdk/gdkkeysyms.h>
- #ifdef HAVE_RSVG
- #include <librsvg/rsvg.h>
--#include <librsvg/rsvg-cairo.h>
- #endif
- 
- #include "eog-config-keys.h"
-diff --git a/src/main.c b/src/main.c
-index 2d09d2e..5cdf002 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -49,7 +49,6 @@
- 
- #if HAVE_RSVG
- #include <librsvg/rsvg.h>
--#include <librsvg/librsvg-features.h>
- #endif
- 
- #define EOG_CSS_FILE_PATH EOG_DATA_DIR G_DIR_SEPARATOR_S "eog.css"
-@@ -145,9 +144,6 @@ main (int argc, char **argv)
- #ifdef HAVE_EXEMPI
-  	xmp_init();
- #endif
--#if defined (HAVE_RSVG) && !LIBRSVG_CHECK_VERSION(2, 35, 1)
--	rsvg_init();
--#endif
- 	eog_debug_init ();
- 	eog_job_queue_init ();
- 	gdk_threads_init ();
-@@ -194,9 +190,6 @@ main (int argc, char **argv)
-   	if (startup_files)
- 		g_strfreev (startup_files);
- 
--#if defined (HAVE_RSVG) && !LIBRSVG_CHECK_VERSION(2, 35, 1)
--	rsvg_term();
--#endif
- #ifdef HAVE_EXEMPI
- 	xmp_terminate();
- #endif
--- 
-1.7.12
-
diff --git a/media-gfx/eog/files/eog-3.6.0-eog.desktop.patch b/media-gfx/eog/files/eog-3.6.0-eog.desktop.patch
deleted file mode 100644
index 0f5f7de184fd..000000000000
--- a/media-gfx/eog/files/eog-3.6.0-eog.desktop.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 165b5e18d66bb60d2cc8ff909c2fca5ff7650c14 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 10 Oct 2012 19:16:26 -0400
-Subject: [PATCH] Add 2DGraphics category to .desktop file
-
-Required to pass validation with desktop-file-utils 0.20
-
-https://bugzilla.gnome.org/show_bug.cgi?id=685923
----
- data/eog.desktop.in.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/eog.desktop.in.in b/data/eog.desktop.in.in
-index 5bf0ad4..672ee81 100644
---- a/data/eog.desktop.in.in
-+++ b/data/eog.desktop.in.in
-@@ -7,7 +7,7 @@ Icon=eog
- StartupNotify=true
- Terminal=false
- Type=Application
--Categories=GNOME;GTK;Graphics;RasterGraphics;Viewer;
-+Categories=GNOME;GTK;Graphics;2DGraphics;RasterGraphics;Viewer;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=EOG
- X-GNOME-Bugzilla-Component=general
--- 
-1.7.12
-