Do not build doc unconditionally, restore USE=doc.

Package-Manager: portage-2.2.0_alpha104/cvs/Linux x86_64

6 files changed, 19 insertions, 348 deletions

diff --git a/dev-ruby/bson/ChangeLog b/dev-ruby/bson/ChangeLog
index 75ca7dd49990..bb5ca70ab14c 100644
--- a/dev-ruby/bson/ChangeLog
+++ b/dev-ruby/bson/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/bson
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bson/ChangeLog,v 1.5 2012/05/11 04:11:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bson/ChangeLog,v 1.6 2012/05/12 06:03:34 flameeyes Exp $
+
+  12 May 2012; Diego E. Pettenò <flameeyes@gentoo.org> -bson-1.5.2.ebuild,
+  -bson-1.6.0.ebuild, -bson-1.6.1.ebuild, bson-1.6.2.ebuild:
+  Do not build doc unconditionally, restore USE=doc.
 
   11 May 2012; Diego E. Pettenò <flameeyes@gentoo.org> bson-1.6.2.ebuild:
   Add support for ruby 1.9 (works fine).
diff --git a/dev-ruby/bson/Manifest b/dev-ruby/bson/Manifest
index e01fb1e6e49d..a66c7681b47c 100644
--- a/dev-ruby/bson/Manifest
+++ b/dev-ruby/bson/Manifest
@@ -1,24 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST mongo-ruby-driver-1.5.2.tar.gz 13678997 RMD160 be3180912612db60166afc14ecbb98a13b822d76 SHA1 2c482b4af547b0a5ed307442fc07bfc8e50db324 SHA256 1dd103bf29d56471482ee02e88bf908996e6b27e6fe0fbdd6c0a9fbfa57efbc3
-DIST mongo-ruby-driver-1.6.0.tar.gz 13682065 RMD160 b43f3079e33df81a3933ed9832b5ef16189a28ce SHA1 9d43a0c529172411f3385170a92399782f74e044 SHA256 597fcb6a22d8611b23471bcae1cf578adecbe6d69a817707c586909d971c2efa
-DIST mongo-ruby-driver-1.6.1.tar.gz 15482357 RMD160 c085d08d1e2964408e83abfc515e217fb2d2faf2 SHA1 cf6112e59f11ab17d38711202662a54c742b9f04 SHA256 16465e160d394c0f50e11d3f35cdfd37f0b6542000c77f57549ae5fb7d0fa5d4
 DIST mongo-ruby-driver-1.6.2.tar.gz 15485515 RMD160 6c1b7b8a7c3315a62869a56a546778fa1f41edbc SHA1 936fdd3d18bf219b69e71affc64447c427342322 SHA256 ef6885ba66fce2df619d5543ef1699b584362fe37931e9e2121d974a67cb4a58
-EBUILD bson-1.5.2.ebuild 2990 RMD160 7f8da37042123ac29f6358dd2b6aec166cd548e3 SHA1 2c2759f1ed4a3bd3bba73b9190410121fa05cb48 SHA256 3b25d55cf1fab2b22b6554b9130cd011907f47f98b805fbfd9c8a5be76691c2d
-EBUILD bson-1.6.0.ebuild 3013 RMD160 1c453216d43ee07a36c2709e3e9b629975f360f9 SHA1 29bbdece9dc620f6f7cf8d880157e7740e94639a SHA256 be8cb50ff571d45596b2934b2a187d1de8587bf5d664634914a52091cea59b37
-EBUILD bson-1.6.1.ebuild 3013 RMD160 7719e6a3c3e07e6675d9892345234a4120169a9c SHA1 ba26c84c7a5d86ee587cf410fe6bbe57f1eaedc3 SHA256 b850384feb3763b310bbba169118c69a83d8170b90428f11d0e387717e14adfc
-EBUILD bson-1.6.2.ebuild 2955 RMD160 480c5cc9af1d61f1a6f196ecf06e2fd8d4b2dc21 SHA1 8cccd0233ec619a0534665ac52bb1d652ccc1275 SHA256 3cbc04c0885f8b1883b7ccea0f042f5e009398702e707511588b4269ae19ee7c
-MISC ChangeLog 852 RMD160 6740e5aaeb5b2ee27fdf945afeba908e92316ad5 SHA1 ab976b136b2234970b32d8e648a0079fce58352f SHA256 b5890346360f03ad466e4695387d0bde9c5d5ccbcd4b6fcf42e05677c47a9756
+EBUILD bson-1.6.2.ebuild 2982 RMD160 30f810806d702941b42c47cb393117e245689e30 SHA1 d0578f1f5317be62942c68a535632a5b41c57f75 SHA256 0186de8c22212c092fb65885a525e52eebb97f82e4a22286885af4af636ac4a2
+MISC ChangeLog 1043 RMD160 c5060947303783868f03b247e8906da6e214063f SHA1 614be9ae331142bd0697fcc82b10aeee94d1db24 SHA256 35f4e02fa4c6c18e3985085474bbe68ac724718d384631577fcd5724e60839a2
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPrJGbAAoJEBzRPIrUMBNC2uMH/RYvDGVGmVmhuAT3+tXeDDtv
-Ju2Uns24WlVOoymaRORjp2nPCDE8+ObVKeUrFtr5zQ+MMNTEdqOqvSCm5jjUi9ZB
-BIf+E2w2qvIhYCBp3Tl9jXQ6pcQ4//B8nCCar7S+4ThOJrP9DJ1IHMcwWF3LnpoS
-qktNk6tiWr2w5/SOhh+1uzps8rutZjgdQgfY8d2xGMs7YGViZSSmtwRXbilL5XUS
-xn4iI73JfWy7Fny3mZ74Boo4v4dhdaEnB9oKx+28roNRCzVxqx7DzFBSX+HBJNEn
-QbAYQy7e9rcNfAIKJoxW2CXhAQaGSLei0gb9qkIPoPdkmLH5LsCj2XIdz7AqPyg=
-=+Jmc
+iQEcBAEBAgAGBQJPrf1EAAoJEBzRPIrUMBNCq98H/1racv7f1Dv9TnUQAFyrfGRh
+WShTUISYFNodj0FtZXFGjwL3EDzymN0HfjA6DZP3OM2Oqw7LsgVgRLhHzsPQ1YbI
+pSHfcE3y78J+wO665jiRLKKKZiE340i+rUYaKpRSeD+QYnDzydsN2gvMnRtlf/Y4
+YZSNf7EAcJ6eMaaMOWAlTZv3QJS9//WJYvLgm+xgd04d2zLxBI9gyzzw4tZal7Hy
+/EPHhIHCU5OZWyy4zqa/n/PPEgeIeIuSESU0vvPa/KMEay63IBa5PwZOcwC2PTK8
+LFUOvpDocaouwM1yhPk2v1re5rQlXP1lf85We4eMK79cRB4EFrF0dyY4WIoFG8Q=
+=htQB
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/bson/bson-1.5.2.ebuild b/dev-ruby/bson/bson-1.5.2.ebuild
deleted file mode 100644
index 13e9cc415718..000000000000
--- a/dev-ruby/bson/bson-1.5.2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bson/bson-1.5.2.ebuild,v 1.1 2011/12/28 23:47:54 flameeyes Exp $
-
-EAPI=4
-# ruby19 → test_exeption_on_using_unsupported_date_class fails
-# jruby → support needs to be written properly
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_DOC="moot" # we do it manually, but still declare it
-RUBY_FAKEGEM_DOCDIR="html"
-RUBY_FAKEGEM_EXTRADOC=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="mongodb"
-GITHUB_PROJECT="mongo-ruby-driver"
-RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
-HOMEPAGE="http://www.mongodb.org/"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/${PV} -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="APSL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend \
-	"test? (
-		dev-ruby/rake
-		dev-ruby/shoulda
-		dev-ruby/mocha
-	)
-	doc? ( virtual/ruby-rdoc )"
-
-all_ruby_prepare() {
-	# remove the stuff that is actually part of dev-ruby/mongo
-	rm -rf {lib,bin}/mongo*
-}
-
-each_ruby_configure() {
-	case ${RUBY} in
-		*/ruby18|*/ruby19|*/rubyee18)
-			${RUBY} -C ext/cbson extconf.rb || die "extconf.rb failed"
-			;;
-		*/jruby)
-			${RUBY} -S rake build:java || die "rake build:java failed"
-			;;
-	esac
-}
-
-each_ruby_compile() {
-	case ${RUBY} in
-		*/ruby18|*/ruby19|*/rubyee18)
-			emake -C ext/cbson CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
-			mkdir lib/bson_ext
-			cp ext/cbson/*.so lib/bson_ext || die
-			;;
-		*/jruby)
-			die "missing in ebuild"
-			;;
-	esac
-}
-
-all_ruby_compile() {
-	# Trying to get the Rakefile to build the sources is more trouble
-	# than it's worth, do it manually instead.
-	rdoc --op html --inline-source lib/**/*.rb || die "rdoc failed"
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*/ruby18|*/ruby19|*/rubyee18)
-			C_EXT=true ${RUBY} -S rake test:bson || die "tests failed"
-			;;
-	esac
-
-	${RUBY} -S rake test:bson || die "tests failed"
-}
-
-each_ruby_install() {
-	# we have to set the library path here because the gemspec tries to
-	# load bson itself, and would fail without that.
-	RUBYLIB="lib" \
-		each_fakegem_install
-
-	# and now we create the simulated gem for bson_ext; we create a file
-	# bson_ext.rb within ext so that we don't have to change the
-	# bson_ext.gemspec file, and at the same time we ensure that bson
-	# gem is loaded when loading bson_ext.
-	dodir $(ruby_fakegem_gemsdir)/gems/bson_ext-${PV}/ext
-	cat - <<EOF > "${D}/$(ruby_fakegem_gemsdir)/gems/bson_ext-${PV}/ext/bson_ext.rb"
-require 'bson'
-EOF
-
-	RUBYLIB="lib" \
-		RUBY_FAKEGEM_NAME=bson_ext \
-		RUBY_FAKEGEM_GEMSPEC=bson_ext.gemspec \
-		ruby_fakegem_install_gemspec
-}
-
-pkg_postinst() {
-	elog "Unlike upstream setup, we do not split bson and bson_ext gem."
-	elog "This means that for all the supported targets, the C-based extension"
-	elog "is installed by this package, and is available transparently."
-}
diff --git a/dev-ruby/bson/bson-1.6.0.ebuild b/dev-ruby/bson/bson-1.6.0.ebuild
deleted file mode 100644
index 5a997ee1ef2d..000000000000
--- a/dev-ruby/bson/bson-1.6.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bson/bson-1.6.0.ebuild,v 1.1 2012/02/22 23:55:46 flameeyes Exp $
-
-EAPI=4
-# ruby19 → test_exeption_on_using_unsupported_date_class fails
-# jruby → support needs to be written properly
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_DOC="moot" # we do it manually, but still declare it
-RUBY_FAKEGEM_DOCDIR="html"
-RUBY_FAKEGEM_EXTRADOC=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="mongodb"
-GITHUB_PROJECT="mongo-ruby-driver"
-RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
-HOMEPAGE="http://www.mongodb.org/"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/${PV} -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="APSL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend \
-	"test? (
-		dev-ruby/rake
-		dev-ruby/shoulda
-		dev-ruby/mocha
-		dev-ruby/test-unit:2
-	)
-	doc? ( virtual/ruby-rdoc )"
-
-all_ruby_prepare() {
-	# remove the stuff that is actually part of dev-ruby/mongo
-	rm -rf {lib,bin}/mongo*
-}
-
-each_ruby_configure() {
-	case ${RUBY} in
-		*/ruby18|*/ruby19|*/rubyee18)
-			${RUBY} -C ext/cbson extconf.rb || die "extconf.rb failed"
-			;;
-		*/jruby)
-			${RUBY} -S rake build:java || die "rake build:java failed"
-			;;
-	esac
-}
-
-each_ruby_compile() {
-	case ${RUBY} in
-		*/ruby18|*/ruby19|*/rubyee18)
-			emake -C ext/cbson CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
-			mkdir lib/bson_ext
-			cp ext/cbson/*.so lib/bson_ext || die
-			;;
-		*/jruby)
-			die "missing in ebuild"
-			;;
-	esac
-}
-
-all_ruby_compile() {
-	# Trying to get the Rakefile to build the sources is more trouble
-	# than it's worth, do it manually instead.
-	rdoc --op html --inline-source lib/**/*.rb || die "rdoc failed"
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*/ruby18|*/ruby19|*/rubyee18)
-			C_EXT=true ${RUBY} -S rake test:bson || die "tests failed"
-			;;
-	esac
-
-	${RUBY} -S rake test:bson || die "tests failed"
-}
-
-each_ruby_install() {
-	# we have to set the library path here because the gemspec tries to
-	# load bson itself, and would fail without that.
-	RUBYLIB="lib" \
-		each_fakegem_install
-
-	# and now we create the simulated gem for bson_ext; we create a file
-	# bson_ext.rb within ext so that we don't have to change the
-	# bson_ext.gemspec file, and at the same time we ensure that bson
-	# gem is loaded when loading bson_ext.
-	dodir $(ruby_fakegem_gemsdir)/gems/bson_ext-${PV}/ext
-	cat - <<EOF > "${D}/$(ruby_fakegem_gemsdir)/gems/bson_ext-${PV}/ext/bson_ext.rb"
-require 'bson'
-EOF
-
-	RUBYLIB="lib" \
-		RUBY_FAKEGEM_NAME=bson_ext \
-		RUBY_FAKEGEM_GEMSPEC=bson_ext.gemspec \
-		ruby_fakegem_install_gemspec
-}
-
-pkg_postinst() {
-	elog "Unlike upstream setup, we do not split bson and bson_ext gem."
-	elog "This means that for all the supported targets, the C-based extension"
-	elog "is installed by this package, and is available transparently."
-}
diff --git a/dev-ruby/bson/bson-1.6.1.ebuild b/dev-ruby/bson/bson-1.6.1.ebuild
deleted file mode 100644
index 2b0337c8df92..000000000000
--- a/dev-ruby/bson/bson-1.6.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bson/bson-1.6.1.ebuild,v 1.1 2012/03/08 01:27:58 flameeyes Exp $
-
-EAPI=4
-# ruby19 → test_exeption_on_using_unsupported_date_class fails
-# jruby → support needs to be written properly
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_DOC="moot" # we do it manually, but still declare it
-RUBY_FAKEGEM_DOCDIR="html"
-RUBY_FAKEGEM_EXTRADOC=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="mongodb"
-GITHUB_PROJECT="mongo-ruby-driver"
-RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
-HOMEPAGE="http://www.mongodb.org/"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/${PV} -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="APSL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend \
-	"test? (
-		dev-ruby/rake
-		dev-ruby/shoulda
-		dev-ruby/mocha
-		dev-ruby/test-unit:2
-	)
-	doc? ( virtual/ruby-rdoc )"
-
-all_ruby_prepare() {
-	# remove the stuff that is actually part of dev-ruby/mongo
-	rm -rf {lib,bin}/mongo*
-}
-
-each_ruby_configure() {
-	case ${RUBY} in
-		*/ruby18|*/ruby19|*/rubyee18)
-			${RUBY} -C ext/cbson extconf.rb || die "extconf.rb failed"
-			;;
-		*/jruby)
-			${RUBY} -S rake build:java || die "rake build:java failed"
-			;;
-	esac
-}
-
-each_ruby_compile() {
-	case ${RUBY} in
-		*/ruby18|*/ruby19|*/rubyee18)
-			emake -C ext/cbson CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
-			mkdir lib/bson_ext
-			cp ext/cbson/*.so lib/bson_ext || die
-			;;
-		*/jruby)
-			die "missing in ebuild"
-			;;
-	esac
-}
-
-all_ruby_compile() {
-	# Trying to get the Rakefile to build the sources is more trouble
-	# than it's worth, do it manually instead.
-	rdoc --op html --inline-source lib/**/*.rb || die "rdoc failed"
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*/ruby18|*/ruby19|*/rubyee18)
-			C_EXT=true ${RUBY} -S rake test:bson || die "tests failed"
-			;;
-	esac
-
-	${RUBY} -S rake test:bson || die "tests failed"
-}
-
-each_ruby_install() {
-	# we have to set the library path here because the gemspec tries to
-	# load bson itself, and would fail without that.
-	RUBYLIB="lib" \
-		each_fakegem_install
-
-	# and now we create the simulated gem for bson_ext; we create a file
-	# bson_ext.rb within ext so that we don't have to change the
-	# bson_ext.gemspec file, and at the same time we ensure that bson
-	# gem is loaded when loading bson_ext.
-	dodir $(ruby_fakegem_gemsdir)/gems/bson_ext-${PV}/ext
-	cat - <<EOF > "${D}/$(ruby_fakegem_gemsdir)/gems/bson_ext-${PV}/ext/bson_ext.rb"
-require 'bson'
-EOF
-
-	RUBYLIB="lib" \
-		RUBY_FAKEGEM_NAME=bson_ext \
-		RUBY_FAKEGEM_GEMSPEC=bson_ext.gemspec \
-		ruby_fakegem_install_gemspec
-}
-
-pkg_postinst() {
-	elog "Unlike upstream setup, we do not split bson and bson_ext gem."
-	elog "This means that for all the supported targets, the C-based extension"
-	elog "is installed by this package, and is available transparently."
-}
diff --git a/dev-ruby/bson/bson-1.6.2.ebuild b/dev-ruby/bson/bson-1.6.2.ebuild
index add65446b6d5..e655b9def673 100644
--- a/dev-ruby/bson/bson-1.6.2.ebuild
+++ b/dev-ruby/bson/bson-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bson/bson-1.6.2.ebuild,v 1.2 2012/05/11 04:11:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bson/bson-1.6.2.ebuild,v 1.3 2012/05/12 06:03:34 flameeyes Exp $
 
 EAPI=4
 # jruby → support needs to be written properly
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/${PV} -> ${
 LICENSE="APSL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
+IUSE="test doc"
 
 ruby_add_bdepend \
 	"test? (
@@ -68,7 +68,9 @@ each_ruby_compile() {
 all_ruby_compile() {
 	# Trying to get the Rakefile to build the sources is more trouble
 	# than it's worth, do it manually instead.
-	rdoc --op html --inline-source lib/**/*.rb || die "rdoc failed"
+	if use doc; then
+		rdoc --op html --inline-source lib/**/*.rb || die "rdoc failed"
+	fi
 }
 
 each_ruby_test() {