Remove doc support which is broken as of bug #455144. Use 'none' recipes to avoid dependencies.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)

2 files changed, 16 insertions, 18 deletions

diff --git a/dev-ruby/flickr/ChangeLog b/dev-ruby/flickr/ChangeLog
index ff1b2763d1ac..c8f8fafd543e 100644
--- a/dev-ruby/flickr/ChangeLog
+++ b/dev-ruby/flickr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/flickr
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flickr/ChangeLog,v 1.12 2012/08/06 17:43:02 graaff Exp $
+# 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 $
+
+*flickr-1.0.2-r5 (02 Feb 2013)
+
+  02 Feb 2013; Diego E. Pettenò <flameeyes@gentoo.org> +flickr-1.0.2-r5.ebuild,
+  -flickr-1.0.2-r4.ebuild:
+  Remove doc support which is broken as of bug #455144. Use 'none' recipes to
+  avoid dependencies.
 
   06 Aug 2012; Hans de Graaff <graaff@gentoo.org> -flickr-1.0.2-r1.ebuild:
   Cleanup.
@@ -56,4 +63,3 @@
   03 Nov 2008; Diego Pettenò <flameeyes@gentoo.org> +metadata.xml,
   +flickr-1.0.2.ebuild:
   Add flickr ebuild (yes again for my blog).
-
diff --git a/dev-ruby/flickr/flickr-1.0.2-r4.ebuild b/dev-ruby/flickr/flickr-1.0.2-r5.ebuild
index 9e9b99ed6d8a..1a059ee7febb 100644
--- a/dev-ruby/flickr/flickr-1.0.2-r4.ebuild
+++ b/dev-ruby/flickr/flickr-1.0.2-r5.ebuild
@@ -1,10 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-r4.ebuild,v 1.1 2011/10/20 17:46:12 graaff Exp $
+# $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 $
 
-EAPI=2
+EAPI=5
 USE_RUBY="ruby18 ruby19 jruby"
 
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
 inherit ruby-fakegem
 
 DESCRIPTION="An insanely easy interface to the Flickr photo-sharing service."
@@ -18,21 +21,10 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-# Tests fail for now, they don't seem to be designed to work just yet
-RESTRICT="test"
-
-ruby_add_rdepend dev-ruby/xml-simple
+ruby_add_rdepend "dev-ruby/xml-simple"
 
 all_ruby_prepare() {
 	cd "${S}"/lib
 	epatch "${FILESDIR}/${P}-fix.patch"
 	epatch "${FILESDIR}/${P}-typo.patch"
 }
-
-all_ruby_install() {
-	if use doc; then
-		dohtml -r "${S}"/doc/* || die "dohtml failed"
-	fi
-
-	dohtml "${S}"/index.html || die "dohtml failed"
-}