graaff 14/12/30 08:33:08 Modified: ChangeLog rmagick-2.13.4.ebuild Log: Avoid double compilation and dependency on rake-compiler. Add ruby22. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Revision Changes Path 1.211 dev-ruby/rmagick/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rmagick/ChangeLog?rev=1.211&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rmagick/ChangeLog?rev=1.211&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rmagick/ChangeLog?r1=1.210&r2=1.211 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/ChangeLog,v retrieving revision 1.210 retrieving revision 1.211 diff -u -r1.210 -r1.211 --- ChangeLog 28 Nov 2014 07:04:23 -0000 1.210 +++ ChangeLog 30 Dec 2014 08:33:08 -0000 1.211 @@ -1,6 +1,9 @@ # ChangeLog for dev-ruby/rmagick # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/ChangeLog,v 1.210 2014/11/28 07:04:23 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/ChangeLog,v 1.211 2014/12/30 08:33:08 graaff Exp $ + + 30 Dec 2014; Hans de Graaff <[email protected]> rmagick-2.13.4.ebuild: + Avoid double compilation and dependency on rake-compiler. Add ruby22. *rmagick-2.13.4 (28 Nov 2014) 1.2 dev-ruby/rmagick/rmagick-2.13.4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rmagick/rmagick-2.13.4.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rmagick/rmagick-2.13.4.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rmagick/rmagick-2.13.4.ebuild?r1=1.1&r2=1.2 Index: rmagick-2.13.4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/rmagick-2.13.4.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rmagick-2.13.4.ebuild 28 Nov 2014 07:04:23 -0000 1.1 +++ rmagick-2.13.4.ebuild 30 Dec 2014 08:33:08 -0000 1.2 @@ -1,9 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/rmagick-2.13.4.ebuild,v 1.1 2014/11/28 07:04:23 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/rmagick-2.13.4.ebuild,v 1.2 2014/12/30 08:33:08 graaff Exp $ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" +USE_RUBY="ruby19 ruby20 ruby21 ruby22" RUBY_FAKEGEM_TASK_DOC="" @@ -24,17 +24,24 @@ RDEPEND+=" >=media-gfx/imagemagick-6.4.9:=[-hdri]" DEPEND+=" >=media-gfx/imagemagick-6.4.9:=[-hdri]" +all_ruby_prepare() { + # Avoid unused dependency on rake-compiler. This also avoids an + # extra compile during tests. + sed -i -e '/extensiontask/ s:^:#:' \ + -e '/ExtensionTask/,/end/ s:^:#:' \ + -e '/compile/ s:^:#:' Rakefile || die + + # Squelch harmless warning about imagemagick installation. + sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die +} + each_ruby_configure() { ${RUBY} -Cext/RMagick extconf.rb || die "extconf.rb failed" } each_ruby_compile() { emake -Cext/RMagick V=1 -} - -each_ruby_install() { - each_fakegem_install - ruby_fakegem_newins ext/RMagick/RMagick2$(get_modname) lib/RMagick2$(get_modname) + cp ext/RMagick/RMagick2$(get_modname) lib/ || die } all_ruby_install() {
