Added USE=default-term to be frendlier to user. Default config contains xterm by default. Added x11-apps/xmessage depend (used to show configuration build error).

Package-Manager: portage-2.2.0_alpha90_p1/cvs/Linux x86_64

4 files changed, 44 insertions, 10 deletions

diff --git a/x11-wm/xmonad/ChangeLog b/x11-wm/xmonad/ChangeLog
index 83df83f5c5ed..f0e56ceeb77a 100644
--- a/x11-wm/xmonad/ChangeLog
+++ b/x11-wm/xmonad/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/xmonad
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/ChangeLog,v 1.23 2012/03/04 05:04:16 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/ChangeLog,v 1.24 2012/03/10 16:26:55 slyfox Exp $
+
+  10 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org> metadata.xml,
+  xmonad-0.10.ebuild:
+  Added USE=default-term to be frendlier to user. Default config contains xterm
+  by default. Added x11-apps/xmessage depend (used to show configuration build
+  error).
 
   04 Mar 2012; Mark Wright <gienah@gentoo.org> xmonad-0.10.ebuild:
   Add ~ppc64 keywords to xmonad 0.10, thanks to EM3RY for testing.
diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
index fdb19d016a2b..2f62693447c6 100644
--- a/x11-wm/xmonad/Manifest
+++ b/x11-wm/xmonad/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xmonad-0.9.2-unbreak-haddock.patch 1381 RMD160 66b2d9b6c4c4a633f022dcc414a180394c4ff750 SHA1 aaa99ec04e6cbb7adee195a74ff54371d8385008 SHA256 2da7bbf88eaa72febf98fde0eb67d35e0ef11ef25940b889a9db0a6b72df8f3c
 AUX xmonad.desktop 148 RMD160 90d2f6277535b1a6b2ad0270d5b2361e9c5ffe78 SHA1 b9f2e9f62c170617bfd0cada24bea7a975118b86 SHA256 744132aa4ba84064d3f542ebe6199df1018f7110a9ceb55b943d6a8f57bb4d08
 DIST xmonad-0.10.tar.gz 57681 RMD160 707f066049a49f817df2982726dd3e9c4dc1f9ad SHA1 8121afb884c9f1c0f972e10f0fe5a71f38106c9d SHA256 4676717615d367abaf2e2bb609cf532427edfd87455268fa48552f7fcdf0e5a7
 DIST xmonad-0.9.2.tar.gz 56974 RMD160 4d8e6f0057833695a876ead876bebc4e1878f17b SHA1 6f05248225f5e6ffd77780ce1c2c2a11300e0b7b SHA256 adcda3f5b7a59fb1fa4f7f48e8c4eb0599642e7d215b013fb072f98aef98851f
 DIST xmonad-0.9.tar.gz 55977 RMD160 c781d2bd69e4ed164f7eb8d0514747b0ad6abdb2 SHA1 c319229fb6d3ef4864a6b177d96368bd9d978283 SHA256 51670f83de211a8ea24ce2724c71ac5c3e4782f25422319d8b5e43f3ae7bf9e8
-EBUILD xmonad-0.10.ebuild 1832 RMD160 d1835f90085078cf382dff488a64e0e56a844009 SHA1 da956bf4f063ea9f889487d48fc17f1e959b4c95 SHA256 13e8cd40ad725e35dbaac53e3df860401e3b3f83d254907a63c336478854a9b7
+EBUILD xmonad-0.10.ebuild 1909 RMD160 5c974b11cff2d906e8dd31d7df1952c882a18df4 SHA1 1279a07726a724f48742c741476ceed024ea8f7e SHA256 354f4b163d56220b417dba3fd1c29caad7a302093b8ce939e9cec7802f202aed
 EBUILD xmonad-0.9.2.ebuild 1802 RMD160 a0e8e9f153ed1036f32dddd6f817826b2a9a5575 SHA1 712415bdbd5fa26cc50c9183120710a09743d97c SHA256 b4edba23c46d1493719f2c408815086fcf318dcfd8a65d3755425d695dbb16e6
 EBUILD xmonad-0.9.ebuild 1730 RMD160 8d9dfdff20cf3a752ee8a6cdafe23da307548a25 SHA1 8c1876203f5b69c284f0ae8ed105e70ca7c6530d SHA256 fe83cac6577daf4c93325071cf32328c073a51a342d4493995abcdb38d4cbc7c
-MISC ChangeLog 3162 RMD160 3366562acd374f33140f2d406df2d827b8cf68ee SHA1 05a8051ad7a9caedbd1e35deecb1484cde2da51c SHA256 4cfd4754d2d7938872448f64072ef17f80f628be3b5eecb6e424e62a135ce49b
-MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
+MISC ChangeLog 3422 RMD160 d91fe41500b7f47542042d897492f38e0fe8f989 SHA1 9ca47167a4bc7ad198c82bda816e468b9153d338 SHA256 e933510c2a31e00c3d2020bc2bd3d4c456a9565165489c14b06010c0f9e143cd
+MISC metadata.xml 965 RMD160 25766b3f97fc8bca3c5d3f07aefcb003fcd74f9e SHA1 6c9629027e3c06850f6934e8b8f5b7c7f30e4f78 SHA256 4cb135a037f1c6935524b584071dd9547cc2fa6cd0b7f2bb9c6c193078842240
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk9bgesACgkQcaHudmEf86rYcACfUlmnvC5peIUSyRi3CYWvumDu
+cSwAn1gzVGFFTfGRMM2cevx9IrqkWHZb
+=n9J2
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/xmonad/metadata.xml b/x11-wm/xmonad/metadata.xml
index 8c66906af531..b671a21949a7 100644
--- a/x11-wm/xmonad/metadata.xml
+++ b/x11-wm/xmonad/metadata.xml
@@ -1,8 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
-<maintainer>
-  <email>haskell@gentoo.org</email>
-</maintainer>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name='default-term'>Pull terminal specified in default xmonad config
+			to be a bit less hostile by default.</flag>
+	</use>
+	<longdescription>
+		xmonad is a tiling window manager for X. Windows are arranged
+		automatically to tile the screen without gaps or overlap, maximising
+		screen use. All features of the window manager are accessible from
+		the keyboard: a mouse is strictly optional. xmonad is written and
+		extensible in Haskell. Custom layout algorithms, and other
+		extensions, may be written by the user in config files. Layouts are
+		applied dynamically, and different layouts may be used on each
+		workspace. Xinerama is fully supported, allowing windows to be tiled
+		on several screens.
+	</longdescription>
 </pkgmetadata>
diff --git a/x11-wm/xmonad/xmonad-0.10.ebuild b/x11-wm/xmonad/xmonad-0.10.ebuild
index ab5c755e8306..305d8509b8c2 100644
--- a/x11-wm/xmonad/xmonad-0.10.ebuild
+++ b/x11-wm/xmonad/xmonad-0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/xmonad-0.10.ebuild,v 1.2 2012/03/04 05:04:16 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/xmonad-0.10.ebuild,v 1.3 2012/03/10 16:26:55 slyfox Exp $
 
 # ebuild generated by hackport 0.2.13
 
@@ -16,7 +16,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
-IUSE=""
+IUSE="+default-term"
 
 RDEPEND="dev-haskell/mtl[profile?]
 		=dev-haskell/utf8-string-0.3*[profile?]
@@ -24,6 +24,9 @@ RDEPEND="dev-haskell/mtl[profile?]
 		>=dev-lang/ghc-6.10.1"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.2"
+PDEPEND="default-term? ( x11-terms/xterm )
+	x11-apps/xmessage
+"
 
 SAMPLE_CONFIG="xmonad.hs"
 SAMPLE_CONFIG_LOC="man"