Version bump, drop old

3 files changed, 7 insertions, 97 deletions

diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index e465cd8..d9d5474 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,2 +1 @@
-DIST enlightenment-0.18.0-alpha4.tar.bz2 27571748 SHA256 8a45a0ee7b41e8dd8ade7c87ba304729670bbba79079bbf0febb2f75673511d6 SHA512 fef6a765fd7cac59e3ee6cbafdf7d73b5e11a4389aab4c7c0b53f51bf4304a7fefa72537490536ea3b4c241e069cdb3c48a671c7a5b2ad37a703dbbd65e0cf35 WHIRLPOOL 85cff23b153fce9231c9d200e76cd6521aecd3a2165f7827098650b1ff9e0aaaae028484285b3665802297f28b58253140693a1025be9be039c38078a35a0454
-DIST enlightenment-0.18.0-rc2.tar.bz2 27603195 SHA256 d6d9344d989b1aa3597a14c63eb16c04a9e81f09d3124e410dd5a56a13bbe817 SHA512 69f9a27bfda2b007e688ede8b53cfd9e3b8642e02fc295f75546e3aaf48cb557002a2003bdbe607f9739e9b0b4b2664d199d3a679461738807359e1088cec4db WHIRLPOOL 07a17af8f4b0d10a0eb4585c1496068d91c0ebc8bcaff358e0486672d7a4881511b1b4f3640c6dfd51ebaed56cf7793ed21e095e7ba2785ea74c89d96d1a07f0
+DIST enlightenment-0.18.0.tar.bz2 27615555 SHA256 462045795f624e0639bf064135441c2f4b1104b7a0f39616dd8a7c490532a317 SHA512 e61f55f10e4b916c8797c1787f11c83ee2139c6c637680782a4e43058adf5576fb29e3b61e4e82ade6528e5a06ea09339e33b877d98911eaeaa786e804f52483 WHIRLPOOL 270f1b1a525e37bc6e36653e2b0f0206db29161126c046b539d3cada1ee72b2ab39dd2254730b5deb44c7ad0c55972f2c8a31e06011fd69320fb0f44243ddedb
diff --git a/x11-wm/enlightenment/enlightenment-0.18.0_rc2.ebuild b/x11-wm/enlightenment/enlightenment-0.18.0.ebuild
index 03f9a9a..1b35b9b 100644
--- a/x11-wm/enlightenment/enlightenment-0.18.0_rc2.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.18.0.ebuild
@@ -10,8 +10,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_SUB_PROJECT="core"
 	EGIT_URI_APPEND="${PN}"
 else
-#	SRC_URI="http://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.bz2"
-	SRC_URI="http://download.enlightenment.org/releases/${MY_P}.tar.bz2"
+	SRC_URI="http://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.bz2"
 	EKEY_STATE="snap"
 fi
 
@@ -21,7 +20,7 @@ DESCRIPTION="Enlightenment DR17 window manager"
 
 LICENSE="BSD-2"
 KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0.17/${PV/_pre2}"
+SLOT="0.17/${PV%%_*}"
 
 # The @ is just an anchor to expand from
 __EVRY_MODS=""
@@ -34,7 +33,7 @@ __NORM_MODS="
 	@access +@appmenu +@backlight +@bluez4 +@battery +@clock
 	+@connman +@contact +@cpufreq +@everything +@fileman
 	+@fileman-opinfo +@gadman +@ibar +@ibox +@illume2 +@mixer +@msgbus
-	+@music-control +@notification +@pager +@physics +@quickaccess +@shot
+	+@music-control +@notification +@pager +@quickaccess +@shot
 	+@start +@syscon +@systray +@tasks +@teamwork +@temperature +@tiling
 	+@winlist +@wizard @wl-desktop-shell @wl-screenshot +@xkbswitch"
 IUSE_E_MODULES="
@@ -51,9 +50,9 @@ RDEPEND="
 		>=x11-libs/pixman-0.31.1
 		>=x11-libs/libxkbcommon-0.3.1
 	)
-	>=dev-libs/efl-1.8.0_alpha2
-	|| ( >=dev-libs/efl-1.8.0_alpha2[X] >=dev-libs/efl-1.8.0_alpha2[xcb] )
-	>=media-libs/elementary-1.8.0_alpha2
+	>=dev-libs/efl-1.8.3
+	|| ( >=dev-libs/efl-1.8.3[X] >=dev-libs/efl-1.8.3[xcb] )
+	>=media-libs/elementary-1.8.2
 	x11-libs/xcb-util-keysyms"
 DEPEND="${RDEPEND}"
 
@@ -76,7 +75,6 @@ src_configure() {
 		$(use_enable udev mount-eeze)
 		$(use_enable ukit mount-udisks)
 		$(use_enable wayland wayland-clients)
-		--disable-ephysics
 	)
 	local u c
 	for u in ${IUSE_E_MODULES} ; do
diff --git a/x11-wm/enlightenment/enlightenment-0.18.0_alpha4.ebuild b/x11-wm/enlightenment/enlightenment-0.18.0_alpha4.ebuild
deleted file mode 100644
index 1885cb4..0000000
--- a/x11-wm/enlightenment/enlightenment-0.18.0_alpha4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit autotools enlightenment
-
-MY_P=${P/_/-}
-DESCRIPTION="Enlightenment DR17 window manager"
-SRC_URI="http://download.enlightenment.org/rel/apps/${PN}/${MY_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 +@comp +@dialogs +@display
-	+@interaction +@intl +@menus
-	+@paths +@performance +@randr +@shelves +@theme +@wallpaper2
-	+@window-manipulation +@window-remembers"
-__NORM_MODS="
-	@access +@appmenu +@backlight +@bluez4 +@battery +@clock
-	+@connman +@contact +@cpufreq +@everything +@fileman
-	+@fileman-opinfo +@gadman +@ibar +@ibox +@illume2 +@mixer +@msgbus
-	+@music-control +@notification +@pager +@physics +@quickaccess +@shot
-	+@start +@syscon +@systray +@tasks +@teamwork +@temperature +@tiling
-	+@winlist +@wizard @wl-desktop-shell @wl-screenshot +@xkbswitch"
-IUSE_E_MODULES="
-	${__CONF_MODS//@/enlightenment_modules_conf-}
-	${__NORM_MODS//@/enlightenment_modules_}"
-
-IUSE="pam spell static-libs systemd +udev ukit wayland ${IUSE_E_MODULES}"
-
-RDEPEND="
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd )
-	wayland? ( dev-libs/efl[wayland]
-		>=dev-libs/wayland-1.2.0
-		>=x11-libs/pixman-0.31.1
-		>=x11-libs/libxkbcommon-0.3.1
-	)
-	>=dev-libs/efl-1.8.0_alpha2
-	|| ( >=dev-libs/efl-1.8.0_alpha2[X] >=dev-libs/efl-1.8.0_alpha2[xcb] )
-	>=media-libs/elementary-1.8.0_alpha2
-	x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/quickstart.diff
-	sed -i "s:1.8.0:1.7.9:g" configure.ac
-	eautoreconf
-	enlightenment_src_prepare
-}
-
-src_configure() {
-	E_ECONF+=(
-		--disable-install-sysactions
-		$(use_enable doc)
-		--disable-device-hal
-		$(use_enable nls)
-		$(use_enable pam)
-		$(use_enable systemd)
-		--enable-device-udev
-		$(use_enable udev mount-eeze)
-		$(use_enable ukit mount-udisks)
-		$(use_enable wayland wayland-clients)
-		--disable-ephysics
-	)
-	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
-}