Gentoo Archives: gentoo-commits

From: Benda XU <heroxbd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/files/, dev-java/java-config/
Date: Fri, 23 Sep 2016 01:36:06
Message-Id: 1474594548.bcac37d4fa122fd21148d66dca71c56cdc1222f1.heroxbd@gentoo
1 commit: bcac37d4fa122fd21148d66dca71c56cdc1222f1
2 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 23 01:35:22 2016 +0000
4 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 23 01:35:48 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcac37d4
7
8 dev-java/java-config: Prefix support.
9
10 Bug: 591156
11
12 Package-Manager: portage-2.3.0
13
14 dev-java/java-config/files/java-config-2.2.0-prefix.patch | 15 +++++++++++++++
15 dev-java/java-config/java-config-2.2.0-r3.ebuild | 2 ++
16 2 files changed, 17 insertions(+)
17
18 diff --git a/dev-java/java-config/files/java-config-2.2.0-prefix.patch b/dev-java/java-config/files/java-config-2.2.0-prefix.patch
19 new file mode 100644
20 index 00000000..068538a
21 --- /dev/null
22 +++ b/dev-java/java-config/files/java-config-2.2.0-prefix.patch
23 @@ -0,0 +1,15 @@
24 +Wait for the java team to upstream this patch.
25 +Bug: 591156
26 +--- /setup.py 2013-02-15 07:12:09.000000000 +0900
27 ++++ /setup.py.new 2016-08-13 16:38:22.000000000 +0900
28 +@@ -87,8 +87,8 @@
29 + elif arch in ['hpux']:
30 + defaults = '*= hp-jdk-bin'
31 +
32 +- os.mkdir(self.root + '/usr/share/java-config-2/config/')
33 +- with open(self.root + '/usr/share/java-config-2/config/jdk-defaults.conf', 'w') as f:
34 ++ os.mkdir(self.root + eprefix + '/usr/share/java-config-2/config/')
35 ++ with open(self.root + eprefix + '/usr/share/java-config-2/config/jdk-defaults.conf', 'w') as f:
36 + f.write("# This files contain the default support jdk's\n")
37 + f.write(defaults + "\n")
38 +
39
40 diff --git a/dev-java/java-config/java-config-2.2.0-r3.ebuild b/dev-java/java-config/java-config-2.2.0-r3.ebuild
41 index 6d97d04..4fa2962 100644
42 --- a/dev-java/java-config/java-config-2.2.0-r3.ebuild
43 +++ b/dev-java/java-config/java-config-2.2.0-r3.ebuild
44 @@ -26,6 +26,8 @@ RDEPEND="
45 sys-apps/baselayout-java
46 sys-apps/portage[${PYTHON_USEDEP}]"
47
48 +PATCHES=( "${FILESDIR}"/${PN}-2.2.0-prefix.patch )
49 +
50 python_install_all() {
51 distutils-r1_python_install_all