Version bump, drop old

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

3 files changed, 11 insertions, 94 deletions

diff --git a/x11-wm/enlightenment/ChangeLog b/x11-wm/enlightenment/ChangeLog
index 5b11636c0d7e..65f53dad441d 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.170 2012/12/19 18:28:10 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/ChangeLog,v 1.171 2012/12/22 00:47:09 tommy Exp $
+
+*enlightenment-0.17.0 (22 Dec 2012)
+
+  22 Dec 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -enlightenment-0.17.0_beta2.ebuild, -enlightenment-0.17.0_beta3.ebuild,
+  +enlightenment-0.17.0.ebuild:
+  Version bump, drop old
 
 *enlightenment-0.17.0_beta3 (19 Dec 2012)
 
diff --git a/x11-wm/enlightenment/enlightenment-0.17.0_beta3.ebuild b/x11-wm/enlightenment/enlightenment-0.17.0.ebuild
index fff127b452e5..f66b091c91bc 100644
--- a/x11-wm/enlightenment/enlightenment-0.17.0_beta3.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.17.0.ebuild
@@ -1,16 +1,17 @@
 # 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_beta3.ebuild,v 1.1 2012/12/19 18:28:10 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.17.0.ebuild,v 1.1 2012/12/22 00:47:09 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"
 
+LICENSE="BSD-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0.17/${PV}"
 
@@ -53,8 +54,6 @@ 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
 }
 
diff --git a/x11-wm/enlightenment/enlightenment-0.17.0_beta2.ebuild b/x11-wm/enlightenment/enlightenment-0.17.0_beta2.ebuild
deleted file mode 100644
index e81613b92512..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.17.0_beta2.ebuild
+++ /dev/null
@@ -1,89 +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_beta2.ebuild,v 1.1 2012/12/14 20:13:45 tommy Exp $
-
-EAPI="2"
-
-MY_P=${P/_beta2/-lucky}
-
-inherit autotools 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.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.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.3 )
-	x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}"
-
-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
-}
-
-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
-}