commit: 233d3fcfd7085787218a341c0f16980937d4f192 Author: Jack Todaro <solpeth <AT> posteo <DOT> org> AuthorDate: Tue Aug 25 23:22:02 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Wed Aug 26 23:25:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=233d3fcf
x11-misc/xmobar: remove old Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Jack Todaro <solpeth <AT> posteo.org> Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> x11-misc/xmobar/Manifest | 2 - .../files/xmobar-0.24.3-alsa-mixer-0.3.patch | 26 ------ x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch | 9 -- x11-misc/xmobar/metadata.xml | 1 - x11-misc/xmobar/xmobar-0.24.3-r1.ebuild | 100 --------------------- x11-misc/xmobar/xmobar-0.35.1.ebuild | 99 -------------------- 6 files changed, 237 deletions(-) diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest index 1efb7834a4b..4e4fd46bf3e 100644 --- a/x11-misc/xmobar/Manifest +++ b/x11-misc/xmobar/Manifest @@ -1,3 +1 @@ -DIST xmobar-0.24.3.tar.gz 100317 BLAKE2B 3ca7aeb977688b975674dc767f645d15aaf296ff906f51d79529ee58d827188437695b4ee0b960563f6c0ce1489baf1f5bdc4360807989277078a93dfafb3ed1 SHA512 aa16d55b16cf108005ee8ec6c3d1b348b3e70a5182cbb97eed2aeb67bed83bee4b23acff6d29d5bda5a30ce35dc87463a6ade6e0814b588f53b173a1c3b5a5b3 -DIST xmobar-0.35.1.tar.gz 133251 BLAKE2B bebd535f2f29f89131b468e1226a63168321cfdb93129e4e3e6cdf9e2489bf4df6bdc02a5d3f6569d5c35d2cfe1fb05efec73587544c7526bf2f97bfe6a7e1b4 SHA512 fd7bb8710f3c877835aa0b20e0fca227f6f620c0be31acd46e6a464b4ba3f6c7da8df31cd3f345e606b03a54328dd9a298e46e8fc2935e74ebd8c5712cedbf76 DIST xmobar-0.36.tar.gz 136890 BLAKE2B be76faaec78d66b5f0f99542bc59330106c34413c5502f4dbef8dc47647dbf7ebfc94311de965520ca620c8cfbdc1ba68a3eab36da65e476c413ad9f8f4f3695 SHA512 abb7f9cf367fa5c03f5928006fc5f7c38434743350d5f524307b99448cb30436fb44e0c856bd274032a6803f05b64e6d4ac553f51f4bd817efd2861408007c02 diff --git a/x11-misc/xmobar/files/xmobar-0.24.3-alsa-mixer-0.3.patch b/x11-misc/xmobar/files/xmobar-0.24.3-alsa-mixer-0.3.patch deleted file mode 100644 index 837df1d2975..00000000000 --- a/x11-misc/xmobar/files/xmobar-0.24.3-alsa-mixer-0.3.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/src/Plugins/Monitors/Volume.hs -+++ b/src/Plugins/Monitors/Volume.hs -@@ -122,7 +122,8 @@ formatDb opts dbi = do - runVolume :: String -> String -> [String] -> Monitor String - runVolume mixerName controlName argv = do - opts <- io $ parseOpts argv -- (lo, hi, val, db, sw) <- io readMixer -+ (lo', hi', val', db, sw) <- io readMixer -+ let (lo, hi, val) = (toInteger <$> lo', toInteger <$> hi', toInteger <$> val') - p <- liftMonitor $ liftM3 formatVol lo hi val - b <- liftMonitor $ liftM3 formatVolBar lo hi val - v <- liftMonitor $ liftM3 formatVolVBar lo hi val -@@ -164,11 +165,11 @@ runVolume mixerName controlName argv = do - - getDB :: Maybe Volume -> IO (Maybe Integer) - getDB Nothing = return Nothing -- getDB (Just v) = channel (dB v) 0 -+ getDB (Just v) = fmap toInteger <$> channel (dB v) 0 - - getVal :: Maybe Volume -> IO (Maybe Integer) - getVal Nothing = return Nothing -- getVal (Just v) = channel (value v) 0 -+ getVal (Just v) = fmap toInteger <$> channel (value v) 0 - - getSw :: Maybe Switch -> IO (Maybe Bool) - getSw Nothing = return Nothing diff --git a/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch b/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch deleted file mode 100644 index 8f4da6b7884..00000000000 --- a/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/xmobar.cabal b/xmobar.cabal -index f6a6dae..8a17579 100644 ---- a/xmobar.cabal -+++ b/xmobar.cabal -@@ -89,3 +89,3 @@ executable xmobar - Xmobar, Actions, Bitmap, Config, Parsers, Commands, Localize, -- XUtil, XPMFile, StatFS, Runnable, ColorCache, Window, Signal, -+ XUtil, StatFS, Runnable, ColorCache, Window, Signal, - Environment, diff --git a/x11-misc/xmobar/metadata.xml b/x11-misc/xmobar/metadata.xml index 3ecfd078e08..f3ba842d32a 100644 --- a/x11-misc/xmobar/metadata.xml +++ b/x11-misc/xmobar/metadata.xml @@ -7,7 +7,6 @@ </maintainer> <use> <flag name="alsa">Use alsa-mixer to get the volume from soundcards</flag> - <flag name="conduit">Use conduit to fetch weather data.</flag> <flag name="dbus">Publish a service on the session bus for controlling xmobar</flag> <flag name="inotify">inotify support (modern Linux only). Required for the Mail and MBox plugins</flag> <flag name="mpd">Support mpd plugin</flag> diff --git a/x11-misc/xmobar/xmobar-0.24.3-r1.ebuild b/x11-misc/xmobar/xmobar-0.24.3-r1.ebuild deleted file mode 100644 index 7cf587b8268..00000000000 --- a/x11-misc/xmobar/xmobar-0.24.3-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.5.9999 -#hackport: flags: -all_extensions,+with_threaded,+with_utf8,with_iwlib:wifi,with_alsa:alsa,with_xft:xft,with_datezone:timezone,with_dbus:dbus,with_mpd:mpd,with_inotify:inotify,with_mpris:mpris,with_xpm:xpm - -CABAL_FEATURES="bin" -inherit haskell-cabal - -DESCRIPTION="A Minimalistic Text Based Status Bar" -HOMEPAGE="https://xmobar.org" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="alsa dbus inotify mpd mpris timezone wifi conduit uvmeter xft xpm" - -RDEPEND=">=dev-haskell/http-4000.2.4:= - >=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:= - dev-haskell/old-locale:= - >=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:= - dev-haskell/regex-compat:= - >=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:= - >=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:= - >=dev-haskell/x11-1.6.1:= - >=dev-lang/ghc-7.8.2:= - x11-libs/libXrandr - x11-libs/libXrender - alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:= - >=dev-haskell/alsa-mixer-0.3:= ) - dbus? ( >=dev-haskell/dbus-0.10:= ) - inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= ) - mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= ) - mpris? ( >=dev-haskell/dbus-0.10:= ) - timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:= - >=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= ) - wifi? ( net-wireless/wireless-tools ) - conduit? ( dev-haskell/http-conduit:= - dev-haskell/http-types:= ) - xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= ) - xpm? ( x11-libs/libXpm ) -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.18.1.3 -" - -PATCHES=( - "${FILESDIR}"/${P}-noxpm.patch - "${FILESDIR}"/${P}-alsa-mixer-0.3.patch -) - -src_prepare() { - default - # xmobar is an idle multithreaded program - # which sits in 'while { sleep(1); }' - # loops in multiple threads. - # It has a pathological behaviour in GHC: - # everything program does is thread context switch - # 100 times per second. It's easily seen with - # - # $ strace -f -p `pidof xmobar` - # - # where rt_sigreturn() manages to enter/exit - # kernel 32 times in each second to do nothing - # This workaround allows shrinkng wakeups/thread - # switches down to one per second (internal xmobar's - # cycle). - # Be careful when remove it :] - HCFLAGS+=" -with-rtsopts=-V0" - - cabal_chdeps \ - 'stm >= 2.3 && < 2.5' 'stm >= 2.3' -} - -src_configure() { - haskell-cabal_src_configure \ - --flag=-all_extensions \ - $(cabal_flag alsa with_alsa) \ - $(cabal_flag conduit with_conduit) \ - $(cabal_flag timezone with_datezone) \ - $(cabal_flag dbus with_dbus) \ - $(cabal_flag inotify with_inotify) \ - $(cabal_flag wifi with_iwlib) \ - $(cabal_flag mpd with_mpd) \ - $(cabal_flag mpris with_mpris) \ - --flag=with_threaded \ - --flag=with_utf8 \ - $(cabal_flag uvmeter with_uvmeter) \ - $(cabal_flag xft with_xft) \ - $(cabal_flag xpm with_xpm) -} - -src_install() { - cabal_src_install - - dodoc samples/xmobar.config readme.md news.md -} diff --git a/x11-misc/xmobar/xmobar-0.35.1.ebuild b/x11-misc/xmobar/xmobar-0.35.1.ebuild deleted file mode 100644 index 50130b0d928..00000000000 --- a/x11-misc/xmobar/xmobar-0.35.1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.6.4.9999 -#hackport: flags: -all_extensions,+with_threaded,+with_utf8,with_iwlib:iwlib,with_alsa:alsa,with_xft:xft,with_datezone:timezone,with_dbus:dbus,with_mpd:mpd,with_inotify:inotify,with_mpris:mpris,with_xpm:xpm,with_nl80211:wifi - -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - -DESCRIPTION="A Minimalistic Text Based Status Bar" -HOMEPAGE="http://xmobar.org" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="alsa dbus inotify iwlib mpd mpris +rtsopts timezone uvmeter +weather wifi xft xpm" - -RDEPEND="dev-haskell/async:=[profile?] - >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] - >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] - dev-haskell/old-locale:=[profile?] - >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] - >=dev-haskell/parsec-numbers-0.1.0:=[profile?] - dev-haskell/regex-compat:=[profile?] - >=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-2.6:=[profile?] - >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] - >=dev-haskell/x11-1.6.1:=[profile?] - >=dev-lang/ghc-8.4.3:= - x11-libs/libXrandr - x11-libs/libXrender - alsa? ( >=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] - >=dev-haskell/alsa-mixer-0.3:=[profile?] <dev-haskell/alsa-mixer-0.4:=[profile?] ) - dbus? ( >=dev-haskell/dbus-1:=[profile?] - weather? ( dev-haskell/http-client-tls:=[profile?] - dev-haskell/http-conduit:=[profile?] - dev-haskell/http-types:=[profile?] ) - xpm? ( x11-libs/libXpm ) ) - !dbus? ( !uvmeter? ( weather? ( !xpm? ( dev-haskell/http-client-tls:=[profile?] - dev-haskell/http-conduit:=[profile?] - dev-haskell/http-types:=[profile?] ) ) ) ) - inotify? ( >=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?] ) - iwlib? ( >=dev-haskell/iwlib-0.1.0:=[profile?] <dev-haskell/iwlib-0.2:=[profile?] - net-wireless/wireless-tools ) - !iwlib? ( wifi? ( >=dev-haskell/cereal-0.5.8.1:=[profile?] - >=dev-haskell/netlink-1.1.1.0:=[profile?] ) ) - mpd? ( >=dev-haskell/libmpd-0.9.0.10:=[profile?] ) - mpris? ( >=dev-haskell/dbus-1:=[profile?] - !dbus? ( !uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] - dev-haskell/http-conduit:=[profile?] - dev-haskell/http-types:=[profile?] ) ) ) - xpm? ( x11-libs/libXpm - weather? ( dev-haskell/http-client-tls:=[profile?] - dev-haskell/http-conduit:=[profile?] - dev-haskell/http-types:=[profile?] ) ) - !xpm? ( uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) ) ) ) - !mpris? ( !dbus? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) - xpm? ( x11-libs/libXpm - weather? ( dev-haskell/http-conduit:=[profile?] - dev-haskell/http-types:=[profile?] ) ) ) ) - timezone? ( >=dev-haskell/timezone-olson-0.1:=[profile?] <dev-haskell/timezone-olson-0.3:=[profile?] - >=dev-haskell/timezone-series-0.1:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] ) - uvmeter? ( dev-haskell/http-conduit:=[profile?] - dev-haskell/http-types:=[profile?] ) - xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] <dev-haskell/x11-xft-0.4:=[profile?] ) -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-2.2.0.1 - test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 - dev-haskell/temporary ) -" - -src_configure() { - haskell-cabal_src_configure \ - --flag=-all_extensions \ - $(cabal_flag alsa with_alsa) \ - $(cabal_flag timezone with_datezone) \ - $(cabal_flag dbus with_dbus) \ - $(cabal_flag inotify with_inotify) \ - $(cabal_flag iwlib with_iwlib) \ - $(cabal_flag mpd with_mpd) \ - $(cabal_flag mpris with_mpris) \ - $(cabal_flag wifi with_nl80211) \ - $(cabal_flag rtsopts with_rtsopts) \ - --flag=with_threaded \ - --flag=with_utf8 \ - $(cabal_flag uvmeter with_uvmeter) \ - $(cabal_flag weather with_weather) \ - $(cabal_flag xft with_xft) \ - $(cabal_flag xpm with_xpm) -} - -src_install() { - cabal_src_install - - dodoc examples/xmobar.config examples/xmobar.hs readme.md changelog.md -}