| 1 |
commit: 4e5500544e86bc84ffc9d9f649ad46c6637038d3 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 30 08:03:09 2016 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 30 08:03:09 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4e550054 |
| 7 |
|
| 8 |
dev-java/ibm-jdk-bin: bump EAPI, eclass no longer supports 4 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28-prefix |
| 11 |
RepoMan-Options: --force |
| 12 |
|
| 13 |
dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild | 6 +++--- |
| 14 |
dev-java/ibm-jdk-bin/ibm-jdk-bin-7.1.1.10.ebuild | 9 +++------ |
| 15 |
dev-java/ibm-jdk-bin/metadata.xml | 5 ++++- |
| 16 |
3 files changed, 10 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
index bd568da..4e19346 100644 |
| 20 |
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild |
| 21 |
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild |
| 22 |
@@ -1,8 +1,8 @@ |
| 23 |
-# Copyright 1999-2012 Gentoo Foundation |
| 24 |
+# Copyright 1999-2016 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
# $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 $ |
| 27 |
|
| 28 |
-EAPI="4" |
| 29 |
+EAPI="5" |
| 30 |
|
| 31 |
inherit java-vm-2 versionator eutils |
| 32 |
|
| 33 |
@@ -69,7 +69,7 @@ SRC_URI=" |
| 34 |
# until someone downloads this thing so it can be added to the Manifest |
| 35 |
# ppc-aix? ( ${PPC_AIX_JDK_DIST} ) |
| 36 |
|
| 37 |
-LICENSE="IBM-J1.6" |
| 38 |
+LICENSE="IBM" |
| 39 |
SLOT="1.6" |
| 40 |
KEYWORDS="-* ~ppc-aix" |
| 41 |
RESTRICT="fetch" |
| 42 |
|
| 43 |
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 |
| 44 |
index 8d331d2..7a6b12a 100644 |
| 45 |
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-7.1.1.10.ebuild |
| 46 |
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-7.1.1.10.ebuild |
| 47 |
@@ -1,8 +1,8 @@ |
| 48 |
-# Copyright 1999-2014 Gentoo Foundation |
| 49 |
+# Copyright 1999-2016 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $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 $ |
| 52 |
|
| 53 |
-EAPI="4" |
| 54 |
+EAPI="5" |
| 55 |
|
| 56 |
inherit java-vm-2 versionator eutils |
| 57 |
|
| 58 |
@@ -29,10 +29,7 @@ SRC_URI+=" ppc64? ( ${PPC64_JDK_DIST} )" |
| 59 |
SRC_URI+=" ppc-aix? ( ${PPC_AIX_JDK_DIST} )" |
| 60 |
#SRC_URI+=" ppc64-aix? ( ${PPC64_AIX_JDK_DIST} )" |
| 61 |
|
| 62 |
-LICENSE=" |
| 63 |
- kernel_Linux? ( IBM-J${JDK_MAJOR}.${JDK_MINOR} ) |
| 64 |
- kernel_AIX? ( IBM-J${JDK_MAJOR}.AIX ) |
| 65 |
-" |
| 66 |
+LICENSE="IBM" |
| 67 |
|
| 68 |
SLOT="${JDK_MAJOR}" |
| 69 |
KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86 ~ppc-aix" |
| 70 |
|
| 71 |
diff --git a/dev-java/ibm-jdk-bin/metadata.xml b/dev-java/ibm-jdk-bin/metadata.xml |
| 72 |
index 6844eea..4e9689c 100644 |
| 73 |
--- a/dev-java/ibm-jdk-bin/metadata.xml |
| 74 |
+++ b/dev-java/ibm-jdk-bin/metadata.xml |
| 75 |
@@ -1,7 +1,10 @@ |
| 76 |
<?xml version="1.0" encoding="UTF-8"?> |
| 77 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 78 |
<pkgmetadata> |
| 79 |
- <herd>java</herd> |
| 80 |
+ <maintainer type="project"> |
| 81 |
+ <email>java@g.o</email> |
| 82 |
+ <name>Java</name> |
| 83 |
+ </maintainer> |
| 84 |
<longdescription>IBM SDK Development kit.</longdescription> |
| 85 |
<use> |
| 86 |
<flag name="javacomm">Enable Java Communications API support</flag> |
Archives