Rename sqlite3 USEflag to sqlite. Fixes bug #548654.

Package-Manager: portage-2.2.20/cvs/Linux x86_64

6 files changed, 30 insertions, 53 deletions

diff --git a/dev-ruby/activerecord/ChangeLog b/dev-ruby/activerecord/ChangeLog
index 4e4185d3b8a1..fec545c06fbc 100644
--- a/dev-ruby/activerecord/ChangeLog
+++ b/dev-ruby/activerecord/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/activerecord
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.292 2015/06/07 16:41:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.293 2015/06/09 14:39:00 mrueg Exp $
+
+  09 Jun 2015; Manuel Rüger <mrueg@gentoo.org> activerecord-3.2.21.ebuild,
+  activerecord-4.0.13.ebuild, activerecord-4.1.10.ebuild,
+  activerecord-4.2.1.ebuild:
+  Rename sqlite3 USEflag to sqlite. Fixes bug #548654.
 
   07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 72edd198689b..319b8d452cd5 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,32 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 DIST rails-3.2.21.tgz 3568729 SHA256 95dcf2a848a7fd09acbb12c47e6901baeea08645c32c37e2ae04e2650cf01deb SHA512 952c799736dd2a48532a4340d97ffbbbdc2451fc509e7f86ca47c09f5c6a3f4e5cb9b87c3e803692bc8a810bc178513bbe74f3037fdf8f786c30f0c85dd26948 WHIRLPOOL a2c79df0091ea0ca6f3969a91b4d73c14f79cab9d31ec30591a640321487aedafd0318326080ad4d9be0523002eab2c3c5e9e49b2c6b0b5ef6f5dac8da0bfab5
 DIST rails-4.0.13.tgz 3761572 SHA256 a693a8c5f767d153e765634cecb6356855ca51b6554b3af1a38888023a204a51 SHA512 3f2cca90187f800d1ec57fc6cbc58c1f3213113a94d1dee7d9cfd3dc0264b7f3a9c6cfc6dd95ef2fb3aa7d8ca5d6da50cedecc288ff8ff7e5305dc0309b4365d WHIRLPOOL a5b3f7f828a88d04b5687b3217b40903192ccea5eca36ca58cbb2baeec7471241fe5529f13688bd1f6396a384cf282c94bfaf54ee1cfafdf5ef400707dee7d01
 DIST rails-4.1.10.tgz 3723355 SHA256 f8060783a25002bdd8120411f3ef7f5b696b5069477135ebf481501f4b69384c SHA512 9493d52ae6d417e11dc141c9e9fa0abf5b4d1ba355d89f5cabbcf774d54128c9e2815b60467bbc0ba275cde8f771b9845c9a4cb1ba775ac8228223a87a51f807 WHIRLPOOL 1a34cd978da13ec1804791cc31aba12de4e1be67787aeda23a50eb2cc54c568a613d89e0d7d61a2969bca1e551e12ba23f362cafedd0b0bc7b0c37e12ab02c05
 DIST rails-4.2.1.tgz 4149447 SHA256 11237cc395c5d4a7f64636f2043cf8c248e862e1946f7491244f448e1c509af7 SHA512 00720fa889b7d0a25c4ef497a8dc95330393300ed05108c5de1413a8f2fa62babf9674b62a627adbd29f1f337395a7ec8c46985753dbed2550023f5159942d91 WHIRLPOOL d09243b37810d2288fe9ea64d82c15c5281b52847e7143a6b7076b5da103cbe02e705788cccdcaf366cced2e9fc6f14362da4b6ddb67df17281ac9a5d1cf5fa7
-EBUILD activerecord-3.2.21.ebuild 2634 SHA256 67bd25d7b872d71de9336c6ccc11eb7808910ee0437a5774c222f4bc2351d361 SHA512 88774b353731fd66e390363945ce270d5a93bcf5bd0d52a9ec969bac9b5debfb7420d048b76e1faf996b16ad209fc0abfd53d99088630d5ad2ff3b4f3bff8a02 WHIRLPOOL 85795919cc2a1959d19fd1b2d51d53d410e6b62be733d5008cbf18f9a1498e31030a4830e56ec6b1d1f1a680054f48daded2623a10240eb9eaf443a683c3fe68
-EBUILD activerecord-4.0.13.ebuild 2670 SHA256 8febd9324efca8b6317a55cbd3ae1de1542f92ca4b708ffaf3677fdac65cb7dd SHA512 c57e5f092dcfa9aae83ff53ebdeebe694eac70319602b9499abe11907fbb297e55ee6826b18ad270008b8073ded3503cdcb841f02eb5e246b78c3b466d97e7cb WHIRLPOOL 323ed2504c28795458b2f3b8c011946aba7e4e3d6ab03d2607fb0d157e35a40290c625125dac94ddee1729966bb60b645101d3f2afbae9e43ff48ff88fe5d6f4
-EBUILD activerecord-4.1.10.ebuild 2442 SHA256 0fd5f54eb1c669cf9bb5e4bff7e984255e2e876bc84d9a8acb6273c96f2c7800 SHA512 092f708d5c4eaad5d3d3b7d963c5ac6490fe6f8e15e07977882c4d7b7722da51f57acdc47f6f4fb6ea22e57c61675d668ee11c83238ee22783dddde8fd700d34 WHIRLPOOL cac4239fc6ffc5f94b4ab09938ad800616613fc48bfcf97993644dde25579d4762a4642db1647d1eecaeee76a1891a6fd2b8d9540120787a84d437d6dad88985
-EBUILD activerecord-4.2.1.ebuild 2496 SHA256 686fbea51def6b4a6f63a8d06ba20ebba64d9f2803a3244d68f65f88ca96abf4 SHA512 aae24ba358cd6b870de740c63118abc1b550eb44d11b8c05dc81eaabeac21e39fa459b4ebbb195e1d43c8001232b4149b587de1341c5b1bffb096c2b85b914c8 WHIRLPOOL 11be02730fa966d647d6119204a776313bdfc4b0c45eb6ed679d835e1e0f5087016ebd7121b43f2520edf44400ff70f0473f18d816991276d22c128e2e5d95f7
-MISC ChangeLog 41683 SHA256 ca9e5464923e5af1d259ad26e56ddbcbaa2d9352dad3b99d2ee67f1291b77b82 SHA512 5b00de5b237b10987b23f8d01243175649be9af989d509bf5f51785a088961b53229e874538deb74419eaee1510eb4d38c5ede5a01c41d279aee7c0e8fb9613f WHIRLPOOL f125738465f01ce8cdde7f62186dffda93f850dfed3d96cecb2bc0bbc047115eaa284eba24908aa00856a4d32bd3ee11c9249c6eb8d36001a1c7f3089823964a
+EBUILD activerecord-3.2.21.ebuild 2574 SHA256 3468a067ff034f5e957655c9c1cd2ec8fb1ac798e4177d9dcd46dc4cea417395 SHA512 c3c222bc69ba2e4a7bfc5b49fdce83cecead7336ceeedafecc26558b235e1a6aaca5914dbdfc4ade8568ca5d6ecccef56eba0725ba288d925125eee6998bc1c5 WHIRLPOOL c9c5c12e64e7e2192be8c48c43af034239ade8e29daf38ee12371dec40cd4d8d3903282eefcbeb774586ae36c4997a4c37dbde29f307a6539123f286f04ffceb
+EBUILD activerecord-4.0.13.ebuild 2666 SHA256 8860a62c3da8ce666954304ec86d49844b0b0ecaa362b769bf413aef4e1cecab SHA512 3e7af2be06a092dc35bbb72c02471fde06e4d9d77de6fbf5459b7885f59f2f9a3d5d500762d3bc00a449a33c86ac2a4ec3d2fd41ffa1f090280481c90192b6f5 WHIRLPOOL ba114632b27abd095b5439da38c7c4f2a4d9d38a79be06ef86855d2be585d13fce36c751d0b2f347590b39e2b0e5d687ebbf55374292e5b0e08dc2fbaaae87c5
+EBUILD activerecord-4.1.10.ebuild 2438 SHA256 15bc30b55f4f216a73069d4d66b47daf936a18844c53829762495a7a90e24a3e SHA512 c3bf9668162ed257dfaa93b77280304540ece78c0df3b0b99071a912566954cd4ac80a497dc6348de04e1194acd17ca9d8c4ff01ca6553c3bdfeef24e4f6ffb4 WHIRLPOOL 5593fd469b3d6134825ef1ea7f43dbfea9c6c26199e410d1a3efb074b59c5e86d8e82e4eb802710589c69c03be377e23b91c7b009192db2589dbea1aedcae5a4
+EBUILD activerecord-4.2.1.ebuild 2492 SHA256 d8bfd6abc3451bde0bcbea0fb75b7b217cc3d5748cb111a58792636fdcc063c1 SHA512 27533ed4b51b2b28d14be02680903e6e425ec255e8e7575353eca1e370f5d135889397b09b9fa2965562412a4842484e154a877074c9d005aca776b390de6045 WHIRLPOOL 39f9fd34cf885772c6f15113de7908a504a6890179fb354ea84871d78f09dff2826b98cadc6454de8bfe4f8de01d8427146c8cd8d5b4fcf725e67621bffbd735
+MISC ChangeLog 41903 SHA256 405f2e375ea107b120bed6b75b6e3a930dc09e9a9110e714ffc8830c46558021 SHA512 c9b5d96cb55c1ceb17337cb8eeb6b8bc7376ff9d11f18151b64b6e67ad2a1be8c90be119e7c6290af9fef9836c03e262244c70a4d9e117ce1f6c4bcd84912362 WHIRLPOOL cef8a1e0209635a6f1da814c90416ae4eb4ffeffa0984c6fdb4fc0d53ee1ea3c8ea6548b840aa0ba3ba5f0077b07a44a54d09cc9071915f92bc420a15e994986
 MISC metadata.xml 239 SHA256 601a5b0fce4b301bb2c349bd1132c36c4a6504f8fadc36403aceb00d3fe45634 SHA512 56fb328eed48436d955df5dafd091e1be8345692fae2d30793166b6d5e2a70a4ba78ec0319601facd2e2c206d4c4089ff6392dd2c25efc26fa084b6b0d1663cb WHIRLPOOL 8a394bfb78d7fdca910776e32b6ca9c9e7c140173d73a2dbdceb03b6e101554650f025034ba2385a0dc1f8b7ce70914308fe15db0a2aa550baa365181f24f2c6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCgBmBQJVdHQdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi20MP/1+7dA/X8NQsew9l95xbTYqL
-nrOkMp3BPdYNRdixL1brDHMXI0S3Gaw2oGoFA44Fv+MGJwkQjOh3BDWGMjD9CTK6
-t8MqB+xJooTScWW7wZa3xPNSHOnX3Eho4BISGekMloTyEJdA8MMsYL7rCmEInRyJ
-DGc1nOeq0V+K4XJtDa+xJRvu+XII7XJ62J98mYmug9tBiGtE2ha/R7fJSyIsX8lW
-HN8fKcY75tnmynofhS6YQireuRbNXtpH2t2qZDsyYnLtbb3VoV3UfaXuol6+bsFG
-e8nkFivsib+ZZimSOTv7HqEoCrQ7csOjmxyw5EX+YzuT6btaMFEZoAbOL3Xc9zhR
-YvyOWQvVyPd/x/Vf1bgS91B6bnc/6Fx/jOqGA3rEMR0dYGpvdVm6k32K1EynTs1j
-DS+NyLOpL6F4pBRIUHcU8O1yCjReY6ICjfJrSm9TpDIrfIwRZxTdYaeTM00BywY+
-m2SysiLHFMQPJBA0vIqV9Twwxe+4O0tTL61iSLrp67j2ZZmqzZkQ+KXHyBg6+tTA
-/FjKBzc2fI4sDXtxWV4F3+unAzAzcpgYCd0nVs/rRu6KENlonDB774KcwgeNXeSv
-Aoae+vr/w+mQSaicoQXhrSy41oqH9BUrkcukW24BYlv/ExqVcUiCU5CXUdmPJDgJ
-q0210CzxYwA5OIcVA72d
-=W8gv
------END PGP SIGNATURE-----
diff --git a/dev-ruby/activerecord/activerecord-3.2.21.ebuild b/dev-ruby/activerecord/activerecord-3.2.21.ebuild
index 9c71fdae22c6..562378010de9 100644
--- a/dev-ruby/activerecord/activerecord-3.2.21.ebuild
+++ b/dev-ruby/activerecord/activerecord-3.2.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.2.21.ebuild,v 1.1 2014/11/17 20:20:00 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.2.21.ebuild,v 1.2 2015/06/09 14:39:00 mrueg Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -22,7 +22,7 @@ SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="mysql postgres sqlite3"
+IUSE="mysql postgres sqlite"
 
 RUBY_S="rails-${PV}/${PN}"
 
@@ -30,7 +30,7 @@ ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
 	>=dev-ruby/arel-3.0.2:3.0
 	>=dev-ruby/tzinfo-0.3.29:0
-	sqlite3? ( >=dev-ruby/sqlite3-1.3.5 )
+	sqlite? ( >=dev-ruby/sqlite3-1.3.5 )
 	mysql? ( >=dev-ruby/mysql2-0.3.10:0.3 )
 	postgres? ( >=dev-ruby/pg-0.11.0 )"
 
@@ -63,13 +63,7 @@ all_ruby_prepare() {
 }
 
 each_ruby_test() {
-	case ${RUBY} in
-		*jruby)
-			;;
-		*)
-			if use sqlite3; then
-				${RUBY} -I. -S rake  test_sqlite3 || die "sqlite3 tests failed"
-			fi
-			;;
-	esac
+	if use sqlite; then
+		${RUBY} -I. -S rake  test_sqlite3 || die "sqlite3 tests failed"
+	fi
 }
diff --git a/dev-ruby/activerecord/activerecord-4.0.13.ebuild b/dev-ruby/activerecord/activerecord-4.0.13.ebuild
index 361fecd53510..557b2027fbf5 100644
--- a/dev-ruby/activerecord/activerecord-4.0.13.ebuild
+++ b/dev-ruby/activerecord/activerecord-4.0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-4.0.13.ebuild,v 1.1 2015/01/07 07:05:49 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-4.0.13.ebuild,v 1.2 2015/06/09 14:39:00 mrueg Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -22,7 +22,7 @@ SRC_URI="http://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="mysql postgres sqlite3"
+IUSE="mysql postgres sqlite"
 
 RUBY_S="rails-${PV}/${PN}"
 
@@ -30,7 +30,7 @@ ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
 	>=dev-ruby/activerecord-deprecated_finders-1.0.2:1.0
 	>=dev-ruby/arel-4.0.2:4.0
-	sqlite3? ( >=dev-ruby/sqlite3-1.3.5 )
+	sqlite? ( >=dev-ruby/sqlite3-1.3.5 )
 	mysql? ( >=dev-ruby/mysql2-0.3.10:0.3 )
 	postgres? ( >=dev-ruby/pg-0.11.0 )
 	!<dev-ruby/protected_attributes-1.0.8"
@@ -72,7 +72,7 @@ each_ruby_test() {
 		*jruby)
 			;;
 		*)
-			if use sqlite3; then
+			if use sqlite; then
 				${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
 			fi
 			;;
diff --git a/dev-ruby/activerecord/activerecord-4.1.10.ebuild b/dev-ruby/activerecord/activerecord-4.1.10.ebuild
index cd1e04d4fbe9..23ed822e4ca6 100644
--- a/dev-ruby/activerecord/activerecord-4.1.10.ebuild
+++ b/dev-ruby/activerecord/activerecord-4.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-4.1.10.ebuild,v 1.1 2015/03/19 19:25:27 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-4.1.10.ebuild,v 1.2 2015/06/09 14:39:00 mrueg Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -22,14 +22,14 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="mysql postgres sqlite3"
+IUSE="mysql postgres sqlite"
 
 RUBY_S="rails-${PV}/${PN}"
 
 ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
 	>=dev-ruby/arel-5.0.0:5.0
-	sqlite3? ( >=dev-ruby/sqlite3-1.3.6 )
+	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
 	mysql? ( >=dev-ruby/mysql2-0.3.13:0.3 )
 	postgres? ( >=dev-ruby/pg-0.11.0 )"
 
@@ -66,7 +66,7 @@ all_ruby_prepare() {
 }
 
 each_ruby_test() {
-	if use sqlite3; then
+	if use sqlite; then
 		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
 	fi
 }
diff --git a/dev-ruby/activerecord/activerecord-4.2.1.ebuild b/dev-ruby/activerecord/activerecord-4.2.1.ebuild
index 1daf6ba6112a..d8071cb1239a 100644
--- a/dev-ruby/activerecord/activerecord-4.2.1.ebuild
+++ b/dev-ruby/activerecord/activerecord-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-4.2.1.ebuild,v 1.1 2015/03/19 19:25:27 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-4.2.1.ebuild,v 1.2 2015/06/09 14:39:00 mrueg Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -22,14 +22,14 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="mysql postgres sqlite3"
+IUSE="mysql postgres sqlite"
 
 RUBY_S="rails-${PV}/${PN}"
 
 ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
 	>=dev-ruby/arel-6.0:6.0
-	sqlite3? ( >=dev-ruby/sqlite3-1.3.6 )
+	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
 	mysql? ( >=dev-ruby/mysql2-0.3.13:0.3 )
 	postgres? ( >=dev-ruby/pg-0.15.0 )"
 
@@ -68,7 +68,7 @@ all_ruby_prepare() {
 }
 
 each_ruby_test() {
-	if use sqlite3; then
+	if use sqlite; then
 		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
 	fi
 }