commit:     4de1484238a8f39deb877a2219d3902fcbc8795f
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Sat Sep 17 10:01:33 2016 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 10:01:33 2016 +0000
URL:        https://gitweb.gentoo.org/dev/xmw.git/commit/?id=4de14842

virtual/xmwde: make thunderbird optional

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0x71D573A82F434065

 virtual/xmwde/metadata.xml                         |  3 +
 virtual/xmwde/xmwde-0_p20150824.ebuild             | 68 ----------------------
 virtual/xmwde/xmwde-0_p20151120.ebuild             | 67 ---------------------
 virtual/xmwde/xmwde-0_p20160112.ebuild             | 64 --------------------
 ...20160320.ebuild => xmwde-0_p20160320-r1.ebuild} | 10 ++--
 5 files changed, 8 insertions(+), 204 deletions(-)

diff --git a/virtual/xmwde/metadata.xml b/virtual/xmwde/metadata.xml
index 59acc2c..72c80b9 100644
--- a/virtual/xmwde/metadata.xml
+++ b/virtual/xmwde/metadata.xml
@@ -5,5 +5,8 @@
 <email>x...@gentoo.org</email>
 <name>Michael Weber</name>
 </maintainer>
+<use>
+       <flag name="webmail">Use ebmail instead of thunderbird</flag>
+</use>
 </pkgmetadata>
 

diff --git a/virtual/xmwde/xmwde-0_p20150824.ebuild 
b/virtual/xmwde/xmwde-0_p20150824.ebuild
deleted file mode 100644
index 293acd1..0000000
--- a/virtual/xmwde/xmwde-0_p20150824.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-DESCRIPTION="Michael Weber (xmw) desktop environment"
-SRC_URI=""
-
-SLOT="0"
-KEYWORDS=""
-IUSE="minimal"
-
-RDEPEND="
-       app-admin/conky[weather-metar,thinkpad,mpd,wifi,hddtemp,thinkpad]
-       app-editors/gvim
-       app-misc/hddled[X]
-       app-misc/pystopwatch
-       app-shells/zsh
-       app-text/llpp
-       app-text/mupdf
-       app-text/paps
-       media-fonts/dina
-       media-fonts/terminus-font
-       media-gfx/feh
-       media-gfx/scrot
-       net-misc/hotot
-       virtual/xmwce
-       x11-apps/setxkbmap
-       x11-apps/xev
-       x11-apps/xkill
-       x11-apps/xmodmap
-       x11-apps/xrandr
-       x11-apps/xset
-       x11-base/xorg-server
-       x11-misc/alock
-       x11-misc/dmenu[xft]
-       x11-misc/trayer-srg
-       x11-misc/trivdm
-       x11-misc/wmname
-       x11-misc/x2x
-       x11-misc/xbindkeys
-       x11-misc/xclip
-       x11-misc/xdotool
-       x11-misc/xscreensaver
-       x11-terms/rxvt-unicode[xft]
-       x11-wm/cwm
-       media-fonts/font-misc-misc
-       !minimal? (
-               || ( app-text/atril app-text/evince )
-               app-text/gv
-               mail-client/thunderbird
-               media-gfx/gimp
-               media-sound/audacity
-               media-sound/baudline
-               || ( media-video/mpv media-video/mplayer2 media-video/mplayer )
-               net-im/pidgin
-               net-p2p/qbittorrent
-               sci-astronomy/stellarium
-               sci-electronics/geda
-               sci-electronics/osqoop
-               sci-geosciences/googleearth
-               www-client/firefox
-               www-client/google-chrome-unstable
-               www-client/opera
-               www-plugins/adobe-flash
-               x11-terms/xterm
-       )"

diff --git a/virtual/xmwde/xmwde-0_p20151120.ebuild 
b/virtual/xmwde/xmwde-0_p20151120.ebuild
deleted file mode 100644
index 1c86bde..0000000
--- a/virtual/xmwde/xmwde-0_p20151120.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-DESCRIPTION="Michael Weber (xmw) desktop environment"
-SRC_URI=""
-
-SLOT="0"
-KEYWORDS=""
-IUSE="minimal"
-
-RDEPEND="
-       app-admin/conky[weather-metar,thinkpad,mpd,wifi,hddtemp,thinkpad]
-       app-editors/gvim
-       app-misc/hddled[X]
-       app-misc/pystopwatch
-       app-shells/zsh
-       app-text/llpp
-       app-text/mupdf
-       app-text/paps
-       media-fonts/dina
-       media-fonts/terminus-font
-       media-gfx/feh
-       media-gfx/scrot
-       virtual/xmwce
-       x11-apps/setxkbmap
-       x11-apps/xev
-       x11-apps/xkill
-       x11-apps/xmodmap
-       x11-apps/xrandr
-       x11-apps/xset
-       x11-base/xorg-server
-       x11-misc/alock
-       x11-misc/dmenu
-       x11-misc/trayer-srg
-       x11-misc/trivdm
-       x11-misc/wmname
-       x11-misc/x2x
-       x11-misc/xbindkeys
-       x11-misc/xclip
-       x11-misc/xdotool
-       x11-misc/xscreensaver
-       x11-terms/rxvt-unicode[xft]
-       x11-wm/cwm
-       media-fonts/font-misc-misc
-       !minimal? (
-               || ( app-text/atril app-text/evince )
-               app-text/gv
-               mail-client/thunderbird
-               media-gfx/gimp
-               media-sound/audacity
-               media-sound/baudline
-               || ( media-video/mpv media-video/mplayer2 media-video/mplayer )
-               net-im/pidgin
-               net-p2p/qbittorrent
-               sci-astronomy/stellarium
-               sci-electronics/geda
-               sci-electronics/osqoop
-               sci-geosciences/googleearth
-               www-client/firefox
-               www-client/google-chrome-unstable
-               www-client/opera
-               www-plugins/adobe-flash
-               x11-terms/xterm
-       )"

diff --git a/virtual/xmwde/xmwde-0_p20160112.ebuild 
b/virtual/xmwde/xmwde-0_p20160112.ebuild
deleted file mode 100644
index 81e6b3c..0000000
--- a/virtual/xmwde/xmwde-0_p20160112.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-DESCRIPTION="Michael Weber (xmw) desktop environment"
-SRC_URI=""
-
-SLOT="0"
-KEYWORDS=""
-IUSE="minimal"
-
-RDEPEND="
-       app-admin/conky[weather-metar,thinkpad,mpd,wifi,hddtemp,thinkpad]
-       app-editors/gvim
-       app-misc/hddled[X]
-       app-misc/pystopwatch
-       app-shells/zsh
-       app-text/llpp
-       app-text/mupdf
-       app-text/paps
-       media-fonts/dina
-       media-fonts/terminus-font
-       media-gfx/feh
-       media-gfx/scrot
-       virtual/xmwce
-       x11-apps/setxkbmap
-       x11-apps/xev
-       x11-apps/xkill
-       x11-apps/xmodmap
-       x11-apps/xrandr
-       x11-apps/xset
-       x11-base/xorg-server
-       x11-misc/alock
-       x11-misc/dmenu
-       x11-misc/trayer-srg
-       x11-misc/trivdm
-       x11-misc/wmname
-       x11-misc/x2x
-       x11-misc/xbindkeys
-       x11-misc/xclip
-       x11-misc/xdotool
-       x11-misc/xscreensaver
-       x11-terms/rxvt-unicode[xft]
-       x11-wm/cwm
-       media-fonts/font-misc-misc
-       !minimal? (
-               || ( app-text/atril app-text/evince )
-               app-text/gv
-               mail-client/thunderbird
-               media-gfx/gimp
-               media-sound/audacity
-               media-sound/baudline
-               media-video/mpv
-               sci-astronomy/stellarium
-               sci-electronics/geda
-               sci-electronics/osqoop
-               sci-geosciences/googleearth
-               www-client/firefox
-               www-client/google-chrome-unstable
-               www-plugins/adobe-flash
-               x11-terms/xterm
-       )"

diff --git a/virtual/xmwde/xmwde-0_p20160320.ebuild 
b/virtual/xmwde/xmwde-0_p20160320-r1.ebuild
similarity index 91%
rename from virtual/xmwde/xmwde-0_p20160320.ebuild
rename to virtual/xmwde/xmwde-0_p20160320-r1.ebuild
index 2b635ea..54d1ea1 100644
--- a/virtual/xmwde/xmwde-0_p20160320.ebuild
+++ b/virtual/xmwde/xmwde-0_p20160320-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-EAPI=3
+EAPI=6
 
 DESCRIPTION="Michael Weber (xmw) desktop environment"
 SRC_URI=""
 
 SLOT="0"
 KEYWORDS=""
-IUSE="minimal"
+IUSE="minimal webmail"
 
 RDEPEND="
        app-admin/conky[weather-metar,thinkpad,mpd,wifi,hddtemp,thinkpad]
@@ -51,7 +51,6 @@ RDEPEND="
        !minimal? (
                || ( app-text/atril app-text/evince )
                app-text/gv
-               mail-client/thunderbird
                media-gfx/gimp
                media-sound/audacity
                media-sound/baudline
@@ -64,4 +63,5 @@ RDEPEND="
                www-client/google-chrome-unstable
                www-plugins/adobe-flash
                x11-terms/xterm
+               !webmail? ( mail-client/thunderbird )
        )"

Reply via email to