Version bump, remove old

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 10 insertions, 44 deletions

diff --git a/media-gfx/eog/ChangeLog b/media-gfx/eog/ChangeLog
index 10b378b24614..bd70f9bac2f5 100644
--- a/media-gfx/eog/ChangeLog
+++ b/media-gfx/eog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/eog
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.260 2010/06/21 11:48:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.261 2010/06/22 14:06:19 pacho Exp $
+
+*eog-2.30.2 (22 Jun 2010)
+
+  22 Jun 2010; Pacho Ramos <pacho@gentoo.org> -eog-2.30.1.ebuild,
+  -files/eog-2.30.1-libjpeg-configure.patch, +eog-2.30.2.ebuild:
+  Version bump including patch we were already applying to fix configure and
+  translation updates. Remove old.
 
   21 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> eog-2.30.1.ebuild:
   Restrict media-libs/lcms depend to old version.
diff --git a/media-gfx/eog/eog-2.30.1.ebuild b/media-gfx/eog/eog-2.30.2.ebuild
index cb460a58761e..0d503ddccfda 100644
--- a/media-gfx/eog/eog-2.30.1.ebuild
+++ b/media-gfx/eog/eog-2.30.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.30.1.ebuild,v 1.2 2010/06/21 11:48:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.30.2.ebuild,v 1.1 2010/06/22 14:06:19 pacho Exp $
 
 EAPI=2
 
-inherit eutils gnome2 autotools
+inherit gnome2
 
 DESCRIPTION="The Eye of GNOME image viewer"
 HOMEPAGE="http://www.gnome.org/projects/eog/"
@@ -56,12 +56,3 @@ pkg_setup() {
 		--disable-scrollkeeper
 		--disable-schemas-install"
 }
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix build without libjpeg, bug #319157
-	epatch "${FILESDIR}/${P}-libjpeg-configure.patch"
-
-	eautoreconf
-}
diff --git a/media-gfx/eog/files/eog-2.30.1-libjpeg-configure.patch b/media-gfx/eog/files/eog-2.30.1-libjpeg-configure.patch
deleted file mode 100644
index 97ab0c5d2674..000000000000
--- a/media-gfx/eog/files/eog-2.30.1-libjpeg-configure.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d44efad798c313288f4b136b08e88ad580880673 Mon Sep 17 00:00:00 2001
-From: Claudio Saavedra <csaavedra@igalia.com>
-Date: Tue, 15 Jun 2010 15:47:18 +0000
-Subject: Fix build without libjpeg
-
-AM_CONDITIONAL calls should be called always, otherwise configure
-gets confused.
-
-Fixes bug #621616.
----
-diff --git a/configure.ac b/configure.ac
-index 3631dd7..8f1e713 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -227,7 +227,6 @@ int main(int c, char**v) { return 0; }
- 			   have_libjpeg_80=yes],
- 		          [AC_MSG_RESULT(no)
- 		           have_libjpeg_80=no])
--        AM_CONDITIONAL(HAVE_LIBJPEG_80, test "x$have_libjpeg_80" = xyes)
- 
-       else
-           AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***)
-@@ -243,6 +242,7 @@ int main(int c, char**v) { return 0; }
-   fi
- AC_SUBST(LIBJPEG)
- AM_CONDITIONAL(ENABLE_JPEG, test x$have_jpeg = xyes)
-+AM_CONDITIONAL(HAVE_LIBJPEG_80, test "x$have_libjpeg_80" = xyes)
- 
- # ****************
- # D-Bus activation
---
-cgit v0.8.3.1