[gentoo-commits] repo/proj/prefix:master commit in: dev-java/ibm-jdk-bin/

[gentoo-commits] repo/proj/prefix:master commit in: dev-java/ibm-jdk-bin/

[Fabian Groffen]

commit:     4e5500544e86bc84ffc9d9f649ad46c6637038d3
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 08:03:09 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 08:03:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4e550054

dev-java/ibm-jdk-bin: bump EAPI, eclass no longer supports 4

Package-Manager: portage-2.2.28-prefix
RepoMan-Options: --force

 dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild | 6 +++---
 dev-java/ibm-jdk-bin/ibm-jdk-bin-7.1.1.10.ebuild      | 9 +++------
 dev-java/ibm-jdk-bin/metadata.xml                     | 5 ++++-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild
index bd568da..4e19346 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild,v 1.3 2012/10/05 15:17:00 ranger Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit java-vm-2 versionator eutils
 
@@ -69,7 +69,7 @@ SRC_URI="
 # until someone downloads this thing so it can be added to the Manifest
 #	ppc-aix? ( ${PPC_AIX_JDK_DIST} )
 
-LICENSE="IBM-J1.6"
+LICENSE="IBM"
 SLOT="1.6"
 KEYWORDS="-* ~ppc-aix"
 RESTRICT="fetch"

diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-7.1.1.10.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-7.1.1.10.ebuild
index 8d331d2..7a6b12a 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-7.1.1.10.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-7.1.1.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild,v 1.3 2012/10/05 15:17:00 ranger Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit java-vm-2 versionator eutils
 
@@ -29,10 +29,7 @@ SRC_URI+=" ppc64?     ( ${PPC64_JDK_DIST}     )"
 SRC_URI+=" ppc-aix?   ( ${PPC_AIX_JDK_DIST}   )"
 #SRC_URI+=" ppc64-aix? ( ${PPC64_AIX_JDK_DIST} )"
 
-LICENSE="
-	kernel_Linux? ( IBM-J${JDK_MAJOR}.${JDK_MINOR} )
-	kernel_AIX?   ( IBM-J${JDK_MAJOR}.AIX          )
-"
+LICENSE="IBM"
 
 SLOT="${JDK_MAJOR}"
 KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86 ~ppc-aix"

diff --git a/dev-java/ibm-jdk-bin/metadata.xml b/dev-java/ibm-jdk-bin/metadata.xml
index 6844eea..4e9689c 100644
--- a/dev-java/ibm-jdk-bin/metadata.xml
+++ b/dev-java/ibm-jdk-bin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <longdescription>IBM SDK Development kit.</longdescription>
   <use>
     <flag name="javacomm">Enable Java Communications API support</flag>