diff options
| author |   William Thomson <wltjr@gentoo.org> | 2008-02-08 00:31:27 +0000 |
|---|---|---|
| committer | William Thomson <wltjr@gentoo.org> | 2008-02-08 00:31:27 +0000 |
| commit | 95719452ed5e88b927428353c57cd5d2b85007ed (patch) | |
| tree | 30d3a8b6ce485c611c6a028bbc5ec6f1fb683654 /dev-java/jss | |
| parent | Add gnome use flag to pull in nautilus and gnome-vfs-obexftp for Browse Devic... (diff) | |
| download | gentoo-2-95719452ed5e88b927428353c57cd5d2b85007ed.tar.gz gentoo-2-95719452ed5e88b927428353c57cd5d2b85007ed.tar.bz2 gentoo-2-95719452ed5e88b927428353c57cd5d2b85007ed.zip | |
Quoted vars
(Portage version: 2.1.4.1)
Diffstat (limited to 'dev-java/jss')
| -rw-r--r-- | dev-java/jss/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/jss/jss-3.4-r1.ebuild | 20 |
2 files changed, 14 insertions, 11 deletions
diff --git a/dev-java/jss/ChangeLog b/dev-java/jss/ChangeLog index e8d2cb81dbd1..8066399d93f0 100644 --- a/dev-java/jss/ChangeLog +++ b/dev-java/jss/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/jss # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/ChangeLog,v 1.16 2008/02/08 00:23:41 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/ChangeLog,v 1.17 2008/02/08 00:31:27 wltjr Exp $ + + 08 Feb 2008; William L. Thomson Jr. <wltjr@gentoo.org> jss-3.4-r1.ebuild: + Quoted vars 08 Feb 2008; William L. Thomson Jr. <wltjr@gentoo.org> jss-4.2.ebuild: Added fix for amd64 thanks to Gergan Penkov, added back ~amd64 keyword per diff --git a/dev-java/jss/jss-3.4-r1.ebuild b/dev-java/jss/jss-3.4-r1.ebuild index 279d2ecad07b..3c385ed84f20 100644 --- a/dev-java/jss/jss-3.4-r1.ebuild +++ b/dev-java/jss/jss-3.4-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/jss-3.4-r1.ebuild,v 1.6 2007/05/25 19:31:36 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/jss-3.4-r1.ebuild,v 1.7 2008/02/08 00:31:27 wltjr Exp $ inherit eutils java-pkg-2 versionator linux-info @@ -32,36 +32,36 @@ pkg_setup() { src_unpack() { unpack ${A} epatch "${FILESDIR}/${P}-target_source.patch" - cd ${S}/mozilla/security/coreconf + cd "${S}/mozilla/security/coreconf" cp Linux2.5.mk Linux$(get_version_component_range 1-3 ${KV}).mk cp Linux2.5.mk Linux$(get_version_component_range 1-2 ${KV}).mk echo "INCLUDES += -I/usr/include/nss -I/usr/include/nspr" \ - >> ${S}/mozilla/security/coreconf/headers.mk + >> "${S}/mozilla/security/coreconf/headers.mk" if use x86; then sed -e 's:-L$(DIST)/lib:-L/usr/lib/nspr -L/usr/lib/nss -L$(JAVA_HOME)/jre/lib/i386 -L$(JAVA_HOME)/jre/lib/i386/server -L$(DIST)/lib:' \ - -i ${S}/mozilla/security/jss/lib/config.mk + -i "${S}/mozilla/security/jss/lib/config.mk" elif use amd64; then sed -e 's:-L$(DIST)/lib:-L/usr/lib/nspr -L/usr/lib/nss -L$(JAVA_HOME)/jre/lib/amd64 -L$(JAVA_HOME)/jre/lib/amd64/server -L$(DIST)/lib:' \ - -i ${S}/mozilla/security/jss/lib/config.mk + -i "${S}/mozilla/security/jss/lib/config.mk" fi } src_compile() { export JAVA_GENTOO_OPTS="-target $(java-pkg_get-target) -source $(java-pkg_get-source)" - cd ${S}/mozilla/security/coreconf + cd "${S}/mozilla/security/coreconf" emake -j1 BUILD_OPT=1 || die "coreconf make failed" - cd ${S}/mozilla/security/jss + cd "${S}/mozilla/security/jss" emake -j1 BUILD_OPT=1 || die "nss make failed" } src_install() { - cd ${S}/mozilla/dist/classes* + cd "${S}"/mozilla/dist/classes* zip -q -r ../jss34.jar . || die "zip failed" java-pkg_dojar ../jss34.jar - cd ${S} + cd "${S}" java-pkg_doso mozilla/security/jss/lib/Linux2*/libjss3.so } |