Version bump for enlightenment-0.17.5, drop 0.17.4 and pre-release

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

3 files changed, 25 insertions, 114 deletions

diff --git a/x11-wm/enlightenment/ChangeLog b/x11-wm/enlightenment/ChangeLog
index 059b25ab1a7a..851647028a2e 100644
--- a/x11-wm/enlightenment/ChangeLog
+++ b/x11-wm/enlightenment/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/enlightenment
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/ChangeLog,v 1.189 2013/10/04 10:40:51 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/ChangeLog,v 1.190 2013/11/13 22:29:07 tommy Exp $
+
+*enlightenment-0.17.5 (13 Nov 2013)
+
+  13 Nov 2013; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +enlightenment-0.17.5.ebuild, -enlightenment-0.17.4.ebuild,
+  -enlightenment-0.17.5_pre2.ebuild:
+  Version bump for enlightenment-0.17.5, drop 0.17.4 and pre-release
 
 *enlightenment-0.17.5_pre2 (04 Oct 2013)
 
diff --git a/x11-wm/enlightenment/enlightenment-0.17.4.ebuild b/x11-wm/enlightenment/enlightenment-0.17.5.ebuild
index 3a45d298cfed..57fa97b15fc3 100644
--- a/x11-wm/enlightenment/enlightenment-0.17.4.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.17.5.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.17.4.ebuild,v 1.2 2013/09/28 23:11:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.17.5.ebuild,v 1.1 2013/11/13 22:29:07 tommy Exp $
 
 EAPI=5
 
-MY_P=${P/_beta3/-omega}
-
-inherit autotools enlightenment
+inherit enlightenment
 
 DESCRIPTION="Enlightenment DR17 window manager"
-SRC_URI="http://download.enlightenment.org/releases/${MY_P}.tar.bz2"
+SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0.17/${PV}"
+SLOT="0.17/${PV/_pre2}"
 
 # The @ is just an anchor to expand from
 __EVRY_MODS=""
@@ -35,24 +33,22 @@ IUSE="emotion pam spell static-libs +udev ukit ${IUSE_E_MODULES}"
 
 RDEPEND="
 	pam? ( sys-libs/pam )
-	>=dev-libs/eet-1.7.8
-	>=dev-libs/efreet-1.7.8
-	>=dev-libs/eio-1.7.8
-	>=dev-libs/eina-1.7.8[mempool-chained-pool]
-	|| ( >=dev-libs/ecore-1.7.8[X,evas,inotify] >=dev-libs/ecore-1.7.4[xcb,evas,inotify] )
-	>=media-libs/edje-1.7.8
-	>=dev-libs/e_dbus-1.7.8[libnotify,udev?]
-	ukit? ( >=dev-libs/e_dbus-1.7.8[udev] )
-	enlightenment_modules_connman? ( >=dev-libs/e_dbus-1.7.8[connman] )
-	enlightenment_modules_shot? ( >=dev-libs/ecore-1.7.8[curl] )
-	|| ( >=media-libs/evas-1.7.8[eet,X,jpeg,png] >=media-libs/evas-1.7.8[eet,xcb,jpeg,png] )
-	>=dev-libs/eeze-1.7.8
-	emotion? ( >=media-libs/emotion-1.7.8 )
+	>=dev-libs/eet-1.7.9
+	>=dev-libs/efreet-1.7.9
+	>=dev-libs/eio-1.7.9
+	>=dev-libs/eina-1.7.9[mempool-chained-pool]
+	|| ( >=dev-libs/ecore-1.7.9[X,evas,inotify] >=dev-libs/ecore-1.7.9[xcb,evas,inotify] )
+	>=media-libs/edje-1.7.9
+	>=dev-libs/e_dbus-1.7.9[libnotify,udev?]
+	ukit? ( >=dev-libs/e_dbus-1.7.9[udev] )
+	enlightenment_modules_connman? ( >=dev-libs/e_dbus-1.7.9[connman] )
+	enlightenment_modules_shot? ( >=dev-libs/ecore-1.7.9[curl] )
+	|| ( >=media-libs/evas-1.7.9[eet,X,jpeg,png] >=media-libs/evas-1.7.9[eet,xcb,jpeg,png] )
+	>=dev-libs/eeze-1.7.9
+	emotion? ( >=media-libs/emotion-1.7.9 )
 	x11-libs/xcb-util-keysyms"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}
-
 src_prepare() {
 	epatch "${FILESDIR}"/quickstart.diff
 	enlightenment_src_prepare
diff --git a/x11-wm/enlightenment/enlightenment-0.17.5_pre2.ebuild b/x11-wm/enlightenment/enlightenment-0.17.5_pre2.ebuild
deleted file mode 100644
index 31742d5d8016..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.17.5_pre2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.17.5_pre2.ebuild,v 1.1 2013/10/04 10:40:51 tommy Exp $
-
-EAPI=5
-
-MY_P=${P/_pre2}
-
-inherit autotools enlightenment
-
-DESCRIPTION="Enlightenment DR17 window manager"
-#SRC_URI="http://download.enlightenment.org/releases/${MY_P}.tar.bz2"
-SRC_URI="http://download.enlightenment.org/pre-releases/${MY_P}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0.17/${PV/_pre2}"
-
-# The @ is just an anchor to expand from
-__EVRY_MODS=""
-__CONF_MODS="
-	+@applications +@dialogs +@display +@edgebindings
-	+@interaction +@intl +@keybindings +@menus
-	+@paths +@performance +@randr +@shelves +@theme
-	+@window-manipulation +@window-remembers"
-__NORM_MODS="
-	@access +@backlight +@battery +@clock +@comp +@connman +@cpufreq +@dropshadow
-	+@everything +@fileman +@fileman-opinfo +@gadman +@ibar +@ibox +@illume2
-	+@mixer	+@msgbus +@notification +@pager +@quickaccess @shot +@start
-	+@syscon +@systray +@tasks +@temperature +@tiling +@winlist +@wizard +@xkbswitch"
-IUSE_E_MODULES="
-	${__CONF_MODS//@/enlightenment_modules_conf-}
-	${__NORM_MODS//@/enlightenment_modules_}"
-
-IUSE="emotion pam spell static-libs +udev ukit ${IUSE_E_MODULES}"
-
-RDEPEND="
-	pam? ( sys-libs/pam )
-	>=dev-libs/eet-1.7.8
-	>=dev-libs/efreet-1.7.8
-	>=dev-libs/eio-1.7.8
-	>=dev-libs/eina-1.7.8[mempool-chained-pool]
-	|| ( >=dev-libs/ecore-1.7.8[X,evas,inotify] >=dev-libs/ecore-1.7.8[xcb,evas,inotify] )
-	>=media-libs/edje-1.7.8
-	>=dev-libs/e_dbus-1.7.8[libnotify,udev?]
-	ukit? ( >=dev-libs/e_dbus-1.7.8[udev] )
-	enlightenment_modules_connman? ( >=dev-libs/e_dbus-1.7.8[connman] )
-	enlightenment_modules_shot? ( >=dev-libs/ecore-1.7.8[curl] )
-	|| ( >=media-libs/evas-1.7.8[eet,X,jpeg,png] >=media-libs/evas-1.7.8[eet,xcb,jpeg,png] )
-	>=dev-libs/eeze-1.7.8
-	emotion? ( >=media-libs/emotion-1.7.8 )
-	x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/quickstart.diff
-	sed -i "s:1.7.9:1.7.8:g" configure.ac
-	eautoreconf
-	enlightenment_src_prepare
-}
-
-src_configure() {
-	E_ECONF+=(
-		--disable-install-sysactions
-		--disable-elementary
-		$(use_enable doc)
-		--disable-device-hal
-		$(use_enable emotion)
-		--disable-mount-hal
-		$(use_enable nls)
-		$(use_enable pam)
-		--enable-device-udev
-		$(use_enable udev mount-eeze)
-		$(use_enable ukit mount-udisks)
-		--disable-physics
-	)
-	local u c
-	for u in ${IUSE_E_MODULES} ; do
-		u=${u#+}
-		c=${u#enlightenment_modules_}
-		E_ECONF+=( $(use_enable ${u} ${c}) )
-	done
-	enlightenment_src_configure
-}
-
-src_install() {
-	enlightenment_src_install
-	insinto /etc/enlightenment
-	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
-}