Add built_with_use to handle hdri USE flag in imagemagick

Package-Manager: portage-2.1.2.9

4 files changed, 107 insertions, 5 deletions

diff --git a/dev-ruby/rmagick/ChangeLog b/dev-ruby/rmagick/ChangeLog
index b4606b3f96f4..9511c77ea6b7 100644
--- a/dev-ruby/rmagick/ChangeLog
+++ b/dev-ruby/rmagick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/rmagick
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/ChangeLog,v 1.66 2007/07/10 18:54:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/ChangeLog,v 1.67 2007/07/11 19:21:48 graaff Exp $
+
+*rmagick-1.15.7-r1 (11 Jul 2007)
+
+  11 Jul 2007; Hans de Graaff <graaff@gentoo.org> +rmagick-1.15.7-r1.ebuild:
+  rmagick does not build against imagemagick if the latter is built with the
+  hdri USE flag. Add built_with_use to handle this situation.
 
   10 Jul 2007; Raúl Porcel <armin76@gentoo.org> rmagick-1.15.7.ebuild:
   alpha/ia64/x86 stable wrt #184538
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index 73875efa5958..23d2b71bdd29 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST RMagick-1.15.5.tar.bz2 958075 RMD160 dc3d81939881b5ecaa01fd496c9900696d47908d SHA1 578da34ae0cbd8b423aa70b654b08383f6729c28 SHA256 c49b0d9b924445d77dcb834a03932706e99fd452a02dccef17946c663e0d66bf
 DIST RMagick-1.15.7.tar.bz2 958153 RMD160 8beab6ebdbbd5561f7817b4cb89bb9f19d0e1e61 SHA1 2fcf595c1a89f7fda56d91e050a0e3ab0aa05439 SHA256 81865e49060a6080acd224f89893b26e09e24ed8e5df2dc161a000a1fc39559a
 DIST RMagick-1.3.2.tar.bz2 1087150 RMD160 709efd9fe1849bfd999fd53dcc73851f6f343699 SHA1 53fe386d96369e63390d0e977ae4fc49aa479aff SHA256 afbe40311042858fe4286694ced1553dd71bb7f3f04124a050c20a37b4dd0690
@@ -5,6 +8,10 @@ EBUILD rmagick-1.15.5.ebuild 2194 RMD160 249af640fa0942930a195c801c04830aea4fac6
 MD5 a5804cbecb92d8249488ce15ee67b288 rmagick-1.15.5.ebuild 2194
 RMD160 249af640fa0942930a195c801c04830aea4fac61 rmagick-1.15.5.ebuild 2194
 SHA256 43a7f343efc0ef61f7e7fde55efe3ac949faa7cc55cfbaf374e39a601c82ca26 rmagick-1.15.5.ebuild 2194
+EBUILD rmagick-1.15.7-r1.ebuild 2687 RMD160 f7d773c7d16dc9baac48795a97a9b4079e8947db SHA1 19670797b74717defd2c68fe6c48fd381cd0a68b SHA256 5bda59ef30d8679ed4127156f7bce9039ef5cd9cb65541a8e359fb4398407c49
+MD5 f3f3d3ac3459e1f51d33e9fdaaef8b77 rmagick-1.15.7-r1.ebuild 2687
+RMD160 f7d773c7d16dc9baac48795a97a9b4079e8947db rmagick-1.15.7-r1.ebuild 2687
+SHA256 5bda59ef30d8679ed4127156f7bce9039ef5cd9cb65541a8e359fb4398407c49 rmagick-1.15.7-r1.ebuild 2687
 EBUILD rmagick-1.15.7.ebuild 2202 RMD160 accbb5dd73988950629bf42d73cd87613255ef07 SHA1 c8d8a3817306f4561947ede233b196f63ebd5870 SHA256 eee984a607c12b95d654ebf02b0510eab6ca3e1a813ead15d4b3dcefb6488610
 MD5 06af6a64aa54f3caef9f1be547593ae8 rmagick-1.15.7.ebuild 2202
 RMD160 accbb5dd73988950629bf42d73cd87613255ef07 rmagick-1.15.7.ebuild 2202
@@ -13,10 +20,10 @@ EBUILD rmagick-1.3.2.ebuild 884 RMD160 f2f422a50c4504b7def2fc5f6b0636c100d4e566
 MD5 bed05d533e46041807f6f50fbde92d71 rmagick-1.3.2.ebuild 884
 RMD160 f2f422a50c4504b7def2fc5f6b0636c100d4e566 rmagick-1.3.2.ebuild 884
 SHA256 91dea8acd1e50848bd3993e5fb36a267cb45c5da9bd81563736abc3ae9800eef rmagick-1.3.2.ebuild 884
-MISC ChangeLog 8807 RMD160 57b933d6fc5f7c26ccc1f5f26b6c98045432e784 SHA1 3c7aabf80a3cdc35e78adffe871d895415872ad7 SHA256 a376b82812794c5edf9ad44f364ce8d0167203099e896b4b52664b4324778add
-MD5 6541f8174824528ee78a7fa6bf84dad7 ChangeLog 8807
-RMD160 57b933d6fc5f7c26ccc1f5f26b6c98045432e784 ChangeLog 8807
-SHA256 a376b82812794c5edf9ad44f364ce8d0167203099e896b4b52664b4324778add ChangeLog 8807
+MISC ChangeLog 9057 RMD160 46b06d40c85bad0c0470401c6dca36f4a2836830 SHA1 e560740e37d90b861770c879ad7026879350ef4c SHA256 978c9795d1be977b1a7e0fe8ca414a7e7efe7810ef7b1697cd5f8ded04353be3
+MD5 c98d0a757bc86d4e4d4c20287a2e20b7 ChangeLog 9057
+RMD160 46b06d40c85bad0c0470401c6dca36f4a2836830 ChangeLog 9057
+SHA256 978c9795d1be977b1a7e0fe8ca414a7e7efe7810ef7b1697cd5f8ded04353be3 ChangeLog 9057
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
@@ -27,6 +34,16 @@ SHA256 b597624eed7691990a64b3ab69ba9c7c79187d747cc15271b6c00aa37a134839 files/di
 MD5 d46bb140ce97e588fb650bcc391452cc files/digest-rmagick-1.15.7 247
 RMD160 533e003ffde31528c3b31b946212e0c62c28e769 files/digest-rmagick-1.15.7 247
 SHA256 2734cbdce743374ebf3209b592efcd69964bcd9f3a46cefcf60022ee15d13e84 files/digest-rmagick-1.15.7 247
+MD5 d46bb140ce97e588fb650bcc391452cc files/digest-rmagick-1.15.7-r1 247
+RMD160 533e003ffde31528c3b31b946212e0c62c28e769 files/digest-rmagick-1.15.7-r1 247
+SHA256 2734cbdce743374ebf3209b592efcd69964bcd9f3a46cefcf60022ee15d13e84 files/digest-rmagick-1.15.7-r1 247
 MD5 0d61b0f7d3853e0f586c1c0d2040f32f files/digest-rmagick-1.3.2 247
 RMD160 8f5ad2543ffeac2e89531e0fba781b4aef8c7b0a files/digest-rmagick-1.3.2 247
 SHA256 1cd53ade0a70e847d3791d9688bd0342ba5e4b53dba735285ede61b2312f4430 files/digest-rmagick-1.3.2 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGlS3V0BM77Tkv120RAg63AJ9MYkaOIZEvUgt98LYkmQMiPL0tNgCfYq4v
+8dXdcItNX+lAD6irIJh7SLQ=
+=b3Y+
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/rmagick/files/digest-rmagick-1.15.7-r1 b/dev-ruby/rmagick/files/digest-rmagick-1.15.7-r1
new file mode 100644
index 000000000000..4221aa23f5da
--- /dev/null
+++ b/dev-ruby/rmagick/files/digest-rmagick-1.15.7-r1
@@ -0,0 +1,3 @@
+MD5 f9ffa4f7cbc0c1ff52bd723674f4c995 RMagick-1.15.7.tar.bz2 958153
+RMD160 8beab6ebdbbd5561f7817b4cb89bb9f19d0e1e61 RMagick-1.15.7.tar.bz2 958153
+SHA256 81865e49060a6080acd224f89893b26e09e24ed8e5df2dc161a000a1fc39559a RMagick-1.15.7.tar.bz2 958153
diff --git a/dev-ruby/rmagick/rmagick-1.15.7-r1.ebuild b/dev-ruby/rmagick/rmagick-1.15.7-r1.ebuild
new file mode 100644
index 000000000000..f060199daf7d
--- /dev/null
+++ b/dev-ruby/rmagick/rmagick-1.15.7-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/rmagick-1.15.7-r1.ebuild,v 1.1 2007/07/11 19:21:48 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.
+
+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/21576/RMagick-${PV}.tar.bz2"
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples doc"
+DEPEND="virtual/ruby
+	>=media-gfx/imagemagick-6.0"
+
+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
+}
+
+# Using a custom src_compile instead of the ruby one because the ruby
+# one gets confused by an additional setup.rb that should not be used
+# here.
+src_compile() {
+	myconf="${RUBY_ECONF} ${EXTRA_ECONF}"
+
+	# 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
+		myconf="${myconf} --disable-htmldoc --enable-allow-example-errors"
+	fi
+
+	./configure \
+		--prefix=/usr \
+		--host=${CHOST} \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--datadir=/usr/share \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		--with-ruby=${RUBY} \
+		${myconf} \
+		"$@" || die "econf failed"
+
+	ruby_emake "$@" || die
+}
+
+# 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.
+src_install() {
+	RUBY_ECONF="${RUBY_ECONF} ${EXTRA_ECONF}"
+
+	${RUBY} setup.rb config --prefix=${D}/usr "$@" \
+		${RUBY_ECONF} || die "setup.rb config failed"
+	${RUBY} setup.rb install --prefix=${D} "$@" \
+		${RUBY_ECONF} || die "setup.rb install failed"
+
+	cd "${S}"
+	dodoc ChangeLog README.html README-Mac-OSX.txt README.txt
+}