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

Collapse All | Expand All

(-)kdejava-3.5.6.ebuild (-15 / +27 lines)
Lines 8-14 Link Here
8
KM_MAKEFILESREV=1
8
KM_MAKEFILESREV=1
9
MAXKDEVER=$PV
9
MAXKDEVER=$PV
10
KM_DEPRANGE="$PV $MAXKDEVER"
10
KM_DEPRANGE="$PV $MAXKDEVER"
11
inherit kde-meta
11
inherit java-pkg-2 kde-meta
12
12
13
DESCRIPTION="KDE java bindings"
13
DESCRIPTION="KDE java bindings"
14
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
14
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
Lines 16-46 Link Here
16
COMMONDEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kwin)
16
COMMONDEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kwin)
17
	$(deprange-dual $PV $MAXKDEVER kde-base/kcontrol)
17
	$(deprange-dual $PV $MAXKDEVER kde-base/kcontrol)
18
	$(deprange $PV $MAXKDEVER kde-base/qtjava)"
18
	$(deprange $PV $MAXKDEVER kde-base/qtjava)"
19
DEPEND="virtual/jdk $COMMONDEPEND"
19
DEPEND=">=virtual/jdk-1.4 $COMMONDEPEND"
20
RDEPEND="virtual/jre $COMMONDEPEND"
20
RDEPEND=">=virtual/jre-1.4 $COMMONDEPEND"
21
OLDDEPEND="~kde-base/kwin-$PV ~kde-base/kcontrol-$PV ~kde-base/qtjava-$PV virtual/jdk"
21
OLDDEPEND="~kde-base/kwin-$PV ~kde-base/kcontrol-$PV ~kde-base/qtjava-$PV virtual/jdk"
22
22
23
PATCHES="$FILESDIR/no-gtk-glib-check.diff $FILESDIR/kdejava-3.4.0_rc1-classpath.diff"
23
PATCHES="${FILESDIR}/no-gtk-glib-check.diff
24
24
	${FILESDIR}/${PN}-${SLOT}-javacflags.patch"
25
25
26
# Probably missing other kdebase, kdepim etc deps
26
# Probably missing other kdebase, kdepim etc deps
27
# Needs to be compiled with just kdelibs installed to make sure
27
# Needs to be compiled with just kdelibs installed to make sure
28
28
29
# Someone who knows about java-in-gentoo should look at this and the
29
# both eclasses define pkg_setup
30
# other java kdebindings, and fix the stupid thing
30
pkg_setup() {
31
	kde_pkg_setup
32
	java-pkg-2_pkg_setup
33
}
34
31
src_unpack() {
35
src_unpack() {
32
	kde-meta_src_unpack
36
	kde-meta_src_unpack
33
37
34
	# $PREFIX-dependant, so don't go into the makefile tarballs
38
	local cp="$(java-pkg_getjars qtjava-${SLOT})"
35
	cd $S/kdejava/koala/org/kde/koala
39
	local mf="${S}/kdejava/koala/org/kde/koala/Makefile.am"
36
	for x in Makefile.am Makefile.in; do
40
	sed -i -e "s#_CLASSPATH_#${cp}#" "${mf}" \
37
		mv $x $x.orig
41
		|| die "sed CLASSPATH failed"
38
		sed -e "s:_CLASSPATH_:$(java-config -p qtjava):" $x.orig > $x
42
	sed -i -e "s#_JAVACFLAGS_#${JAVACFLAGS}#" "${mf}" \
39
		rm $x.orig
43
		|| die "sed JAVACFLAGS failed"
40
	done
41
}
44
}
42
45
43
src_compile() {
46
src_compile() {
44
	myconf="$myconf --with-java=`java-config --jdk-home`"
47
	myconf="${myconf} --with-java=${JDK_HOME}"
45
	kde-meta_src_compile
48
	kde-meta_src_compile
46
}
49
}
50
51
src_install() {
52
	kde-meta_src_install
53
54
	rm -rf ${D}/usr/kde/${SLOT}/lib/java
55
56
	java-pkg_dojar ${S}/${PN}/koala/koala.jar
57
	java-pkg_regso "${D}/usr/kde/${SLOT}"/lib/*.so
58
}

Return to bug 114327