Merge branch 'dev-util/update-copyright' Generated with: $ git merge -s ours --no-commit --log --allow-unrelated-histories dev-util/update-copyright $ git rm -rf dev-util/update-copyright/ $ git read-tree --prefix="dev-util/update-copyright/" -u dev-util/update-copyright $ git commit * dev-util/update-copyright: update-copyright-9999.ebuild: Update to git-r3 ChangeLog: Drop this optional file Bump package compatibility to Python 3.4 dev-util/update-copyright: Update to Python 3 master branch dev-util/update-copyright: update to python3 branch. Update URLs from einstein to tremily. Add dev-util/update-copyright package.
Merge branch 'dev-python/pyassuan' Generated with: $ git merge -s ours --no-commit --log --allow-unrelated-histories dev-python/pyassuan $ git rm -rf dev-python/pyassuan/ $ git read-tree --prefix="dev-python/pyassuan/" -u dev-python/pyassuan $ git commit * dev-python/pyassuan: pyassuan-9999.ebuild: Bump to EAPI 6, git-r3, and distutils-r1 ChangeLog: Drop this optional file Manifest: Remove this file dev-python/pyassuan: require Python 3.3 for socket.sendmsg() and .recvmsg(). Add dev-python/pyassuan package.
pyassuan-9999.ebuild: Bump to EAPI 6, git-r3, and distutils-r1 Also claim compatibility with Python 3.3 through 3.6 to match upstream since [1] and drop nose for testing to match upstream since [2]. [1]: https://github.com/wking/pyassuan/commit/7bdffe153e0999625a9e874ce68c5fcf43c3eac8 [2]: https://github.com/wking/pyassuan/commit/1c19d389bbf5894a0bf451e2fc9ddace4317661a
Merge branch 'dev-python/timebook' Generated with: $ git merge -s ours --no-commit --log --allow-unrelated-histories dev-python/timebook $ git rm -rf dev-python/timebook/ $ git read-tree --prefix="dev-python/timebook/" -u dev-python/timebook $ git commit * dev-python/timebook: Manifest: Remove this file metadata: Bump my email address to tremily.us timebook-9999.ebuild: Bump to EAPI 6 and distutils-r1 ChangeLog: Drop this optional file Oops, update timebook digest after adding ~amd64 keyword. Add ~amd64 keyword to timebook, and update to EAPI 4. Add python[sqlite] use dependency to timebook. Add timebook package.
Merge branch 'dev-python/pyvows' * dev-python/pyvows: pyvows-9999.ebuild: Bump to EAPI 6 and git-r3 Conflicts: dev-python/pyvows/pyvows-2.0.3.ebuild The conflicts are due to the file addition/removal and thte local dev-python/pyvows namespacing, and were resolved by removing pyvows-2.0.3.ebuild and adding pyvows-2.1.0.ebuild.