summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2009-03-25 14:37:44 +0000
committerChristian Faulhammer <fauli@gentoo.org>2009-03-25 14:37:44 +0000
commit2c4174b23411b23e3c9a42eebbb99b78622ef36e (patch)
treefc5bf30d81e50f9c013ed5bdfa9303938adfc242 /app-misc/alexandria/files
parentMarked ppc/ppc64 stable for bug #263443. (diff)
downloadgentoo-2-2c4174b23411b23e3c9a42eebbb99b78622ef36e.tar.gz
gentoo-2-2c4174b23411b23e3c9a42eebbb99b78622ef36e.tar.bz2
gentoo-2-2c4174b23411b23e3c9a42eebbb99b78622ef36e.zip
get rid of spurious patches, too
(Portage version: 2.1.6.7/cvs/Linux i686)
Diffstat (limited to 'app-misc/alexandria/files')
-rw-r--r--app-misc/alexandria/files/alexandria-0.6.2-rake-0.8.1.patch147
-rw-r--r--app-misc/alexandria/files/alexandria-0.6.3-no_amazon_3.0.diff19
-rw-r--r--app-misc/alexandria/files/alexandria-0.6.3-tooltips.patch90
3 files changed, 0 insertions, 256 deletions
diff --git a/app-misc/alexandria/files/alexandria-0.6.2-rake-0.8.1.patch b/app-misc/alexandria/files/alexandria-0.6.2-rake-0.8.1.patch
deleted file mode 100644
index d99757994d21..000000000000
--- a/app-misc/alexandria/files/alexandria-0.6.2-rake-0.8.1.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-# Merge changes from upstream to fix compilation with rake 0.8.1
-
---- tasks.rb.orig 2007-12-19 20:49:17.000000000 +0000
-+++ tasks.rb 2008-02-07 11:33:54.000000000 +0000
-@@ -38,6 +38,7 @@
- # these may be distributed as ordinary libraries,
- # or as gems. Try the library versions first.
- retrying_with_rubygems = false
-+
- begin
- require 'rake'
- require 'rake/tasklib'
-@@ -199,21 +200,35 @@
- desc "Run RSpec specifications"
- Spec::Rake::SpecTask.new("spec") do |t|
- t.spec_files = @files.specs
-- t.spec_opts = ["--format", "specdoc"]
-+ t.spec_opts = ["--format", "progress"]
- end
-+
- namespace :spec do
-+ Spec::Rake::SpecTask.new("autotest") do |t|
-+ t.spec_files = @files.specs
-+ t.spec_opts = ["--format", "progress"]
-+ end
-+
- desc "Verify test coverage"
- Spec::Rake::SpecTask.new("rcov") do |t|
-- t.spec_files = FileList['spec/**/*_spec.rb']
-+ t.spec_files = @files.specs
- t.spec_opts = ["--format", "specdoc"]
- t.rcov_opts = ["--exclude", "spec"]
- t.rcov = true
- end
-+ desc "Generate spec html"
- Spec::Rake::SpecTask.new("html") do |t|
-- t.spec_files = FileList['spec/**/*_spec.rb']
-+ t.spec_files = @files.specs
- t.spec_opts = ["--format", "html"]
- t.rcov_opts = ["--exclude", "spec"]
- end
-+ desc "Profile slowest examples"
-+ Spec::Rake::SpecTask.new("profile") do |t|
-+ t.spec_files = @files.specs
-+ t.spec_opts = ["--format", "profile"]
-+ t.rcov_opts = ["--exclude", "spec"]
-+ end
-+
- desc "Run slower acceptance tests (real world data)"
- Spec::Rake::SpecTask.new("acceptance") do |t|
- t.spec_files = FileList['spec/acceptance/*_spec.rb']
-@@ -258,8 +273,8 @@
- end
- dest = source_path ? dest_basedir + source_path : dest_basedir
- FileUtils.mkdir_p dest unless test ?d, dest
-- puts "Installing #{file} to #{dest}"
-- File.install(file.to_s, dest.to_s, mode)
-+ puts "Installing #{file} to #{dest} with #{mode}"
-+ FileUtils.install(file.to_s, dest.to_s, :mode => mode)
- end
-
- def define_install_tasks
-@@ -318,9 +333,9 @@
-
- def base_installation
- [
-- ['lib', build.files.libs, rubylib, 0644],
-- ['data', build.files.data, sharedir, 0644],
-- ['bin', build.files.programs, bindir, 0755]
-+ ['lib', build.files.libs, rubylib, 0644],
-+ ['data', build.files.data, sharedir, 0644],
-+ ['bin', build.files.programs, bindir, 0755]
- ]
- end
-
-@@ -329,7 +344,7 @@
- icon_group = []
- build.files.icons.each do |filename|
- filename =~ /.*\/(.+)\/.+/
-- size = $1
-+ size = $1
- dest = File.join(icon_dir, size, 'apps')
- icon_group << [File.dirname(filename), filename, dest, 0644]
- end
-@@ -357,8 +372,8 @@
- end
- end
- [
-- ['doc', docdir_files, doc_dir, 0644],
-- ['.', curdir_files, doc_dir, 0644]
-+ ['doc', docdir_files, doc_dir, 0644],
-+ ['.', curdir_files, doc_dir, 0644]
- ]
- end
-
-@@ -388,7 +403,7 @@
- def template_copy(src, dest, data)
- src_text = File.open(src).read()
- dest_text = src_text.gsub(/#(\w+)#/) { |match| data[$1.intern] }
-- FileUtils.mkdir_p(File.dirname(dest))
-+ FileUtils.mkdir_p(File.dirname(dest))
- File.open(dest, 'w') { |f| f.write(dest_text) }
- end
-
-@@ -416,16 +431,16 @@
- # HACK gconf
- gconf_dir = File.join(@debinstall.staging_dir, "/usr/share/gconf/schemas")
- FileUtils.mkdir_p(gconf_dir)
-- File.install("schemas/alexandria.schemas", gconf_dir, 0644)
-+ FileUtils.install("schemas/alexandria.schemas", gconf_dir, 0644)
-
- # HACK copyright
- doc_dir = File.join(@debinstall.staging_dir, "/usr/share/doc/#{@name}")
- FileUtils.mkdir_p(doc_dir)
-- File.install("debian/copyright", doc_dir, 0644)
-+ FileUtils.install("debian/copyright", doc_dir, 0644)
- FileUtils.rm_f(File.join(doc_dir, 'COPYING'))
- FileUtils.rm_f(File.join(doc_dir, 'INSTALL'))
-- File.install("debian/README.Debian", doc_dir, 0644)
-- File.install("debian/changelog", doc_dir, 0644)
-+ FileUtils.install("debian/README.Debian", doc_dir, 0644)
-+ FileUtils.install("debian/changelog", doc_dir, 0644)
-
- autogen_files = ["lib/alexandria/config.rb",
- "lib/alexandria/version.rb",
-@@ -549,7 +564,7 @@
- end
- def locale_for(omf_file)
- omf_file =~ /.*-(.+)\.omf/
-- $1
-+ $1
- end
- def in_files
- FileList["#{@omf_dir}/*.omf.in"]
-@@ -566,9 +581,9 @@
- def define_gettext_tasks
- # extract translations from PO files into other files
- file files.desktop => ["#{files.desktop}.in",
-- *@gettext.po_files] do |f|
-- system("intltool-merge -d #{@gettext.po_dir} #{f.name}.in #{f.name}")
-- end
-+ *@gettext.po_files] do |f|
-+ raise "Need to install intltool" unless system("intltool-merge -d #{@gettext.po_dir} #{f.name}.in #{f.name}")
-+ end
-
- # create MO files
- rule( /\.mo$/ => [ lambda { |dest| @gettext.source_file(dest) }]) do |t|
diff --git a/app-misc/alexandria/files/alexandria-0.6.3-no_amazon_3.0.diff b/app-misc/alexandria/files/alexandria-0.6.3-no_amazon_3.0.diff
deleted file mode 100644
index 09069bebcaf3..000000000000
--- a/app-misc/alexandria/files/alexandria-0.6.3-no_amazon_3.0.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./lib/alexandria/book_providers.rb 2008-02-21 01:11:37.000000000 +0000
-+++ ./lib/alexandria/book_providers.rb 2008-04-09 19:25:58.000000000 +0100
-@@ -244,11 +244,11 @@
- require 'alexandria/book_providers/webster_it'
- require 'alexandria/book_providers/worldcat'
-
-- begin
-- require 'alexandria/book_providers/amazon'
-- rescue LoadError
-- log.info { "Can't load Ruby/Amazon, hence provider Amazon not available" }
-- end
-+# begin
-+# require 'alexandria/book_providers/amazon'
-+# rescue LoadError
-+# log.info { "Can't load Ruby/Amazon, hence provider Amazon not available" }
-+# end
-
- # mechanize is optional
- begin
diff --git a/app-misc/alexandria/files/alexandria-0.6.3-tooltips.patch b/app-misc/alexandria/files/alexandria-0.6.3-tooltips.patch
deleted file mode 100644
index 5ff60c4211eb..000000000000
--- a/app-misc/alexandria/files/alexandria-0.6.3-tooltips.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Changes backported from upstream SVN for bug 254601.
-Fixes a crash when displaying a tooltip for a book without publisher.
-
---- lib/alexandria/ui/iconview_tooltips.rb 2008-11-25 12:31:05.000000000 +0000
-+++ lib/alexandria/ui/iconview_tooltips.rb 2009-01-11 20:44:51.000000000 +0000
-@@ -25,6 +25,8 @@
- #
- # Ported to ruby-gtk2 (and modified for IconView) by Cathal Mc Ginley
-
-+require 'cgi'
-+
- class IconViewTooltips
- def initialize(view)
- @tooltip_window = Gtk::Window.new(Gtk::Window::POPUP)
-@@ -36,21 +38,21 @@
- @tooltip_window.signal_connect('expose_event') { |window, event|
- on_expose(window, event) }
-
-- @label = Gtk::Label.new('')
-- @label.wrap = true
-- @label.set_alignment(0.5, 0.5)
-- @label.use_markup = true
-- @label.show()
-+ @label = Gtk::Label.new('')
-+ @label.wrap = true
-+ @label.set_alignment(0.5, 0.5)
-+ @label.use_markup = true
-+ @label.show()
-
-- @tooltip_window.add(@label)
-- set_view(view)
-+ @tooltip_window.add(@label)
-+ set_view(view)
- end
-
- def set_view(view)
- view.signal_connect('motion_notify_event') { |view, event|
- on_motion(view, event) }
-- view.signal_connect('leave_notify_event') { |view, event|
-- on_leave(view, event) }
-+ view.signal_connect('leave_notify_event') { |view, event|
-+ on_leave(view, event) }
- end
-
- def on_expose(window, event)
-@@ -71,30 +73,31 @@
- # This is much too complex... but it works for now!
- html = ""
- if title.size > 0
-- html += "<b>#{title}</b>"
-+ html += "<b>#{CGI.escapeHTML(title)}</b>"
- if authors.size > 0
- html += "\n"
- end
- end
- if authors.size > 0
-- html += "<i>#{authors}</i>"
-+ html += "<i>#{CGI.escapeHTML(authors)}</i>"
- end
- if (title.size > 0) or (authors.size > 0)
- html += "\n"
- end
-- if (publisher.size > 0) or (year.size > 0)
-- html += "<small>"
-- if publisher.size > 0
-- html += "#{publisher}"
-- end
-- if year.size > 0
-- if publisher.size > 0
-- html += " "
-- end
-- html += "(#{year})"
-+
-+ html += "<small>"
-+ if publisher and publisher.size > 0
-+ html += "#{CGI.escapeHTML(publisher)}"
-+ end
-+
-+ if year and year.size > 0
-+ if publisher and publisher.size > 0
-+ html += " "
- end
-- html += "</small>"
-+ html += "(#{year})"
- end
-+
-+ html += "</small>"
- end
-
- def on_motion(view, event)