Permalink
Browse files

Merge branch 'master' of git://vcs.niifaq.ru/e17

  • Loading branch information...
2 parents 5ab59d4 + 842a0ef commit 789c6f66076758494004ddef8b5d6ded1c81904d @lzoubek committed May 5, 2012
View
3 Documentation/live-builds/package.keywords/enlightenment.live
@@ -80,7 +80,6 @@
=x11-plugins/e_modules-flame-9999 **
=x11-plugins/e_modules-forecasts-9999 **
=x11-plugins/e_modules-iiirk-9999 **
-=x11-plugins/e_modules-language-9999 **
=x11-plugins/e_modules-mail-9999 **
=x11-plugins/e_modules-mem-9999 **
=x11-plugins/e_modules-moon-9999 **
@@ -97,13 +96,11 @@
=x11-plugins/e_modules-snow-9999 **
=x11-plugins/e_modules-taskbar-9999 **
=x11-plugins/e_modules-tclock-9999 **
-=x11-plugins/e_modules-tiling-9999 **
=x11-plugins/e_modules-uptime-9999 **
=x11-plugins/e_modules-weather-9999 **
=x11-plugins/e_modules-winlist-ng-9999 **
=x11-plugins/e_modules-winselector-9999 **
=x11-plugins/e_modules-wlan-9999 **
-=x11-plugins/e_modules-xkbswitch-9999 **
=x11-plugins/eplanet-9999 **
=x11-plugins/extramenu-9999 **
=x11-plugins/trash-9999 **
View
2 app-text/estardict/estardict-9999.ebuild
@@ -15,7 +15,7 @@ inherit bzr eutils efl
DESCRIPTION="An offline dictionary reader, made in C with Enlightenment Elementary UI"
HOMEPAGE="http://www.vaudano.eu/wiki/en/estardict"
-EBZR_REPO_URI="http://bazaar.launchpad.net/~vaudano/estardict/trunk"
+EBZR_REPO_URI="https://launchpad.net/estardict"
LICENSE="GPL-3"
SLOT="0"
View
8 profiles/package.mask
@@ -1,3 +1,11 @@
+# evadim <evadim@evadim.ru> (03 May 2012)
+# Masked for removal, as it was merged into x11-wm/enlightenment itself
+x11-plugins/e_modules-tiling
+
+# evadim <evadim@evadim.ru> (29 Apr 2012)
+# Masked for removal, as it was merged into x11-wm/enlightenment itself
+x11-plugins/e_modules-xkbswitch
+
# Andrian Nord <nightnord@gmail.com> (10 Aug 2011)
# Masked for removal, as it was merged into x11-wm/enlightenment itself
x11-plugins/e_modules-efm_nav
View
2 sets/enlightenment-broken
@@ -3,3 +3,5 @@
=net-misc/exalt-9999
=x11-plugins/e_modules-exalt-client-9999
=dev-python/python-lightmediascanner-9999
+=x11-plugins/e_modules-xkbswitch-9999
+=x11-plugins/e_modules-tiling-9999
View
2 sets/enlightenment-modules
@@ -20,7 +20,6 @@
=x11-plugins/e_modules-flame-9999
=x11-plugins/e_modules-forecasts-9999
=x11-plugins/e_modules-iiirk-9999
-=x11-plugins/e_modules-language-9999
=x11-plugins/e_modules-mail-9999
=x11-plugins/e_modules-mem-9999
=x11-plugins/e_modules-moon-9999
@@ -36,7 +35,6 @@
=x11-plugins/e_modules-snow-9999
=x11-plugins/e_modules-taskbar-9999
=x11-plugins/e_modules-tclock-9999
-=x11-plugins/e_modules-tiling-9999
=x11-plugins/e_modules-uptime-9999
=x11-plugins/e_modules-weather-9999
=x11-plugins/e_modules-winlist-ng-9999
View
23 x11-plugins/e_modules-language/e_modules-language-9999.ebuild
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-E_PKG_IUSE="nls"
-ESVN_SUB_PROJECT="E-MODULES-EXTRA"
-ESVN_URI_APPEND="${PN#e_modules-}"
-inherit efl
-
-DESCRIPTION="Gadget to control active keyboard, keyboard layout, and layout variant"
-
-IUSE=""
-
-RDEPEND="x11-wm/enlightenment:0.17
- >=dev-libs/ecore-9999
- >=media-libs/edje-9999
- dev-libs/libxml2"
-
-DEPEND="${RDEPEND}
- x11-libs/libX11
- x11-libs/libxkbfile"
View
7 x11-plugins/e_modules-language/metadata.xml
@@ -1,7 +0,0 @@
-<?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>
-</pkgmetadata>
View
10 x11-wm/enlightenment/enlightenment-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -96,8 +96,12 @@ RDEPEND="
enlightenment_modules_connman? ( >=dev-libs/e_dbus-9999[connman] )
enlightenment_everything_aspell? ( app-text/aspell )
enlightenment_everything_calc? ( sys-devel/bc )
-"
-DEPEND="${RDEPEND}"
+ "
+
+DEPEND="
+ !x11-plugins/e_modules-xkbswitch
+ !x11-plugins/e_modules-tiling
+${RDEPEND}"
expand_iuse() {
local flags="$1" prefix="$2" requirement="$3"

0 comments on commit 789c6f6

Please sign in to comment.