From 4f75dde620c2ccea77a34be3f45b75fdae7e5e5d Mon Sep 17 00:00:00 2001 From: Johannes Date: Wed, 13 Mar 2019 00:23:58 +0100 Subject: [PATCH 1/5] New package: removed-packages this meta-package replaces all packages which should be removed --- srcpkgs/removed-packages/template | 83 +++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 srcpkgs/removed-packages/template diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template new file mode 100644 index 00000000000..bc175313071 --- /dev/null +++ b/srcpkgs/removed-packages/template @@ -0,0 +1,83 @@ +# Template file for 'removed-packages' +pkgname=removed-packages +version=0.1 +revision=1 +build_style=meta +short_desc="Uninstalls packages removed from repository" +maintainer="Piotr Wójcik " +license="Public Domain" +homepage="https://voidlinux.org" + +replaces=" + Platinum9-theme<=0.0.0.20170720_3 + apg<=2.2.3_5 + arm-mem-git<=20131108_2 + arptables<=0.0.4_3 + bokken<=1.8_3 + caja-gksu<=1.20.2_2 + california<=0.4.0_4 + ctpp2<=2.8.3_7 + ctpp2-devel<=2.8.3_7 + dleyna-core<=0.6.0_2 + dleyna-renderer<=0.6.0_2 + dleyna-server<=0.6.0_2 + ebtables<=2.0.10.4_8 + eclipse-ecj<=4.9_3 + enventor<=1.0.0_2 + epstopdf<=2.27_3 + fontmatrix<=0.6.0.20171228_2 + gksu<=2.0.2_4 + go1.4-bootstrap<=20171003_2 + goffice0.8<=0.8.17_6 + grv<=0.3.1_3 + httperf<=0.9.0_9 + isl16<=0.16_2 + keepassx<=0.4.4_2 + libapp<=20140527_2 + libdbusmenu-qt<=0.9.2_4 + libgksu<=2.0.12_5 + libqzeitgeist<=0.8.0_6 + libump-git<=20150407_2 + livewallpaper<=0.5.0_2 + llvm3.9<=3.9.1_5 + lmdb++<=0.9.14.0+20160229_2 + ls++-git<=20140919_3 + mac<=3.99u4b5s7_3 + mdds0<=0.12.1_3 + mongroup<=0.4.1_2 + mtxclient<=0.2.0_3 + nheko<=0.6.2_2 + oksh<=0.5.9_3 + oxygen-icons<=4.14.3_3 + phonon-backend-gstreamer<=4.9.0_2 + phonon-backend-vlc<=0.9.1_3 + polkit-qt<=0.112.0_5 + profile-sync-daemon<=5.75_4 + profont<=1.0_2 + puddletag<=1.2.0_3 + pyside-tools<=0.2.15_2 + python-PyQt4<=4.12.1_4 + python-SecretStorage<=2.3.1_4 + python-audit<=2.8.5_2 + python-jellyfish<=0.6.1_2 + python-pivy<=0.6.4_2 + python-pyenet<=1.3.13.post7_2 + python-pyside<=1.2.2_7 + python-pytest-relaxed<=1.1.2_2 + qimageblitz<=0.0.6_4 + r2-bindings<=1.0.1_2 + seriespl<=2.3.5_2 + simple-obfs<=0.0.5_2 + skypetab-ng<=20150201_3 + soulseekqt<=20160117_2 + spacefm-ng<=1.0.6_3 + timidity<=2.15.0_1 + ttyload-git<=20141117_4 + tweeny<=2_2 + urlmatch-git<=20141116_2 + v8<=3.24.35.33_4 + varnish<=6.1.1_3 + wireguard-go<=0.0.20181222_2 + wireshark-gtk<=3.0.7_1 + yt-play<=20140117_2 +" From 55db97fec85f4f88d410bda13a459c73945cf532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 17 Dec 2019 21:30:28 +0100 Subject: [PATCH 2/5] Manual.md: add package to removed-packages on removal --- Manual.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Manual.md b/Manual.md index 4f954b840be..386daa24362 100644 --- a/Manual.md +++ b/Manual.md @@ -929,7 +929,7 @@ can be used to pass arguments during compilation. If your package does not make extensions consider using the `gem` build style instead. - `gem` For packages that are installed using gems from [RubyGems](https://rubygems.org/). -The gem command can be overridden by `gem_cmd`. +The gem command can be overridden by `gem_cmd`. `distfiles` is set by the build style if the template does not do so. If your gem provides extensions which must be compiled consider using the `gemspec` build style instead. @@ -1652,6 +1652,9 @@ generally those packages are the same but have been split as to avoid cyclic dependencies. Make sure that the package you're removing is not the source of those patches/files. - Remove package template. +- Add `pkgname<=version_revision` to `replaces` variable of `removed-packages` +template. All removed subpkgs should be added too. +This will uninstall package from systems where it is installed. - Remove the package from the repository index or contact a team member that can do so. From 77056e01be26756b8d5647ca8f29408751592d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 17 Dec 2019 21:28:54 +0100 Subject: [PATCH 3/5] base-system: depend on removed-packages --- srcpkgs/base-system/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/base-system/template b/srcpkgs/base-system/template index 810563c1bad..cf398262205 100644 --- a/srcpkgs/base-system/template +++ b/srcpkgs/base-system/template @@ -1,7 +1,7 @@ # Template file for 'base-system' pkgname=base-system -version=0.113 -revision=2 +version=0.114 +revision=1 build_style=meta short_desc="Void Linux base system meta package" maintainer="Enno Boland " @@ -14,7 +14,7 @@ depends=" mdocml>=1.13.3 shadow e2fsprogs btrfs-progs xfsprogs f2fs-tools dosfstools procps-ng tzdata pciutils usbutils iana-etc openssh dhcpcd kbd iproute2 iputils iw wpa_supplicant xbps nvi sudo wifi-firmware - void-artwork traceroute ethtool kmod acpid eudev runit-void" + void-artwork traceroute ethtool kmod acpid eudev runit-void removed-packages" case "$XBPS_TARGET_MACHINE" in *-musl) depends+=" musl";; From 5763727c6f668df188315bf3d880566cf78f454c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 5 Jan 2021 18:24:26 +0100 Subject: [PATCH 4/5] base-minimal: depend on removed-packages --- srcpkgs/base-minimal/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/base-minimal/template b/srcpkgs/base-minimal/template index 95021043f7b..f43f0c3ccc3 100644 --- a/srcpkgs/base-minimal/template +++ b/srcpkgs/base-minimal/template @@ -1,6 +1,6 @@ # Template file for 'base-minimal' pkgname=base-minimal -version=0.2 +version=0.3 revision=1 build_style=meta short_desc="Void Linux base system meta with minimal tools" @@ -11,7 +11,7 @@ homepage="https://www.voidlinux.org/" depends=" base-files coreutils findutils diffutils dash grep gzip sed gawk util-linux which tar shadow procps-ng iana-etc xbps nvi tzdata - runit-void" + runit-void removed-packages" case "$XBPS_TARGET_MACHINE" in *-musl) depends+=" musl";; From 41b3589b18f7ea900be8d30488fa22cd959bd39e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 5 Jan 2021 18:45:02 +0100 Subject: [PATCH 5/5] base-voidstrap: depend on removed-packages --- srcpkgs/base-voidstrap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/base-voidstrap/template b/srcpkgs/base-voidstrap/template index 763ced9a306..563f950d5d7 100644 --- a/srcpkgs/base-voidstrap/template +++ b/srcpkgs/base-voidstrap/template @@ -1,6 +1,6 @@ # Template file for 'base-voidstrap' pkgname=base-voidstrap -version=0.10 +version=0.11 revision=1 build_style=meta short_desc="Void Linux base system meta package for containers/chroots" @@ -13,7 +13,7 @@ depends=" dash bash grep gzip file sed gawk less util-linux which tar man-pages mdocml>=1.13.3 shadow e2fsprogs btrfs-progs xfsprogs f2fs-tools dosfstools kbd procps-ng tzdata pciutils iana-etc eudev runit-void openssh dhcpcd - iproute2 iputils iw xbps nvi sudo traceroute kmod" + iproute2 iputils iw xbps nvi sudo traceroute kmod removed-packages" case "$XBPS_TARGET_MACHINE" in *-musl) depends+=" musl";;