Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 416367 | Differences between
and this patch

Collapse All | Expand All

(-)gcj-jdk-4.6.3.ebuild.old (-7 / +12 lines)
Lines 1-8 Link Here
1
# Copyright 1999-2012 Gentoo Foundation
1
# Copyright 1999-2012 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: $
3
# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.5.3.ebuild,v 1.2 2012/04/15 17:51:54 vapier Exp $
4
4
5
EAPI="2"
5
EAPI="4"
6
6
7
inherit java-vm-2 toolchain-funcs multilib versionator
7
inherit java-vm-2 toolchain-funcs multilib versionator
8
8
Lines 11-25 HOMEPAGE="http://www.gentoo.org/" Link Here
11
SRC_URI=""
11
SRC_URI=""
12
12
13
LICENSE="GPL-2"
13
LICENSE="GPL-2"
14
#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
14
KEYWORDS="~x86-linux"
15
SLOT="0"
15
SLOT="0"
16
IUSE=""
16
IUSE=""
17
17
18
ECJ_GCJ_SLOT="3.6"
18
ECJ_GCJ_SLOT="3.6"
19
19
20
RDEPEND="~sys-devel/gcc-${PV}[gcj]
20
RDEPEND="~sys-devel/gcc-${PV}[gcj,gtk]
21
	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
21
	dev-java/ecj-gcj:${ECJ_GCJ_SLOT}"
22
DEPEND="${RDEPEND}"
22
DEPEND="${RDEPEND}"
23
S="${WORKDIR}"
23
24
24
JAVA_PROVIDE="jdbc-stdext jdbc2-stdext gnu-jaxp"
25
JAVA_PROVIDE="jdbc-stdext jdbc2-stdext gnu-jaxp"
25
26
Lines 38-47 src_install() { Link Here
38
	# jre lib paths ...
39
	# jre lib paths ...
39
	local libarch="$(get_system_arch)"
40
	local libarch="$(get_system_arch)"
40
	local gccbin=$(gcc-config -B)
41
	local gccbin=$(gcc-config -B)
42
	gccbin=${gccbin#"${EPREFIX}"}
41
	local gcclib=$(gcc-config -L|cut -d':' -f1)
43
	local gcclib=$(gcc-config -L|cut -d':' -f1)
44
	gcclib=${gcclib#"${EPREFIX}"}
42
	local gcjhome="/usr/lib/${P}"
45
	local gcjhome="/usr/lib/${P}"
43
	local gcc_version=$(gcc-fullversion)
46
	local gcc_version=$(gcc-fullversion)
44
	local gccchost="${CHOST}"
47
	local gccchost="${CHOST}"
48
	local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*)
49
	gcjlibdir=${gcjlibdir#"${EPREFIX}"}
45
50
46
	# correctly install gcj
51
	# correctly install gcj
47
	dosym ${gccbin}/gij /usr/bin/gij
52
	dosym ${gccbin}/gij /usr/bin/gij
Lines 71-79 src_install() { Link Here
71
	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
76
	dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv
72
	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
77
	dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv
73
	dodir ${gcjhome}/jre/lib/${libarch}/client
78
	dodir ${gcjhome}/jre/lib/${libarch}/client
74
	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
79
	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so
75
	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
80
	dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so
76
	dosym /usr/$(get_libdir)/gcj-${gcc_version}*/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
81
	dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so
77
	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
82
	dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \
78
		${gcjhome}/jre/lib/rt.jar
83
		${gcjhome}/jre/lib/rt.jar
79
	dodir ${gcjhome}/lib
84
	dodir ${gcjhome}/lib

Return to bug 416367