diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2006-10-04 02:06:32 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2006-10-04 02:06:32 +0000 |
| commit | 58abee1083c466e82d4e68054672dfb3bec730ea (patch) | |
| tree | 1ec78076bb3a8c90bcc01fd5b5a7a00cd0bea221 /eclass | |
| parent | Added preliminary ebuild for libeds-java. Doesn't quite compile yet. (diff) | |
| download | java-58abee1083c466e82d4e68054672dfb3bec730ea.tar.gz java-58abee1083c466e82d4e68054672dfb3bec730ea.tar.bz2 java-58abee1083c466e82d4e68054672dfb3bec730ea.zip | |
Updated to java-gnome-2.14.3. Cleanups to java-gnome.eclass
svn path=/migrated-java-experimental-overlay/; revision=3012
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-gnome.eclass | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/eclass/java-gnome.eclass b/eclass/java-gnome.eclass index b9d15b0c..d1482bc2 100644 --- a/eclass/java-gnome.eclass +++ b/eclass/java-gnome.eclass @@ -4,7 +4,8 @@ # # Original Author: Joshua Nichols <nichoj@gentoo.org> -# Purpose: Reduce repeated code betwen the java-gnome packages +# Purpose: Reduce repeated code between the java-gnome packages to +# to facilitate ease of maintenance. # # Must be before the gnome.org inherit @@ -13,7 +14,7 @@ inherit java-pkg-2 eutils gnome.org ECLASS="java-gnome" -INHERITED="$INHERITED $ECLASS" +INHERITED="${INHERITED} ${ECLASS}" HOMEPAGE="http://java-gnome.sourceforge.net/" LICENSE="LGPL-2.1" @@ -24,6 +25,8 @@ DEPEND=">=virtual/jdk-1.4 source? ( app-arch/zip ) dev-util/pkgconfig" +# Do some heuristics to figure out what bindings this package is for +# This may be overriden when needed from each ebuild if [[ -z ${JAVA_GNOME_BINDINGS} ]]; then JAVA_GNOME_BINDINGS=${PN} JAVA_GNOME_BINDINGS=${JAVA_GNOME_BINDINGS/-java/} @@ -32,9 +35,17 @@ if [[ -z ${JAVA_GNOME_BINDINGS} ]]; then JAVA_GNOME_BINDINGS=${JAVA_GNOME_BINDINGS/lib/} fi -JAVA_GNOME_JARNAME="${JAVA_GNOME_BINDINGS}${SLOT}.jar" +# Filename of the jar that will be built/installed +if [[ ${SLOT} != "0" ]]; then + JAVA_GNOME_JARNAME="${JAVA_GNOME_BINDINGS}${SLOT}.jar" +else + JAVA_GNOME_JARNAME="${JAVA_GNOME_BINDINGS}.jar" +fi + +# Full path to installed jar JAVA_GNOME_JARPATH="${JAVA_PKG_JARDEST}/${JARNAME}" +# pkgconfig file for the package JAVA_GNOME_PC=${JAVA_GNOME_PC:="${JAVA_GNOME_BINDINGS}-java.pc"} # Override arguments to econf, by calling java-gnome_src_compile @@ -53,12 +64,12 @@ java-gnome_src_compile() { --with-jardir=${JAVA_PKG_JARDEST} \ "$@" || die "configure failed" - emake || die "compile failed" + emake || die "emake failed" # Fix the broken pkgconfig file sed -i \ - -e "s:classpath.*$:classpath=\${prefix}/share/${PN}-${SLOT}/lib/${JAVA_GNOME_JARNAME}:" \ - ${S}/${JAVA_GNOME_PC} || die "sed failed" + -e "s:classpath.*$:classpath=\${prefix}/share/${JAVA_PKG_NAME}/lib/${JAVA_GNOME_JARNAME}:" \ + ${S}/${JAVA_GNOME_PC} || die "failed to tweak ${JAVA_NOME_PC}" } java-gnome_src_install() { @@ -66,7 +77,7 @@ java-gnome_src_install() { java-pkg_regjar ${JAVA_GNOME_JARPATH} # Examples as documentation - use doc || rm -rf ${D}/usr/share/doc/${PF}/examples + ! use doc && rm -rf ${D}/usr/share/doc/${PF}/examples use source && java-pkg_dosrc ${S}/src/java/* } |