Update to EAPI 5. Specify LICENSE more precisely.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

3 files changed, 28 insertions, 29 deletions

diff --git a/dev-tex/feynmf/ChangeLog b/dev-tex/feynmf/ChangeLog
index a7cfce4f9377..a8c47c738beb 100644
--- a/dev-tex/feynmf/ChangeLog
+++ b/dev-tex/feynmf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-tex/feynmf
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/feynmf/ChangeLog,v 1.42 2012/05/09 17:07:05 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/feynmf/ChangeLog,v 1.43 2014/03/25 13:00:47 ulm Exp $
+
+  25 Mar 2014; Ulrich Müller <ulm@gentoo.org> feynmf-1.08-r3.ebuild:
+  Update to EAPI 5. Specify LICENSE more precisely.
 
   09 May 2012; Alexis Ballier <aballier@gentoo.org> feynmf-1.08-r3.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-tex/feynmf/Manifest b/dev-tex/feynmf/Manifest
index 43ac5fba5ae3..fe60aa415cbe 100644
--- a/dev-tex/feynmf/Manifest
+++ b/dev-tex/feynmf/Manifest
@@ -5,23 +5,20 @@ AUX feynmf-1.08-tempfile.patch 1138 SHA256 ef9e667c1f48392b6e62dd9e7513ab8cfe6c2
 AUX feynmf-1.08.patch 305 SHA256 7b10bc2d2b8a2902a0cfcfff7ab3b0a8608569c89d23cac505a3aae7f08c2ad8 SHA512 3a85fb8a132be9d7c465953345d4d4374192f2341a90dd9f89ab65a3999c7de76fe92019af533edacc4353b85805a0af2749687d304c06080a1a5ff7ce5613a3 WHIRLPOOL e870cfc6b5936845f26ea092648a39509d000f535274a54fadd3eb251174dc57bf6675fa5a531466aa7b848cd09c11880658cf3fe5a80c96e7a7276a3db6f910
 DIST feynmf-1.08.tar.gz 286208 SHA256 07bd8c23246fc3e8c7bab6590570e601dcbab2e7b07119cc052693c06d31bd0f SHA512 968853ef09ab140fa0844068e564995b44bd79bbe5376a7b866d6db80278b2099aab47920213c7f744d5558e10e69a6de8e056f4d35c8d0fe51055a17981cad2 WHIRLPOOL f83c8e7fc6de3f5d7be55ae621a96230abdbd77892f8f76b66f70feee6115bcb51456dd0dd44e21b24f032060eb1d6aa012ea7576dbbb56d70ff309a060aef37
 DIST feynmf-cnl.tar.gz 49920 SHA256 18bbfc2aedcb76f20c8817a1ee002962baa1172f5b2c9fb23f968268db2c75d5 SHA512 ba84d284a6157bd1fce6fd1752a006472631bd8628d9c7b0cd9f429e7d3f5c79a7489c43d9db76232987cbe8de01a794d060095dbcbffbd003189ff002493201 WHIRLPOOL 7bb8df35942ef79aa93591b6980051e7f86e4c244557b8645c125b9bc4db6ad6e7aac035e8ba4bfc9b9614b777159e62be74d21c9b4181f52f412ba2f91465fe
-EBUILD feynmf-1.08-r3.ebuild 1504 SHA256 c61e5170efe80d7f86d05bcd6f7ab9159719992c1608e1ad8991a0d34cbcd7d8 SHA512 30796636492296f7667bb9d8f7f0faf8a9a7aad7f27e6767d8b51ee62fefea24b4b96771d21b23a535c3bfa4f94ce6ca1eca0b8f288bcad83dfb81d5f4d82937 WHIRLPOOL be30f6d49d7e1e5997636fb4363ae1212e839de7c3788ddea9554eb8a4f013f9b0e3070b86fa5e00d0e9c27fba17f1a932a5c2f8813a620f019e798ebbcc1ee8
-MISC ChangeLog 5099 SHA256 b73369fe68f220631e3ef0b3161dc2ac836933b14164e1266d10cce0b479047c SHA512 912c34a4995da84b95b69230e7b0c56555a44a0f12727fad6170322dbc7c3d4d27dc7b9487398697d67e3d7dfefebf433fed77d7190de54efa868a22cda77f08 WHIRLPOOL 5cb0502e526e7bd27abc0f2feededfe8bb7237b7f406376ffa4eb1cb7a0b5e979763651cb9d3ad6f73aa2a16702d00415418d639ad3c500bc4c00b0d48d75120
+EBUILD feynmf-1.08-r3.ebuild 1475 SHA256 9147543880b8497432196803381369dcfe3fabd99595eadc97a165ab92da278c SHA512 6ff3e13fa1061cf2d47d6d7fe1d10fe2418858a39f2c73184ca07bc70a43fa3d9c1e5e00afcd629ad7b7b8c5a0252a51b344daa47532707f4d2d56b65056d84c WHIRLPOOL e2327dccac873cc60dddfa252c59b478fe81193aec7c3e80056f8ec93e8454b4696b707379818463f07683d4b44c71f9c5af5f38a05bd094e9d95ee3d66aa49c
+MISC ChangeLog 5217 SHA256 ff2b79416ef5960651bb6ec8b38b12006e4254b434b66ba7556f727c15d10e74 SHA512 2c09eead1e651b8b3d189caffbffc06d50b861dffe0eb99f436f77ed0c070e974b9f29a41140f1f33aa7ee7b1bc94517c4eb04ed3db9830a5f44f48d59dc1782 WHIRLPOOL 4c9cf04eeeb75c57178d7cea9cd8b3f4b87733e1ac8202a2616e01f8c4f807cfe44d4d26b2bc1c780adb3e84247c7339aba3d945a382a25c9ca4ba90fdaa5d14
 MISC metadata.xml 558 SHA256 0c8877ec813a01f4e7bba8d00474c54912f43daafd65e6ade042270f2c7dfeb4 SHA512 702bfa963c08967fd133ead1f3a174ebc6cbdae6167cf879364ba51c224e5b83a8a282796cf9506483bedc4d523e9b690e17b285964291eeca36a790551d7e93 WHIRLPOOL 43df9032ae3c233feb44f732500d22e284a1b3069d1cb840f48c8b45ffcb8fe43c52cc126396959642b08310e1e1edc1d60c22aa0710a4c55712b20851ef7297
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJP9gPrAAoJEDxpGckxwJCBS3wQAJPvCPrlw7uT7lgKYXwirmaR
-+3dOJntu3XHmNCpuA+ujbAiBlxpa/tH/xJPfPqcS6K+ch+e1eWqZH5iNwZbdeLiD
-kW0LBnchNtSPFoPw1KDonTnAoyXc1Uq0CHodjbMNW1nfG+9iuolVem80my8/skx4
-6vJ+8H5QKTIi83feSUToVwn++VJLVhbwn6hldV5did4jBYMJRvCyW/KsvcAxfrok
-Nbo/FWP9WiIc6z032t+bb9A3olBuXRsOpOuch9cjTdfRChH1f0iL2ug+Buspblpi
-pDHLLdGrUWH55sRpP7jaGY6AiLnGBy+VVvdokWQveXAoDktnYNy/ekQkN/roQlDL
-AuSSltErrkG7nQT5ggMW2tvZXSsqNvCNHZGApz3vGo99x6pJLXyxT8ZAWmRNmF6Y
-CrPJnQk+QGm6obSEm1Ol19R+Dp7asfTL+TrI+dNneOrKlaEbX0VECcUi0BQNVqiI
-1b1NJGa3wqcarT52h3r7Yt+wanGFVmmAODYFAJhqZLbHf1SwVDOTo98e4AeK5rzV
-4yxZvjsuI3JqbXMxU0kEDA/+jjM7PqUjh1REx57vUthNdvpDVDsYEuIS4kaEHrk4
-svWXGYntLlEAwB23gumZRh8OM+EVw5LVoEubRp5AZXK1kFQuDEIqWj7kzUkVe11L
-OCoR1jt+omve+uOuiHa9
-=/ZIV
+iQGcBAEBCAAGBQJTMX+ZAAoJEJQzkH1pP7W4seUL/2hyAJ8tEUCXoQnBbJmzUPIy
+SEHrQZoP/OJ/F4f66Eqa/KXDmjoHHsk+cauOZbtT1r4QbSUN40ywo8+MdZEXv1xs
+0VgHrrj4VDRKh6p6fxZn1uOiQ4eFSEhL6AEI0LmWVCoI/GKQvHiH2ot+9XjMXPWz
+t0n+pia6EFN6hJvH7bdysKMe6ml/n/nG2VJhbbUoepn+HzPGg8EPCqW/fsVwDW2u
+T+5OHawht9Dx/7k9BjrDH0yzp0M/95ukAIQPvDVtdBAgOH1wob1WXYw8jh5fa8di
+2ov9inaxRy5zgPfxiWJpZDYxKw+LQ9r7+XVCSMnIDl2sOZiN8K62nIvdk1rJOlRU
+RWOrKQwxSQEWFWl/OUFauXWYKJ3OwdxbfNsX8Y/oNRyerzldHDn9KYFBY9ehu+pc
+s6174ryjJlWX8AqREaYZVXmNx4DaQgNa46BHwFDq7si0vmMGm2g0/thjHrVg33+I
+sMgX1GNzDmQ9EH7AskrUavJeNVu3vA9EwHfiypWjiQ==
+=4y5p
 -----END PGP SIGNATURE-----
diff --git a/dev-tex/feynmf/feynmf-1.08-r3.ebuild b/dev-tex/feynmf/feynmf-1.08-r3.ebuild
index 6054f436670a..0f43f1c34e7f 100644
--- a/dev-tex/feynmf/feynmf-1.08-r3.ebuild
+++ b/dev-tex/feynmf/feynmf-1.08-r3.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/feynmf/feynmf-1.08-r3.ebuild,v 1.17 2012/05/09 17:07:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/feynmf/feynmf-1.08-r3.ebuild,v 1.18 2014/03/25 13:00:47 ulm Exp $
+
+EAPI=5
 
 inherit eutils latex-package
 
 DESCRIPTION="Combined LaTeX/Metafont package for drawing of Feynman diagrams"
 HOMEPAGE="http://www.ctan.org/tex-archive/macros/latex/contrib/feynmf/"
 #Taken from: ftp.tug.ctan.org/tex-archive/macros/latex/contrib/${PN}.tar.gz
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	doc? ( mirror://gentoo/${PN}-cnl.tar.gz )"
+SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.tar.gz
+	doc? ( http://dev.gentoo.org/~ulm/distfiles/${PN}-cnl.tar.gz )"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
@@ -22,18 +24,15 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PN}"
 TEXMF="/usr/share/texmf-site"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	epatch "${FILESDIR}/${P}.patch"
 	epatch "${FILESDIR}/${P}-tempfile.patch"
 }
 
 src_compile() {
 	export VARTEXFONTS="${T}"/fonts
-	emake MP=mpost all manual.ps || die "emake failed"
-	if use doc; then
-		emake -f Makefile.cnl ps || die "emake fmfcnl failed"
-	fi
+	emake MP=mpost all manual.ps
+	use doc && emake -f Makefile.cnl ps
 }
 
 src_install() {