Version bump, drop old

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

4 files changed, 17 insertions, 57 deletions

diff --git a/media-libs/elementary/ChangeLog b/media-libs/elementary/ChangeLog
index 2d370627255d..20fffbe6943f 100644
--- a/media-libs/elementary/ChangeLog
+++ b/media-libs/elementary/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/elementary
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/elementary/ChangeLog,v 1.3 2012/12/16 20:03:43 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/elementary/ChangeLog,v 1.4 2012/12/21 20:56:22 tommy Exp $
+
+*elementary-1.7.4 (21 Dec 2012)
+
+  21 Dec 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -elementary-1.7.1.ebuild, -elementary-1.7.2.ebuild, +elementary-1.7.4.ebuild,
+  metadata.xml:
+  Version bump, drop old
 
   16 Dec 2012; Kacper Kowalik <xarthisius@gentoo.org> metadata.xml:
   Drop no-herd from metadata.xml
diff --git a/media-libs/elementary/elementary-1.7.2.ebuild b/media-libs/elementary/elementary-1.7.2.ebuild
deleted file mode 100644
index 25df42c52197..000000000000
--- a/media-libs/elementary/elementary-1.7.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/elementary/elementary-1.7.2.ebuild,v 1.1 2012/11/23 21:39:27 tommy Exp $
-
-EAPI=2
-
-inherit enlightenment
-
-DESCRIPTION="Basic widget set, based on EFL for mobile touch-screen devices."
-HOMEPAGE="http://trac.enlightenment.org/e/wiki/Elementary"
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus debug examples fbcon opengl quicklaunch sdl X xcb xdg static-libs"
-
-DEPEND="
-	>=dev-libs/ecore-1.7.0[evas,fbcon?,opengl?,sdl?,X?,xcb?]
-	>=media-libs/evas-1.7.0[fbcon?,opengl?,X?,xcb?]
-	>=media-libs/edje-1.7.0
-	dbus? ( >=dev-libs/e_dbus-1.7.0 )
-	xdg? ( >=dev-libs/efreet-1.7.0 )
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	MY_ECONF="$(use_enable dbus edbus)
-		$(use_enable debug)
-		$(use_enable doc)
-		--disable-ecore-cocoa
-		--disable-ecore-psl1ght
-		--disable-ecore-wayland
-		--disable-ecore-win32
-		--disable-ecore-wince
-		--disable-emap
-		--disable-emotion
-		--disable-ethumb
-		--disable-eweather
-		$(use_enable examples build-examples)
-		$(use_enable examples install-examples)
-		$(use_enable fbcon ecore-fb)
-		$(use_enable sdl ecore-sdl)
-		--disable-web
-		$(use_enable X ecore-x)
-		$(use_enable quicklaunch quick-launch)
-		$(use_enable xdg efreet)"
-
-	enlightenment_src_configure
-}
diff --git a/media-libs/elementary/elementary-1.7.1.ebuild b/media-libs/elementary/elementary-1.7.4.ebuild
index 61e6727d9cc2..fd998cea7374 100644
--- a/media-libs/elementary/elementary-1.7.1.ebuild
+++ b/media-libs/elementary/elementary-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/elementary/elementary-1.7.1.ebuild,v 1.1 2012/11/16 17:28:10 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/elementary/elementary-1.7.4.ebuild,v 1.1 2012/12/21 20:56:22 tommy Exp $
 
 EAPI=2
 
@@ -12,13 +12,15 @@ SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
-IUSE="dbus debug examples fbcon opengl quicklaunch sdl X xcb xdg static-libs"
+IUSE="dbus debug emotion ethumb examples fbcon opengl quicklaunch sdl X xcb xdg static-libs"
 
 DEPEND="
 	>=dev-libs/ecore-1.7.0[evas,fbcon?,opengl?,sdl?,X?,xcb?]
 	>=media-libs/evas-1.7.0[fbcon?,opengl?,X?,xcb?]
 	>=media-libs/edje-1.7.0
 	dbus? ( >=dev-libs/e_dbus-1.7.0 )
+	emotion? ( >=media-libs/emotion-1.7.0 )
+	ethumb? ( >=media-libs/ethumb-1.7.0 )
 	xdg? ( >=dev-libs/efreet-1.7.0 )
 	"
 RDEPEND="${DEPEND}"
@@ -33,8 +35,8 @@ src_configure() {
 		--disable-ecore-win32
 		--disable-ecore-wince
 		--disable-emap
-		--disable-emotion
-		--disable-ethumb
+		$(use_enable emotion)
+		$(use_enable ethumb)
 		--disable-eweather
 		$(use_enable examples build-examples)
 		$(use_enable examples install-examples)
diff --git a/media-libs/elementary/metadata.xml b/media-libs/elementary/metadata.xml
index 72ffcd59669a..91ff5b732db8 100644
--- a/media-libs/elementary/metadata.xml
+++ b/media-libs/elementary/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
- <email>enlightenment@gentoo.org</email>
-</maintainer>
+<herd>enlightenment</herd>
 <use>
  <flag name="dbus">Enable integration with <pkg>dev-libs/e_dbus</pkg>.</flag>
+ <flag name='emotion'>Add support for <pkg>media-libs/emotion</pkg></flag>
+ <flag name='ethumb'>Add support for <pkg>media-libs/ethumb</pkg></flag>
  <flag name="quicklaunch">Enable quick-launch support</flag>
  <flag name="xdg">Enable integration with <pkg>dev-libs/efreet</pkg> for cross-desktop standards (freedesktop.org).</flag>
 </use>