Version bump, drop old

(Portage version: 2.2.6-r1/cvs/Linux x86_64, signed Manifest commit with key 0x35899067)

3 files changed, 25 insertions, 70 deletions

diff --git a/media-libs/emotion/ChangeLog b/media-libs/emotion/ChangeLog
index fc712c34ed25..13bfcf3876f0 100644
--- a/media-libs/emotion/ChangeLog
+++ b/media-libs/emotion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/emotion
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/emotion/ChangeLog,v 1.15 2013/10/12 20:11:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/emotion/ChangeLog,v 1.16 2013/11/12 18:41:06 tommy Exp $
+
+*emotion-1.7.9 (12 Nov 2013)
+
+  12 Nov 2013; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +emotion-1.7.9.ebuild, -emotion-1.7.4-r1.ebuild, -emotion-1.7.6.ebuild:
+  Version bump, drop old
 
   12 Oct 2013; Mike Frysinger <vapier@gentoo.org> emotion-1.7.8.ebuild:
   Update deps #486538 by Rick Farina.
diff --git a/media-libs/emotion/emotion-1.7.4-r1.ebuild b/media-libs/emotion/emotion-1.7.4-r1.ebuild
deleted file mode 100644
index 7d15d0ac6665..000000000000
--- a/media-libs/emotion/emotion-1.7.4-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/emotion/emotion-1.7.4-r1.ebuild,v 1.2 2013/04/03 17:17:16 tommy Exp $
-
-EAPI=2
-
-inherit autotools enlightenment
-
-DESCRIPTION="video libraries for e17"
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="gstreamer static-libs vlc xine"
-
-DEPEND=">=media-libs/evas-1.7.4
-	>=media-libs/edje-1.7.4
-	>=dev-libs/ecore-1.7.4
-	>=dev-libs/eeze-1.7.4
-	vlc? ( media-video/vlc )
-	xine? ( >=media-libs/xine-lib-1.1.1 )
-	!gstreamer? ( !vlc? ( !xine? ( >=media-libs/xine-lib-1.1.1 ) ) )
-	gstreamer? (
-		=media-libs/gstreamer-0.10*
-		=media-libs/gst-plugins-good-0.10*
-		=media-plugins/gst-plugins-ffmpeg-0.10*
-	)"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/respect-ldflags-with-gstreamer-backend.patch
-	eautoreconf
-}
-
-src_configure() {
-	if ! use vlc && ! use xine && ! use gstreamer ; then
-		export MY_ECONF="--enable-xine --disable-gstreamer --disable-generic-vlc"
-	else
-		export MY_ECONF="
-			$(use_enable xine) \
-			$(use_enable gstreamer) \
-			$(use_enable vlc generic-vlc)
-		"
-	fi
-
-	MY_ECONF+="
-		$(use_enable doc)
-	"
-
-	if use gstreamer ; then
-		addpredict "/root/.gconfd"
-		addpredict "/root/.gconf"
-	fi
-
-	enlightenment_src_configure
-}
diff --git a/media-libs/emotion/emotion-1.7.6.ebuild b/media-libs/emotion/emotion-1.7.9.ebuild
index 504b31dc3d09..b95a5da1cac8 100644
--- a/media-libs/emotion/emotion-1.7.6.ebuild
+++ b/media-libs/emotion/emotion-1.7.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/emotion/emotion-1.7.6.ebuild,v 1.1 2013/04/10 21:34:51 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/emotion/emotion-1.7.9.ebuild,v 1.1 2013/11/12 18:41:06 tommy Exp $
 
-EAPI=2
+EAPI="4"
 
 inherit enlightenment
 
@@ -13,10 +13,11 @@ LICENSE="BSD-2"
 KEYWORDS="~amd64 ~x86"
 IUSE="gstreamer static-libs vlc xine"
 
-DEPEND=">=media-libs/evas-1.7.6
-	>=media-libs/edje-1.7.6
-	>=dev-libs/ecore-1.7.6
-	>=dev-libs/eeze-1.7.4
+DEPEND=">=media-libs/evas-1.7.9
+	>=media-libs/edje-1.7.9
+	>=dev-libs/ecore-1.7.9
+	>=dev-libs/eina-1.7.9
+	>=dev-libs/eeze-1.7.9
 	vlc? ( media-video/vlc )
 	xine? ( >=media-libs/xine-lib-1.1.1 )
 	!gstreamer? ( !vlc? ( !xine? ( >=media-libs/xine-lib-1.1.1 ) ) )
@@ -29,18 +30,22 @@ RDEPEND=${DEPEND}
 
 src_configure() {
 	if ! use vlc && ! use xine && ! use gstreamer ; then
-		export MY_ECONF="--enable-xine --disable-gstreamer --disable-generic-vlc"
+		E_ECONF+=(
+			--enable-xine
+			--disable-gstreamer
+			--disable-generic-vlc
+		)
 	else
-		export MY_ECONF="
-			$(use_enable xine) \
-			$(use_enable gstreamer) \
+		E_ECONF+=(
+			$(use_enable xine)
+			$(use_enable gstreamer)
 			$(use_enable vlc generic-vlc)
-		"
+		)
 	fi
 
-	MY_ECONF+="
+	E_ECONF+=(
 		$(use_enable doc)
-	"
+	)
 
 	if use gstreamer ; then
 		addpredict "/root/.gconfd"