Version bump

Package-Manager: portage-2.1.4.4

4 files changed, 109 insertions, 5 deletions

diff --git a/app-misc/alexandria/ChangeLog b/app-misc/alexandria/ChangeLog
index 0f54189e8921..05b7700b6ffc 100644
--- a/app-misc/alexandria/ChangeLog
+++ b/app-misc/alexandria/ChangeLog
@@ -1,6 +1,14 @@
 # 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.22 2008/03/09 10:25:25 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/ChangeLog,v 1.23 2008/04/23 18:20:26 graaff Exp $
+
+*alexandria-0.6.3 (23 Apr 2008)
+
+  23 Apr 2008; Hans de Graaff <graaff@gentoo.org>
+  +files/alexandria-0.6.3-no_amazon_3.0.diff, +alexandria-0.6.3.ebuild:
+  Version bump with some additional dependencies and information on further
+  dependencies for specific book providers. Thanks to John Keeping for doing all
+  the actual work in #215337.
 
   09 Mar 2008; Hans de Graaff <graaff@gentoo.org> -alexandria-0.6.0.ebuild:
   Remove old version
diff --git a/app-misc/alexandria/Manifest b/app-misc/alexandria/Manifest
index 0c2e42ef1a91..e6b30fdbde89 100644
--- a/app-misc/alexandria/Manifest
+++ b/app-misc/alexandria/Manifest
@@ -2,19 +2,22 @@
 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-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
 DIST alexandria-0.6.2.tar.gz 1723857 RMD160 9cbc48b3c2c0a3d9cbfeebd789d26bcea9e06fab SHA1 e1e1af71cc322f3b052f4237a6d3e62721ccc2e1 SHA256 e1cb96b0380291bcf82b776904e8b3bde52c1632d9c0ed47fe4f44c582b0c8d7
+DIST alexandria-0.6.3.tar.gz 2748946 RMD160 b76b67e77fb18977f7b27e2888bcc8d27ee57508 SHA1 4f8585a708e405f7a5b8840b81a785d5e0f9664e SHA256 7366bfbd0898bb7f840402c2775844b06f00a52f94dcc22a6ec386af3dd4e9da
 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
-MISC ChangeLog 3044 RMD160 d03efddfbc304744963d595afa04b2a63960577d SHA1 bfbb18b8fd9895d8df17c16d83db451912342361 SHA256 beb231c515359c0edde4bc0940c04ed350e043aea59d7afe4cd217257d4a2005
+EBUILD alexandria-0.6.3.ebuild 1723 RMD160 c425399a59300178a67f639ced5359aaff7307ee SHA1 00ec3383a0b53a267913b0c65c140b6bbc07d006 SHA256 250595b49f4215b688b6d561f9764fbae5d301dd7f242e7981b5222d5c121634
+MISC ChangeLog 3387 RMD160 1267ad700ea0c5a88ed0ba80c01a45ef7948114c SHA1 6484c17c7325ee0ba89becd123545032cc17c62f SHA256 da82ce799346b6d0cfee13cf84d1d8b84b493e4c8109c51b40a094d906a81f65
 MISC metadata.xml 295 RMD160 42f895a8c3619e0a747f33af56f6420b2138f3d0 SHA1 d99a6ad2e3948fd01f6467859050ae012bf52f93 SHA256 d85e5fba4ce142acc61fa7b7e006665cde7dbe045a4238858b360ff0b23c175b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH07saQUozDL2JlH4RAsLmAJoDDS3A0zHpLymkumU4R96PGARBUACZARGi
-4RvwnauJsXwU/ETbMV5xGBI=
-=Onj8
+iD8DBQFID33wQUozDL2JlH4RAssfAJ4oop5DTvhNHIyL60w9fuPLsZtWxQCeL7z9
+qUd6INWTCmghf4ShdiC363M=
+=Fe3+
 -----END PGP SIGNATURE-----
diff --git a/app-misc/alexandria/alexandria-0.6.3.ebuild b/app-misc/alexandria/alexandria-0.6.3.ebuild
new file mode 100644
index 000000000000..959e5dc08b32
--- /dev/null
+++ b/app-misc/alexandria/alexandria-0.6.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2008 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.ebuild,v 1.1 2008/04/23 18:20:26 graaff 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"
+
+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-no_amazon_3.0.diff b/app-misc/alexandria/files/alexandria-0.6.3-no_amazon_3.0.diff
new file mode 100644
index 000000000000..09069bebcaf3
--- /dev/null
+++ b/app-misc/alexandria/files/alexandria-0.6.3-no_amazon_3.0.diff
@@ -0,0 +1,19 @@
+--- ./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