From 7c2c062dad4da8fb2e05abc3a6e77c04bdbe256a Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Sun, 9 Mar 2008 11:56:36 +0000 Subject: [PATCH] Fix examples USE flag; remove old versions Package-Manager: portage-2.1.4.4 --- dev-ruby/rmagick/ChangeLog | 6 ++- dev-ruby/rmagick/Manifest | 14 ++---- dev-ruby/rmagick/rmagick-2.1.0.ebuild | 66 --------------------------- dev-ruby/rmagick/rmagick-2.2.0.ebuild | 66 --------------------------- dev-ruby/rmagick/rmagick-2.2.2.ebuild | 4 +- 5 files changed, 13 insertions(+), 143 deletions(-) delete mode 100644 dev-ruby/rmagick/rmagick-2.1.0.ebuild delete mode 100644 dev-ruby/rmagick/rmagick-2.2.0.ebuild diff --git a/dev-ruby/rmagick/ChangeLog b/dev-ruby/rmagick/ChangeLog index 49a7e943bd0f..e2468be9eaa8 100644 --- a/dev-ruby/rmagick/ChangeLog +++ b/dev-ruby/rmagick/ChangeLog @@ -1,6 +1,10 @@ # 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.99 2008/02/20 20:17:28 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/ChangeLog,v 1.100 2008/03/09 11:56:36 graaff Exp $ + + 09 Mar 2008; Hans de Graaff -rmagick-2.1.0.ebuild, + -rmagick-2.2.0.ebuild, rmagick-2.2.2.ebuild: + Fix ebuild to actually install examples when requested. Remove old versions. *rmagick-2.2.2 (20 Feb 2008) diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest index ac9071a21302..66fc63715405 100644 --- a/dev-ruby/rmagick/Manifest +++ b/dev-ruby/rmagick/Manifest @@ -4,21 +4,17 @@ Hash: SHA1 DIST RMagick-1.15.10.tar.bz2 972865 RMD160 ce2b32d64dbeed0dc3ae5e7ec3e4066d65bf1356 SHA1 b1713cfed6e35e9c4ce9137dcef093ed4026a108 SHA256 07596567b01108876c6397a57160acf3da2d0e33b38e077158a0c08fd1a1e971 DIST RMagick-1.15.12.tar.bz2 974608 RMD160 b670ebfeac263b51110b29cc616fc0f2b2657543 SHA1 8a2d08e06a70dcdf25e801561b66e070d5d2ef3e SHA256 b7f3441aa2810f91d5619aebd203f76fe623a7a272c269e456900e3dad18d3af DIST RMagick-1.15.13.tar.bz2 974642 RMD160 608905983cc8397ce61285863e4366bcda3bbd41 SHA1 bf69f6341de61845d2db9734a030558ffbaffd63 SHA256 b2ed07e45796c3242815922cce8451eca249930c5ee33a6bf261469ac6596c93 -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 DIST RMagick-2.2.2.tar.bz2 930268 RMD160 9d9ef6e0c41efffbad27edb10e19679c742ee71e SHA1 147065cb0276f7f1ec1dd03ea46da19b08226f96 SHA256 e71c2e4ce7c8f8cae5392953265f2ef1dde4659d28709614c496844aac76cd75 EBUILD rmagick-1.15.10.ebuild 2683 RMD160 c313aaa4b05b851634e81006a36f5f1a3324d3ff SHA1 e82ef63547f4f8527eb7b207e95a763c0756cd73 SHA256 f4b20fe769276db3feb8172302f8ba07fe62bb0635e8d29a03ccbddfb123f7b3 EBUILD rmagick-1.15.12.ebuild 2689 RMD160 56ea629800c4b23f231ce84409f8aa3e1c7c83b3 SHA1 726e95a9a236ee02bcf74551dfe706ce54f12227 SHA256 757b094eb4d81db43b7bfba3ce8b82653ec8211daa4cec53287a967863659f0c EBUILD rmagick-1.15.13.ebuild 2695 RMD160 fe7dbf6fe09b9c73c4eef18f7f1545f9957e99b8 SHA1 fd8507efbdf7083ecff511350a2c35d46ff4457d SHA256 b2526e41c4fddadd948234afaf8016ad2302f95be4dcf1134c381209badfbc07 -EBUILD rmagick-2.1.0.ebuild 2631 RMD160 fac7829b483f6bbd2cbe09dd868be10afa985efd SHA1 5d5f78025048ebdff22482ff07ad77517eba3d54 SHA256 6f1d390d5e9b659b11eb6f31b31a0cc9869736f10f3d0f8da2e15a1697e042dd -EBUILD rmagick-2.2.0.ebuild 2631 RMD160 04104a3c3d53e236b8443dd670492d3af9190df3 SHA1 a658eeaae7e0dd6df4c87d75e2ea74cdca1b191a SHA256 b87e40fe28968d784a656aef0b0d94f548002145d869477d2e0a96575620dbad -EBUILD rmagick-2.2.2.ebuild 2631 RMD160 2b48f251edaef3dd738ec95ef511aedadd3c8e06 SHA1 f8425d3618f4f107fd495cd52d6831aa61874425 SHA256 b30addc5e202e548a576e7f1992f967d04a60d094ff57ca34bdf8d4d0cbebbbc -MISC ChangeLog 13549 RMD160 69052379aa4029349a9c8ed05e35e678db87957f SHA1 a1ae5d3eb1af031818a7cdc158b25292f2934b7f SHA256 7fcb5405cf6db2b64fea5f7d98939f6640320c77fb9fb8c186d2ac190f2665da +EBUILD rmagick-2.2.2.ebuild 2666 RMD160 fdc216e20cc1f17acf64617ff41f947d2347f80d SHA1 3bf7aceaa5c75740b7fbf1c94b2cfa585d0bcd10 SHA256 dfaf8c18893a33b32aaf690bb0c07475183a9577a28185aa4e9c2e344a16beb2 +MISC ChangeLog 13750 RMD160 7de1d66fdd8c5946c4a037fe14ae97b008118ea6 SHA1 ad05625ba529d76c080de38d4a7c7c820bcc5c06 SHA256 d2f04f697c39967249c5ffb31b6f3d73270dff0500ccb49ff9151245bd14c997 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFHvIreQUozDL2JlH4RAokuAJ9lpL3nAf7PfmQ6H74EY9kH+1vUdgCfco0O -6pJ3iwwGubTrxq9gARBaLVk= -=mDiS +iD8DBQFH09CCQUozDL2JlH4RAunwAJ4gVyYeVkBeSQHDPO/4cAqMMw4uQQCfUTnh +4cwD5yHHkZhUL6Ek4+bnzCM= +=97Fq -----END PGP SIGNATURE----- diff --git a/dev-ruby/rmagick/rmagick-2.1.0.ebuild b/dev-ruby/rmagick/rmagick-2.1.0.ebuild deleted file mode 100644 index b386f145d126..000000000000 --- a/dev-ruby/rmagick/rmagick-2.1.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# 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.1.0.ebuild,v 1.1 2008/01/10 19:58:30 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/30514/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 -} diff --git a/dev-ruby/rmagick/rmagick-2.2.0.ebuild b/dev-ruby/rmagick/rmagick-2.2.0.ebuild deleted file mode 100644 index 6c8ff43c8a7e..000000000000 --- a/dev-ruby/rmagick/rmagick-2.2.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# 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 -} diff --git a/dev-ruby/rmagick/rmagick-2.2.2.ebuild b/dev-ruby/rmagick/rmagick-2.2.2.ebuild index 75a4e590befb..45df4b37f7b2 100644 --- a/dev-ruby/rmagick/rmagick-2.2.2.ebuild +++ b/dev-ruby/rmagick/rmagick-2.2.2.ebuild @@ -1,6 +1,6 @@ # 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.2.ebuild,v 1.1 2008/02/20 20:17:28 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/rmagick-2.2.2.ebuild,v 1.2 2008/03/09 11:56:36 graaff Exp $ inherit ruby @@ -63,4 +63,6 @@ src_install() { cd "${S}" dodoc ChangeLog README.html README-Mac-OSX.txt README.txt + + use examples && dodoc examples/* } -- 2.26.2