Fix up documentation bug 296669 and an upstream bug affecting nvidia users.

(Portage version: 2.2_rc56/cvs/Linux i686)

2 files changed, 123 insertions, 0 deletions

diff --git a/dev-util/bless/files/bless-0.6.0-docpath.patch b/dev-util/bless/files/bless-0.6.0-docpath.patch
new file mode 100644
index 000000000000..0def24d27e98
--- /dev/null
+++ b/dev-util/bless/files/bless-0.6.0-docpath.patch
@@ -0,0 +1,103 @@
+diff --git a/Makefile.am b/Makefile.am
+index 33f265b..23fcb0e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -35,10 +35,10 @@ dist-hook:
+ 	bzr log > $(distdir)/ChangeLog
+ 
+ install-data-local:
+-	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
++	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+ 	$(INSTALL_DATA) AUTHORS COPYING INSTALL ChangeLog NEWS \
+ 			README README.packaging bless.spec     \
+-			$(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
++			$(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+ 
+ uninstall-local:
+ 	rm -rf $(DESTDIR)$(libdir)/$(PACKAGE_NAME)
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 13ea7ed..207c17a 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -12,7 +12,7 @@ PWD=$(shell pwd)
+ help_script.sh: help_script.tmpl
+ 	sed -e 's,@blessdocdir\@,$(PWD)/../doc,g' help_script.tmpl > help_script.sh
+ 	chmod +x help_script.sh
+-	sed -e 's,@blessdocdir\@,$(datadir)/doc/$(PACKAGE_NAME),g' help_script.tmpl > help_script.sh.install
++	sed -e 's,@blessdocdir\@,$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION),g' help_script.tmpl > help_script.sh.install
+ 
+ install-data-local:
+ 	$(INSTALL) -d $(DESTDIR)$(datadir)/$(PACKAGE_NAME)
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index b18e94a..c0e700d 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,4 +1,4 @@
+ SUBDIRS= developer user
+ 
+ uninstall-local:
+-	rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
++	rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+diff --git a/doc/developer/Makefile.am b/doc/developer/Makefile.am
+index 65911f8..c13f216 100644
+--- a/doc/developer/Makefile.am
++++ b/doc/developer/Makefile.am
+@@ -4,8 +4,8 @@ DOCS=$(srcdir)/en/*.xml \
+ EXTRA_DIST=$(DOCS) bless-docs.source
+ 
+ #install-data-local: 
+-#	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/developer
+-#	$(INSTALL_DATA) $(MD_FILES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/developer
++#	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer
++#	$(INSTALL_DATA) $(MD_FILES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer
+ 
+ #uninstall-local:
+-#	rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/developer
++#	rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer
+diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am
+index 729b295..b1d371d 100644
+--- a/doc/user/Makefile.am
++++ b/doc/user/Makefile.am
+@@ -10,7 +10,7 @@ noinst_SCRIPTS=$(OMF)
+ 
+ $(OMF): $(OMF).in
+ 	if [ -x `which scrollkeeper-preinstall` ]; then \
+-	    scrollkeeper-preinstall file:$(datadir)/doc/$(PACKAGE_NAME)/user/bless-manual.xml $(OMF).in $(OMF); \
++	    scrollkeeper-preinstall file:$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/bless-manual.xml $(OMF).in $(OMF); \
+ 	else \
+ 	    cp $(OMF).in $(OMF); \
+ 	fi
+@@ -27,22 +27,22 @@ dist-hook: doc
+ 	rm html_file_list
+ 
+ install-data-local:
+-	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
+-	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures
++	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user
++	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/figures
+ 	$(INSTALL_DATA) $(DOCS) $(wildcard *.html) \
+-			$(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
+-	$(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures
+-	$(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
+-	$(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
++			$(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user
++	$(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/figures
++	$(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
++	$(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+ if WITH_SCROLLKEEPER
+-	scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
++	scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+ endif
+ 
+ uninstall-local:
+-	rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
+-	rm $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)/$(OMF)
++	rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user
++	rm $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(OMF)
+ if WITH_SCROLLKEEPER
+-	scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
++	scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+ endif
+-	rm -rf $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
++	rm -rf $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+ 
diff --git a/dev-util/bless/files/bless-0.6.0-pixmap.patch b/dev-util/bless/files/bless-0.6.0-pixmap.patch
new file mode 100644
index 000000000000..441a9e2bfb79
--- /dev/null
+++ b/dev-util/bless/files/bless-0.6.0-pixmap.patch
@@ -0,0 +1,20 @@
+=== modified file 'src/gui/drawers/HexDrawer.cs'
+--- src/gui/drawers/HexDrawer.cs	2007-06-13 12:20:53 +0000
++++ src/gui/drawers/HexDrawer.cs	2009-04-10 23:21:41 +0000
+@@ -57,11 +57,14 @@
+ 
+ 		//System.Console.WriteLine(s);
+ 
+-		pangoLayout.SetText(s);
++		pangoLayout.SetText(s.Substring(0,256));
+ 
+ 
+ 		gc.RgbFgColor = fg;
+ 		pix.DrawLayout(gc, 0, 0, pangoLayout);
++		
++		pangoLayout.SetText(s.Substring(256,256));
++		pix.DrawLayout(gc, 128*2*width, 0, pangoLayout);
+ 
+ 		return pix;
+ 	}
+