Use RUBY_S instead of S to fix bugs 455144 and 455848. Re-add documentation because that builds fine.

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 16 insertions, 14 deletions

diff --git a/dev-ruby/flickr/ChangeLog b/dev-ruby/flickr/ChangeLog
index c8f8fafd543e..9bd4f878b26d 100644
--- a/dev-ruby/flickr/ChangeLog
+++ b/dev-ruby/flickr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/flickr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flickr/ChangeLog,v 1.13 2013/02/02 16:16:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flickr/ChangeLog,v 1.14 2013/02/10 08:47:53 graaff Exp $
+
+  10 Feb 2013; Hans de Graaff <graaff@gentoo.org> flickr-1.0.2-r5.ebuild:
+  Use RUBY_S instead of S to fix bugs 455144 and 455848. Re-add documentation
+  because that builds fine.
 
 *flickr-1.0.2-r5 (02 Feb 2013)
 
diff --git a/dev-ruby/flickr/Manifest b/dev-ruby/flickr/Manifest
index fa3e88e0cff5..295c36a03d14 100644
--- a/dev-ruby/flickr/Manifest
+++ b/dev-ruby/flickr/Manifest
@@ -5,17 +5,13 @@ AUX flickr-1.0.2-fix.patch 1211 SHA256 4645c6f69aa3377d4ff891c868c524671e6135848
 AUX flickr-1.0.2-typo.patch 1362 SHA256 008ecc927321028ccc0f4073e61136e03e619b449c0600696bd058b8b1aa338f SHA512 bca36df49f23c691e87c4bb1503bfd0f95d07d7c80b4a7e2ffefb6f15376b2cb7d9eb5ea7c7b8b3bf49d74b05584fbc167d9bd1ea27a5d10a5a33db55d54a9ec WHIRLPOOL 0dd38923fff9c14be1a55955cc55320220f424a8d9438b86bcbd8dd39a692695ddfa1708b54d8da94de79ec18708629c9830cf38e526285180269fd9f9bb9184
 DIST flickr-1.0.2-gentoo.tar.bz2 7693 SHA256 34f20dee5b8681f3850bd080e318ad40e7a4c059bc6f50da402576b3675510ca SHA512 d78a43d6ba44c726fc0ab7b99b8c072d46197b40c4e8654b3d58021786fe8dd4e31afab982cabc57b62e623f41672e20301b9b57f42e0c788d2e9a870ce6215c WHIRLPOOL 1a115116bc47515dc6a7c53ba33c3d60621445c76182fdef975add7f99135b3db3ecc571d19aaf024cc2011eb4fc4b55de537edea3bb56a71c51925e0e45aba9
 EBUILD flickr-1.0.2-r3.ebuild 905 SHA256 2da4d5acd9b1e36337555ed8be11005f1093700e4bb94703df2a633d7b6c77e2 SHA512 8b96e2d8a23c883e24412510c2a6a1a7292c834fb819dc7a095d646b22210ab0975defdcf80084639aeade50f71f378e42eb44d9772c69da703c10cd889bd846 WHIRLPOOL 993efdf8a1e3b5796993de02b97027abf5ebbfac4f86afed1dc796e82388da7ec3ea64f51829bc42259c14db458c58c8ab8cdd30826a524ff76dbeae4ccd7f54
-EBUILD flickr-1.0.2-r5.ebuild 754 SHA256 d069d198ed602af923c1e315510342eb7cc55665f1960a8163e27eba8f827d15 SHA512 6280ae80d8cdc81dbf6103cfcadc5aef335af99a6f44a2033b8c34ad1fb4f863c121d07674c083b81ee3150417e3275452c425ff495c4cc03635c8466b2f1bce WHIRLPOOL 84efd8253c344392567be8c24169665365ce7e82f8bb158d29f67955179a2e2bc7063a50551707204bdf47f24475a0c00a2b74814e6b9d65dafba8a02144937f
-MISC ChangeLog 2024 SHA256 9c82e3d3d067f183af4e3f5371390146c89cc21079b283e82019aeb937819bda SHA512 a73a80039bb1cf857f5f0d0cd9c93a958708f652a260a89c642c93044ec0c60c907164f47c5be6c6d19655fdc848c8cd6b7a7259ae91fd6ab5437bed8eaa8678 WHIRLPOOL a12017effbc93ab13dbcb9494725878c78e1191373963e8a646ca55bde0492fb2d8081daa791362f2a713a73cb0640b887aec3e3ad983d43b336bc79f9aec15d
+EBUILD flickr-1.0.2-r5.ebuild 780 SHA256 11322f01057ed50e91d3c0dee46a806b0f1ea4fc13e7ab4cb7b19342d0779105 SHA512 c94c771ec38fdad63fcb961cf1cd9896674b30faefb75ed384008b4ead623b305e8d3aa4a4feb3158fad73916a998b60bc92e48ba4bb72330e0affa127f6da9d WHIRLPOOL 601d68a46ef8876e5686aab561a4b7ae83b0fd10cf8d4e240fd3e4a6c8cc9c328b946ecdcdf981991ffc0b85cc4f6bc3b29b30baf7f2ecaf214ffd67ac45bd7d
+MISC ChangeLog 2202 SHA256 e44dd4a2aaab06fda73d255dc8c4e77c6a166f2e0a46504667d331fb4e22d59b SHA512 4a393df54d213e13fbe32001f364b04e331e7b4dda060a08ae6dec54c58d46dc4a25659e28d3999efbb036e68e53e1efb0391923aa6cac0eec36524e05f402e6 WHIRLPOOL f92448eee28b5882a3b5b2c2e3e3a79b1a10a7f3fc957f65b1c38c23fab0c86bd66e331aa93dce50c07bf1e62b756c768157c23e957ba97831d5fe650b0a16be
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRDTv7AAoJEBzRPIrUMBNCoqUIAJNkOEBoVh2VY+AJ75xtMY03
-B/nmHhDAju+uC1PUo7UfzjJQPLH9Q1WoSmCm0EUdx0PtHiehTnnUj+rv6TpFjXyf
-jYRyrkDkGW6d3ui4B7ZH5JleZgvetipRTMbV+rV3pyDZStrnbg+XUk8LYwjIfQep
-NLLWLAGrJ+4Qcn8ocAvzEryw8sWd6Ekiimwa4u/Jbulbe2NrKZAiGa1+/anZgv5e
-n73+QBaThDzI171lr2tmZdxmNjA+cqOhGRlPhu0KDcgxMCDG6m/wnlEKe7ewRBE9
-OZeb9DZMhhCZ6jVb1CE+Kckz0YtR5U5Dpr/+JPBSeyNqzl6CbrgbqzWFyaJtoaU=
-=tzuW
+iF4EAREIAAYFAlEXXr8ACgkQiIP6VqMIqNfp/gEAlR29hE9OHe9WA430wV2Zrvwl
+F4SkrAZQrj7SFhWcls0A/0v3SPChoEMHLzK8HR12PhWgGAQrrvZCDuWMKkLn+lA/
+=f42h
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/flickr/flickr-1.0.2-r5.ebuild b/dev-ruby/flickr/flickr-1.0.2-r5.ebuild
index 1a059ee7febb..7c67a8c7ef46 100644
--- a/dev-ruby/flickr/flickr-1.0.2-r5.ebuild
+++ b/dev-ruby/flickr/flickr-1.0.2-r5.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flickr/flickr-1.0.2-r5.ebuild,v 1.1 2013/02/02 16:16:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flickr/flickr-1.0.2-r5.ebuild,v 1.2 2013/02/10 08:47:53 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby18 ruby19 jruby"
 
+# Tests require a flickr API key.
 RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
 inherit ruby-fakegem
 
@@ -14,7 +16,7 @@ DESCRIPTION="An insanely easy interface to the Flickr photo-sharing service."
 HOMEPAGE="http://rubyforge.org/projects/flickr/"
 SRC_URI="mirror://gentoo/${P}-gentoo.tar.bz2"
 
-S="${WORKDIR}/${P}-gentoo"
+RUBY_S="${P}-gentoo"
 
 LICENSE="MIT"
 SLOT="0"
@@ -24,7 +26,7 @@ IUSE=""
 ruby_add_rdepend "dev-ruby/xml-simple"
 
 all_ruby_prepare() {
-	cd "${S}"/lib
+	cd lib || die
 	epatch "${FILESDIR}/${P}-fix.patch"
 	epatch "${FILESDIR}/${P}-typo.patch"
 }