Fix location for app-defaults, see bug #152250.

Package-Manager: portage-2.1.2_pre3-r7

diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index daf0f97a0ac9b572a2d1b05e07f00c5c7c37b4fa..a87173aff321d537c7fbc00c3e31311ac2f941f7 100644 (file)
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -4,14 +4,14 @@ EBUILD xlockmore-5.19.ebuild 1949 RMD160 1bdfd0c2e106ae00192ba44ba29b872288d24cd
 MD5 842efff5ec763a9379042943ee5294ff xlockmore-5.19.ebuild 1949
 RMD160 1bdfd0c2e106ae00192ba44ba29b872288d24cd6 xlockmore-5.19.ebuild 1949
 SHA256 4fc890a35f9870a3e73e02626415c5b1c2ef2597dcd0ecc3b9678c6431cb1626 xlockmore-5.19.ebuild 1949
-EBUILD xlockmore-5.21-r1.ebuild 2016 RMD160 509b0aeffc8093396996186d1f10bebce25d54a0 SHA1 54ce1328c9648129310e895edd2a042c00639144 SHA256 a6d9d08b12e09f0b28705db4a90517cbf087b3caa908f28791ca02f2f940e1fc
-MD5 af2d72c8cd5c6ac93777f603a034a7fe xlockmore-5.21-r1.ebuild 2016
-RMD160 509b0aeffc8093396996186d1f10bebce25d54a0 xlockmore-5.21-r1.ebuild 2016
-SHA256 a6d9d08b12e09f0b28705db4a90517cbf087b3caa908f28791ca02f2f940e1fc xlockmore-5.21-r1.ebuild 2016
-MISC ChangeLog 9173 RMD160 47e163ed99d89b841e2e401527ea1e01c4846899 SHA1 db748452920e485ff2f2d63a5a8839a9f867d4ea SHA256 1b497001a7ef932b09191c6dbe433b9f153f6c3234f6f5c2d97debcc4cbdb503
-MD5 c083ed74b243c48985b49bc0cb7208e6 ChangeLog 9173
-RMD160 47e163ed99d89b841e2e401527ea1e01c4846899 ChangeLog 9173
-SHA256 1b497001a7ef932b09191c6dbe433b9f153f6c3234f6f5c2d97debcc4cbdb503 ChangeLog 9173
+EBUILD xlockmore-5.21-r1.ebuild 2013 RMD160 e12b4d989ca85e8e74243c5e44007a79bfd139e7 SHA1 03818be9e700971f4d12786fcf8590c876a3afe2 SHA256 74ae6c83e58a8ba21ce68db4054bef986942628aa2ef4248f1d0b47d72677a61
+MD5 50cef78b84b93b4719ab377d4e305f54 xlockmore-5.21-r1.ebuild 2013
+RMD160 e12b4d989ca85e8e74243c5e44007a79bfd139e7 xlockmore-5.21-r1.ebuild 2013
+SHA256 74ae6c83e58a8ba21ce68db4054bef986942628aa2ef4248f1d0b47d72677a61 xlockmore-5.21-r1.ebuild 2013
+MISC ChangeLog 9265 RMD160 b1a75842be499dacb97843bd03fb57776175011b SHA1 35f86e340f3e3369b12866fa03629de4bed8015f SHA256 b8ea50ddfcec58a9f99a834a1bdd819ca3f304960ff5e2711c298130fa173538
+MD5 c3b3fbea530176d43c1c196a15ee0adb ChangeLog 9265
+RMD160 b1a75842be499dacb97843bd03fb57776175011b ChangeLog 9265
+SHA256 b8ea50ddfcec58a9f99a834a1bdd819ca3f304960ff5e2711c298130fa173538 ChangeLog 9265
 MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e metadata.xml 173

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index b9a3a3d2a842dce6c52d278c53ecf6a04dbb1efa..abb346f8ba7c7cd09c2ccbd972bbcf186928e684 100644 (file)
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.155 2006/10/22 01:06:57 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.156 2006/10/24 08:51:58 nelchael Exp $
+
+  24 Oct 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  xscreensaver-5.01.ebuild:
+  Fix location for app-defaults, see bug #152250.
 
   22 Oct 2006; David Shakaryan <omp@gentoo.org> xscreensaver-4.24.ebuild,
   xscreensaver-5.00-r1.ebuild, xscreensaver-5.01.ebuild:

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 1feb7714d2d2405d7d46d7c26c13c9c81d42c216..7cf83b28c7fa7900dded1fb7b0076e6e55e2df42 100644 (file)
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -60,14 +60,14 @@ EBUILD xscreensaver-5.00-r1.ebuild 4773 RMD160 18fd9d33cf407a7d7a11b9f26830709b8
 MD5 2de343f458c3237b3e6020275a12fc44 xscreensaver-5.00-r1.ebuild 4773
 RMD160 18fd9d33cf407a7d7a11b9f26830709b82480e7f xscreensaver-5.00-r1.ebuild 4773
 SHA256 8db17a847ab51347971b060b9a0b95a011251f3229e687394c44a7c30c1fdc02 xscreensaver-5.00-r1.ebuild 4773
-EBUILD xscreensaver-5.01.ebuild 4650 RMD160 111317c2fa088f380295ee1b3585922238dfd5ef SHA1 665fc7c48ce2440473d07c2558bb1bf82c4efc69 SHA256 e9566640988406ba40df6b94c7e50c73c6f241cf0096c74a163798859efc1663
-MD5 4b9d02da0b82227c86a1106b5488f6be xscreensaver-5.01.ebuild 4650
-RMD160 111317c2fa088f380295ee1b3585922238dfd5ef xscreensaver-5.01.ebuild 4650
-SHA256 e9566640988406ba40df6b94c7e50c73c6f241cf0096c74a163798859efc1663 xscreensaver-5.01.ebuild 4650
-MISC ChangeLog 26574 RMD160 1ea8a780c4810929dcea11def0c8617bde907aef SHA1 d5b927f81378717b0503bacbc180a021cc40d546 SHA256 639879278157f976b7b46ea2b3f5ba92c80106f5f2c888b90df8a04f4f5738c1
-MD5 2734499fa0be8c9edfc243c318bd01d5 ChangeLog 26574
-RMD160 1ea8a780c4810929dcea11def0c8617bde907aef ChangeLog 26574
-SHA256 639879278157f976b7b46ea2b3f5ba92c80106f5f2c888b90df8a04f4f5738c1 ChangeLog 26574
+EBUILD xscreensaver-5.01.ebuild 4842 RMD160 c74a715dfa3b4578119deb08342092e850dda691 SHA1 2a2de9b2773f2df3a022951642ce561419036387 SHA256 c0472ee01764a14d7ee729cda7051226fa908552e81ad9acbd8c034e4a966dd8
+MD5 cc17c1be4b626f6bcdcbaff7483b9348 xscreensaver-5.01.ebuild 4842
+RMD160 c74a715dfa3b4578119deb08342092e850dda691 xscreensaver-5.01.ebuild 4842
+SHA256 c0472ee01764a14d7ee729cda7051226fa908552e81ad9acbd8c034e4a966dd8 xscreensaver-5.01.ebuild 4842
+MISC ChangeLog 26711 RMD160 911a19556c31ebe90e386bea1626e5dc36843262 SHA1 d1f10fce2f48f695893a98350e568d8b148a4b16 SHA256 eaecd3d0d93d37293036976a2710ab32441dcab1fe20aa8aefd21e147ee08eac
+MD5 b6a5ccf795b2bb310ea43601db83e68b ChangeLog 26711
+RMD160 911a19556c31ebe90e386bea1626e5dc36843262 ChangeLog 26711
+SHA256 eaecd3d0d93d37293036976a2710ab32441dcab1fe20aa8aefd21e147ee08eac ChangeLog 26711
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -84,7 +84,7 @@ SHA256 373fdb9ab0176f3509fbeeffdb25e3b2266e496475024636029574913943f921 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFOsQ+vSApE0uP4UsRAoaaAJ9zVxmLfcowm1wcRjZ+oxqOmx4CKgCfezWy
-5RDxoIMJkk5xvCDUirXGxMQ=
-=NvK7
+iD8DBQFFPdQ5go/w9rxVVVERAooQAKCI8V/LB3zaXXWYCwYPddTNBi/y/ACeKt3g
+DjzAv/97xFsLy5mu4SjNozE=
+=sVCy
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/xscreensaver/xscreensaver-5.01.ebuild b/x11-misc/xscreensaver/xscreensaver-5.01.ebuild
index 57abe7dcd00205954ce0909dde0509b222ee31a7..6af50d4de4942aa0f33f6821c3c5f75999fd3a3a 100644 (file)
--- a/x11-misc/xscreensaver/xscreensaver-5.01.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.01.ebuild,v 1.3 2006/10/22 01:06:57 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.01.ebuild,v 1.4 2006/10/24 08:51:58 nelchael Exp $
 
 inherit eutils flag-o-matic pam fixheadtails autotools
 
@@ -143,6 +143,11 @@ src_install() {
        mv "${D}/usr/share/man/man6/worm.6" \
                "${D}/usr/share/man/man6x/worm.6x"
 
+       # Fix bug #152250:
+       dodir "/usr/share/X11/app-defaults"
+       mv "${D}/usr/$(get_libdir)/X11/app-defaults/XScreenSaver" \
+               "${D}/usr/share/X11/app-defaults/XScreenSaver" || die "mv failed"
+
 }
 
 pkg_postinst() {