From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- x11-wm/xmonad/Manifest | 2 + x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch | 14 +++++ x11-wm/xmonad/files/xmonad-0.11-sample.patch | 74 ++++++++++++++++++++++++ x11-wm/xmonad/files/xmonad-check-repeat.patch | 40 +++++++++++++ x11-wm/xmonad/files/xmonad.desktop | 7 +++ x11-wm/xmonad/metadata.xml | 21 +++++++ x11-wm/xmonad/xmonad-0.11-r1.ebuild | 73 +++++++++++++++++++++++ x11-wm/xmonad/xmonad-0.11-r3.ebuild | 80 ++++++++++++++++++++++++++ x11-wm/xmonad/xmonad-0.11.1.ebuild | 80 ++++++++++++++++++++++++++ 9 files changed, 391 insertions(+) create mode 100644 x11-wm/xmonad/Manifest create mode 100644 x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch create mode 100644 x11-wm/xmonad/files/xmonad-0.11-sample.patch create mode 100644 x11-wm/xmonad/files/xmonad-check-repeat.patch create mode 100644 x11-wm/xmonad/files/xmonad.desktop create mode 100644 x11-wm/xmonad/metadata.xml create mode 100644 x11-wm/xmonad/xmonad-0.11-r1.ebuild create mode 100644 x11-wm/xmonad/xmonad-0.11-r3.ebuild create mode 100644 x11-wm/xmonad/xmonad-0.11.1.ebuild (limited to 'x11-wm/xmonad') diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest new file mode 100644 index 000000000000..e2d8ead4b4c7 --- /dev/null +++ b/x11-wm/xmonad/Manifest @@ -0,0 +1,2 @@ +DIST xmonad-0.11.1.tar.gz 59307 SHA256 39e0bf227df782d7a5799c811ad0d8b70c9d6eaaa94e8cc395fcf25895d6d2dd SHA512 4916451d81d359dbbf508f3b20f649f956255f526f14b1eb6c0d32bc789474db30d7acac768663ca32784c7fe361195a50f45a7cb7371ee9a29c9b8f1c64d528 WHIRLPOOL 5707bd5763f525b196deea6ead806af74707e2bbd31ff67039b292f3b97f607c2351ef45e57373f0f7313e5c307335cb5f4a84820d8e658b7d864927f109891c +DIST xmonad-0.11.tar.gz 59119 SHA256 e5bd36d5184facad66acf2688b02922bfc6de32b576758f4b00688253c425bdb SHA512 34740f032508584f34f6b138d21394eca17e8020bccc4d8c6e8b3cb6b7ca64b153077cfd16636a6130768ebd145fe993569f8a229862d7816d0c89c905ee08bc WHIRLPOOL 9bab495c4094f21427afa797f97b6af13d9c156484b33087b6378191b0d99255f070adc09df3da9eba3ff55a59a8f03830110a4ab2aa9ad9d93d2f1a35d5dc54 diff --git a/x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch b/x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch new file mode 100644 index 000000000000..e92a31ec7044 --- /dev/null +++ b/x11-wm/xmonad/files/xmonad-0.11-ghc-7.10.patch @@ -0,0 +1,14 @@ +Fri May 2 06:57:43 BST 2014 Adam Vogt + * derive Applicative instance for Query +diff -rN -u old-xmonad/XMonad/Core.hs new-xmonad/XMonad/Core.hs +--- old-xmonad/XMonad/Core.hs 2015-01-08 21:40:45.320979242 +0000 ++++ new-xmonad/XMonad/Core.hs 2015-01-08 21:40:45.367979193 +0000 +@@ -155,7 +155,7 @@ + + type ManageHook = Query (Endo WindowSet) + newtype Query a = Query (ReaderT Window X a) +- deriving (Functor, Monad, MonadReader Window, MonadIO) ++ deriving (Functor, Applicative, Monad, MonadReader Window, MonadIO) + + runQuery :: Query a -> Window -> X a + runQuery (Query m) w = runReaderT m w diff --git a/x11-wm/xmonad/files/xmonad-0.11-sample.patch b/x11-wm/xmonad/files/xmonad-0.11-sample.patch new file mode 100644 index 000000000000..0780af8c18d4 --- /dev/null +++ b/x11-wm/xmonad/files/xmonad-0.11-sample.patch @@ -0,0 +1,74 @@ +Sun Jan 6 17:42:54 GMT 2013 Daniel Wagner + * define the "help" string in the sample configuration bundled with xmonad +diff -rN -u old-xmonad/man/xmonad.hs new-xmonad/man/xmonad.hs +--- old-xmonad/man/xmonad.hs 2015-02-27 08:38:26.993365307 +0000 ++++ new-xmonad/man/xmonad.hs 2015-02-27 08:38:27.046365303 +0000 +@@ -280,3 +280,54 @@ + logHook = myLogHook, + startupHook = myStartupHook + } ++ ++-- | Finally, a copy of the default bindings in simple textual tabular format. ++help :: String ++help = unlines ["The default modifier key is 'alt'. Default keybindings:", ++ "", ++ "-- launching and killing programs", ++ "mod-Shift-Enter Launch xterminal", ++ "mod-p Launch dmenu", ++ "mod-Shift-p Launch gmrun", ++ "mod-Shift-c Close/kill the focused window", ++ "mod-Space Rotate through the available layout algorithms", ++ "mod-Shift-Space Reset the layouts on the current workSpace to default", ++ "mod-n Resize/refresh viewed windows to the correct size", ++ "", ++ "-- move focus up or down the window stack", ++ "mod-Tab Move focus to the next window", ++ "mod-Shift-Tab Move focus to the previous window", ++ "mod-j Move focus to the next window", ++ "mod-k Move focus to the previous window", ++ "mod-m Move focus to the master window", ++ "", ++ "-- modifying the window order", ++ "mod-Return Swap the focused window and the master window", ++ "mod-Shift-j Swap the focused window with the next window", ++ "mod-Shift-k Swap the focused window with the previous window", ++ "", ++ "-- resizing the master/slave ratio", ++ "mod-h Shrink the master area", ++ "mod-l Expand the master area", ++ "", ++ "-- floating layer support", ++ "mod-t Push window back into tiling; unfloat and re-tile it", ++ "", ++ "-- increase or decrease number of windows in the master area", ++ "mod-comma (mod-,) Increment the number of windows in the master area", ++ "mod-period (mod-.) Deincrement the number of windows in the master area", ++ "", ++ "-- quit, or restart", ++ "mod-Shift-q Quit xmonad", ++ "mod-q Restart xmonad", ++ "mod-[1..9] Switch to workSpace N", ++ "", ++ "-- Workspaces & screens", ++ "mod-Shift-[1..9] Move client to workspace N", ++ "mod-{w,e,r} Switch to physical/Xinerama screens 1, 2, or 3", ++ "mod-Shift-{w,e,r} Move client to screen 1, 2, or 3", ++ "", ++ "-- Mouse bindings: default actions bound to mouse events", ++ "mod-button1 Set the window to floating mode and move by dragging", ++ "mod-button2 Raise the window to the top of the stack", ++ "mod-button3 Set the window to floating mode and resize by dragging"] +Sun Jan 6 17:44:14 GMT 2013 Daniel Wagner + * use "modm" instead of "modMask" in the sample config +diff -rN -u old-xmonad/man/xmonad.hs new-xmonad/man/xmonad.hs +--- old-xmonad/man/xmonad.hs 2015-02-27 08:39:59.280358012 +0000 ++++ new-xmonad/man/xmonad.hs 2015-02-27 08:39:59.333358007 +0000 +@@ -129,7 +129,7 @@ + , ((modm , xK_q ), spawn "xmonad --recompile; xmonad --restart") + + -- Run xmessage with a summary of the default keybindings (useful for beginners) +- , ((modMask .|. shiftMask, xK_slash ), spawn ("echo \"" ++ help ++ "\" | xmessage -file -")) ++ , ((modm .|. shiftMask, xK_slash ), spawn ("echo \"" ++ help ++ "\" | xmessage -file -")) + ] + ++ + diff --git a/x11-wm/xmonad/files/xmonad-check-repeat.patch b/x11-wm/xmonad/files/xmonad-check-repeat.patch new file mode 100644 index 000000000000..9b30cb5ece31 --- /dev/null +++ b/x11-wm/xmonad/files/xmonad-check-repeat.patch @@ -0,0 +1,40 @@ +--- xmonad//XMonad/Core.hs 2010-09-05 05:11:42.000000000 +0400 ++++ xmonad//XMonad/Core.hs 2010-09-18 07:59:14.000000000 +0400 +@@ -65,6 +65,7 @@ + , waitingUnmap :: !(M.Map Window Int) -- ^ the number of expected UnmapEvents + , dragging :: !(Maybe (Position -> Position -> X (), X ())) + , numberlockMask :: !KeyMask -- ^ The numlock modifier ++ , keyPressed :: !KeyCode -- ^ keycode of the key being pressed if any + , extensibleState :: !(M.Map String (Either String StateExtension)) + -- ^ stores custom state information. + -- +--- xmonad//XMonad/Main.hsc 2010-09-05 05:11:42.000000000 +0400 ++++ xmonad//XMonad/Main.hsc 2010-09-18 08:03:11.000000000 +0400 +@@ -129,6 +129,7 @@ + , mapped = S.empty + , waitingUnmap = M.empty + , dragging = Nothing ++ , keyPressed = 0 + , extensibleState = extState + } + allocaXEvent $ \e -> +@@ -190,10 +191,15 @@ + -- run window manager command + handle (KeyEvent {ev_event_type = t, ev_state = m, ev_keycode = code}) + | t == keyPress = withDisplay $ \dpy -> do +- s <- io $ keycodeToKeysym dpy code 0 +- mClean <- cleanMask m +- ks <- asks keyActions +- userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id ++ kp <- gets keyPressed ++ if kp /= code then do ++ modify $ \s -> s { keyPressed = code } ++ s <- io $ keycodeToKeysym dpy code 0 ++ mClean <- cleanMask m ++ ks <- asks keyActions ++ userCodeDef () $ whenJust (M.lookup (mClean, s) ks) id ++ else return () ++ | t == keyRelease = modify $ \s -> s { keyPressed = 0 } + + -- manage a new window + handle (MapRequestEvent {ev_window = w}) = withDisplay $ \dpy -> do diff --git a/x11-wm/xmonad/files/xmonad.desktop b/x11-wm/xmonad/files/xmonad.desktop new file mode 100644 index 000000000000..d72fc71866a2 --- /dev/null +++ b/x11-wm/xmonad/files/xmonad.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=xmonad +Comment=A lightweight window manager +Exec=/etc/X11/Sessions/xmonad +TryExec=xmonad +Icon= +Type=Application diff --git a/x11-wm/xmonad/metadata.xml b/x11-wm/xmonad/metadata.xml new file mode 100644 index 000000000000..c5471239194d --- /dev/null +++ b/x11-wm/xmonad/metadata.xml @@ -0,0 +1,21 @@ + + + + haskell + + Pull terminal specified in default xmonad config + to be a bit less hostile by default. + Allow ignoring of keyboard autorepeat. + + + 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. + + diff --git a/x11-wm/xmonad/xmonad-0.11-r1.ebuild b/x11-wm/xmonad/xmonad-0.11-r1.ebuild new file mode 100644 index 000000000000..e7ae14bf6878 --- /dev/null +++ b/x11-wm/xmonad/xmonad-0.11-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +# ebuild generated by hackport 0.3.1 + +CABAL_FEATURES="bin lib profile haddock hscolour hoogle" +inherit haskell-cabal + +DESCRIPTION="A tiling window manager" +HOMEPAGE="http://xmonad.org" +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="amd64 ~ppc64 ~sparc x86" +IUSE="+default-term" + +RDEPEND="dev-haskell/extensible-exceptions:=[profile?] + dev-haskell/mtl:=[profile?] + =dev-haskell/utf8-string-0.3*:=[profile?] + >=dev-haskell/x11-1.5:=[profile?] + =dev-lang/ghc-6.10.4:=" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.6" +PDEPEND="default-term? ( x11-terms/xterm ) + x11-apps/xmessage +" + +SAMPLE_CONFIG="xmonad.hs" +SAMPLE_CONFIG_LOC="man" + +src_prepare() { + # allow user patches + epatch_user +} + +src_install() { + cabal_src_install + + echo -e "#!/bin/sh\n/usr/bin/xmonad" > "${T}/${PN}" + exeinto /etc/X11/Sessions + doexe "${T}/${PN}" + + insinto /usr/share/xsessions + doins "${FILESDIR}/${PN}.desktop" + + doman man/xmonad.1 + dohtml man/xmonad.1.html + + dodoc CONFIG README +} + +pkg_postinst() { + ghc-package_pkg_postinst + + elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:" + elog " /usr/share/${PF}/ghc-$(ghc-version)/${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}" + elog "The parameters in this file are the defaults used by xmonad." + elog "To customize xmonad, copy this file to:" + elog " ~/.xmonad/${SAMPLE_CONFIG}" + elog "After editing, use 'mod-q' to dynamically restart xmonad " + elog "(where the 'mod' key defaults to 'Alt')." + elog "" + elog "Read the README or man page for more information, and to see " + elog "other possible configurations go to:" + elog " http://haskell.org/haskellwiki/Xmonad/Config_archive" + elog "Please note that many of these configurations will require the " + elog "x11-wm/xmonad-contrib package to be installed." +} diff --git a/x11-wm/xmonad/xmonad-0.11-r3.ebuild b/x11-wm/xmonad/xmonad-0.11-r3.ebuild new file mode 100644 index 000000000000..e94fa77939f1 --- /dev/null +++ b/x11-wm/xmonad/xmonad-0.11-r3.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +# ebuild generated by hackport 0.3.1 + +CABAL_FEATURES="bin lib profile haddock hscolour hoogle" +inherit haskell-cabal + +DESCRIPTION="A tiling window manager" +HOMEPAGE="http://xmonad.org" +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ppc64 ~sparc ~x86" +IUSE="+default-term no-autorepeat-keys" + +RDEPEND="dev-haskell/extensible-exceptions:=[profile?] + dev-haskell/mtl:=[profile?] + >=dev-haskell/utf8-string-0.3:=[profile?] + >=dev-haskell/x11-1.5:=[profile?] + =dev-lang/ghc-6.10.4:=" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.6" +PDEPEND="default-term? ( x11-terms/xterm ) + x11-apps/xmessage +" + +SAMPLE_CONFIG="xmonad.hs" +SAMPLE_CONFIG_LOC="man" + +src_prepare() { + epatch "$FILESDIR"/${P}-ghc-7.10.patch + epatch "$FILESDIR"/${P}-sample.patch + use no-autorepeat-keys && epatch "$FILESDIR"/${PN}-check-repeat.patch + + cabal_chdeps \ + "utf8-string >= 0.3 && < 0.4" "utf8-string >= 0.3 && < 1.1" + + # allow user patches + epatch_user +} + +src_install() { + cabal_src_install + + echo -e "#!/bin/sh\n/usr/bin/xmonad" > "${T}/${PN}" + exeinto /etc/X11/Sessions + doexe "${T}/${PN}" + + insinto /usr/share/xsessions + doins "${FILESDIR}/${PN}.desktop" + + doman man/xmonad.1 + dohtml man/xmonad.1.html + + dodoc CONFIG README +} + +pkg_postinst() { + ghc-package_pkg_postinst + + elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:" + elog " /usr/share/${PF}/ghc-$(ghc-version)/${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}" + elog "The parameters in this file are the defaults used by xmonad." + elog "To customize xmonad, copy this file to:" + elog " ~/.xmonad/${SAMPLE_CONFIG}" + elog "After editing, use 'mod-q' to dynamically restart xmonad " + elog "(where the 'mod' key defaults to 'Alt')." + elog "" + elog "Read the README or man page for more information, and to see " + elog "other possible configurations go to:" + elog " http://haskell.org/haskellwiki/Xmonad/Config_archive" + elog "Please note that many of these configurations will require the " + elog "x11-wm/xmonad-contrib package to be installed." +} diff --git a/x11-wm/xmonad/xmonad-0.11.1.ebuild b/x11-wm/xmonad/xmonad-0.11.1.ebuild new file mode 100644 index 000000000000..97e372501899 --- /dev/null +++ b/x11-wm/xmonad/xmonad-0.11.1.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +# ebuild generated by hackport 0.4.4.9999 + +CABAL_FEATURES="bin lib profile haddock hoogle hscolour" +inherit haskell-cabal + +DESCRIPTION="A tiling window manager" +HOMEPAGE="http://xmonad.org" +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ppc64 ~sparc ~x86" +IUSE="+default-term no-autorepeat-keys" + +RDEPEND="dev-haskell/extensible-exceptions:=[profile?] + dev-haskell/mtl:=[profile?] + >=dev-haskell/utf8-string-0.3:=[profile?] + >=dev-haskell/x11-1.5:=[profile?] =dev-lang/ghc-7.4.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.6 +" +PDEPEND="default-term? ( x11-terms/xterm ) + x11-apps/xmessage +" + +SAMPLE_CONFIG="xmonad.hs" +SAMPLE_CONFIG_LOC="man" + +src_prepare() { + epatch "$FILESDIR"/${PN}-0.11-sample.patch + use no-autorepeat-keys && epatch "$FILESDIR"/${PN}-check-repeat.patch + + cabal_chdeps \ + "utf8-string >= 0.3 && < 0.4" "utf8-string >= 0.3 && < 1.1" + + # allow user patches + epatch_user +} + +src_install() { + cabal_src_install + + echo -e "#!/bin/sh\n/usr/bin/xmonad" > "${T}/${PN}" + exeinto /etc/X11/Sessions + doexe "${T}/${PN}" + + insinto /usr/share/xsessions + doins "${FILESDIR}/${PN}.desktop" + + doman man/xmonad.1 + dohtml man/xmonad.1.html + + dodoc CONFIG README +} + +pkg_postinst() { + ghc-package_pkg_postinst + + elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:" + elog " /usr/share/${PF}/ghc-$(ghc-version)/${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}" + elog "The parameters in this file are the defaults used by xmonad." + elog "To customize xmonad, copy this file to:" + elog " ~/.xmonad/${SAMPLE_CONFIG}" + elog "After editing, use 'mod-q' to dynamically restart xmonad " + elog "(where the 'mod' key defaults to 'Alt')." + elog "" + elog "Read the README or man page for more information, and to see " + elog "other possible configurations go to:" + elog " http://haskell.org/haskellwiki/Xmonad/Config_archive" + elog "Please note that many of these configurations will require the " + elog "x11-wm/xmonad-contrib package to be installed." +} -- cgit v1.2.3-65-gdbad