Add a new revision of flickr using a manually-forged tarball, and add a fix for the URLs.

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

4 files changed, 99 insertions, 5 deletions

diff --git a/dev-ruby/flickr/ChangeLog b/dev-ruby/flickr/ChangeLog
index 78925484d1b8..729f9021c8c0 100644
--- a/dev-ruby/flickr/ChangeLog
+++ b/dev-ruby/flickr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/flickr
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flickr/ChangeLog,v 1.2 2009/04/23 19:43:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flickr/ChangeLog,v 1.3 2009/04/27 12:33:50 flameeyes Exp $
+
+*flickr-1.0.2-r1 (27 Apr 2009)
+
+  27 Apr 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/flickr-1.0.2-fix.patch, +flickr-1.0.2-r1.ebuild:
+  Add a new revision of flickr using a manually-forged tarball, and add a
+  fix for the URLs.
 
   23 Apr 2009; Markus Meier <maekke@gentoo.org> flickr-1.0.2:
   amd64 stable, bug #266510
diff --git a/dev-ruby/flickr/Manifest b/dev-ruby/flickr/Manifest
index f2cc3a7b539c..d9855dd9ee87 100644
--- a/dev-ruby/flickr/Manifest
+++ b/dev-ruby/flickr/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX flickr-1.0.2-fix.patch 1211 RMD160 9ea39758484f58d6b351de28586e1e67d0586278 SHA1 13df0dedb474daa4304c95a86a3bcfb09a9ebc1c SHA256 4645c6f69aa3377d4ff891c868c524671e61358483f051450e954e447ee18c08
+DIST flickr-1.0.2-gentoo.tar.bz2 7693 RMD160 1665b93bb8196709eecf2ba2fed3091fb51fae1d SHA1 92226bb3e61836fd819c3735a8b539bc04b923dc SHA256 34f20dee5b8681f3850bd080e318ad40e7a4c059bc6f50da402576b3675510ca
 DIST flickr-1.0.2.gem 10752 RMD160 547889a4ce26534ce067da296d6b05fecfdb9978 SHA1 1e10e363be62dbb9361ffafc962b5abdfefd9d4b SHA256 2b094b80654b93488ec30ea3f52c23137a8e9c13494df118bcc1259ab6399752
+EBUILD flickr-1.0.2-r1.ebuild 1267 RMD160 418ab05e193c67b02d03b22239c5f0866e25b10e SHA1 584c1365495563bf0008aea209a9df944387d1b3 SHA256 8a39499b45855e27df3f66121a44c5d6db04adf3957fc4a000838bf7d347778f
 EBUILD flickr-1.0.2.ebuild 439 RMD160 0081a2afb991659dc682a46fa7f72392537f35e5 SHA1 75d8045ce63ec3b4d495cad590a136d058aa58be SHA256 b4b0c124998832cafa444d5cbd9a3a3c6f1f873a004acb41cd386e6bf9e49433
-MISC ChangeLog 461 RMD160 f4dcf9acd71d8dd88f82a1b4ab45cee5dd768746 SHA1 65f7e4970d3d0105f60dbaa42f23a42f61070298 SHA256 0db75f5a3f4aa74378b97bc98958579d6946d990992d3bde55aeef2fa339dd6f
+MISC ChangeLog 705 RMD160 6e8ba2c4d575a5cb1bbb8105ff855e4a68d2bdda SHA1 3539f8e360a0264f41db62b3054e6d25bc49e7fd SHA256 44f4134211af906c78da96e78ef869a2e5660aa30cfa66203f04e7c614adf9b8
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknwxOsACgkQkKaRLQcq0GI2OACeO/aa7nb7/zV3Ted1895FvjP4
-00IAoJQoru6uUkMra0omSP6j9kq7kBez
-=s3Ek
+iEYEARECAAYFAkn1pjMACgkQAiZjviIA2XhLnACfYMLoURGQy97PnOb8IVQabayH
+aSUAn3yLY1u1J3oLSlsQdsphQ1tfKp6W
+=ZQBy
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/flickr/files/flickr-1.0.2-fix.patch b/dev-ruby/flickr/files/flickr-1.0.2-fix.patch
new file mode 100644
index 000000000000..6b9a8add1706
--- /dev/null
+++ b/dev-ruby/flickr/files/flickr-1.0.2-fix.patch
@@ -0,0 +1,30 @@
+Index: flickr-1.0.2-gentoo/lib/flickr.rb
+===================================================================
+--- flickr-1.0.2-gentoo.orig/lib/flickr.rb
++++ flickr-1.0.2-gentoo/lib/flickr.rb
+@@ -64,7 +64,7 @@ class Flickr
+   # Takes a Flickr API method name and set of parameters; returns an XmlSimple object with the response
+   def request(method, *params)
+     response = XmlSimple.xml_in(http_get(request_url(method, params)), { 'ForceArray' => false })
+-    raise response['err']['msg'] if response['stat'] != 'ok'
++    raise (response['err']['msg'] + "API key #{@api_key}") if response['stat'] != 'ok'
+     response
+   end
+   
+@@ -167,14 +167,14 @@ class Flickr
+     
+     attr_reader :client, :id, :name, :location, :photos_url, :url, :count, :firstdate, :firstdatetaken
+ 
+-    def initialize(id=nil, username=nil, email=nil, password=nil, api_key=nil)
++    def initialize(id=nil, api_key=nil, username=nil, email=nil, password=nil)
+       @id = id
++      @api_key = api_key
+       @username = username
+       @email = email
+       @password = password
+       @client = Flickr.new @api_key
+       @client.login(email, password) if email and password
+-      @api_key = api_key
+     end
+ 
+     def username
diff --git a/dev-ruby/flickr/flickr-1.0.2-r1.ebuild b/dev-ruby/flickr/flickr-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..86fefdfb0a0e
--- /dev/null
+++ b/dev-ruby/flickr/flickr-1.0.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2008 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-r1.ebuild,v 1.1 2009/04/27 12:33:50 flameeyes Exp $
+
+inherit ruby eutils
+
+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"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test doc"
+
+# Tests fail for now, they don't seem to be designed to work just yet
+RESTRICT="test"
+
+RDEPEND="dev-ruby/xml-simple"
+DEPEND="
+	test? ( dev-ruby/rake
+		dev-ruby/rubygems )
+	doc? ( dev-ruby/rake
+		dev-ruby/rubygems )"
+
+USE_RUBY="ruby18"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P}-fix.patch"
+}
+
+src_compile() {
+	if use doc; then
+		rake rdoc || die "rake rdoc failed"
+	fi
+}
+
+src_install() {
+	cd "${S}"/lib
+	doruby -r * || die "doruby failed"
+
+	if use doc; then
+		dohtml -r "${S}"/doc/* || die "dohtml failed"
+	fi
+
+	dohtml "${S}"/index.html || die "dohtml failed"
+
+	insinto $(${RUBY} -r rbconfig -e 'print Config::CONFIG["vendorlibdir"]' | sed -e 's:vendor_ruby:gems:')/specifications
+	doins "${S}"/${P}.gemspec || die "Unable to install fake gemspec"
+}