Version bump, drop old

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

3 files changed, 21 insertions, 99 deletions

diff --git a/x11-wm/enlightenment/ChangeLog b/x11-wm/enlightenment/ChangeLog
index ecca6b4615ed..de63932b709f 100644
--- a/x11-wm/enlightenment/ChangeLog
+++ b/x11-wm/enlightenment/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/enlightenment
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/ChangeLog,v 1.168 2012/12/13 20:16:07 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/ChangeLog,v 1.169 2012/12/14 20:13:45 tommy Exp $
+
+*enlightenment-0.17.0_beta2 (14 Dec 2012)
+
+  14 Dec 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -enlightenment-0.17.0_beta.ebuild, -enlightenment-0.17.0_beta1.ebuild,
+  +enlightenment-0.17.0_beta2.ebuild:
+  Version bump, drop old
 
 *enlightenment-0.17.0_beta1 (13 Dec 2012)
 
diff --git a/x11-wm/enlightenment/enlightenment-0.17.0_beta1.ebuild b/x11-wm/enlightenment/enlightenment-0.17.0_beta1.ebuild
deleted file mode 100644
index 9dc40041961e..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.17.0_beta1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.17.0_beta1.ebuild,v 1.1 2012/12/13 20:16:07 tommy Exp $
-
-EAPI="2"
-
-MY_P=${P/_beta1/-gamma}
-
-inherit enlightenment
-
-DESCRIPTION="Enlightenment DR17 window manager"
-SRC_URI="http://download.enlightenment.org/releases/${MY_P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0.17"
-
-# 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/efreet-1.7.1
-	>=dev-libs/eio-1.7.1
-	>=dev-libs/eina-1.7.1[mempool-chained]
-	|| ( >=dev-libs/ecore-1.7.1[X,evas,inotify] >=dev-libs/ecore-1.7.1[xcb,evas,inotify] )
-	>=media-libs/edje-1.7.2
-	>=dev-libs/e_dbus-1.7.1[libnotify,udev?]
-	ukit? ( >=dev-libs/e_dbus-1.7.1[udev] )
-	enlightenment_modules_connman? ( >=dev-libs/e_dbus-1.7.1[connman] )
-	enlightenment_modules_shot? ( >=dev-libs/ecore-1.7.1[curl] )
-	|| ( >=media-libs/evas-1.7.1[eet,X,jpeg,png] >=media-libs/evas-1.7.1[eet,xcb,jpeg,png] )
-	>=dev-libs/eeze-1.7.1
-	emotion? ( >=media-libs/emotion-1.7.0 )
-	x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/quickstart.diff
-	enlightenment_src_prepare
-}
-
-src_configure() {
-	export MY_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_}
-		MY_ECONF+=" $(use_enable ${u} ${c})"
-	done
-	enlightenment_src_configure
-}
-
-src_install() {
-	enlightenment_src_install
-	insinto /etc/enlightenment
-	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf || die
-}
diff --git a/x11-wm/enlightenment/enlightenment-0.17.0_beta.ebuild b/x11-wm/enlightenment/enlightenment-0.17.0_beta2.ebuild
index a6fdc4094dcb..e81613b92512 100644
--- a/x11-wm/enlightenment/enlightenment-0.17.0_beta.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.17.0_beta2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.17.0_beta.ebuild,v 1.1 2012/12/08 20:19:30 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.17.0_beta2.ebuild,v 1.1 2012/12/14 20:13:45 tommy Exp $
 
 EAPI="2"
 
-MY_P=${P/_beta/-beta}
+MY_P=${P/_beta2/-lucky}
 
-inherit enlightenment
+inherit autotools enlightenment
 
 DESCRIPTION="Enlightenment DR17 window manager"
 SRC_URI="http://download.enlightenment.org/releases/${MY_P}.tar.bz2"
@@ -34,18 +34,18 @@ IUSE="emotion pam spell static-libs +udev ukit ${IUSE_E_MODULES}"
 
 RDEPEND="
 	pam? ( sys-libs/pam )
-	>=dev-libs/efreet-1.7.1
-	>=dev-libs/eio-1.7.1
-	>=dev-libs/eina-1.7.1[mempool-chained]
-	|| ( >=dev-libs/ecore-1.7.1[X,evas,inotify] >=dev-libs/ecore-1.7.1[xcb,evas,inotify] )
-	>=media-libs/edje-1.7.2
+	>=dev-libs/efreet-1.7.3
+	>=dev-libs/eio-1.7.3
+	>=dev-libs/eina-1.7.3[mempool-chained]
+	|| ( >=dev-libs/ecore-1.7.3[X,evas,inotify] >=dev-libs/ecore-1.7.3[xcb,evas,inotify] )
+	>=media-libs/edje-1.7.3
 	>=dev-libs/e_dbus-1.7.1[libnotify,udev?]
 	ukit? ( >=dev-libs/e_dbus-1.7.1[udev] )
 	enlightenment_modules_connman? ( >=dev-libs/e_dbus-1.7.1[connman] )
-	enlightenment_modules_shot? ( >=dev-libs/ecore-1.7.1[curl] )
-	|| ( >=media-libs/evas-1.7.1[eet,X,jpeg,png] >=media-libs/evas-1.7.1[eet,xcb,jpeg,png] )
+	enlightenment_modules_shot? ( >=dev-libs/ecore-1.7.3[curl] )
+	|| ( >=media-libs/evas-1.7.3[eet,X,jpeg,png] >=media-libs/evas-1.7.3[eet,xcb,jpeg,png] )
 	>=dev-libs/eeze-1.7.1
-	emotion? ( >=media-libs/emotion-1.7.0 )
+	emotion? ( >=media-libs/emotion-1.7.3 )
 	x11-libs/xcb-util-keysyms"
 DEPEND="${RDEPEND}"
 
@@ -53,6 +53,8 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch "${FILESDIR}"/quickstart.diff
+	sed -i 's:efl_version="1.7.3":efl_version="1.7.1":g' configure.ac
+	eautoreconf
 	enlightenment_src_prepare
 }