Revbump to fix bug 254601, thanks to John Keeping for the patch.

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.28-gentoo x86_64

4 files changed, 183 insertions, 7 deletions

diff --git a/app-misc/alexandria/ChangeLog b/app-misc/alexandria/ChangeLog
index 05b7700b6ffc..c91bf239e098 100644
--- a/app-misc/alexandria/ChangeLog
+++ b/app-misc/alexandria/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/alexandria
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/ChangeLog,v 1.23 2008/04/23 18:20:26 graaff Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/ChangeLog,v 1.24 2009/01/18 10:51:02 a3li Exp $
+
+*alexandria-0.6.3-r1 (18 Jan 2009)
+
+  18 Jan 2009; Alex Legler <a3li@gentoo.org>
+  +files/alexandria-0.6.3-tooltips.patch, +alexandria-0.6.3-r1.ebuild:
+  Fixing tooltip crash reported in bug 254601. Patch provided by John
+  Keeping. PATCHES now is a bash array.
 
 *alexandria-0.6.3 (23 Apr 2008)
 
diff --git a/app-misc/alexandria/Manifest b/app-misc/alexandria/Manifest
index e6b30fdbde89..16c84e835a4d 100644
--- a/app-misc/alexandria/Manifest
+++ b/app-misc/alexandria/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX alexandria-0.6.2-rake-0.8.1.patch 5281 RMD160 d8a7f4c94ae3972d40a51ce59312d6ebcb0fd3d1 SHA1 0f49dfca3b159116fe5dfc45c41f258b2f1767c0 SHA256 ed4dc7560f088f58411473003ddee3cb44623a5e53c22bb59e9cc0e40e845443
 AUX alexandria-0.6.3-no_amazon_3.0.diff 671 RMD160 128d236354e7d9601b892f103884f8faed6dbc78 SHA1 3fec27e919fd0885f7eaf6826629c561bbb175f1 SHA256 8bbae006f0e55ad90121cee34ca85b31ae8f902320d2bc2aa0a26431bb61f46e
+AUX alexandria-0.6.3-tooltips.patch 2475 RMD160 b09628eddd19fc5491f557be2012cfb278bc1f2d SHA1 d394e0ee33582dd0d1dd030ebfa4b01a4a827fcb SHA256 8bd8decc2a03e6c3c578f4642a0dae4d1dacf68f92d37c96dd25b88e62896a4d
 AUX alexandria-rakefile.patch 447 RMD160 0e091640e3666f23b574834d976c0649a5124067 SHA1 5abfcb997c95d0a08d1401df4151dfe25aada1da SHA256 88852e3f4bb5e4edb40b6e89609aeb91dddbed7886fbfed5a52fb8112e888416
 DIST alexandria-0.5.1.tar.gz 124613 RMD160 bb153001bbdfc09ca33b467504d8ba4b3bb7a18f SHA1 547be0fe7fd1af80a54468e19fcb89a77f20888e SHA256 a1d1bdc3561320c0c081949237206b8662444dcad68aa6ca482177f9655e2588
 DIST alexandria-0.6.1.tar.gz 929638 RMD160 908b4234f75ffdb2d413366809b6dd8e6a406734 SHA1 9ed4079d73c1449ad0c2af52fff38f9886797369 SHA256 8f81822ba7a2cef2ce0b8f7d472f59737127d6c926853f4a4e288e11fdf8cf7f
@@ -11,13 +12,14 @@ DIST alexandria-0.6.3.tar.gz 2748946 RMD160 b76b67e77fb18977f7b27e2888bcc8d27ee5
 EBUILD alexandria-0.5.1.ebuild 1562 RMD160 f8ac34cc9efadea7521ee03def7dd040686d6d03 SHA1 51e8ba5dbd0b0c7fddb232236d05d80e4cc3a5d4 SHA256 63354f6db98f1aa19f5bb3f05e753cba6a668805f0e5e46c8aa5050fe1a6e231
 EBUILD alexandria-0.6.1.ebuild 1370 RMD160 a75be2100c5233555d21e15873842686919fb120 SHA1 d51c045f7bdd12c467406d43dfe5827fba97649d SHA256 75e9629a6b9454adee41bed793b800bb844bde1f4d5c064907f728cd94268996
 EBUILD alexandria-0.6.2.ebuild 1442 RMD160 ba2a9f71a3a1ce9960ff823b9541ef82a3727d5d SHA1 caa4ae526f0b6cd976b992130a45df9ed2ae8ac4 SHA256 dd36e7055b533739fb6c444cdada7aa7a6e71c8e17e1fe2eed902dd9d0b4d7a2
+EBUILD alexandria-0.6.3-r1.ebuild 1766 RMD160 b3f4294b9c7a98126430c2fe5a2186e669047c3e SHA1 ea648bfe9293d6e800122d39cf8cc75f9a98fff7 SHA256 b54560bd27464ae650695638d07fb94b0662e6f9a7a13d29af0fd5dd315017de
 EBUILD alexandria-0.6.3.ebuild 1723 RMD160 c425399a59300178a67f639ced5359aaff7307ee SHA1 00ec3383a0b53a267913b0c65c140b6bbc07d006 SHA256 250595b49f4215b688b6d561f9764fbae5d301dd7f242e7981b5222d5c121634
-MISC ChangeLog 3387 RMD160 1267ad700ea0c5a88ed0ba80c01a45ef7948114c SHA1 6484c17c7325ee0ba89becd123545032cc17c62f SHA256 da82ce799346b6d0cfee13cf84d1d8b84b493e4c8109c51b40a094d906a81f65
+MISC ChangeLog 3648 RMD160 62ba8a653b637f5f5e51705f72210af14a9af496 SHA1 ef4fa50995b3b123e39a242404f4ab13f1f4d441 SHA256 f4507de73c884fc2330024fc1563c207079e05b799058a9ce4e16522fe155eb7
 MISC metadata.xml 295 RMD160 42f895a8c3619e0a747f33af56f6420b2138f3d0 SHA1 d99a6ad2e3948fd01f6467859050ae012bf52f93 SHA256 d85e5fba4ce142acc61fa7b7e006665cde7dbe045a4238858b360ff0b23c175b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFID33wQUozDL2JlH4RAssfAJ4oop5DTvhNHIyL60w9fuPLsZtWxQCeL7z9
-qUd6INWTCmghf4ShdiC363M=
-=Fe3+
+iEYEARECAAYFAklzCaQACgkQk3qunHEll7OsrwCfSN7SpjlfT/PLNmXBokdU35yW
+6f8An3o/umPFg9eqBs50k+nBbbaza41h
+=T3ZL
 -----END PGP SIGNATURE-----
diff --git a/app-misc/alexandria/alexandria-0.6.3-r1.ebuild b/app-misc/alexandria/alexandria-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..db88e0bf221e
--- /dev/null
+++ b/app-misc/alexandria/alexandria-0.6.3-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/alexandria-0.6.3-r1.ebuild,v 1.1 2009/01/18 10:51:02 a3li Exp $
+
+inherit gnome2 ruby
+
+IUSE="evo"
+
+DESCRIPTION="A GNOME application to help you manage your book collection"
+HOMEPAGE="http://alexandria.rubyforge.org/"
+SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS="COPYING ChangeLog README TODO"
+
+RDEPEND=">=dev-lang/ruby-1.8.0
+	>=dev-ruby/ruby-gettext-0.6.1
+	>=dev-ruby/ruby-gnome2-0.16.0
+	>=dev-ruby/ruby-libglade2-0.12.0
+	>=dev-ruby/ruby-gconf2-0.12.0
+	>=dev-ruby/imagesize-0.1.1
+	evo? ( >=dev-ruby/revolution-0.5 )"
+
+DEPEND=">=dev-lang/ruby-1.8.0
+	app-text/scrollkeeper
+	dev-ruby/rake"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-rakefile.patch"
+	"${FILESDIR}/${P}-no_amazon_3.0.diff"
+	"${FILESDIR}/${P}-tooltips.patch"
+)
+
+src_compile() {
+	rake || die
+}
+
+src_install() {
+	export PREFIX="${D}/usr"
+	rake install || die
+
+	[ -n "${DOCS}" ] && dodoc ${DOCS}
+
+	# Move the installed docs to the gentoo standard directory
+	for doc in "${D}/usr/share/doc/alexandria/*"
+	do
+		dodoc $doc
+	done
+	rm -rf "${D}/usr/share/doc/alexandria"
+}
+
+pkg_postinst() {
+	unset PREFIX
+
+	gnome2_gconf_install
+
+	# For the next line see bug #76726
+	"${ROOT}/usr/bin/gconftool-2" --shutdown
+
+	echo
+	elog "To enable some book providers you will need to emerge"
+	elog "additional packages:"
+	echo
+	elog "  For the Deastore book provider:"
+	elog "    dev-ruby/mechanize"
+	echo
+	elog "  For Z39.50 support and the Library of Congress and"
+	elog "  British Library book proviers:"
+	elog "    dev-ruby/ruby-zoom"
+	echo
+	elog "  For the Amazon book provider:"
+	elog "    dev-ruby/hpricot"
+	echo
+}
diff --git a/app-misc/alexandria/files/alexandria-0.6.3-tooltips.patch b/app-misc/alexandria/files/alexandria-0.6.3-tooltips.patch
new file mode 100644
index 000000000000..5ff60c4211eb
--- /dev/null
+++ b/app-misc/alexandria/files/alexandria-0.6.3-tooltips.patch
@@ -0,0 +1,90 @@
+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)