[gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/support/, etc/

[gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/support/, etc/

[Matt Turner]

commit:     f189619d3c588dfcb2d70fd31f843c00f212cb56
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 03:20:01 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat May 16 06:50:36 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f189619d

catalyst: Remove remnants of options="preserve_libs"

This option has been broken since commit e3114e65ffda (Some options
cleanup, unifying their use, reducing redundancy.) in 2013 which was
first in catalyst 3.0.0.

I think the feature was a kludge, and that if or when we find the need
for something similar that we instead just run emerge @preserved-rebuild
instead.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 etc/catalyst.conf           | 2 --
 targets/support/depclean.sh | 2 --
 targets/support/unmerge.sh  | 2 --
 3 files changed, 6 deletions(-)

diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 5aa2b3fb..f64fe971 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -38,8 +38,6 @@ envscript="/etc/catalyst/catalystrc"
 #	build stops in livecd-stage2)
 # pkgcache = keeps a tbz2 of every built package (useful if your build stops
 #	prematurely)
-# preserve_libs = enables portage to preserve used libs when unmerging packages
-#	(used on installcd-stage2 and stage4 targets)
 # seedcache = use the build output of a previous target if it exists to speed up
 #	the copy
 # sticky-config = enables the code that will keep any internal 'catalyst_use' flags

diff --git a/targets/support/depclean.sh b/targets/support/depclean.sh
index 56f9a669..f99134e0 100755
--- a/targets/support/depclean.sh
+++ b/targets/support/depclean.sh
@@ -2,8 +2,6 @@
 
 source /tmp/chroot-functions.sh
 
-# If the user enabled PRESERVE_LIBS in options, tell portage to preserve them.
-[ -n "${clst_PRESERVE_LIBS}" ] && FEATURES="${clst_myfeatures} preserve-libs"
 if [ "${clst_livecd_depclean}" = "keepbdeps" ]; then
 	run_merge --depclean --with-bdeps=y
 else

diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
index 0c0c0374..9f112735 100755
--- a/targets/support/unmerge.sh
+++ b/targets/support/unmerge.sh
@@ -2,8 +2,6 @@
 
 source /tmp/chroot-functions.sh
 
-# If the user enabled PRESERVE_LIBS in options, tell portage to preserve them.
-[ -n "${clst_PRESERVE_LIBS}" ] && FEATURES="${clst_myfeatures} preserve-libs"
 run_merge -C ${clst_packages}
 
 exit 0

[gentoo-commits] proj/catalyst:wip/mattst88 commit in: etc/, targets/support/

[Matt Turner]

commit:     f189619d3c588dfcb2d70fd31f843c00f212cb56
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 03:20:01 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat May 16 06:50:36 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f189619d

catalyst: Remove remnants of options="preserve_libs"

This option has been broken since commit e3114e65ffda (Some options
cleanup, unifying their use, reducing redundancy.) in 2013 which was
first in catalyst 3.0.0.

I think the feature was a kludge, and that if or when we find the need
for something similar that we instead just run emerge @preserved-rebuild
instead.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 etc/catalyst.conf           | 2 --
 targets/support/depclean.sh | 2 --
 targets/support/unmerge.sh  | 2 --
 3 files changed, 6 deletions(-)

diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 5aa2b3fb..f64fe971 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -38,8 +38,6 @@ envscript="/etc/catalyst/catalystrc"
 #	build stops in livecd-stage2)
 # pkgcache = keeps a tbz2 of every built package (useful if your build stops
 #	prematurely)
-# preserve_libs = enables portage to preserve used libs when unmerging packages
-#	(used on installcd-stage2 and stage4 targets)
 # seedcache = use the build output of a previous target if it exists to speed up
 #	the copy
 # sticky-config = enables the code that will keep any internal 'catalyst_use' flags

diff --git a/targets/support/depclean.sh b/targets/support/depclean.sh
index 56f9a669..f99134e0 100755
--- a/targets/support/depclean.sh
+++ b/targets/support/depclean.sh
@@ -2,8 +2,6 @@
 
 source /tmp/chroot-functions.sh
 
-# If the user enabled PRESERVE_LIBS in options, tell portage to preserve them.
-[ -n "${clst_PRESERVE_LIBS}" ] && FEATURES="${clst_myfeatures} preserve-libs"
 if [ "${clst_livecd_depclean}" = "keepbdeps" ]; then
 	run_merge --depclean --with-bdeps=y
 else

diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
index 0c0c0374..9f112735 100755
--- a/targets/support/unmerge.sh
+++ b/targets/support/unmerge.sh
@@ -2,8 +2,6 @@
 
 source /tmp/chroot-functions.sh
 
-# If the user enabled PRESERVE_LIBS in options, tell portage to preserve them.
-[ -n "${clst_PRESERVE_LIBS}" ] && FEATURES="${clst_myfeatures} preserve-libs"
 run_merge -C ${clst_packages}
 
 exit 0

[gentoo-commits] proj/catalyst:master commit in: etc/, targets/support/

[Matt Turner]

commit:     f189619d3c588dfcb2d70fd31f843c00f212cb56
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 03:20:01 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat May 16 06:50:36 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f189619d

catalyst: Remove remnants of options="preserve_libs"

This option has been broken since commit e3114e65ffda (Some options
cleanup, unifying their use, reducing redundancy.) in 2013 which was
first in catalyst 3.0.0.

I think the feature was a kludge, and that if or when we find the need
for something similar that we instead just run emerge @preserved-rebuild
instead.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 etc/catalyst.conf           | 2 --
 targets/support/depclean.sh | 2 --
 targets/support/unmerge.sh  | 2 --
 3 files changed, 6 deletions(-)

diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 5aa2b3fb..f64fe971 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -38,8 +38,6 @@ envscript="/etc/catalyst/catalystrc"
 #	build stops in livecd-stage2)
 # pkgcache = keeps a tbz2 of every built package (useful if your build stops
 #	prematurely)
-# preserve_libs = enables portage to preserve used libs when unmerging packages
-#	(used on installcd-stage2 and stage4 targets)
 # seedcache = use the build output of a previous target if it exists to speed up
 #	the copy
 # sticky-config = enables the code that will keep any internal 'catalyst_use' flags

diff --git a/targets/support/depclean.sh b/targets/support/depclean.sh
index 56f9a669..f99134e0 100755
--- a/targets/support/depclean.sh
+++ b/targets/support/depclean.sh
@@ -2,8 +2,6 @@
 
 source /tmp/chroot-functions.sh
 
-# If the user enabled PRESERVE_LIBS in options, tell portage to preserve them.
-[ -n "${clst_PRESERVE_LIBS}" ] && FEATURES="${clst_myfeatures} preserve-libs"
 if [ "${clst_livecd_depclean}" = "keepbdeps" ]; then
 	run_merge --depclean --with-bdeps=y
 else

diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
index 0c0c0374..9f112735 100755
--- a/targets/support/unmerge.sh
+++ b/targets/support/unmerge.sh
@@ -2,8 +2,6 @@
 
 source /tmp/chroot-functions.sh
 
-# If the user enabled PRESERVE_LIBS in options, tell portage to preserve them.
-[ -n "${clst_PRESERVE_LIBS}" ] && FEATURES="${clst_myfeatures} preserve-libs"
 run_merge -C ${clst_packages}
 
 exit 0