Add a new patchset to add support for Berkeley DB 5.0 (bug #326937). Add support for adding new patchsets without bumping the revision for all the old ebuilds as well.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 68 insertions, 19 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 8ed5eb4d8ca2..8b6bc8293522 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.456 2010/07/14 20:44:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.457 2010/07/20 23:07:03 flameeyes Exp $
+
+  20 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  ruby-1.8.6_p388-r1.ebuild, ruby-1.8.7_p299.ebuild, ruby-1.9.1_p429.ebuild,
+  ruby-1.9.2_rc2.ebuild:
+  Add a new patchset to add support for Berkeley DB 5.0 (bug #326937). Add
+  support for adding new patchsets without bumping the revision for all the
+  old ebuilds as well.
 
 *ruby-1.9.2_rc2 (14 Jul 2010)
 
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index e1e34607a7ba..fce2a6021785 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -11,19 +11,19 @@ DIST ruby-patches-1.8.6_p388.tar.bz2 3137 RMD160 6c9b3099687aef29bf9881f11c2915f
 DIST ruby-patches-1.8.7_p249.tar.bz2 1499 RMD160 98670658db00a1c4ad563e68bf25263fd7f317fd SHA1 d371f7f25a75ac8626e2e87a570bb52a60579fb8 SHA256 b35ba05fb07c0264a9232e756cd80ff7f284fb8aa464368ce028d67fa11f31af
 DIST ruby-patches-1.8.7_p299.tar.bz2 1781 RMD160 edf80f6ea3809b3a9f2e697b8f78baeb5df2e346 SHA1 29743874ace02f75dc4e1fcf4516cfac589748b3 SHA256 83931a1d9d59a307cf5b173e7b4235a8606f61c86636e6e489f4da15bde8110d
 DIST ruby-patches-1.9.1_p429.tar.bz2 2115 RMD160 1d9e9f6450fb703df2a3d7787e9323fc1000fa24 SHA1 dde517b7302c245e8d443a1cd17781038fc4671b SHA256 d62e7f09e54c35cae0d7a9c780daf6d0cf5f8400fa59029a920d63088a6bd4cd
-DIST ruby-patches-1.9.2_rc2.tar.bz2 1218 RMD160 06d727671caf3b433fdcafc73f62e29bf39cceff SHA1 3b81e0521523bd9298e7a2b00bd8112c94510f80 SHA256 01cebb7ba6f7726bcf509746690abb8522ce26634849ec93fd23781aacbf9082
-EBUILD ruby-1.8.6_p388-r1.ebuild 5413 RMD160 c880ceb23dc375129909c2a7e578ad00026bdf9c SHA1 b51021864f4d758425d020ffd45fc3fbce6c6da0 SHA256 41ceb77309098a910cd7b300b774a830616471790835ca8689c8df0cdf5f9999
+DIST ruby-patches-1.9.2_rc2-r0.1.tar.bz2 1404 RMD160 52e78dda4204c7c656a1cbdfaeb5b5a24a79cff9 SHA1 b0aab4e566f23bf7bb353f99fc2a483f96f938d2 SHA256 404e5059073e336a8cc7f1378cdf43851b5a4be178d23640d2267bd13a03b75f
+EBUILD ruby-1.8.6_p388-r1.ebuild 5589 RMD160 565bf243f86894bfaa1a5fa3d0345364cf4ccb46 SHA1 362b5ad1174dc4e9ee83fdf8ca06c4b16f7d4614 SHA256 d6de170747a9c77b0e30b0636c6e178b46f8bf8e467db932b1ae8a8ec4e07ae7
 EBUILD ruby-1.8.6_p388.ebuild 5329 RMD160 91d80731628a54a76254540a816b7be7cb22e91e SHA1 2bfe49e18e9c39cd2fcc79dd6aadbc678073c8b5 SHA256 92c012a949f9d274754f22d0fb80e35f0c22559b2cad2ce5d7c79ab64fa8bce7
 EBUILD ruby-1.8.7_p249.ebuild 5344 RMD160 1c78a00aceb9f3ddeb6c18f4c45d289bc507b370 SHA1 34808e3e70b3c0c20f87f991ebdd9d51dd98b848 SHA256 3d2a1eb8198d65adad424198f35e42679408ffb44e5e9c281f98ee9a45c970eb
-EBUILD ruby-1.8.7_p299.ebuild 5427 RMD160 ea91ad2c6b378fe391d74040d6a858f2b82b853f SHA1 4d5eb522d4efd6dfaad65590199aad8e051fd8e7 SHA256 1db8b54e29bc947138d5584a56444baa0b7dc0f1960e7bb35ed0c8722b2dff7f
-EBUILD ruby-1.9.1_p429.ebuild 5453 RMD160 16869eaca27fe73a6d47d42063172400490f36c5 SHA1 d5db5d98fe11197bc44185d611d10f03078f6f71 SHA256 bc6d7a78a7441941402e486a229006152d0f81a8f2688d0a6ac8a4e00c36b842
-EBUILD ruby-1.9.2_rc2.ebuild 5502 RMD160 e8664a5b5b8e1972d34cb7f4936d8515554946f7 SHA1 7cde0a35fd1f440b8fbef2c5bf210bc5b10aadcb SHA256 a6a36e34804f2f7390fca10cf78311e6df3718b21c1c493a0526c115ce7f4a58
-MISC ChangeLog 70794 RMD160 21c3be4648e22afdd08f4fe4a132933bc6d4d0f7 SHA1 18f2c3b7e7675828a422bc3990e3c95f30ec64d3 SHA256 cee1dac4f1342d5da594a621679ab952f2f9508314870df2f62f4786af227de0
+EBUILD ruby-1.8.7_p299.ebuild 5598 RMD160 984c810de291e6e7a58525fb4f594c6cbf30c81a SHA1 798a3a49157094481ebb31d2ee259e56e610d6fa SHA256 e0fadcbb2715ca19960feff48f76a32de188778fb8a92e359e485fcf00c87458
+EBUILD ruby-1.9.1_p429.ebuild 5624 RMD160 7855ed84afe973f03ecf2eabd3ad65f467190680 SHA1 d46bab6c6166a4e215fce3405472d871d9bc1f56 SHA256 84c32054d7e22ab69e54c0cfcb716cb627ae5f0d49e0d33891b6ffc05118fc85
+EBUILD ruby-1.9.2_rc2.ebuild 5685 RMD160 d3086007c936abbab2fe668ae1804517ba095d22 SHA1 e2535e7adbda67501a4c26b6b3ead6399dcfac6d SHA256 f79ed7cb2c4770b45fdfca263f76a9d91343b1d1ed8bfa4b3ad02d8280c59832
+MISC ChangeLog 71127 RMD160 aff644f87ecfd5cc8c8bb956c0ba5712109e0c5b SHA1 c863309f8c5ca2e781ad6a7b6c4024f01dbd0a34 SHA256 c616ece87199e7c9aab9e2b85420192e4a38c84a27a1f543292e93fa203ffc0c
 MISC metadata.xml 1081 RMD160 77ebe9b23b118075684351f9c6443aaa81fab263 SHA1 d3d03be57aab9b84a4712b51a69eff47bc47124d SHA256 428eb9a33cba960d1d03ba6c9b4566b99f0ff8171d5d16873b600bb75837745d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkw+IeoACgkQAiZjviIA2XgmwQCfTthVDVComLiO/1etSqVPS2rw
-8BUAn2N1OduaRO/P4Co1uCCyGYecMCiw
-=Gf0a
+iEYEARECAAYFAkxGLCAACgkQAiZjviIA2XhK2QCgqjC9Qv/TSMYo+tFfxYeNSxRi
+z6oAoOVb+iygJaeyArs8HZGN/tKt1yoo
+=ZbPS
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/ruby-1.8.6_p388-r1.ebuild b/dev-lang/ruby/ruby-1.8.6_p388-r1.ebuild
index 263f670acc47..3be872a632cd 100644
--- a/dev-lang/ruby/ruby-1.8.6_p388-r1.ebuild
+++ b/dev-lang/ruby/ruby-1.8.6_p388-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p388-r1.ebuild,v 1.3 2010/05/19 19:42:23 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p388-r1.ebuild,v 1.4 2010/07/20 23:07:03 flameeyes Exp $
 
 EAPI=2
 
@@ -14,10 +14,20 @@ MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
 # 1.8 and 1.9 series disagree on this
 RUBYVERSION=$(get_version_component_range 1-2)
 
+if [[ -n ${PATCHSET} ]]; then
+	if [[ ${PVR} == ${PV} ]]; then
+		PATCHSET="${PV}-r0.${PATCHSET}"
+	else
+		PATCHSET="${PVR}.${PATCHSET}"
+	fi
+else
+	PATCHSET="${PVR}"
+fi
+
 DESCRIPTION="An object-oriented scripting language"
 HOMEPAGE="http://www.ruby-lang.org/"
 SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.bz2
-		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PVR}.tar.bz2"
+		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby GPL-2 )"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/dev-lang/ruby/ruby-1.8.7_p299.ebuild b/dev-lang/ruby/ruby-1.8.7_p299.ebuild
index f4707b1dce48..b4de47f28fbd 100644
--- a/dev-lang/ruby/ruby-1.8.7_p299.ebuild
+++ b/dev-lang/ruby/ruby-1.8.7_p299.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p299.ebuild,v 1.1 2010/06/23 22:40:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p299.ebuild,v 1.2 2010/07/20 23:07:03 flameeyes Exp $
 
 EAPI=2
 
@@ -14,10 +14,20 @@ MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
 # 1.8 and 1.9 series disagree on this
 RUBYVERSION=$(get_version_component_range 1-2)
 
+if [[ -n ${PATCHSET} ]]; then
+	if [[ ${PVR} == ${PV} ]]; then
+		PATCHSET="${PV}-r0.${PATCHSET}"
+	else
+		PATCHSET="${PVR}.${PATCHSET}"
+	fi
+else
+	PATCHSET="${PVR}"
+fi
+
 DESCRIPTION="An object-oriented scripting language"
 HOMEPAGE="http://www.ruby-lang.org/"
 SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.bz2
-		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PVR}.tar.bz2"
+		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby GPL-2 )"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
diff --git a/dev-lang/ruby/ruby-1.9.1_p429.ebuild b/dev-lang/ruby/ruby-1.9.1_p429.ebuild
index a1b3a77523bb..0ce4dd1b0bb1 100644
--- a/dev-lang/ruby/ruby-1.9.1_p429.ebuild
+++ b/dev-lang/ruby/ruby-1.9.1_p429.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.1_p429.ebuild,v 1.1 2010/07/04 15:45:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.1_p429.ebuild,v 1.2 2010/07/20 23:07:03 flameeyes Exp $
 
 EAPI=2
 
@@ -14,10 +14,20 @@ MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
 # 1.8 and 1.9 series disagree on this
 RUBYVERSION=$(get_version_component_range 1-3)
 
+if [[ -n ${PATCHSET} ]]; then
+	if [[ ${PVR} == ${PV} ]]; then
+		PATCHSET="${PV}-r0.${PATCHSET}"
+	else
+		PATCHSET="${PVR}.${PATCHSET}"
+	fi
+else
+	PATCHSET="${PVR}"
+fi
+
 DESCRIPTION="An object-oriented scripting language"
 HOMEPAGE="http://www.ruby-lang.org/"
 SRC_URI="mirror://ruby/${MY_P}.tar.bz2
-		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PVR}.tar.bz2"
+		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby GPL-2 )"
 KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
diff --git a/dev-lang/ruby/ruby-1.9.2_rc2.ebuild b/dev-lang/ruby/ruby-1.9.2_rc2.ebuild
index c4108a4d8dcf..3eeee8c10882 100644
--- a/dev-lang/ruby/ruby-1.9.2_rc2.ebuild
+++ b/dev-lang/ruby/ruby-1.9.2_rc2.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.2_rc2.ebuild,v 1.1 2010/07/14 20:44:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.2_rc2.ebuild,v 1.2 2010/07/20 23:07:03 flameeyes Exp $
 
 EAPI=2
 
+PATCHSET=1
+
 inherit autotools eutils flag-o-matic multilib versionator
 
 MY_P="${PN}-$(replace_version_separator 3 '-')"
@@ -14,10 +16,20 @@ MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
 # 1.8 and 1.9 series disagree on this
 RUBYVERSION=$(get_version_component_range 1-3)
 
+if [[ -n ${PATCHSET} ]]; then
+	if [[ ${PVR} == ${PV} ]]; then
+		PATCHSET="${PV}-r0.${PATCHSET}"
+	else
+		PATCHSET="${PVR}.${PATCHSET}"
+	fi
+else
+	PATCHSET="${PVR}"
+fi
+
 DESCRIPTION="An object-oriented scripting language"
 HOMEPAGE="http://www.ruby-lang.org/"
 SRC_URI="mirror://ruby/${MY_P}.tar.bz2
-		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PVR}.tar.bz2"
+		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby GPL-2 )"
 KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"