diff --git a/x11-wm/notion/metadata.xml b/x11-wm/notion/metadata.xml index 3f744d39c34f..0211f73fc23a 100644 --- a/x11-wm/notion/metadata.xml +++ b/x11-wm/notion/metadata.xml @@ -5,9 +5,6 @@ soap@gentoo.org David Seifert - - Add support for xrandr - notion raboof/notion diff --git a/x11-wm/notion/notion-4.0.4.ebuild b/x11-wm/notion/notion-4.0.4.ebuild index d5f6645cbe94..857c67935469 100644 --- a/x11-wm/notion/notion-4.0.4.ebuild +++ b/x11-wm/notion/notion-4.0.4.ebuild @@ -23,22 +23,19 @@ fi LICENSE="LGPL-2.1" SLOT="0" -IUSE="nls xinerama +xrandr" +IUSE="nls" # needs slingshot,... not in tree RESTRICT="test" -# mod_xrandr references mod_xinerama -REQUIRED_USE=" - ${LUA_REQUIRED_USE} - xrandr? ( xinerama )" +REQUIRED_USE="${LUA_REQUIRED_USE}" RDEPEND=" ${LUA_DEPS} x11-libs/libSM x11-libs/libX11 x11-libs/libXext - nls? ( sys-devel/gettext ) - xinerama? ( x11-libs/libXinerama ) - xrandr? ( x11-libs/libXrandr )" + x11-libs/libXinerama + x11-libs/libXrandr + nls? ( sys-devel/gettext )" DEPEND="${RDEPEND}" # luac is called at build time BDEPEND=" @@ -73,15 +70,6 @@ src_configure() { LUA_INCLUDES=$(lua_get_CFLAGS) $(usev !nls "DEFINES+=-DCF_NO_LOCALE -DCF_NO_GETTEXT") _EOF_ - - if ! use xinerama ; then - sed -e 's/mod_xinerama//g' -i modulelist.mk || die - fi - - if ! use xrandr ; then - sed -e 's/mod_xrandr//g' -i modulelist.mk || die - sed -e '/mod_xrandr/d' -i etc/cfg_defaults.lua || die - fi } src_install() { diff --git a/x11-wm/notion/notion-9999.ebuild b/x11-wm/notion/notion-9999.ebuild index b3e99b846d59..776619ed420c 100644 --- a/x11-wm/notion/notion-9999.ebuild +++ b/x11-wm/notion/notion-9999.ebuild @@ -21,22 +21,19 @@ fi LICENSE="LGPL-2.1" SLOT="0" -IUSE="nls xinerama +xrandr" +IUSE="nls" # needs slingshot,... not in tree RESTRICT="test" -# mod_xrandr references mod_xinerama -REQUIRED_USE=" - ${LUA_REQUIRED_USE} - xrandr? ( xinerama )" +REQUIRED_USE="${LUA_REQUIRED_USE}" RDEPEND=" ${LUA_DEPS} x11-libs/libSM x11-libs/libX11 x11-libs/libXext - nls? ( sys-devel/gettext ) - xinerama? ( x11-libs/libXinerama ) - xrandr? ( x11-libs/libXrandr )" + x11-libs/libXinerama + x11-libs/libXrandr + nls? ( sys-devel/gettext )" DEPEND="${RDEPEND}" # luac is called at build time BDEPEND=" @@ -66,15 +63,6 @@ src_configure() { LUA_INCLUDES=$(lua_get_CFLAGS) $(usev !nls "DEFINES+=-DCF_NO_LOCALE -DCF_NO_GETTEXT") _EOF_ - - if ! use xinerama ; then - sed -e 's/mod_xinerama//g' -i modulelist.mk || die - fi - - if ! use xrandr ; then - sed -e 's/mod_xrandr//g' -i modulelist.mk || die - sed -e '/mod_xrandr/d' -i etc/cfg_defaults.lua || die - fi } src_install() {