Ruby 1.9 doesn't allow the lambda to walk up the directory structure to
require the spec helper This is the same issue as with commit:
f6da3339f59bbd9243a03dc1e417b1fed7955c7e

Also, you can't call each on a string in Ruby 1.9 directly since it
doesn't implicitly do a split on \n like it did in older Rubies, but
each_line works all the way back to 1.8.5

Reviewed-by: Nick Lewis <nick@puppetlabs.com>

Adds support for use Archlinux's pacman package manager in Puppet.

Originally written by Miah Johnson, with bug fixes from Thomas Hatch and
myself.

Manually resolved conflicts:
	lib/puppet/parser/resource.rb
	lib/puppet/parser/scope.rb
	spec/unit/parser/scope_spec.rb

* feature/master/4258-pkgutil: (29 commits)
  (#4258) Fix pkgutil spec test to have the correct provider
  (#4258) Remove superfluous command check that called pkgutil
  (#4258) Fix fd leak opening pkgutil config files
  (#4258) Permit variations of -nv in both pkgutil.conf files
  (#4258) Stop file and config checks from breaking spec
  (#4258) Check wgetopts in pkgutil.conf
  (#4258) Fix hash duplication affecting canonical provider instance
  (#4258) Use pkgutil -a to reliably determine package common names/aliases
  (#4258) Update pkgutil spec for recent impl changes
  (#4258) pkgutil: bug fix: if shortname is not equal to package name
  (#4258) pkgutil provider: better handling of short package names
  (#4258) pkgutil provider: misc enhancements
  Add spec tests for pkgutil package provider
  * Fix exception on parse failure of pkgutil output * Fix exception when querying latest version for unknown package
  Fixing indentation
  Removing blastwave references and unused PAGER
  Changing indentation to 2-spaces as per 2.6+ style
  Single package queries made more robust when dealing with pkgutil noise
  Fixing wget verbose regex
  These regular expressions will not match anything.  pkgutil doesn't output anything that can be matched.
  ...

* james/tickets/2.6.x/6681:
  Fixed #6681 - Remove --force-yes option from aptitude is used

* 2.6.x:
  Updated CHANGELOG for 2.6.8rc1
  (#2331) Remove darwinports pkg provider, replace with rewritten macports provider
  Fixed #7082 - Added system support for groups
  (#7018) Give more context on the service type's assumptions. Wording tweaks.
  (#7018) explain internals better in service provider documentation
  maint: Fix sqlite3 require to really be optional
  maint: Fix sporadic sqlite error
  (#6818) Stop from getting Rails 3 named_scope deprecation warning
  (#6856) Copy dangling symlinks with 'links => manage' File resource.

Conflicts (Resolved manually):
	lib/puppet/type/group.rb
	spec/unit/indirector/facts/inventory_active_record_spec.rb

  * Employs port -q installed, much faster than port list installed
  * Handles upgrades correctly now
  * Makes use of internal port revision for ensure => latest upgrades
  * Versionable, now works with ensure => specified_version
  * Does not handle port variants at all yet.
  * Does not allow manual specification of revision, only version
  * Test coverage expanded using newer syntax

Paired-With: Daniel Pittman