From: Hans de Graaff <graaff@gentoo.org>
Date: Tue, 30 Dec 2014 08:33:09 +0000 (+0000)
Subject: Avoid double compilation and dependency on rake-compiler. Add ruby22.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=93b2a600f79bcced9e56c8941d5dda395f52acd8;p=gentoo.git

Avoid double compilation and dependency on rake-compiler. Add ruby22.

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

diff --git a/dev-ruby/rmagick/ChangeLog b/dev-ruby/rmagick/ChangeLog
index 7884d5c0482c..46f0cba442c3 100644
--- a/dev-ruby/rmagick/ChangeLog
+++ b/dev-ruby/rmagick/ChangeLog
@@ -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 <graaff@gentoo.org> rmagick-2.13.4.ebuild:
+  Avoid double compilation and dependency on rake-compiler. Add ruby22.
 
 *rmagick-2.13.4 (28 Nov 2014)
 
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index e364f571176e..4504aba6319f 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -8,13 +8,13 @@ DIST rmagick-2.13.4.gem 1539584 SHA256 7877ce2fe1b05e51e62b0a4f5d17ecae6223c17bd
 EBUILD rmagick-2.13.2-r1.ebuild 1348 SHA256 588d90739056d209988885db5e451ec70cf7c8afc7628e0a9b0024919e4f92e0 SHA512 28f981cd579589dab28e1266418c904563a1fdb3bae3e87abe51ea41de7beccde28293c5bbffc412acb5973bd8b74a483b2517d2a3d615b24393d8d969c574b7 WHIRLPOOL 9725503087af84bd4afc4099e436ff3841f6b544ca73d8771a620d95276062a353745c9c28425d3e1ba8290d406dee6b3b0fc0c72f7acc79c28063615e8de0be
 EBUILD rmagick-2.13.2-r2.ebuild 1258 SHA256 64793f20eedd50c10f88554e4fe3e0ce7f76397cbf3cf9d9c1f2796d2b9c0ddd SHA512 706fc275dd3e9796bfc76be3305b8087b050f0046fae7d040936b03c5ec39a5238beadbaf5346548a4c4cfeca22e01901c9a70caed3a8b761acd3bb29a074164 WHIRLPOOL ca573a8f90f7403b109d7272eda4287b6b0304c2202c21a376f8b2ab33db21a85918dd45cd3c8d090d23324fb98cd7b4868a1501d2df485e61b5f1378c1bdd72
 EBUILD rmagick-2.13.3.ebuild 1230 SHA256 1e9a3d92177b88fe18dded6f437496e46ca131e00720e188e1ee27aa77b610d4 SHA512 7ba8e6fbfb31c4d544093c9debc020cd02705cb54b5006cc9d1e21161e441f6c4161d137d6a529c7629a3da961ae987d61f1315af528ba54593c0ba3bc48a0e3 WHIRLPOOL 8359c16d0b45d294c278e6195610516467dc421685cb7b1af2e56791f3213736e051622ecc491923adeb992193004c4830d3744eb502d527e802e66458d06313
-EBUILD rmagick-2.13.4.ebuild 1202 SHA256 202be16942b5e01329d85cfb66720cc80b17ea44138e7c6a54a77be9e7dbe8ed SHA512 5adcddb33c5bd98e6c4fb4964e3c554e7425c5244f626568f3d6822b1443ef619b6712a8c7a5a6146b6fa5ca4049dd4c92cf5b93789b73bd42009d11b3c510e0 WHIRLPOOL f7f912a751f691216394162681b0088224d3ff669d5a008f0c53b2a8c9f90d996509d6ffc5154f9066bda50ee23948633e954a18deea6e7029dc8e208e373718
-MISC ChangeLog 29226 SHA256 43d8ee70c7999ba8b0313dfeface873045116256d2cea32288389547540c6b4e SHA512 e84442a0d7f3b65b4b3e880e9297527c49eabd37cd4c2e74c36f606d84b161f5f9fc844e8842ac64e45b327fec58fbd84ebf7c6c13d04b27b0706266f7a87a3f WHIRLPOOL 9bd610fdc0e05a78fd921412552624c3ace96da89b71c33e54bdeaa59dc679f64522d3e9360fbceb7e50e028ac2e7522473c74a87be8ef85007433dd530f1307
+EBUILD rmagick-2.13.4.ebuild 1508 SHA256 0857b5f9a5bc5f36c06cd97350971ef29460e4093374de5528955c634a2fb988 SHA512 be110380ef6644f8627710d606a3848e58ccb638ee08ab1dc05d81dbadedd2d6570983598917be2c5f4fa60049da09e1c7219aebb94e3abf53bde57346d50f99 WHIRLPOOL ad37c00a80b03159e7e09653e49a56102af37e7d64baf64864572c9843f1583449befbfbecd62b6786096c0ba837238ebab2a6a51a1f227a0001141ff78a9761
+MISC ChangeLog 29372 SHA256 5c95321f9e7bdfcb0b0b68b3638ebd216367431a61abbc251a8be7a97e619a23 SHA512 d2aaf42a8518793433467c8632af71c0e0127ca8b8985f231afdce48996b2b70917ac28fc6a3ce1a1bc71a767320edce252079fdeb6910b17fa1dcf7f45267b7 WHIRLPOOL 247adb128d43f37a7cb14c7d9e6b7aa98c8c5a535c1ee968e3250159a94faf802106887bdd0571241cc274fce8d8ca1295660164e75c8bed7d442981468701fa
 MISC metadata.xml 233 SHA256 cbdcd4e2029c2aeaed4edd234058b94306ce4f59502b7eb6c860737815d26b61 SHA512 244a069719cd52bb7e64d84be3a9c8608674dd8dd407997a162d6955dbd4ed6492f98c70ec1872659dc2be6763d7d41ed2c7028bb2be733b02c2164c2a4041ed WHIRLPOOL 8604f701f76ddf029ef6c972a800ac5fb44e3a00c9cae2772e594932d3d59618fadae048a78376056be16bd93424de1bf1e40b1aef1e717f55f23cfec3828f23
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlR4HnwACgkQiIP6VqMIqNfKjQD/c5nGnEzhOxBhu77QWSpIKFsq
-5FnPhAnNUD1FNgGdp5UA/1R+imw9FNeP+tcRy3pm5mWoo4H4mHO3jWmRUAddbPgK
-=B+3w
+iF4EAREIAAYFAlSiY0UACgkQiIP6VqMIqNcbVAD/climrWYnwvn+lMG4Mq07cj3t
+EXmN/qfQ5S/RDSJpsRIA/0PzZ4mD//NkbaW4S6z0TmsWg8kMgyjDwM1vB8oxZDcb
+=ukAA
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rmagick/rmagick-2.13.4.ebuild b/dev-ruby/rmagick/rmagick-2.13.4.ebuild
index 25398285d112..c7b028816393 100644
--- a/dev-ruby/rmagick/rmagick-2.13.4.ebuild
+++ b/dev-ruby/rmagick/rmagick-2.13.4.ebuild
@@ -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 @@ IUSE="doc"
 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() {