media-video/imagination: Fix deps for gnome3, Version Bump, Respect CFLAGS

svn path=/sunrise/; revision=11963

5 files changed, 37 insertions, 29 deletions

diff --git a/media-video/imagination/ChangeLog b/media-video/imagination/ChangeLog
index db44666f0..86c763ada 100644
--- a/media-video/imagination/ChangeLog
+++ b/media-video/imagination/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for media-video/imagination
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Apr 2011; Justin Lecher <jlec@gentoo.org> -imagination-2.1.ebuild,
+  -files/imagination-2.1-transitions.patch, +imagination-3.0.ebuild,
+  +files/imagination-3.0-cflags.patch:
+  Fix deps for gnome3, Version Bump, Respect CFLAGS
+
   15 Oct 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   imagination-2.1.ebuild:
   Add missing Manifest, fix whitespaces
diff --git a/media-video/imagination/Manifest b/media-video/imagination/Manifest
index c24948a4a..1588e80a9 100644
--- a/media-video/imagination/Manifest
+++ b/media-video/imagination/Manifest
@@ -1,5 +1,5 @@
-AUX imagination-2.1-transitions.patch 313 RMD160 a5e0043dbd16f96deffe0811f93fd54837a4fd4f SHA1 202018e591dff587663cb0944a588ac8633953ca SHA256 30ee744410bf34a0dfffee128b41f9d166ef20fbe291d382586f4640372ec63c
-DIST imagination-2.1.tar.gz 634174 RMD160 6458d91d86aae4fb1178f2326b30724e25aacbe2 SHA1 063970c3054b62adcf201e395af4153e182ebe34 SHA256 78b341541a87bf6a68efbc44e3d2b8c4fd07e406be902bc5a4b72297632a44ee
-EBUILD imagination-2.1.ebuild 685 RMD160 373c0388f2455033d0c084bfdb8add621c78b26c SHA1 c35c5f72a700475f5e296612be4c4ed23ddef1d5 SHA256 c051c015a1ed530eac8c5d22b39dcfab91ff14efaf3f483c423397838442e67c
-MISC ChangeLog 474 RMD160 39504dcf464f8c180830406d406b0af1334992a9 SHA1 65d35576d7920c5c7cdd5b77cbe0db5e7a96e3c9 SHA256 9846b5069e67ba8238ace778160ed06a51a4330eaafcd8e7121cad778894757c
+AUX imagination-3.0-cflags.patch 353 RMD160 c0beb7e323a59ea4c245e8afeed4385f153cf849 SHA1 88fd0c5e3f7ae2fe3c2b5e3b85e4cdefbba9f226 SHA256 86276d31f4bc7815df8f7f68c11abd2f65719d5553d5b5d5e2d4a48a7c401607
+DIST imagination-3.0.tar.gz 3327784 RMD160 d063febdcca1c26a2a863bfef9a4957264f12f2e SHA1 b2a0c4305405dcb8ad8a0f408c7c58bbfc7ebf4e SHA256 417d8586d9c85109b87d30b9c196d63531a637cbc2ffb3c12b48a873bfcb4b1e
+EBUILD imagination-3.0.ebuild 573 RMD160 fbc5899ad1fab62ea4e8170afdf106a80f9e1447 SHA1 9e09098158b69c70c0ed492d781d7c1470248c20 SHA256 bf764a25ea3cb3f580d3644bc9ba422a182c880b929fc589e37587d94c489912
+MISC ChangeLog 707 RMD160 903f2c5f486fcac102ec6e976f6f45c2eb965a65 SHA1 857fae51e15908837543e30db6493c0c5c5afd9b SHA256 9a3c7be7c25046fc2a03cafb50d496b0c00b3fe18da9490fddd37e855bd1517d
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/media-video/imagination/files/imagination-2.1-transitions.patch b/media-video/imagination/files/imagination-2.1-transitions.patch
deleted file mode 100644
index b9baa596d..000000000
--- a/media-video/imagination/files/imagination-2.1-transitions.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/support.c	2009-10-07 08:10:04.000000000 +0200
-+++ src/support.new.c	2009-10-14 16:16:38.288080473 +0200
-@@ -20,7 +20,7 @@
- #include "support.h"
- #include <glib/gstdio.h>
- 
--#define PLUGINS_INSTALLED 0
-+#define PLUGINS_INSTALLED 1
- 
- static gboolean img_plugin_is_loaded(img_window_struct *, GModule *);
- 
diff --git a/media-video/imagination/files/imagination-3.0-cflags.patch b/media-video/imagination/files/imagination-3.0-cflags.patch
new file mode 100644
index 000000000..a0f6adb6d
--- /dev/null
+++ b/media-video/imagination/files/imagination-3.0-cflags.patch
@@ -0,0 +1,16 @@
+ configure.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 0be7802..d19c8ec 100644
+--- a/configure.in
++++ b/configure.in
+@@ -46,7 +46,7 @@ fi
+ if test "x${REVISION}" != "xr0"
+ then
+ 	# force debug mode for a SVN working copy
+-	CFLAGS="-g -Wall"
++	CFLAGS +="-Wall"
+ else
+ 	REVISION="-1"
+ fi
diff --git a/media-video/imagination/imagination-2.1.ebuild b/media-video/imagination/imagination-3.0.ebuild
index 357d5e5c0..0076081f6 100644
--- a/media-video/imagination/imagination-2.1.ebuild
+++ b/media-video/imagination/imagination-3.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+EAPI="4"
+
+inherit autotools eutils
 
 DESCRIPTION="Simple DVD slideshow maker"
 HOMEPAGE="http://imagination.sourceforge.net/"
@@ -13,22 +15,18 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND=">=x11-libs/gtk+-2.12.11
-	>=media-sound/sox-14.2.0"
-
+DEPEND="
+	x11-libs/gtk+:2
+	media-sound/sox"
 RDEPEND="${DEPEND}
 	media-video/ffmpeg"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-transitions.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	eautoreconf
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS NEWS README TODO || die "dodoc failed"
+	default
 	doicon icons/48x48/${PN}.png
 }