Fix sqlite dependency #176308, remove old version

Package-Manager: portage-2.1.2.2

5 files changed, 19 insertions, 58 deletions

diff --git a/dev-ruby/og/ChangeLog b/dev-ruby/og/ChangeLog
index c27a55d10c8d..90e109d2d43a 100644
--- a/dev-ruby/og/ChangeLog
+++ b/dev-ruby/og/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/og
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/og/ChangeLog,v 1.12 2007/03/15 10:15:51 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/og/ChangeLog,v 1.13 2007/05/13 16:32:14 graaff Exp $
+
+  13 May 2007; Hans de Graaff <graaff@gentoo.org> -og-0.29.0.ebuild,
+  og-0.40.0.ebuild:
+  og depends on sqlite3, not sqlite. Update USE flag and dependency. Bug 176308.
+  Dropped ~ppc64 keyword since ppc64 does not have sqlite3-ruby keyworded.
+  Remove old version.
 
   14 Mar 2007; Tom Gall <tgall@gentoo.org> og-0.40.0.ebuild:
   added ~ppc64 
diff --git a/dev-ruby/og/Manifest b/dev-ruby/og/Manifest
index d6815f3372fe..49f3b6ed1075 100644
--- a/dev-ruby/og/Manifest
+++ b/dev-ruby/og/Manifest
@@ -1,34 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST og-0.29.0.gem 122880 RMD160 c4832691ce7805ce152cc09b365a3412950c8d05 SHA1 8a1be40a70057e430a75e3a25dd77ac151f29687 SHA256 919cbbb3eb5f1831cedecdb1c0d15d25cca5abea672d1d29e04f2f47e409a6e7
 DIST og-0.40.0.gem 103936 RMD160 3b70ba87dbfed4c3cb0ed700f6c2d480078d42ee SHA1 4b1efb15a5080ae844b89074c0ce6fdb8c945946 SHA256 41132296e66e2a49c9ea24d7c82cc4d6fe41d14ba1b4c0e5073a9792c5ff2345
-EBUILD og-0.29.0.ebuild 727 RMD160 f49ccef1d0c1a92cfff3c18040bc48ad56f9d17e SHA1 f42fddf26a84a305a90707487a0350687c853319 SHA256 bee84eed93ce3e98ab06624f18d3d1e536392fdcfbf183cd45e7e442e81c3fbf
-MD5 5c822e3172a43b8cff9633ec74658594 og-0.29.0.ebuild 727
-RMD160 f49ccef1d0c1a92cfff3c18040bc48ad56f9d17e og-0.29.0.ebuild 727
-SHA256 bee84eed93ce3e98ab06624f18d3d1e536392fdcfbf183cd45e7e442e81c3fbf og-0.29.0.ebuild 727
-EBUILD og-0.40.0.ebuild 736 RMD160 6b55be9819129ce55d795aae274db3c67a1ca9b3 SHA1 c7ad91c12ff5489647be0a0ea7e7b3355d139b52 SHA256 1b49a2ffad61045f89b6dd7b922854cb93c38277c53e13eeaacac3317fe02101
-MD5 8d43913b33f3c8143e5a0db861b09943 og-0.40.0.ebuild 736
-RMD160 6b55be9819129ce55d795aae274db3c67a1ca9b3 og-0.40.0.ebuild 736
-SHA256 1b49a2ffad61045f89b6dd7b922854cb93c38277c53e13eeaacac3317fe02101 og-0.40.0.ebuild 736
-MISC ChangeLog 1516 RMD160 5ba0cf955efb8dc3dae42e29069afd1e0cf5a777 SHA1 67e00c7d0f572fa99eebe660b1e86b5b6dc16038 SHA256 ea4c0a82f4e6a2ff0464362e6f5854b1cbf1173f243a7f2a96df72d6bb3a9fb4
-MD5 a32081dc507c06ad24728316103b2420 ChangeLog 1516
-RMD160 5ba0cf955efb8dc3dae42e29069afd1e0cf5a777 ChangeLog 1516
-SHA256 ea4c0a82f4e6a2ff0464362e6f5854b1cbf1173f243a7f2a96df72d6bb3a9fb4 ChangeLog 1516
+EBUILD og-0.40.0.ebuild 733 RMD160 6dd69d5d502b4ba9f7a59f1024d1fc7ecd47217c SHA1 8ed63ea5f4c732fec34a2ee62c361c97d5466ba5 SHA256 f683ee544eadb24071e92a7ddb4e8648f35b14dbd57a886a4f9126920cd556b5
+MD5 5db0f8b66098f41b827d903bff5b0d57 og-0.40.0.ebuild 733
+RMD160 6dd69d5d502b4ba9f7a59f1024d1fc7ecd47217c og-0.40.0.ebuild 733
+SHA256 f683ee544eadb24071e92a7ddb4e8648f35b14dbd57a886a4f9126920cd556b5 og-0.40.0.ebuild 733
+MISC ChangeLog 1786 RMD160 341a58007a1252b14d9514bbda1c3e2e3467c0ad SHA1 018d0ab91b7a8ca6f142b13bc930ac4f7834bb92 SHA256 1ee11582f8e0effbf0b22aba196b03f390e24cfff39a3447bb0c195ce14b1ab7
+MD5 fe9c913563a82ecba205cae195c91c21 ChangeLog 1786
+RMD160 341a58007a1252b14d9514bbda1c3e2e3467c0ad ChangeLog 1786
+SHA256 1ee11582f8e0effbf0b22aba196b03f390e24cfff39a3447bb0c195ce14b1ab7 ChangeLog 1786
 MISC metadata.xml 254 RMD160 45352e67c97e6f541e16e45effa6cc89a075efa4 SHA1 9dfb8e560b511643a6ebab0195a2f458cd87ff5b SHA256 793f01b5f7ab962d5845ec1c730edf86460cf792428710ef7bf6aeb046fc08bf
 MD5 1a24e0b48460c02e20931fceded24e1a metadata.xml 254
 RMD160 45352e67c97e6f541e16e45effa6cc89a075efa4 metadata.xml 254
 SHA256 793f01b5f7ab962d5845ec1c730edf86460cf792428710ef7bf6aeb046fc08bf metadata.xml 254
-MD5 b454c00c7e5005650d263f4be28d1eb5 files/digest-og-0.29.0 220
-RMD160 6e49947116ce585d457ce5f35c7e2eb33c77e65d files/digest-og-0.29.0 220
-SHA256 8a8d74474a3164469defdd11ea7441866de67d92d4ad62226d8270043643c058 files/digest-og-0.29.0 220
 MD5 a923d5e5c3c3fdfb47cfcd7815f03d58 files/digest-og-0.40.0 220
 RMD160 7e76124ac3f6e2a32d8ebbeb7932eb755fb49272 files/digest-og-0.40.0 220
 SHA256 e9d5b2dc432627c08ef6b6da76e7c3d05797048148885d9bf10b7e9cf9ce3f28 files/digest-og-0.40.0 220
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFF+RzgV3J2n04EauwRApjAAKCgeINR5mro5BImaqDOLOZ0Ch5DkgCfYdLR
-YOeHNi66q1FAUU0bEDboVsg=
-=Mdwx
------END PGP SIGNATURE-----
diff --git a/dev-ruby/og/files/digest-og-0.29.0 b/dev-ruby/og/files/digest-og-0.29.0
deleted file mode 100644
index bde32ef83f42..000000000000
--- a/dev-ruby/og/files/digest-og-0.29.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a45c6f19241b8894c525466817113506 og-0.29.0.gem 122880
-RMD160 c4832691ce7805ce152cc09b365a3412950c8d05 og-0.29.0.gem 122880
-SHA256 919cbbb3eb5f1831cedecdb1c0d15d25cca5abea672d1d29e04f2f47e409a6e7 og-0.29.0.gem 122880
diff --git a/dev-ruby/og/og-0.29.0.ebuild b/dev-ruby/og/og-0.29.0.ebuild
deleted file mode 100644
index 68041a8c65c1..000000000000
--- a/dev-ruby/og/og-0.29.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/og/og-0.29.0.ebuild,v 1.2 2006/06/12 14:47:48 rajiv Exp $
-
-inherit ruby gems
-
-USE_RUBY="ruby18"
-DESCRIPTION="Og (ObjectGraph) is a powerfull object-relational mapping library."
-HOMEPAGE="http://www.nitroproject.org/"
-SRC_URI="http://gems.rubyforge.org/gems/${P}.gem"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~ia64 ~x86"
-IUSE="mysql postgres sqlite kirbybase"
-
-DEPEND=">=dev-lang/ruby-1.8.3
-	=dev-ruby/glue-${PV}
-	mysql? ( >=dev-ruby/mysql-ruby-2.5 )
-	postgres? ( >=dev-ruby/ruby-postgres-0.7.1 )
-	sqlite? ( >=dev-ruby/sqlite-ruby-2.2.2 )
-	kirbybase? ( >=dev-ruby/kirbybase-2.3 )"
-
-
diff --git a/dev-ruby/og/og-0.40.0.ebuild b/dev-ruby/og/og-0.40.0.ebuild
index b0c42b5043a3..0e79d3ed03a1 100644
--- a/dev-ruby/og/og-0.40.0.ebuild
+++ b/dev-ruby/og/og-0.40.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/og/og-0.40.0.ebuild,v 1.2 2007/03/15 03:53:08 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/og/og-0.40.0.ebuild,v 1.3 2007/05/13 16:32:14 graaff Exp $
 
 inherit ruby gems
 
@@ -11,14 +11,14 @@ SRC_URI="http://gems.rubyforge.org/gems/${P}.gem"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~ia64 ~ppc64 ~x86"
-IUSE="mysql postgres sqlite kirbybase"
+KEYWORDS="~ia64 ~x86"
+IUSE="mysql postgres sqlite3 kirbybase"
 
 DEPEND=">=dev-lang/ruby-1.8.5
 	=dev-ruby/glue-${PV}
 	mysql? ( >=dev-ruby/mysql-ruby-2.7.2 )
 	postgres? ( >=dev-ruby/ruby-postgres-0.7.1 )
-	sqlite? ( >=dev-ruby/sqlite-ruby-2.2.2 )
+	sqlite3? ( >=dev-ruby/sqlite3-ruby-1.2.1 )
 	kirbybase? ( >=dev-ruby/kirbybase-2.3 )"