version bump for newer Ruby GTK versions, patch and information provided by Tomoh K. in bug 395117.

Package-Manager: portage-2.1.10.41/cvs/Linux i686

4 files changed, 99 insertions, 5 deletions

diff --git a/app-misc/alexandria/ChangeLog b/app-misc/alexandria/ChangeLog
index 628cd268c3b7..6359361aa15d 100644
--- a/app-misc/alexandria/ChangeLog
+++ b/app-misc/alexandria/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/alexandria
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/ChangeLog,v 1.46 2011/12/13 19:26:15 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/ChangeLog,v 1.47 2011/12/26 10:56:58 fauli Exp $
+
+*alexandria-0.6.8 (26 Dec 2011)
+
+  26 Dec 2011; Christian Faulhammer <fauli@gentoo.org>
+  +alexandria-0.6.8.ebuild, +files/alexandria-0.6.8-set_status_label.patch:
+  version bump for newer Ruby GTK versions, patch and information provided
+  by Tomoh K. in bug 395117.
 
 *alexandria-0.6.7 (13 Dec 2011)
 
diff --git a/app-misc/alexandria/Manifest b/app-misc/alexandria/Manifest
index 9efe45469188..dbaa6a2ee285 100644
--- a/app-misc/alexandria/Manifest
+++ b/app-misc/alexandria/Manifest
@@ -2,18 +2,21 @@
 Hash: SHA1
 
 AUX alexandria-0.6.6-Rakefile.patch 509 RMD160 1433786000f4fadd054dbb411d6da4ddbe6c7924 SHA1 d71853c608312f9a73ef7c13a0e0adfc2e0dadd7 SHA256 5d29b2edc0891f2707a2eae0f8e6236c1c1e04f3d48d34a0a645abe275619cc9
+AUX alexandria-0.6.8-set_status_label.patch 396 RMD160 fa6cd68a403a8c016b9b42a20842970568a970ff SHA1 859acd11f558f3e13fb0209a850f67e5ae7a1e00 SHA256 6a4a9cddad5a54814c6ebef1763e555aa08323c5a2d69e61f1dbe868af01c0bf
 DIST alexandria-0.6.6.tar.gz 2990953 RMD160 a935205782caafff990a859f548eec81eba4ba63 SHA1 edcd808ab2fd7407bfbacdd8ecd7f0346e871b1d SHA256 42a9c81288b13190928166c67592426d893a8fba98293fca98e1fb9f36054ce0
 DIST alexandria-0.6.7.tar.gz 3014178 RMD160 f00041ee8afc0c97fd4412d7b73786d9ba1a096a SHA1 0a31bd9bb1e626e5451f01c900ac9ad9c25f5e1c SHA256 47991fc42884187974ac600b1b9db6f57546d4ea6af3ef0c125519d95bbd710b
+DIST alexandria-0.6.8.tar.gz 2888984 RMD160 a77d9eb81a2ecb6af578403a10e2b1786091ec0a SHA1 8c85085d58acd73ce2f982bc4636d949121770ee SHA256 d6bd9d6619a0bda5992a0df440404726c63cda57c49bfe0f57d5e21506866770
 EBUILD alexandria-0.6.6-r1.ebuild 1734 RMD160 f927e4cc1ce2ad2ab7c0f22512fa765bab9b13b2 SHA1 9fd7b97d9f890fe021761bef11245b469703bf11 SHA256 10db9902b520c93f62f3fb1916469075bba1ef379053327c095cafc0ba318725
 EBUILD alexandria-0.6.6-r2.ebuild 1668 RMD160 9e548ca0e9783a05e8006ac92a922b4cb263c862 SHA1 c36c634cd012c9cd7fa07b226967b7058220a79d SHA256 4bd77a8e940991a845b69566b8c2b81003f7697c759e3301613752c98062f3f4
 EBUILD alexandria-0.6.6.ebuild 1658 RMD160 43297399bc8e35ddada69e6033982329e5392ce5 SHA1 0a152eafaa4df497d66637e0a827212f9b4759fb SHA256 981b0f7c0bd8f754f4e988995f55ac8219bdd0f98a633e536a9a0d5e1e818f60
 EBUILD alexandria-0.6.7.ebuild 1671 RMD160 5343bf0cc791f854801496c0499b31f886fff6e7 SHA1 0f9732da8b8cf4d575bbc5eaebe3d779e8a4d4d6 SHA256 23ac28b7e3bdb1400d00fbe462082d3b50115ad26c09eff80b8a832568eee049
-MISC ChangeLog 6856 RMD160 e072c098416ecd953386ef4d1535a8c09929b9c3 SHA1 2a16ab76b6126233043d2c5e4fd9208d320ebb5d SHA256 6d2276e2382f189fae2dcdf3c1bd72eb448ddfbd13135f5b9f0478aaf4d484d4
+EBUILD alexandria-0.6.8.ebuild 1813 RMD160 e3efbc72a0fcc2bde5bbec21c3b2cd766f30b53f SHA1 c4593aff5fdbb870d4481088a296a29336273a8d SHA256 18e001c5229acc431e698e610fa5ffdd3443cbef50d13a365f737260de2e4ed7
+MISC ChangeLog 7125 RMD160 fe0f8bef97418fad7413e5d977ae539b7064e671 SHA1 29c19cbdfec9e211538606342d1f30f042f61394 SHA256 96b97c19de62982d5f742e9d2b7f70bc6cad32f8463da8725a21a06ad2b92dfd
 MISC metadata.xml 412 RMD160 22781e283441655607d305bdcdb742a649e35731 SHA1 21bdd783552eee61b48c952329cbbf5a08dd8409 SHA256 a7a97efa71df1e2ae81605713d72705a7aaff07756cfeb545defac70c9cce191
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7npwkACgkQNQqtfCuFneNKjgCdH+qhGlWzNxWp5TkZFm9PW5/i
-Tw8An17xckEGRiiE5R8pXiwJT8P9Mwoz
-=br1f
+iEYEARECAAYFAk74Uz8ACgkQNQqtfCuFneODTwCfXe/26dLc7ifUCSuHWjUA5oIq
+V1IAnRHNjz+c92jFq9BKGx6AODrrnKKt
+=YX0g
 -----END PGP SIGNATURE-----
diff --git a/app-misc/alexandria/alexandria-0.6.8.ebuild b/app-misc/alexandria/alexandria-0.6.8.ebuild
new file mode 100644
index 000000000000..99898e31ace1
--- /dev/null
+++ b/app-misc/alexandria/alexandria-0.6.8.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/alexandria-0.6.8.ebuild,v 1.1 2011/12/26 10:56:58 fauli Exp $
+
+EAPI=4
+USE_RUBY="ruby18"
+
+inherit gnome2 ruby-ng
+
+DESCRIPTION="A GNOME application to help you manage your book collection"
+HOMEPAGE="http://alexandria.rubyforge.org/"
+SRC_URI="mirror://rubyforge/${PN}/${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="evo"
+
+DOCS="ChangeLog README TODO doc/BUGS doc/cuecat_support.rdoc doc/FAQ doc/HACKING doc/NEWS"
+
+ruby_add_rdepend "
+	>=dev-ruby/ruby-gettext-0.6.1
+	>=dev-ruby/ruby-gtk2-0.90
+	>=dev-ruby/ruby-goocanvas-0.90
+	>=dev-ruby/ruby-gstreamer-0.90
+	>=dev-ruby/ruby-pango-0.90
+	>=dev-ruby/imagesize-0.1.1
+	dev-ruby/hpricot
+	evo? ( >=dev-ruby/revolution-0.5 )"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+DEPEND="${DEPEND}
+	gnome-base/gconf:2
+	app-text/scrollkeeper"
+
+RUBY_PATCHES=(
+	"${FILESDIR}/${P}-set_status_label.patch"
+	"${FILESDIR}/${PN}-0.6.6-Rakefile.patch"
+)
+
+each_ruby_compile() {
+	${RUBY} -S rake || die
+}
+
+each_ruby_install() {
+	export DESTDIR="${D}" PREFIX=/usr RUBYLIBDIR="$(ruby_rbconfig_value 'sitelibdir')"
+	${RUBY} -S rake install_package_staging || die
+}
+
+all_ruby_install() {
+	[ -n "${DOCS}" ] && dodoc ${DOCS} || die "Failed to install documentation"
+}
+
+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/htmlentities"
+	echo
+	elog "  For Z39.50 support and the Library of Congress and"
+	elog "  British Library book proviers:"
+	elog "    dev-ruby/ruby-zoom"
+}
diff --git a/app-misc/alexandria/files/alexandria-0.6.8-set_status_label.patch b/app-misc/alexandria/files/alexandria-0.6.8-set_status_label.patch
new file mode 100644
index 000000000000..55fbade8827e
--- /dev/null
+++ b/app-misc/alexandria/files/alexandria-0.6.8-set_status_label.patch
@@ -0,0 +1,11 @@
+--- lib/alexandria/ui/dialogs/new_book_dialog.rb.orig
++++ lib/alexandria/ui/dialogs/new_book_dialog.rb
+@@ -574,7 +574,7 @@
+           log.debug { "update message : #{message}" }
+ 
+           # @parent.appbar.status = message
+-          MainApp.instance.appbar.status = message # HACKish
++          MainApp.instance.ui_manager.set_status_label( message )
+           #false
+         end
+       end