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.

diff --git a/dev-util/update-copyright/ChangeLog b/dev-util/update-copyright/ChangeLog
deleted file mode 100644 (file)
index 9f02d2e..0000000
--- a/dev-util/update-copyright/ChangeLog
+++ /dev/null
@@ -1,30 +0,0 @@
-# ChangeLog for dev-util/update-copyright
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*update-copyright-9999 (12 Dec 2013)
-
-  12 Dec 2013; W. Trevor King <wking@tremily.us> update-copyright-9999.ebuild:
-  - Update to Python 3 master branch and disutils-r1.
-
-*update-copyright-9999 (25 Oct 2012)
-
-  25 Oct 2012; W. Trevor King <wking@tremily.us> update-copyright-9999.ebuild:
-  - Update to Python 3.
-
-*update-copyright-9999 (06 Mar 2012)
-
-  06 Mar 2012; W. Trevor King <wking@drexel.edu> update-copyright-9999.ebuild:
-  - Change SRC_URI from einstein -> tremily.
-
-*update-copyright-9999 (16 Feb 2012)
-
-  16 Feb 2012; W. Trevor King <wking@drexel.edu> ChangeLog, metadata.xml,
-      update-copyright-9999.ebuild:
-  - Created ebuild suite for update-copyright.
-  - Added initial ChangeLog which should be updated whenever the
-  package is updated in any way. This changelog is targetted to
-  users. This means that the comments should well explained and
-  written in clean English. The details about writing correct
-  changelogs are explained in the skel.ChangeLog file which you can
-  find in the root directory of the portage repository.

diff --git a/dev-util/update-copyright/update-copyright-9999.ebuild b/dev-util/update-copyright/update-copyright-9999.ebuild
index 4b6656b39c33979bb744d90b69205e76691071ec..25741c16779228343dd8843196936c1dce4679fc 100644 (file)
--- a/dev-util/update-copyright/update-copyright-9999.ebuild
+++ b/dev-util/update-copyright/update-copyright-9999.ebuild
@@ -2,14 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="5"
-PYTHON_COMPAT=( python{3_2,3_3,3_4} )
+EAPI="6"
+PYTHON_COMPAT=( python{3_2,3_3,3_4,3_5,3_6} )
 
 inherit eutils distutils-r1
 
 if [[ "${PV}" == "9999" ]] ; then
-       inherit git-2
-       EGIT_BRANCH="master"
+       inherit git-r3
        EGIT_REPO_URI="git://tremily.us/${PN}.git"
        SRC_URI=""
 else