From 0f4722fe5b1d7dcd629d9cfca14b80dda6870bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 8 Nov 2021 19:57:08 +0100 Subject: [PATCH 1/3] xmonad-contrib: remove --- srcpkgs/removed-packages/template | 1 + srcpkgs/xmonad-contrib/files/stack.yaml | 5 ----- srcpkgs/xmonad-contrib/template | 18 ------------------ srcpkgs/xmonad-contrib/update | 2 -- 4 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 srcpkgs/xmonad-contrib/files/stack.yaml delete mode 100644 srcpkgs/xmonad-contrib/template delete mode 100644 srcpkgs/xmonad-contrib/update diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 8a6164c31e11..d9eee3b9aded 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -330,6 +330,7 @@ replaces=" xlennart<=1.1.1_1 xnoise<=0.2.21_4 xnoise-devel<=0.2.21_4 + xmonad-contrib<=0.16_3 yturl<=2.0.2_5 yt-play<=20140117_2 nvidia340<=340.108_4 diff --git a/srcpkgs/xmonad-contrib/files/stack.yaml b/srcpkgs/xmonad-contrib/files/stack.yaml deleted file mode 100644 index 74227aa2e1e9..000000000000 --- a/srcpkgs/xmonad-contrib/files/stack.yaml +++ /dev/null @@ -1,5 +0,0 @@ -resolver: lts-16.13 -packages: - - . -extra-deps: - - xmonad-0.15 diff --git a/srcpkgs/xmonad-contrib/template b/srcpkgs/xmonad-contrib/template deleted file mode 100644 index 03a4de861b58..000000000000 --- a/srcpkgs/xmonad-contrib/template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'xmonad-contrib' -pkgname=xmonad-contrib -version=0.16 -revision=3 -build_style=haskell-stack -hostmakedepends="pkg-config" -makedepends="libX11-devel libXinerama-devel libXrandr-devel libXft-devel libXScrnSaver-devel" -short_desc="Third party extensions for xmonad" -maintainer="xaltsc " -license="BSD-3-Clause" -homepage="https://xmonad.org/" -distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz" -checksum=ad72c38de1bf4f9e176bd0da7ee62a6153b03c9087313b3d4782f365f77caddd -nocross=yes - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/xmonad-contrib/update b/srcpkgs/xmonad-contrib/update deleted file mode 100644 index d111b2b2ce9c..000000000000 --- a/srcpkgs/xmonad-contrib/update +++ /dev/null @@ -1,2 +0,0 @@ -site=http://hackage.haskell.org/package/xmonad-contrib -pattern="Readme for xmonad-contrib-\K[\d\.]+" From 91a479191992b852ffc6900de6225b4d42a415c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 8 Nov 2021 19:57:54 +0100 Subject: [PATCH 2/3] xmonad: remove --- srcpkgs/removed-packages/template | 1 + srcpkgs/xmonad/template | 20 -------------------- srcpkgs/xmonad/update | 2 -- 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 srcpkgs/xmonad/template delete mode 100644 srcpkgs/xmonad/update diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index d9eee3b9aded..9d6a5483e88f 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -330,6 +330,7 @@ replaces=" xlennart<=1.1.1_1 xnoise<=0.2.21_4 xnoise-devel<=0.2.21_4 + xmonad<=0.15_5 xmonad-contrib<=0.16_3 yturl<=2.0.2_5 yt-play<=20140117_2 diff --git a/srcpkgs/xmonad/template b/srcpkgs/xmonad/template deleted file mode 100644 index a9cf809c87a2..000000000000 --- a/srcpkgs/xmonad/template +++ /dev/null @@ -1,20 +0,0 @@ -# Template file for 'xmonad' -pkgname=xmonad -version=0.15 -revision=5 -build_style=haskell-stack -stackage=lts-16.13 -makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel" -short_desc="Tiling window manager fully configurable in Haskell" -maintainer="xaltsc " -license="BSD-3-Clause" -homepage="https://xmonad.org" -distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz" -checksum=4a7948e6eee5e34a27d15444589ade3b3fa1adecadbf37b943cff8348380f928 -nopie_files="/usr/bin/xmonad" -nocross=yes - -post_install() { - vman man/xmonad.1 - vlicense LICENSE -} diff --git a/srcpkgs/xmonad/update b/srcpkgs/xmonad/update deleted file mode 100644 index 6959312f769b..000000000000 --- a/srcpkgs/xmonad/update +++ /dev/null @@ -1,2 +0,0 @@ -site=http://hackage.haskell.org/package/xmonad -pattern="Readme for xmonad-\K[\d\.]+" From 75fc764c9de8376b8c6f0f93bafd1f7452d518dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Mon, 8 Nov 2021 20:03:54 +0100 Subject: [PATCH 3/3] removed packages: revbump for xmonad, sort --- srcpkgs/removed-packages/template | 128 +++++++++++++++--------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 9d6a5483e88f..12fff3d089ed 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=53 +revision=54 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -9,6 +9,7 @@ license="Public Domain" homepage="https://voidlinux.org" replaces=" + ImageMagick6<=6.9.12.12_2 Platinum9-theme<=0.0.0.20170720_3 XorCurses<=0.2.2_1 acme-client<=0.1.16_5 @@ -18,12 +19,12 @@ replaces=" arm-mem-git<=20131108_2 arptables<=0.0.4_3 atom<=1.44.0_1 - avogadro<=1.2.0_8 avogadro-devel<=1.2.0_8 + avogadro<=1.2.0_8 bokken<=1.8_3 bomi<=0.9.11_17 - burp-server<=1.4.40_13 burp-client<=1.4.40_13 + burp-server<=1.4.40_13 bzr<=2.7.0_1 bzrtools<=2.6.0_4 caja-gksu<=1.20.2_2 @@ -33,31 +34,31 @@ replaces=" couchdb<=1.7.1_2 cracklib-python<=2.9.7_1 crystal<=0.34.0_4 - ctpp2<=2.8.3_7 ctpp2-devel<=2.8.3_7 - dht-node<=0.2.0_3 - deepin-menu<=3.4.8_3 - deepin-screenshot<=5.0.0_2 - dtkwidget<=2.1.1_2 - dtkwidget-devel<=2.1.1_2 - dtkcore<=2.1.1_2 - dtkcore-devel<=2.1.1_2 - dtkwm<=2.0.12_1 - dtkwm-devel<=2.0.12_1 + ctpp2<=2.8.3_7 deepin-calculator<=5.0.1_1 deepin-draw<=1.0.0_1 deepin-editor<=1.2.9.1_1 - deepin-movie-reborn<=5.0.0_2 + deepin-menu<=3.4.8_3 deepin-movie-reborn-devel<=5.0.0_2 - deepin-turbo<=0.0.3_1 + deepin-movie-reborn<=5.0.0_2 + deepin-screenshot<=5.0.0_2 deepin-turbo-devel<=0.0.3_1 + deepin-turbo<=0.0.3_1 deepin-voice-recorder<=5.0.0_2 + dht-node<=0.2.0_3 djmount<=0.71_8 dleyna-core<=0.6.0_2 dleyna-renderer<=0.6.0_2 dleyna-server<=0.6.0_2 dnote-cli<=0.6.2_1 docker2aci<=0.17.2_4 + dtkcore-devel<=2.1.1_2 + dtkcore<=2.1.1_2 + dtkwidget-devel<=2.1.1_2 + dtkwidget<=2.1.1_2 + dtkwm-devel<=2.0.12_1 + dtkwm<=2.0.12_1 ebtables<=2.0.10.4_8 eclipse-ecj<=4.9_3 electron7<=7.3.3_1 @@ -73,22 +74,20 @@ replaces=" gksu<=2.0.2_4 glibmm-doc<=2.64.2_2 gnome-getting-started-docs<=3.38.1_1 - gnome-twitch<=0.4.2_1 gnome-shell-mousewheel-zoom<=0.8.0_2 + gnome-twitch<=0.4.2_1 + go-gdm<=1.4_7 go1.4-bootstrap<=20171003_2 goat<=0.0.0.28022016_10 goffice0.8<=0.8.17_6 goproxy<=7.0_1 - go-gdm<=1.4_7 + grv<=0.3.1_3 gsettings-qt<=0.1+17.10.20170824_3 gst1-python<=1.18.3_1 - grv<=0.3.1_3 - gtkhtml<=4.10.0_1 gtkhtml-devel<=4.10.0_1 + gtkhtml<=4.10.0_1 gx-go<=1.9.0_1 - libgtkhtml<=4.10.0_1 httperf<=0.9.0_9 - icecat<=78.6.1_1 icecat-i18n-ach<=78.6.1_1 icecat-i18n-af<=78.6.1_1 icecat-i18n-an<=78.6.1_1 @@ -182,39 +181,44 @@ replaces=" icecat-i18n-xh<=78.6.1_1 icecat-i18n-zh-CN<=78.6.1_1 icecat-i18n-zh-TW<=78.6.1_1 - ImageMagick6<=6.9.12.12_2 - libmagick6<=6.9.12.12_2 - libmagick6-devel<=6.9.12.12_2 - libmagick6-perl<=6.9.12.12_2 + icecat<=78.6.1_1 ioquake3-rpi<=20130506_2 isl16<=0.16_2 js<=1.8.5_11 jwm-settings-manager<=2.1.5_1 k3s<=1.0.0_1 kadu<=4.3_6 - keepassx<=0.4.4_2 keepassx2<=2.0.3_2 + keepassx<=0.4.4_2 key-mon<=1.17_5 libapp<=20140527_2 + libco-devel<=20_1 + libco<=20_1 libdbusmenu-qt<=0.9.2_4 - libfcitx-qt<=4.2.9.8_1 libfcitx-qt-devel<=4.2.9.8_1 + libfcitx-qt<=4.2.9.8_1 libgksu<=2.0.12_5 libglib-static<=2.58.3_5 + libgtkhtml<=4.10.0_1 + libmagick6-devel<=6.9.12.12_2 + libmagick6-perl<=6.9.12.12_2 + libmagick6<=6.9.12.12_2 libpyside-python3<=5.15.0_2 - libqmatrixclient<=0.5.3.2_1 libqmatrixclient-devel<=0.5.3.2_1 + libqmatrixclient<=0.5.3.2_1 libqzeitgeist<=0.8.0_6 - librpcsecgss<=0.19_6 librpcsecgss-devel<=0.19_6 + librpcsecgss<=0.19_6 libshiboken-python3<=5.15.0_3 + libspa-ffmpeg<=0.3.32_1 + libxnoise<=0.2.21_4 livewallpaper<=0.5.0_2 llvm3.9<=3.9.1_5 lprng<=3.8.C_1 ls++-git<=20140919_3 luxmark<=3.1_9 - luxrays<=3.1_18 luxrays-devel<=3.1_18 + luxrays<=3.1_18 mac<=3.99u4b5s7_3 masterpassword-cli<=2.6_5 mattermost-desktop<=4.6.0_1 @@ -224,10 +228,15 @@ replaces=" mozjs68<=68.11.0_1 mutagen<=1.43.0_3 ncdns<=0.0.2_12 - orage<=4.12.1_7 - onionshare<=2.2_5 - oce<=0.18.3_1 + nodejs-lts-10<=10.24.0_2 + nvidia340-dkms<=340.108_4 + nvidia340-libs<=340.108_4 + nvidia340-opencl<=340.108_4 + nvidia340<=340.108_4 oce-devel<=0.18.3_1 + oce<=0.18.3_1 + onionshare<=2.2_5 + orage<=4.12.1_7 paraview<=5.8.1_3 perl-Gtk2-Ex-Simple-List<=0.50_4 perl-Gtk2-ImageView<=0.05_8 @@ -247,8 +256,8 @@ replaces=" python-enchant<=2.0.0_4 python-gntp<=1.0.3_7 python-jellyfish<=0.6.1_2 - python-matplotlib<=2.2.4_2 python-matplotlib-data<=2.2.4_2 + python-matplotlib<=2.2.4_2 python-netifaces<=0.10.9_3 python-nose<=1.3.7_7 python-pivy<=0.6.4_2 @@ -259,28 +268,24 @@ replaces=" python-xlib<0.29_1 python3-Django<=3.0.7_2 python3-SPARQLWrapper<=1.8.4_4 + python3-aiohttp-cors2<=0.7.0_3 + python3-aiohttp2<=2.3.10_4 python3-bluez<=0.23_2 + python3-docker-pycreds<=0.4.0_4 python3-grako<=3.99.9_7 + python3-idna-ssl<=1.1.0_3 python3-keepalive<=0.5_6 python3-pyPEG2<=2.15.2_7 python3-pyenet<=5.15.0_2 - python3-pyside<=5.15.0_2 python3-pyside-phonon<=5.15.0_2 + python3-pyside<=5.15.0_2 python3-shiboken<=5.15.0_3 - python3-aiohttp2<=2.3.10_4 - python3-aiohttp-cors2<=0.7.0_3 - python3-idna-ssl<=1.1.0_3 - python3-docker-pycreds<=0.4.0_4 qimageblitz<=0.0.6_4 - quake4<=1.4.2_3 - qucs<=0.0.19_2 - qupzilla1<=1.8.9_16 - qt<=4.8.7_29 - qt-designer<=4.8.7_29 qt-designer-devel<=4.8.7_29 qt-designer-libs<=4.8.7_29 - qt-devel<=4.8.7_29 + qt-designer<=4.8.7_29 qt-devel-tools<=4.8.7_29 + qt-devel<=4.8.7_29 qt-doc<=4.8.7_29 qt-host-tools<=4.8.7_29 qt-plugin-mysql<=4.8.7_29 @@ -290,13 +295,17 @@ replaces=" qt-qmake<=4.8.7_29 qt5dxcb-plugin<=5.0.11_1 qt5integration<=5.0.0_7 + qt<=4.8.7_29 + quake4<=1.4.2_3 + qucs<=0.0.19_2 + qupzilla1<=1.8.9_16 qupzilla<=3.0.1_1 r2-bindings<=1.0.1_2 redkite<=1.3.1_1 reminiscence<=0.4.6_1 - rkt<=1.30.0_3 - rkt-stage1-fly<=1.30.0_3 rkt-stage1-coreos<=1.30.0_3 + rkt-stage1-fly<=1.30.0_3 + rkt<=1.30.0_3 scantailor<=0.9.12.1_2 seahorse-sharing<=3.8.0_4 seriespl<=2.3.5_2 @@ -309,8 +318,8 @@ replaces=" sqlite-replication<=3.32.3_2 srw<=0.7_1 tagainijisho<=1.0.3_1 - tlsdate<=0.0.13_16 taizen<=0.0.0.20180808_4 + tlsdate<=0.0.13_16 traverso<=0.49.6_2 ttyload-git<=20141117_4 tuxc<=1.1_3 @@ -318,34 +327,25 @@ replaces=" uwsgi-python<=2.0.18_3 v8<=3.24.35.33_4 volnoti<=0.1_1 - vte<=0.28.2_16 vte-devel<=0.28.2_16 vte-python<=0.28.2_16 vte290-devel<=0.36.5_5 vte290<=0.36.5_5 + vte<=0.28.2_16 w_scan<=20170107_1 wireguard-go<=0.0.20181222_2 wireshark-gtk<=3.0.7_1 - libxnoise<=0.2.21_4 xlennart<=1.1.1_1 - xnoise<=0.2.21_4 - xnoise-devel<=0.2.21_4 - xmonad<=0.15_5 xmonad-contrib<=0.16_3 - yturl<=2.0.2_5 + xmonad<=0.15_5 + xnoise-devel<=0.2.21_4 + xnoise<=0.2.21_4 yt-play<=20140117_2 - nvidia340<=340.108_4 - nvidia340-dkms<=340.108_4 - nvidia340-opencl<=340.108_4 - nvidia340-libs<=340.108_4 + yturl<=2.0.2_5 + zbackup<=1.4.4_23 zou<=0.2.0_7 - zuluplay<=1.1_1 zuluplay-devel<=1.1_1 - nodejs-lts-10<=10.24.0_2 - libspa-ffmpeg<=0.3.32_1 - libco<=20_1 - libco-devel<=20_1 - zbackup<=1.4.4_23 + zuluplay<=1.1_1 " if [ "$XBPS_TARGET_LIBC" = "musl" ]; then