Version bump and fixed licensing (bug #470800)

(Portage version: 2.2.01.21938-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

4 files changed, 27 insertions, 21 deletions

diff --git a/sci-physics/herwig/ChangeLog b/sci-physics/herwig/ChangeLog
index 5a44886cf5ff..0c557fc95837 100644
--- a/sci-physics/herwig/ChangeLog
+++ b/sci-physics/herwig/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/herwig
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/herwig/ChangeLog,v 1.5 2012/10/16 18:58:13 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/herwig/ChangeLog,v 1.6 2013/06/04 18:00:58 bicatali Exp $
+
+*herwig-6.5.21 (04 Jun 2013)
+
+  04 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> +herwig-6.5.21.ebuild,
+  -herwig-6.5.20.ebuild, herwig-6.5.10.ebuild, metadata.xml:
+  Version bump and fixed licensing (bug #470800)
 
   16 Oct 2012; Justin Lecher <jlec@gentoo.org> herwig-6.5.10.ebuild,
   herwig-6.5.20.ebuild, metadata.xml:
@@ -27,4 +33,3 @@
   18 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org>
   +sci-physics/herwig/metadata.xml:
   Initial import, ebuild from Ben Bannier, bug #257734
-
diff --git a/sci-physics/herwig/herwig-6.5.10.ebuild b/sci-physics/herwig/herwig-6.5.10.ebuild
index 7d03aa29ccb2..656fcbfe8bdd 100644
--- a/sci-physics/herwig/herwig-6.5.10.ebuild
+++ b/sci-physics/herwig/herwig-6.5.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/herwig/herwig-6.5.10.ebuild,v 1.4 2012/10/16 18:58:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/herwig/herwig-6.5.10.ebuild,v 1.5 2013/06/04 18:00:58 bicatali Exp $
 
 EAPI=2
 
@@ -21,7 +21,9 @@ SRC_URI="
 	${COM_URI}/${MY_P}.inc
 	${COM_URI}/${MY_PINC}"
 
-LICENSE="as-is"
+LICENSE="all-rights-reserved"
+RESTRICT="mirror bindist"
+
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/sci-physics/herwig/herwig-6.5.20.ebuild b/sci-physics/herwig/herwig-6.5.21.ebuild
index 4f797716d2c1..226a2375f82d 100644
--- a/sci-physics/herwig/herwig-6.5.20.ebuild
+++ b/sci-physics/herwig/herwig-6.5.21.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/herwig/herwig-6.5.20.ebuild,v 1.2 2012/10/16 18:58:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/herwig/herwig-6.5.21.ebuild,v 1.1 2013/06/04 18:00:58 bicatali Exp $
 
-EAPI=4
+EAPI=5
 
-inherit versionator autotools fortran-2
+AUTOTOOLS_AUTORECONF=yes
+inherit versionator autotools-utils fortran-2
 
 PV1=$(get_version_component_range 1 ${PV})
 PV2=$(get_version_component_range 2 ${PV})
@@ -21,9 +22,11 @@ SRC_URI="${COM_URI}/${MY_P}.f
 	${COM_URI}/${MY_PINC}
 	doc? ( ${COM_URI}/hw65_manual.pdf )"
 
-LICENSE="as-is"
+LICENSE="all-rights-reserved"
+RESTRICT="mirror bindist"
+
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 RDEPEND="!sci-physics/cernlib-montecarlo[herwig]"
@@ -50,19 +53,15 @@ src_prepare() {
 	cat > Makefile.am <<-EOF
 		lib_LTLIBRARIES = lib${PN}.la
 		lib${PN}_la_SOURCES = ${MY_P}.f
-		pkginclude_HEADERS = \
+		include_HEADERS = \
 			${MY_PINC} \
 			${MY_P}.inc
 
 	EOF
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
+	autotools-utils_src_prepare
 }
 
 src_install() {
-	default
+	autotools-utils_src_install
 	use doc && dodoc "${DISTDIR}"/hw65_manual.pdf
 }
diff --git a/sci-physics/herwig/metadata.xml b/sci-physics/herwig/metadata.xml
index 7f0af39c235f..5141b913339a 100644
--- a/sci-physics/herwig/metadata.xml
+++ b/sci-physics/herwig/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-physics</herd>
-	<longdescription lang="en">
+<herd>sci-physics</herd>
+<longdescription lang="en">
   HERWIG is a Monte Carlo package for simulating Hadron Emission
   Reactions With Interfering Gluons.
 </longdescription>