Do not set FETCH_USING, should not be set in a package Makefile.
Use REPLACE_PYTHON instead of reimplementing it.
Remove python-2.5 reference.
Remove gnome-keyring option, libsecret is now used and on by default.
Update to 2.6.1:

2.6.1 - 1 January 2014
       The GnuCash development team proudly announces GnuCash 2.6.1,
       the latest stable release of the GnuCash Free Accounting
       Software.

       This is a maintenance release; there are no new features, but
       Mike Alexander has extensively reworked the Advanced Portfolio
       Report.

       Bugs Fixed:

       454827 - Reports: Incorrect share value of stocks in foreign currency
       553020 - Reports: Incorrect share value of stocks in foreign currency
       555182 - Security Type template hidden
       605991 - Help button on New and Edit Job dialogs brings up wrong
       	        help page.
       677489 - Critical error reported when initializing an Invoice
       721211 - Reconciliation checkboxes fail to sync for split
       	        transactions across sub-accounts
       721251 - Incorrect Transaction Dates
       721260 - Crash on startup: gnucash cannot handle default locale
       721290 - SX Editor: Pressing "Enter" too soon hides transaction
       721306 - Account hierarchy column widths are reset when restarting
       	        a second time without changing the widths
       721447 - Entries with values of ,50 are imported as ,51
       721464 - Program won’t open the website link
       721576 - Gnucash can not work with files, that have russian symbols
       	        in path.
       721600 - Segmentation fault on startup if report Income/Expense Chart
       	        was opened since last running
       721607 - fix GnuCash version numbers and remove/update links.
       721667 - Accelerator key map loaded from one file and saved
       721770 - "Choose accounts to create" has no effect
       721791 - Segmentation fault when correcting invalid date
       721825 - Online prices displayed as unreadable fractions in 2.6.0
       721913 - Fetch Rate crashes application
       721929 - Importing a customer list causes a crash.
       721954 - Multiple Scheduled Transaction Editors
       721966 - --add-price-quotes ignoring compress files preference
       722035 - Missing space in the Spanish translation of msgid "Total For "
       722123 - Zero price entry added to price database on stock purchase

       Translations updated: Catalan, Danish, German, Italian
Updated finance/gnucash to 2.6.1
Update to 0.25. Allow Python 3.

Version 0.25 (December 2012)
    * Add support for $XDG_RUNTIME_DIR, Debian bug #656338.
    * Allow desktop entry files that are not encoded in UTF-8, Debian bug #693855.
    * Mime: Add support for subclasses and aliases.

Version 0.24 (October 2012)
    * Update allowed DesktopEntry categories following changes to the
      specification.
    * Fix removal of empty submenu, freedesktop bug #54747.
    * Documentation is now available on RTD: http://pyxdg.readthedocs.org/
    * A few more tests, and some code cleanup.
    * Fix failure to parse some menu files when kde-config is missing,
      freedesktop bug #56426.

Version 0.23 (July 2012)
    * Fix a test for non-UTF-8 locales.

Version 0.22 (July 2012)
    * Better unicode handling in several modules.
    * Fix for sorting non-ASCII menu entries, freedesktop bug #52492.
    * More tests.

Version 0.21 (July 2012)
    * Tests can now be run conveniently using nosetests, and cover more of the
      code.
    * BaseDirectory: New save_cache_path() function, freedesktop bug #26458.
    * Config: Default icon theme is 'hicolor', not 'highcolor'.
    * Menu: Obsolete Rule.compile() method removed.
    * DesktopEntry: Corrected spelling of checkCategories() method, freedesktop
      bug #24974.
    * DesktopEntry: Consider Actions and Keywords keys standard.
    * DesktopEntry: Accept non-ASCII Keywords.
    * DesktopEntry: Update list of environments valid for OnlyShowIn.
    * Mime: Fix get_type_by_contents() in Python 3.
    * RecentFiles: Minor bug fixes.

Version 0.20 (June 2012)
    * Compatible with Python 3; requires Python 2.6 or later
    * Clean up accidental GPL license notice in Menu.py
    * Add test scripts for xdg.Mime, xdg.Locale and xdg.RecentFiles
    * Fixes for icon theme validation
    * Fix exception in xdg.Mime
    * Replace invalid string exceptions
    * Fall back to default base directories if $XDG* environment variables are
      set but empty.
    * Remove use of deprecated os.popen3 in Menu.py
    * Correct URLs in README
Updated devel/py-xdg to 0.25
Update to 3.3.0:

3.3.0 (2014-01-26)
==================

Bugs fixed
----------

* The heuristic that distinguishes file paths from URLs was tightened
  to produce less false negatives.

3.3.0beta5 (2014-01-18)
=======================

Features added
--------------

* The PEP 393 unicode parsing support gained a fallback for wchar strings
  which might still be somewhat common on Windows systems.

Bugs fixed
----------

* Several error handling problems were fixed throughout the code base that
  could previously lead to exceptions being silently swallowed or not
  properly reported.

* The C-API function ``appendChild()`` is now deprecated as it does not
  propagate exceptions (its return type is ``void``).  The new function
  ``appendChildToElement()`` was added as a safe replacement.

* Passing a string into ``fromstringlist()`` raises an exception instead of
  parsing the string character by character.

Other changes
-------------

* Document cleanup code was simplified using the new GC features in
  Cython 0.20.


3.3.0beta4 (2014-01-12)
=======================

Bugs fixed
----------

* The (empty) value returned by the ``attrib`` property of Entity and Comment
  objects was mutable.

* Element class lookup wasn't available for the new pull parsers or when using
  a custom parser target.

* Setting Element attributes on instantiation with both the ``attrib`` argument
  and keyword arguments could modify the mapping passed as ``attrib``.

* LP#1266171: DTDs instantiated from internal/external subsets (i.e. through
  the docinfo property) lost their attribute declarations.

Other changes
-------------

* Built with Cython 0.20pre (gitrev 012ae82eb) to prepare support for
  Python 3.4.


3.3.0beta3 (2014-01-02)
=======================

Features added
--------------

* Unicode string parsing was optimised for Python 3.3 (PEP 393).

Bugs fixed
----------

* HTML parsing of Unicode strings could misdecode the input on some platforms.

* Crash in xmlfile() when closing open elements out of order in an error case.

3.3.0beta2 (2013-12-20)
=======================

Features added
--------------

* ``iterparse()`` supports the ``recover`` option.

Bugs fixed
----------

* Crash in ``iterparse()`` for HTML parsing.

* Crash in target parsing with attributes.

Other changes
-------------

* The safety check in the read-only tree implementation (e.g. used by
  ``PythonElementClassLookup``) raises a more appropriate ``ReferenceError``
  for illegal access after tree disposal instead of an ``AssertionError``.
  This should only impact test code that specifically checks the original
  behaviour.


3.3.0beta1 (2013-12-12)
=======================

Features added
--------------

* New option ``handle_failures`` in ``make_links_absolute()`` and
  ``resolve_base_href()`` (lxml.html) that enables ignoring or
  discarding links that fail to parse as URLs.

* New parser classes ``XMLPullParser`` and ``HTMLPullParser`` for
  incremental parsing, as implemented for ElementTree in Python 3.4.

* ``iterparse()`` enables recovery mode by default for HTML parsing
  (``html=True``).

Bugs fixed
----------

* LP#1255132: crash when trying to run validation over non-Element (e.g.
  comment or PI).

* Error messages in the log and in exception messages that originated
  from libxml2 could accidentally be picked up from preceding warnings
  instead of the actual error.

* The ``ElementMaker`` in lxml.objectify did not accept a dict as
  argument for adding attributes to the element it's building. This
  works as in lxml.builder now.

* LP#1228881: ``repr(XSLTAccessControl)`` failed in Python 3.

* Raise ``ValueError`` when trying to append an Element to itself or
  to one of its own descendants, instead of running into an infinite
  loop.

* LP#1206077: htmldiff discarded whitespace from the output.

* Compressed plain-text serialisation to file-like objects was broken.

* lxml.html.formfill: Fix textarea form filling.
  The textarea used to be cleared before the new content was set,
  which removed the name attribute.


Other changes
-------------

* Some basic API classes use freelists internally for faster
  instantiation.  This can speed up some ``iterparse()`` scenarios,
  for example.

* ``iterparse()`` was rewritten to use the new ``*PullParser``
  classes internally instead of being a parser itself.


3.2.5 (2014-01-02)
==================

Bugs fixed
----------

* Crash in xmlfile() when closing open elements out of order in an error case.

* Crash in target parsing with attributes.

* LP#1255132: crash when trying to run validation over non-Element (e.g.
  comment or PI).
Updated textproc/py-lxml to 3.3.0
Update to 2.1:

---
2.1
---

* Issue #129: Suppress inspection of '*.whl' files when searching for files
  in a zip-imported file.
* Issue #131: Fix RuntimeError when constructing an egg fetcher.
Updated devel/py-setuptools to 2.1
Update to 1.1.2, update HOMEPAGE.

Urwid 1.1.2
===========

2013-12-30

 * Move to urwid.org and use sphinx docs for generating whole site,
   move changelog to docs/changelog.rst

 * Fix encoding exceptions when unicode used on non-UTF-8 terminal

 * Fix for suspend and resume applications with ^Z

 * Fix for tmux and screen missing colors on right bug

 * Fix Pile zero-weighted items and mouse_event when empty

 * Fix Terminal select() not retrying when interrupted by signal

 * Fix for Padding.align and width change not invalidating
Updated devel/py-urwid to 1.1.2
Update to 1.2.1:

Release 1.2.1 (released Jan 19, 2014)
=====================================

Bugs fixed
----------

* #1335: Fix autosummary template overloading with exclamation prefix like
  ``{% extends "!autosummary/class.rst" %}`` cause infinite recursive function
  call. This was caused by PR#181.
* #1337: Fix autodoc with ``autoclass_content="both"`` uses useless
  ``object.__init__`` docstring when class does not have ``__init__``.
  This was caused by a change for #1138.
* #1340: Can't search alphabetical words on the HTML quick search generated
  with language='ja'.
* #1319: Do not crash if the :confval:`html_logo` file does not exist.
* #603: Do not use the HTML-ized title for building the search index (that
  resulted in "literal" being found on every page with a literal in the
  title).
* #751: Allow production lists longer than a page in LaTeX by using longtable.
* #764: Always look for stopwords lowercased in JS search.
* #814: autodoc: Guard against strange type objects that don't have
  ``__bases__``.
* #932: autodoc: Do not crash if ``__doc__`` is not a string.
* #933: Do not crash if an :rst:role:`option` value is malformed (contains
  spaces but no option name).
* #908: On Python 3, handle error messages from LaTeX correctly in the pngmath
  extension.
* #943: In autosummary, recognize "first sentences" to pull from the docstring
  if they contain uppercase letters.
* #923: Take the entire LaTeX document into account when caching
  pngmath-generated images.  This rebuilds them correctly when
  :confval:`pngmath_latex_preamble` changes.
* #901: Emit a warning when using docutils' new "math" markup without a Sphinx
  math extension active.
* #845: In code blocks, when the selected lexer fails, display line numbers
  nevertheless if configured.
* #929: Support parsed-literal blocks in LaTeX output correctly.
* #949: Update the tabulary.sty packed with Sphinx.
* #1050: Add anonymous labels into ``objects.inv`` to be referenced via
  :mod:`~sphinx.ext.intersphinx`.
* #1095: Fix print-media stylesheet being included always in the "scrolls"
  theme.
* #1085: Fix current classname not getting set if class description has
  ``:noindex:`` set.
* #1181: Report option errors in autodoc directives more gracefully.
* #1155: Fix autodocumenting C-defined methods as attributes in Python 3.
* #1233: Allow finding both Python classes and exceptions with the "class" and
  "exc" roles in intersphinx.
* #1198: Allow "image" for the "figwidth" option of the :rst:dir:`figure`
  directive as documented by docutils.
* #1152: Fix pycode parsing errors of Python 3 code by including two grammar
  versions for Python 2 and 3, and loading the appropriate version for the
  running Python version.
* #1017: Be helpful and tell the user when the argument to :rst:dir:`option`
  does not match the required format.
* #1345: Fix two bugs with :confval:`nitpick_ignore`; now you don't have to
  remove the store environment for changes to have effect.
* #1072: In the JS search, fix issues searching for upper-cased words by
  lowercasing words before stemming.
* #1299: Make behavior of the :rst:dir:`math` directive more consistent and
  avoid producing empty environments in LaTeX output.
* #1308: Strip HTML tags from the content of "raw" nodes before feeding it
  to the search indexer.
* #1249: Fix duplicate LaTeX page numbering for manual documents.
* #1292: In the linkchecker, retry HEAD requests when denied by HTTP 405.
  Also make the redirect code apparent and tweak the output a bit to be
  more obvious.
* #1285: Avoid name clashes between C domain objects and section titles.
* #848: Always take the newest code in incremental rebuilds with the
  :mod:`sphinx.ext.viewcode` extension.
* #979, #1266: Fix exclude handling in ``sphinx-apidoc``.
* #1302: Fix regression in :mod:`sphinx.ext.inheritance_diagram` when
  documenting classes that can't be pickled.
* #1316: Remove hard-coded ``font-face`` resources from epub theme.
* #1329: Fix traceback with empty translation msgstr in .po files.
* #1300: Fix references not working in translated documents in some instances.
* #1283: Fix a bug in the detection of changed files that would try to access
  doctrees of deleted documents.
* #1330: Fix :confval:`exclude_patterns` behavior with subdirectories in the
  :confval:`html_static_path`.
* #1323: Fix emitting empty ``<ul>`` tags in the HTML writer, which is not
  valid HTML.
* #1147: Don't emit a sidebar search box in the "singlehtml" builder.

Documentation
-------------

* #1325: Added a "Intersphinx" tutorial section. (:file:`doc/tutorial.rst`)
Updated textproc/py-sphinx to 1.2.1
Update to 1.11.2:

1.11.2 (2014-01-26)
~~~~~~~~~~~~~~~~~~~

* Fixed easy_install installed virtualenvs by updated pip to 1.5.2

1.11.1 (2014-01-20)
~~~~~~~~~~~~~~~~~~~

* Fixed an issue where pip and setuptools were not getting installed when using
  the ``--system-site-packages`` flag.
* Updated setuptools to fix an issue when installed with easy_install
* Fixed an issue with Python 3.4 and sys.stdout encoding being set to ascii
* Upgraded pip to v1.5.1
* Upgraded setuptools to v2.1
Updated devel/py-virtualenv to 1.11.2
Update to 0.20:

0.20 (??)
===================

Features added
--------------

* Support for CPython 3.4.

* Support for calling C++ template functions.

* ``yield`` is supported in ``finally`` clauses.

* The C code generated for finally blocks is duplicated for each exit
  case to allow for better optimisations by the C compiler.

* Cython tries to undo the Python optimisationism of assigning a bound
  method to a local variable when it can generate better code for the
  direct call.

* Constant Python float values are cached.

* String equality comparisons can use faster type specific code in
  more cases than before.

* String/Unicode formatting using the '%' operator uses a faster
  C-API call.

* ``bytearray`` has become a known type and supports coercion from and
  to C strings.  Indexing, slicing and decoding is optimised. Note that
  this may have an impact on existing code due to type inference.

* Using ``cdef basestring stringvar`` and function arguments typed as
  ``basestring`` is now meaningful and allows assigning exactly
  ``str`` and ``unicode`` objects, but no subtypes of these types.

* Support for the ``__debug__`` builtin.

* Assertions in Cython compiled modules are disabled if the running
  Python interpreter was started with the "-O" option.

* Some types that Cython provides internally, such as functions and
  generators, are now shared across modules if more than one Cython
  implemented module is imported.

* The type inference algorithm works more fine granular by taking the
  results of the control flow analysis into account.

* A new script in ``bin/cythonize`` provides a command line frontend
  to the cythonize() compilation function (including distutils build).

* The new extension type decorator ``@cython.no_gc_clear`` prevents
  objects from being cleared during cyclic garbage collection, thus
  making sure that object attributes are kept alive until deallocation.

* During cyclic garbage collection, attributes of extension types that
  cannot create reference cycles due to their type (e.g. strings) are
  no longer considered for traversal or clearing.  This can reduce the
  processing overhead when searching for or cleaning up reference cycles.

* Package compilation (i.e. ``__init__.py`` files) now works, starting
  with Python 3.3.

* The cython-mode.el script for Emacs was updated.  Patch by Ivan Andrus.

* An option common_utility_include_dir was added to cythonize() to save
  oft-used utility code once in a separate directory rather than as
  part of each generated file.

* ``unraisable_tracebacks`` directive added to control printing of
  tracebacks of unraisable exceptions.

Bugs fixed
----------

* Abstract Python classes that subtyped a Cython extension type
  failed to raise an exception on instantiation, and thus ended
  up being instantiated.

* ``set.add(a_tuple)`` and ``set.discard(a_tuple)`` failed with a
  TypeError in Py2.4.

* The PEP 3155 ``__qualname__`` was incorrect for nested classes and
  inner classes/functions declared as ``global``.

* Several corner cases in the try-finally statement were fixed.

* The metaclass of a Python class was not inherited from its parent
  class(es).  It is now extracted from the list of base classes if not
  provided explicitly using the Py3 ``metaclass`` keyword argument.
  In Py2 compilation mode, a ``__metaclass__`` entry in the class
  dict will still take precedence if not using Py3 metaclass syntax,
  but only *after* creating the class dict (which may have been done
  by a metaclass of a base class, see PEP 3115).  It is generally
  recommended to use the explicit Py3 syntax to define metaclasses
  for Python types at compile time.

* The automatic C switch statement generation behaves more safely for
  heterogeneous value types (e.g. mixing enum and char), allowing for
  a slightly wider application and reducing corner cases.  It now always
  generates a 'default' clause to avoid C compiler warnings about
  unmatched enum values.

* Fixed a bug where class hierarchies declared out-of-order could result
  in broken generated code.

* Fixed a bug which prevented overriding const methods of C++ classes.

* Fixed a crash when converting Python objects to C++ strings fails.

Other changes
-------------

* In Py3 compilation mode, Python2-style metaclasses declared by a
  ``__metaclass__`` class dict entry are ignored.

* In Py3.4+, the Cython generator type uses ``tp_finalize()`` for safer
  cleanup instead of ``tp_del()``.
Updated devel/py-cython to 0.20