Version bump

Package-Manager: portage-2.1.3.19

4 files changed, 91 insertions, 8 deletions

diff --git a/dev-ruby/rmagick/ChangeLog b/dev-ruby/rmagick/ChangeLog
index dfe4b08b8857..6135e005bfeb 100644
--- a/dev-ruby/rmagick/ChangeLog
+++ b/dev-ruby/rmagick/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-ruby/rmagick
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/ChangeLog,v 1.88 2008/01/10 19:58:30 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/ChangeLog,v 1.89 2008/01/31 06:31:05 graaff Exp $
 
+*rmagick-2.2.0 (31 Jan 2008)
+
+  31 Jan 2008; Hans de Graaff <graaff@gentoo.org> +rmagick-2.2.0.ebuild:
+  Version bump: some new functionality made available by newer imagemagick 
+  versions, and several bug fixes
+  
 *rmagick-2.1.0 (10 Jan 2008)
 
   10 Jan 2008; Hans de Graaff <graaff@gentoo.org> +rmagick-2.1.0.ebuild:
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index d8fe80d4ad13..86c13758fc2c 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -6,6 +6,7 @@ DIST RMagick-1.15.11.tar.bz2 972974 RMD160 3f4772252c9b71befab596f685e1e7cc21f15
 DIST RMagick-1.15.12.tar.bz2 974608 RMD160 b670ebfeac263b51110b29cc616fc0f2b2657543 SHA1 8a2d08e06a70dcdf25e801561b66e070d5d2ef3e SHA256 b7f3441aa2810f91d5619aebd203f76fe623a7a272c269e456900e3dad18d3af
 DIST RMagick-2.0.0.tar.bz2 928741 RMD160 769abf5e6200e1d26d8a2bc4127d15fc08b72f9d SHA1 f9366f30194345adfb8ed1d812e8caaf49a45671 SHA256 39e3ca177b85986e5d9d19b6f6af9e24ff189976eb2ea83f3232f3a8d347a7e8
 DIST RMagick-2.1.0.tar.bz2 928514 RMD160 d6ead50f9c57a2a9c790c9dbf427e842f2273f87 SHA1 0264f58a4b24200f31de5f6b9eaea95ee5facbae SHA256 6e42636afd4ce07a9024d358d14d22d029ace4d9817f19dca7ed60fb9d741b1c
+DIST RMagick-2.2.0.tar.bz2 930470 RMD160 2579eea76e017afd7d9af1937ae2e0281cc28bf4 SHA1 8e49a9be9a7dce16959a1cccdb746b6d07c67cd5 SHA256 057022d8cb9e34ba93ebf0382bd5a1002978bd0899d0f596d7dafeab3d1dc60c
 EBUILD rmagick-1.15.10.ebuild 2683 RMD160 c313aaa4b05b851634e81006a36f5f1a3324d3ff SHA1 e82ef63547f4f8527eb7b207e95a763c0756cd73 SHA256 f4b20fe769276db3feb8172302f8ba07fe62bb0635e8d29a03ccbddfb123f7b3
 MD5 c86f04c4ac042277cb1896b37191a9da rmagick-1.15.10.ebuild 2683
 RMD160 c313aaa4b05b851634e81006a36f5f1a3324d3ff rmagick-1.15.10.ebuild 2683
@@ -26,10 +27,14 @@ EBUILD rmagick-2.1.0.ebuild 2631 RMD160 fac7829b483f6bbd2cbe09dd868be10afa985efd
 MD5 29e40493a7cf7002469a69bf6682dbc2 rmagick-2.1.0.ebuild 2631
 RMD160 fac7829b483f6bbd2cbe09dd868be10afa985efd rmagick-2.1.0.ebuild 2631
 SHA256 6f1d390d5e9b659b11eb6f31b31a0cc9869736f10f3d0f8da2e15a1697e042dd rmagick-2.1.0.ebuild 2631
-MISC ChangeLog 12093 RMD160 25b550f226b9c415bcddda1f9615605f2ec6e850 SHA1 d2b6bd5e1dbabdca2814d5b4689de19cbd813fb5 SHA256 816976c913d18b176840eff5ef19bbbf1e442ffcdc2013cbbb5bda3d1a7aebc2
-MD5 16419b9ddb71588cbac7bea448784f3e ChangeLog 12093
-RMD160 25b550f226b9c415bcddda1f9615605f2ec6e850 ChangeLog 12093
-SHA256 816976c913d18b176840eff5ef19bbbf1e442ffcdc2013cbbb5bda3d1a7aebc2 ChangeLog 12093
+EBUILD rmagick-2.2.0.ebuild 2631 RMD160 04104a3c3d53e236b8443dd670492d3af9190df3 SHA1 a658eeaae7e0dd6df4c87d75e2ea74cdca1b191a SHA256 b87e40fe28968d784a656aef0b0d94f548002145d869477d2e0a96575620dbad
+MD5 4bc43cd24a2ae84ea7142fcd1b0e3bb4 rmagick-2.2.0.ebuild 2631
+RMD160 04104a3c3d53e236b8443dd670492d3af9190df3 rmagick-2.2.0.ebuild 2631
+SHA256 b87e40fe28968d784a656aef0b0d94f548002145d869477d2e0a96575620dbad rmagick-2.2.0.ebuild 2631
+MISC ChangeLog 12309 RMD160 c65f96a6ca9197d5391f2150576364b0a40b482b SHA1 c37d8774fffe623c0183123c45e90bc04a6f1be4 SHA256 96541a4c3f478134f0c1c38d91a6f50e885e863bafc94a8d0c573457a82cc633
+MD5 9af6b0af64bb14135ea630986d0f52c7 ChangeLog 12309
+RMD160 c65f96a6ca9197d5391f2150576364b0a40b482b ChangeLog 12309
+SHA256 96541a4c3f478134f0c1c38d91a6f50e885e863bafc94a8d0c573457a82cc633 ChangeLog 12309
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
@@ -49,10 +54,13 @@ SHA256 319deca4ae924ed3458909f9de1aa2c6d6c400209db1575d66787f9bb821b011 files/di
 MD5 1c9aca845e841fb88cacb5a76d94f141 files/digest-rmagick-2.1.0 244
 RMD160 3f9c92ce4511baeedd33966c32ea863cb566c389 files/digest-rmagick-2.1.0 244
 SHA256 9e61e25bc3b9e498d0bc03424073da4fb0c086046eddb5adf7768707b4476b9f files/digest-rmagick-2.1.0 244
+MD5 df955ac52f179f5b70672654ca968057 files/digest-rmagick-2.2.0 244
+RMD160 b3dc82fb61f2e86f775a8e2d42ec577c4b068518 files/digest-rmagick-2.2.0 244
+SHA256 58996ec2ee39a420c415c8ad1ffb1308b19a53a0d7ffae5f9e7fba8dccbc1526 files/digest-rmagick-2.2.0 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHhnjrQUozDL2JlH4RAl9IAJ915VaSPCBki/tVR0wLHXQDRQ6qkQCdHDQ0
-k3PAbradtFb8I+3GpzFJdqw=
-=bscA
+iD8DBQFHoWsvQUozDL2JlH4RAnFvAJ9OgTm3/kw/V0UU7uQnVossaB4DmQCfZLpW
+6gYdMgt2BlL+pIH/Y+K3Sl8=
+=z90Y
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rmagick/files/digest-rmagick-2.2.0 b/dev-ruby/rmagick/files/digest-rmagick-2.2.0
new file mode 100644
index 000000000000..17b24e5d275f
--- /dev/null
+++ b/dev-ruby/rmagick/files/digest-rmagick-2.2.0
@@ -0,0 +1,3 @@
+MD5 2a05dfdeb3d167b10098270592687cac RMagick-2.2.0.tar.bz2 930470
+RMD160 2579eea76e017afd7d9af1937ae2e0281cc28bf4 RMagick-2.2.0.tar.bz2 930470
+SHA256 057022d8cb9e34ba93ebf0382bd5a1002978bd0899d0f596d7dafeab3d1dc60c RMagick-2.2.0.tar.bz2 930470
diff --git a/dev-ruby/rmagick/rmagick-2.2.0.ebuild b/dev-ruby/rmagick/rmagick-2.2.0.ebuild
new file mode 100644
index 000000000000..6c8ff43c8a7e
--- /dev/null
+++ b/dev-ruby/rmagick/rmagick-2.2.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/rmagick-2.2.0.ebuild,v 1.1 2008/01/31 06:31:05 graaff Exp $
+
+inherit ruby
+
+# The gem for this package doesn't seem to play well with portage.  It
+# runs a GNUish configure script, with argument passed directly from
+# the gem install command, but gem install doesn't use the same style
+# of arguments.  Thus, unless you're smart enough to come up with a
+# fix, please leave this as a source package install.
+
+MY_PV=${PV//_/-}
+DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
+HOMEPAGE="http://rmagick.rubyforge.org/"
+SRC_URI="http://rubyforge.org/frs/download.php/31523/RMagick-${MY_PV}.tar.bz2"
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples doc"
+DEPEND="virtual/ruby
+	>=media-gfx/imagemagick-6.3.5.6"
+
+S="${WORKDIR}/RMagick-${PV}"
+
+# hdri causes extensive changes in the imagemagick internals, and
+# rmagick is not ready to deal with those, see bug 184356.
+pkg_setup() {
+	if built_with_use --missing false media-gfx/imagemagick hdri ; then
+		eerror "imagemagick is built with the hdri USE flag, this is not supported by rmagick"
+		eerror "please rebuild imagemagick without hdri support if you want to use rmagick"
+		die "imagemagick is built with the hdri USE flag, this is not supported by rmagick"
+	fi
+}
+
+# Use a custom src_compile because the setup.rb included with RMagick
+# doesn't like extra parameters during the setup phase.
+src_compile() {
+	# When documentation is built many examples are also run. Not all
+	# of them may work (e.g. due to missing additional dependencies)
+	# so we allow the examples to fail.
+	if ! use doc ; then
+		RUBY_ECONF="--disable-htmldoc --allow-example-errors"
+	fi
+
+	${RUBY} setup.rb config --prefix=/usr "$@" \
+		${RUBY_ECONF} ${EXTRA_ECONF} || die "setup.rb config failed"
+	${RUBY} setup.rb setup || die "setup.rb setup failed"
+}
+
+# Use a custom src_install instead of the default one in ruby.eclass
+# because the one in ruby.eclass does not include setting the prefix
+# for the installation step and assumes that arguments can be given
+# also during the install phase.
+src_install() {
+	if ! use doc ; then
+		RUBY_ECONF="--disable-htmldoc --allow-example-errors"
+	fi
+
+	${RUBY} setup.rb config --prefix="${D}/usr" "$@" \
+		${RUBY_ECONF} ${EXTRA_ECONF} || die "setup.rb config failed"
+	${RUBY} setup.rb install --prefix="${D}" || die "setup.rb install failed"
+
+	cd "${S}"
+	dodoc ChangeLog README.html README-Mac-OSX.txt README.txt
+}