diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-08-13 11:26:36 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-08-13 11:26:36 +0000 |
| commit | 722ce25a7589d4101eef4077cf299186d5768a50 (patch) | |
| tree | 6201bae90a49ff87030c03ef8d41c40cb535598c /profiles | |
| parent | Bump, thanks to Benjamin Bannier for notifying. Closes #328563 (diff) | |
| download | gentoo-2-722ce25a7589d4101eef4077cf299186d5768a50.tar.gz gentoo-2-722ce25a7589d4101eef4077cf299186d5768a50.tar.bz2 gentoo-2-722ce25a7589d4101eef4077cf299186d5768a50.zip | |
Add support for a new-style ruby-ssl virtual needed when the OpenSSL bindings are required by Ruby code.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 7 | ||||
| -rw-r--r-- | profiles/base/package.use.force | 11 | ||||
| -rw-r--r-- | profiles/package.mask | 7 |
3 files changed, 19 insertions, 6 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 066f9eb751bc..dc7ab86d3626 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,16 @@ # ChangeLog for profile directory # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4468 2010/08/13 04:27:59 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4469 2010/08/13 11:26:34 flameeyes Exp $ # # This ChangeLog should include records for all changes in profiles directory. # Only typo fixes which don't affect portage/repoman behaviour could be avoided # here. If in doubt put a record here! + 13 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org> + base/package.use.force, package.mask: + Add support for a new-style ruby-ssl virtual needed when the OpenSSL + bindings are required by Ruby code. + 13 Aug 2010; Ryan Hill <dirtyepic@gentoo.org> package.mask: Mask app-crypt/wxchecksums and media-gfx/zphoto for removal. diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force index 48255a505f99..7428e3977ee6 100644 --- a/profiles/base/package.use.force +++ b/profiles/base/package.use.force @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.force,v 1.16 2010/05/19 11:28:52 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.force,v 1.17 2010/08/13 11:26:36 flameeyes Exp $ # Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> # Python should use wide Unicode implementation by default. @@ -21,3 +21,10 @@ dev-ruby/duby ruby_targets_jruby dev-ruby/jruby-debug-base ruby_targets_jruby dev-ruby/jruby-openssl ruby_targets_jruby =dev-ruby/test-unit-1* ruby_targets_ruby19 + +# Diego E. Pettenò <flameeyes@gentoo.org> (14 Jan 2010) +# Multi-version Ruby virtuals for sanity +~virtual/ruby-ssl-0 ruby_targets_ruby18 +~virtual/ruby-ssl-1 ruby_targets_ruby19 +~virtual/ruby-ssl-2 ruby_targets_jruby +~virtual/ruby-ssl-3 ruby_targets_ree18 diff --git a/profiles/package.mask b/profiles/package.mask index 49084a04f50f..a1db4f553bab 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11843 2010/08/13 04:27:59 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11844 2010/08/13 11:26:35 flameeyes Exp $ # # When you add an entry to the top of this file, add your name, the date, and # an explanation of why something is getting masked. Please be extremely @@ -1130,10 +1130,11 @@ app-portage/udept >=net-misc/dhcp-4.0.0 # Alex Legler <a3li@gentoo.org> (20 Mar 2009) -# Ruby 1.9.1 for preliminary testing of libraries depending on it, bug 203706. -# Expect (many) breakages and incompatibilities. +# Ruby 1.9 for preliminary testing of libraries depending on it, bug 203706. +# Expect (some) breakages and incompatibilities. # Want to help testing? #gentoo-ruby on Freenode >=dev-lang/ruby-1.9.1 +~virtual/ruby-ssl-2 # Matti Bickel <mabi@gentoo.org> (1 Mar 2009) # Mask testing branch |