summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-ruby/flickr/ChangeLog6
-rw-r--r--dev-ruby/flickr/flickr-1.0.2-r5.ebuild10
2 files changed, 11 insertions, 5 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/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"
}