Add ~amd64 keyword to calibcant, and update to git-2 and EAPI 4.

diff --git a/ChangeLog b/ChangeLog
index 862e9cafdaf8e16093955f8468f9b6e7c9251d68..002e1d8bd1851179574068ff300ea8ddc18a7409 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
 # ChangeLog for sci-physics/calibcant
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+*calicant-9999 (25 Jan 2012)
+  25 Jan 2012; W. Trevor King <wking@drexel.edu> calicant-9999.ebuild:
+  Add ~amd64 keyword, now that I'm testing calicant on an AMD C-60.
+  Also update to `git-2` eclass and EAPI 4, and fix LICENSE (to GPL-3).
+
 *calibcant-9999 (28 Jan 2011)
   27 Jan 2011; W. Trevor King <wking@drexel.edu> ChangeLog, metadata.xml, calibcant-9999.ebuild :
   - Created ebuild suite for calibcant.

diff --git a/Manifest b/Manifest
index 09120df2fccd9d977e7b33e3e2304ab88a161f1d..e1ee6ba1a02a8c8da9b9454e44efa32d011d5f0e 100644 (file)
--- a/Manifest
+++ b/Manifest
@@ -1,3 +1,3 @@
-EBUILD calibcant-9999.ebuild 1003 RMD160 f1c999f7f55ff53e9c7de8d196dd513b6564bba2 SHA1 9bea5cdf5c8483527ff1d1e127fe4717947d58a4 SHA256 ed5248ed1c2f79c6259a540979aafbe4592f11d1bbe2b2b9d112c5a32e3fef4e
-MISC ChangeLog 706 RMD160 04caeb2b8547def36813a297f6ed1b69a099753f SHA1 3d653b104caa232b8103a1397ea193f962f16e8f SHA256 e49b1597e3c47747ac5b661bb5e7b0a67ba618ebe56903f03ae8cd9a2117960a
+EBUILD calibcant-9999.ebuild 1013 RMD160 ee64e8cdae6472cb2dbe386d13fd65e4353f039b SHA1 9ec8f0f6cee7e0892319ddbe50a06d6b7320ff4a SHA256 38bb5c22c191e36d8304ce1f600e5fde8269f728233f06946c8920efe6a610a2
+MISC ChangeLog 947 RMD160 ffc712ae5ce901d0ebfd7f1d4d65ca3460c04bf7 SHA1 d74cc08fdd8b06cac72e044658130e60beb95889 SHA256 a27fa3490aa29d738bc13a235f8e595ee8908fca7a8219dd4df973a05f7d66cb
 MISC metadata.xml 247 RMD160 6735f3a5dd2d7a2b70589d1693f35d54291b7147 SHA1 c015969fe50967340dd050a44cb9f8a30b5e34a5 SHA256 9e65060e5f9d0a50d28c7a69d9c27fed6c3037fdd3e420cc276627fde2794f72

diff --git a/calibcant-9999.ebuild b/calibcant-9999.ebuild
index 926d75c19f58e12c3331e7a7631b49a647f2fcc9..97510286ff13708a82544652972ad66752b75aac 100644 (file)
--- a/calibcant-9999.ebuild
+++ b/calibcant-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI="4"
 PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
@@ -10,7 +10,7 @@ RESTRICT_PYTHON_ABIS="3.*"
 inherit eutils distutils
 
 if [[ ${PV} == "9999" ]] ; then
-       inherit git
+       inherit git-2
        EGIT_BRANCH="master"
        EGIT_REPO_URI="http://www.physics.drexel.edu/~wking/code/git/${PN}.git"
        SRC_URI=""
@@ -21,9 +21,9 @@ fi
 DESCRIPTION="AFM cantilever thermal-tune calibration."
 HOMEPAGE="http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/${PN}"
 
-LICENSE="LGPL-3"
+LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND="dev-python/numpy
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
        if [[ ${PV} == "9999" ]] ; then
-               git_src_unpack
+               git-2_src_unpack
        else
                unpack ${A}
        fi