Fix bug 111033 - modular X issue.

Package-Manager: portage-2.0.53_rc7

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 19fd889b0c57978cc27f241045bd865a650d82fe..58b11fdd2cb49bb32bda54ca30232d468f384d83 100644 (file)
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.115 2005/10/30 16:44:13 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.116 2005/10/31 22:19:29 nelchael Exp $
+
+  31 Oct 2005; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/xscreensaver-4.23-app-defaults.patch, xscreensaver-4.23.ebuild:
+  Fix bug 111033 - modular X issue.
 
   30 Oct 2005; Krzysiek Pawlik <nelchael@gentoo.org> ChangeLog:
   Fixed typo in ChangeLog.

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 2973d7c26e0774a74399dd94bb6ad064a619a541..d82e2ba41aac121f1f0e1b1b4c8e7e16ed63ee08 100644 (file)
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,4 +1,4 @@
-MD5 bd79e91c63f6185f4fd584ea1102e460 ChangeLog 19877
+MD5 d89eaaf052efba853d7168d0e55aa40f ChangeLog 20040
 MD5 51377e1938cf119bd11972b3c30c0a25 files/desktop_entries/screensaver-properties.desktop 1000
 MD5 64d504c9ea04705ce78f9ffb87c96321 files/digest-xscreensaver-4.20 70
 MD5 24bb039b898635c9224f9866f29757ed files/digest-xscreensaver-4.22-r2 70
@@ -12,10 +12,11 @@ MD5 f5dcb5acf99e374e9f99a95890b8eb0f files/xscreensaver-4.22-configure.patch 159
 MD5 e6a4444e1548adf83be31a933c5e19bf files/xscreensaver-4.22-interaggregate.patch 542
 MD5 cab8a426e9f99c0b49f598983b896b80 files/xscreensaver-4.22-nsfw-webcollage.patch 5029
 MD5 0802ff58ba46dfdc9d155798ef4936e5 files/xscreensaver-4.22-settings.patch 1766
+MD5 bd61d24250fdc129cf9b86e154c8c27a files/xscreensaver-4.23-app-defaults.patch 1080
 MD5 e24f49eb6b4473a5fd9f0869065cfe85 files/xscreensaver-4.23-nsfw.patch 6634
 MD5 7528066fa9a88bd1b6d46224d118dd7b files/xscreensaver-blank-screen.patch 487
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 MD5 30baa75aa8ad6b15fa87c15cce9d3f40 xscreensaver-4.20.ebuild 4842
 MD5 ec122eaf5cf8ae7c3738b52c5d3d42c1 xscreensaver-4.22-r2.ebuild 5474
 MD5 b45b943068a44b872e23f1c8c0f2d857 xscreensaver-4.22-r4.ebuild 5657
-MD5 26d43b14f43090098c836b47455dfc7d xscreensaver-4.23.ebuild 5482
+MD5 592406c1b6118f2df4b139e0a7a23250 xscreensaver-4.23.ebuild 5557

diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.23-app-defaults.patch b/x11-misc/xscreensaver/files/xscreensaver-4.23-app-defaults.patch
new file mode 100644 (file)
index 0000000..0c5072b
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-4.23-app-defaults.patch
@@ -0,0 +1,20 @@
+diff -Nru xscreensaver-4.23.orig/configure.in xscreensaver-4.23/configure.in
+--- xscreensaver-4.23.orig/configure.in        2005-10-17 03:05:49.000000000 +0200
++++ xscreensaver-4.23/configure.in     2005-10-31 22:16:53.000000000 +0100
+@@ -715,6 +715,8 @@
+   # Look for the directory under a standard set of common directories.
+   # Check X11 before X11Rn because it's often a symlink to the current release.
+   for ac_dir in                                 \
++    /usr/lib/X11/app-defaults                   \
++                                                \
+     /usr/X11/lib/app-defaults                   \
+     /usr/X11R6/lib/app-defaults                 \
+     /usr/X11R6/lib/X11/app-defaults             \
+@@ -745,7 +747,6 @@
+     /usr/x386/lib/X11/app-defaults              \
+     /usr/XFree86/lib/X11/app-defaults           \
+                                                 \
+-    /usr/lib/X11/app-defaults                   \
+     /usr/local/lib/X11/app-defaults             \
+     /usr/unsupported/lib/X11/app-defaults       \
+     /usr/athena/lib/X11/app-defaults            \

diff --git a/x11-misc/xscreensaver/xscreensaver-4.23.ebuild b/x11-misc/xscreensaver/xscreensaver-4.23.ebuild
index 09570c2694dcee29b04b40a074e815a7ffc71702..4bf2c48f1fc6cb027504e82f278a2354f6bc482e 100644 (file)
--- a/x11-misc/xscreensaver/xscreensaver-4.23.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.23.ebuild,v 1.1 2005/10/30 16:42:38 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.23.ebuild,v 1.2 2005/10/31 22:19:29 nelchael Exp $
 
 inherit eutils flag-o-matic pam fixheadtails
 
@@ -83,6 +83,9 @@ src_unpack() {
        # disable not-safe-for-work xscreensavers
        use offensive || epatch ${FILESDIR}/${PN}-4.23-nsfw.patch
 
+       # Fix for modular X:
+       epatch "${FILESDIR}/${PN}-4.23-app-defaults.patch"
+
        # change old head/tail to POSIX ones
        #cd hacks
        ht_fix_all