Make sure we change KDE_IS_PRELINKED in /etc/env.d/ accordingly as suggested by alwin...

Package-Manager: portage-2.1.2.2

diff --git a/sys-devel/prelink/ChangeLog b/sys-devel/prelink/ChangeLog
index 0704834280ceab11eb66d794842a13180f126d9d..ab67e1fb6c93cd7009efe2943dcfdb3f60a94f84 100644 (file)
--- a/sys-devel/prelink/ChangeLog
+++ b/sys-devel/prelink/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/prelink
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/ChangeLog,v 1.51 2007/03/25 05:09:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/ChangeLog,v 1.52 2007/03/25 05:30:30 vapier Exp $
+
+  25 Mar 2007; Mike Frysinger <vapier@gentoo.org> files/prelink.cron:
+  Make sure we change KDE_IS_PRELINKED in /etc/env.d/ accordingly as suggested
+  by alwin #165904.
 
 *prelink-20061201 (25 Mar 2007)
 

diff --git a/sys-devel/prelink/Manifest b/sys-devel/prelink/Manifest
index b4af91dce9e9e0499016af03e3a93109e118b08a..3f7332e2d5acb70787f2eea781899fa4fbc77587 100644 (file)
--- a/sys-devel/prelink/Manifest
+++ b/sys-devel/prelink/Manifest
@@ -25,10 +25,10 @@ AUX prelink.confd 1454 RMD160 0eae2b85fe68c19dd1c843834b45f1a9c16b49b7 SHA1 9e67
 MD5 3bdd06eb10f032f3c219dc8e73f7f2b7 files/prelink.confd 1454
 RMD160 0eae2b85fe68c19dd1c843834b45f1a9c16b49b7 files/prelink.confd 1454
 SHA256 0e4345269f90b34f8dc0253e15c62696d371c4ba7faf5ca3ac81fe559adbc13a files/prelink.confd 1454
-AUX prelink.cron 2132 RMD160 aa0bcd54834450fb7defca2a8216ee1459ef9d86 SHA1 3380b3034ffde8cb7729d3c7833377e4b636c9ca SHA256 2816f0d6873b2f86d1248cd51943f5d42f7c369a3936f0f897aa3ecc9b0cb093
-MD5 4ed2114197ed2948bf917e66b7bf042b files/prelink.cron 2132
-RMD160 aa0bcd54834450fb7defca2a8216ee1459ef9d86 files/prelink.cron 2132
-SHA256 2816f0d6873b2f86d1248cd51943f5d42f7c369a3936f0f897aa3ecc9b0cb093 files/prelink.cron 2132
+AUX prelink.cron 2332 RMD160 20386395ca1ea0445f184173c72effaffc0d5f75 SHA1 7c647a51023547a97a1187888a20f8d6120c20b2 SHA256 47fde82da19e1bcc3a646ba9e89d22c142be7bd434814ea287f03dd8a209d3bb
+MD5 2cc081f402fe6848b5af62629121fc1c files/prelink.cron 2332
+RMD160 20386395ca1ea0445f184173c72effaffc0d5f75 files/prelink.cron 2332
+SHA256 47fde82da19e1bcc3a646ba9e89d22c142be7bd434814ea287f03dd8a209d3bb files/prelink.cron 2332
 DIST prelink-20050314.tar.bz2 905343 RMD160 27cb5aa9d9ad889fe301dd8b76b4fcbd7c2af51e SHA1 0df95e7a163eb13b4a836688785b88a245d2b750 SHA256 5e175ab84f01cf3b8214f4d47c5246df4ff490bc140bac7ad858f4967bafc116
 DIST prelink-20050610.tar.bz2 905388 RMD160 bf1657536497a15fc144ca9c8a0d0e616f7a218f SHA1 dd920a3c9438192eb49804efbe1ae588a8a14e9f SHA256 354fbbd6e98985b644038bc871df8a5c90da9244bf1b8594552d4925f1ae50e6
 DIST prelink-20050901.tar.bz2 905959 RMD160 cfe15d86a38b7a2a375ed0d28b6c6218306ecf3c SHA1 defe77e7934fc1df304ba7bfaecaefdc1d078195 SHA256 d8fec0a1dcde1fbcca43fe8ca3f9429127b39a7c4fd1753ca69932af379476f8
@@ -59,10 +59,10 @@ EBUILD prelink-20061201.ebuild 1666 RMD160 4a0e34ae1bbb00289f4a56dfc033670c5b9c8
 MD5 2f3331e9fa18491a613769a256139808 prelink-20061201.ebuild 1666
 RMD160 4a0e34ae1bbb00289f4a56dfc033670c5b9c8422 prelink-20061201.ebuild 1666
 SHA256 a248b0a950a8eef4434b90d789e89249303880e7bf8ffacf40565e8141ed8dfc prelink-20061201.ebuild 1666
-MISC ChangeLog 6064 RMD160 2b509d10483e5fb4f7db64b845f3eb456bfcc148 SHA1 3bf2e56388d287f054423e099de89ca435a35a25 SHA256 b4ccbb291ea2a9b0f71163ce778087013a5720e8c997b02906e110bda5e341b8
-MD5 d7081536d50c4908e19836a324384deb ChangeLog 6064
-RMD160 2b509d10483e5fb4f7db64b845f3eb456bfcc148 ChangeLog 6064
-SHA256 b4ccbb291ea2a9b0f71163ce778087013a5720e8c997b02906e110bda5e341b8 ChangeLog 6064
+MISC ChangeLog 6234 RMD160 5dd9a7ae3f51020d08c68b6afa02597a028d0446 SHA1 35d96d029af849f421d39562f18246d84be379e8 SHA256 388a574e316c29bb6884478fa52516455e4514a5f99429f20d66053795ea770b
+MD5 56bfc6cfbbe9329aaa16469131955bc5 ChangeLog 6234
+RMD160 5dd9a7ae3f51020d08c68b6afa02597a028d0446 ChangeLog 6234
+SHA256 388a574e316c29bb6884478fa52516455e4514a5f99429f20d66053795ea770b ChangeLog 6234
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -88,7 +88,7 @@ SHA256 b6a4019843ea0f69d246fb7382524fdc8741d594dc4e3e4ab0c36775343cfcb1 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGBgQ08bi6rjpTunYRAtArAKCIfT5lmUffE/7/0Qvp04aGjYCZLACgwMRu
-MyVN5H5YekpFXbYHKPFKqHo=
-=Pr1P
+iD8DBQFGBgkZ8bi6rjpTunYRAqM2AJ9c/JLrc3JBslapEDpZgJxx8nLyYQCcD3qE
+oL1OnN/WWxWopPMd514tWa4=
+=TvC8
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/prelink/files/prelink.cron b/sys-devel/prelink/files/prelink.cron
index 9ad52dff9bb7a8d02afcfe4d56d2bd9858b4c036..37b119d6b8e28206537ab660d44fec168d26fb1b 100644 (file)
--- a/sys-devel/prelink/files/prelink.cron
+++ b/sys-devel/prelink/files/prelink.cron
@@ -5,6 +5,7 @@
 renice +19 -p $$ >/dev/null 2>&1
 
 if [ "$PRELINKING" != yes ]; then
+  sed -ri '/^[[:space:]]*#?[[:space:]]*KDE_IS_PRELINKED=/s:.*:#KDE_IS_PRELINKED=1:' /etc/env.d/*kde*
   if [ -f /etc/prelink.cache ]; then
     echo /usr/sbin/prelink -uav > /var/log/prelink.log
     /usr/sbin/prelink -uav >> /var/log/prelink.log 2>&1 \
@@ -16,6 +17,8 @@ if [ "$PRELINKING" != yes ]; then
   exit 0
 fi
 
+sed -ri '/^[[:space:]]*#?[[:space:]]*KDE_IS_PRELINKED=/s:.*:KDE_IS_PRELINKED=1:' /etc/env.d/*kde*
+
 if [ ! -f /etc/prelink.cache -o -f /var/lib/misc/prelink.force ] \
    || grep -q '^prelink-ELF0.[0-2]' /etc/prelink.cache; then
   # If cache does not exist or is from older prelink versions or