Fix app-defaults directory wrt #247655.

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 36 insertions, 16 deletions

diff --git a/x11-misc/xosview/ChangeLog b/x11-misc/xosview/ChangeLog
index d50ee842ded1..0ed406e7e17f 100644
--- a/x11-misc/xosview/ChangeLog
+++ b/x11-misc/xosview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xosview
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/ChangeLog,v 1.41 2009/08/06 16:00:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/ChangeLog,v 1.42 2009/12/23 16:16:17 ssuominen Exp $
+
+*xosview-1.8.3-r1 (23 Dec 2009)
+
+  23 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +xosview-1.8.3-r1.ebuild, files/xosview-resdir.patch:
+  Fix app-defaults directory wrt #247655.
 
   06 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> xosview-1.8.3.ebuild,
   +files/xosview-1.8.3-gcc44.patch:
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
index 358afa4636e7..d9e51bcd8c4e 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -1,8 +1,8 @@
 AUX xosview-1.8.3-gcc44.patch 730 RMD160 5abcf2d62dcbfdefa1593f633117df1de1fb9bdc SHA1 e0c1a78365e9293e0e68bb1898acdaeed449ca80 SHA256 6afa06f4dc73c2e8c8bdec7f9bdab278f1c82b294ca6cb7e19dc0119780b80f2
 AUX xosview-1.8.3-remove-serialmeter.patch 2306 RMD160 972a2f585342d8b8bf62a50395628c1b3bdad6ce SHA1 c4420fd9ae13b4840512e22383d4cc4e7aaddfad SHA256 957edf6f7faeda3f8bdad80ffa982cc95a14833e82636d60e918377fec3f8681
 AUX xosview-emptyxpaths.patch 1861 RMD160 e3c1d82654843335db656a12cb820f74e5a53692 SHA1 ae1a154a490c086be351ddb432d35fd1814f2007 SHA256 64e87a9c6e03e682be98986fa4fef68b57a779d93908f5bf9c8b2d4efd0930b8
-AUX xosview-resdir.patch 1566 RMD160 1e185bb65f963bdbe09db2eff839d14996b7f511 SHA1 3c5bc93d7f4d85d5a8aa77a04510944a3361313f SHA256 b5c01c4c23119ade31a11bc3d567de83cc9605f6a277a61e89c99b91f942dd6d
+AUX xosview-resdir.patch 2253 RMD160 075a0abaecd8fd24a8a87ac4dfb8710202208138 SHA1 c17968f8c81eeaacea59d1e91f59a47205a4ad74 SHA256 85e40ec105077eadd60ef46a1a9994fff6f0a5d9bb550d120cad21e3e8911e94
 DIST xosview-1.8.3.tar.gz 259793 RMD160 595e812dee686ccaa5d95eb537782679d752271b SHA1 420fd0620ff9fb9ba83fc833eeb8b872414e377e SHA256 3aa28fb12552ea106e06f6958e1a0913bde8b0bb1491c091a3f1849717736b66
-EBUILD xosview-1.8.3.ebuild 998 RMD160 d1dbe9d3e80146d995b94076c048bbbe3857eaed SHA1 588b2ab625f2c75d0c6483900c05b68d665db8fc SHA256 4e0a166f973849514d6a9fbfdc821225c3476eaa3fac9f4556bd342bfeaf5019
-MISC ChangeLog 6873 RMD160 bdeef953e05c33267e9c94a2a9f089d290d366d7 SHA1 85f92ebbab95b6d06467f5331b51388fe9b25c77 SHA256 50105771b06fb2647ec8d2e84fd89cfc6d62bc08d084a3c9f0c6edfc139d06eb
+EBUILD xosview-1.8.3-r1.ebuild 1006 RMD160 9a0987366dd9a72ddb4acaa1eaf1a732d4d85e0e SHA1 dd5d8e1641cbbe39cbb09af84cdc611536b8b02c SHA256 423c2efb7512bad146b862ea0af4f44b4b8f00d5c06da01cf0c29d2e936aa1cd
+MISC ChangeLog 7059 RMD160 b8d7c2e53f0dd6a49fe9ef43b0ae9c18853eb320 SHA1 3b6834aa683ee2f977922fb6eefe2e630079e3d4 SHA256 dc8bc60813e161ff098b8d0296d4386e76e1bdf79ddbd59fec3a195aeb100fe2
 MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f
diff --git a/x11-misc/xosview/files/xosview-resdir.patch b/x11-misc/xosview/files/xosview-resdir.patch
index 3bd142e1d732..f6a0c2b67ec6 100644
--- a/x11-misc/xosview/files/xosview-resdir.patch
+++ b/x11-misc/xosview/files/xosview-resdir.patch
@@ -1,22 +1,35 @@
---- xosview-1.8.2.orig/Xrm.cc
-+++ xosview-1.8.2/Xrm.cc
-@@ -148,20 +148,26 @@
+diff -ur xosview-1.8.3.orig/config/Makefile.top.in xosview-1.8.3/config/Makefile.top.in
+--- xosview-1.8.3.orig/config/Makefile.top.in	2006-02-18 10:12:33.000000000 +0200
++++ xosview-1.8.3/config/Makefile.top.in	2009-12-23 18:14:52.000000000 +0200
+@@ -49,7 +49,7 @@
+ PREFIX_TO_USE=@prefix@
+ BINDIR=$(PREFIX_TO_USE)/bin
+ MANDIR=$(PREFIX_TO_USE)/share/man/man1
+-XAPPLOADDIR=$(PREFIX_TO_USE)/lib/X11/app-defaults
++XAPPLOADDIR=$(PREFIX_TO_USE)/share/X11/app-defaults
+ PACKAGENAME=xosview-$(VERS)
+ DISTRIBDIR=@top_srcdir@/../$(PACKAGENAME)
+ 
+diff -ur xosview-1.8.3.orig/Xrm.cc xosview-1.8.3/Xrm.cc
+--- xosview-1.8.3.orig/Xrm.cc	2006-02-18 06:33:04.000000000 +0200
++++ xosview-1.8.3/Xrm.cc	2009-12-23 18:14:26.000000000 +0200
+@@ -152,20 +152,26 @@
  
    //  Merge in the system resource database.
    char rfilename[2048];
 +  int result;
  
    // Get the app-defaults
-+  //  Check /usr/lib/X11 for when /usr/X11R6 compatibility symlink is removed
-+  result = snprintf(rfilename, sizeof rfilename, "/usr/lib/X11/app-defaults/%s",
-+      XrmQuarkToString(_class));
-+  if (result >= 0 && result < sizeof rfilename)
-+    XrmCombineFileDatabase (rfilename, &_db, 1);
 -  snprintf(rfilename, 2048, "/usr/X11R6/lib/X11/app-defaults/%s",
-+  result = snprintf(rfilename, sizeof rfilename, "/usr/X11R6/lib/X11/app-defaults/%s",
++  //  Check /usr/lib/X11 for when /usr/X11R6 compatibility symlink is removed
++  result = snprintf(rfilename, sizeof rfilename, "/etc/X11/app-defaults/%s",
        XrmQuarkToString(_class));
 -  if (rfilename != NULL)
 +  if (result >= 0 && result < sizeof rfilename)
++    XrmCombineFileDatabase (rfilename, &_db, 1);
++  result = snprintf(rfilename, sizeof rfilename, "/usr/share/X11/app-defaults/%s",
++      XrmQuarkToString(_class));
++  if (result >= 0 && result < sizeof rfilename)
      XrmCombineFileDatabase (rfilename, &_db, 1);
    //  Try a few more, for SunOS/Solaris folks.
 -  snprintf(rfilename, 2048, "/usr/openwin/lib/X11/app-defaults/%s",
@@ -26,10 +39,11 @@
 +  if (result >= 0 && result < sizeof rfilename)
      XrmCombineFileDatabase (rfilename, &_db, 1);
 -  snprintf(rfilename, 2048, "/usr/local/X11R6/lib/X11/app-defaults/%s",
-+  result = snprintf(rfilename, sizeof rfilename, "/usr/local/X11R6/lib/X11/app-defaults/%s",
++  result = snprintf(rfilename, sizeof rfilename, "/usr/local/share/X11/app-defaults/%s",
        XrmQuarkToString(_class));
 -  if (rfilename != NULL)
 +  if (result >= 0 && result < sizeof rfilename)
      XrmCombineFileDatabase (rfilename, &_db, 1);
  
    //  Now, check for an XOSView file in the XAPPLRESDIR directory...
+Only in xosview-1.8.3: Xrm.cc.orig
diff --git a/x11-misc/xosview/xosview-1.8.3.ebuild b/x11-misc/xosview/xosview-1.8.3-r1.ebuild
index 32df0caf2f99..df16a6a30cb8 100644
--- a/x11-misc/xosview/xosview-1.8.3.ebuild
+++ b/x11-misc/xosview/xosview-1.8.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.8.3.ebuild,v 1.12 2009/08/06 16:00:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.8.3-r1.ebuild,v 1.1 2009/12/23 16:16:17 ssuominen Exp $
 
 inherit eutils
 
@@ -34,7 +34,7 @@ src_unpack() {
 src_install() {
 	exeinto /usr/bin
 	doexe xosview
-	insinto /etc/X11/app-defaults
+	insinto /usr/share/X11/app-defaults
 	newins Xdefaults XOsview
 	doman *.1
 	dodoc CHANGES README README.linux TODO