diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2005-07-12 23:19:55 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2005-07-12 23:19:55 +0000 |
| commit | 0797833cc60b21b7da9b6de27e4714e8cec2736c (patch) | |
| tree | cc411acf5687a3fff35e70b20354b825dc5780cc /dev-java/ldapsdk | |
| parent | Manual Manifest commit. (diff) | |
| download | gentoo-2-0797833cc60b21b7da9b6de27e4714e8cec2736c.tar.gz gentoo-2-0797833cc60b21b7da9b6de27e4714e8cec2736c.tar.bz2 gentoo-2-0797833cc60b21b7da9b6de27e4714e8cec2736c.zip | |
Style/Dep fixes
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-java/ldapsdk')
| -rw-r--r-- | dev-java/ldapsdk/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/ldapsdk/ldapsdk-4.1.7-r1.ebuild | 17 |
2 files changed, 13 insertions, 9 deletions
diff --git a/dev-java/ldapsdk/ChangeLog b/dev-java/ldapsdk/ChangeLog index 977ad7c09355..c6962a5bb13e 100644 --- a/dev-java/ldapsdk/ChangeLog +++ b/dev-java/ldapsdk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/ldapsdk # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ldapsdk/ChangeLog,v 1.6 2005/04/26 01:27:43 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ldapsdk/ChangeLog,v 1.7 2005/07/12 23:19:55 axxo Exp $ + + 12 Jul 2005; Thomas Matthijs <axxo@gentoo.org> ldapsdk-4.1.7-r1.ebuild: + Style/Dep fixes 26 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> ldapsdk-4.1.7-r1.ebuild: diff --git a/dev-java/ldapsdk/ldapsdk-4.1.7-r1.ebuild b/dev-java/ldapsdk/ldapsdk-4.1.7-r1.ebuild index 7b86c2e61715..849f55f9a602 100644 --- a/dev-java/ldapsdk/ldapsdk-4.1.7-r1.ebuild +++ b/dev-java/ldapsdk/ldapsdk-4.1.7-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ldapsdk/ldapsdk-4.1.7-r1.ebuild,v 1.3 2005/04/26 01:27:43 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ldapsdk/ldapsdk-4.1.7-r1.ebuild,v 1.4 2005/07/12 23:19:55 axxo Exp $ inherit eutils java-pkg @@ -13,13 +13,14 @@ SLOT="4.1" KEYWORDS="x86 amd64 sparc" IUSE="doc" -S=${WORKDIR}/mozilla/directory/java-sdk - -DEPEND=">=virtual/jdk-1.4 - >=dev-java/ant-core-1.6.2" RDEPEND=">=virtual/jre-1.4 =dev-java/jss-3.4* =dev-java/jakarta-oro-2.0*" +DEPEND=">=virtual/jdk-1.4 + ${RDEPEND} + >=dev-java/ant-core-1.6.2" + +S=${WORKDIR}/mozilla/directory/java-sdk src_unpack() { unpack ${A} @@ -28,8 +29,8 @@ src_unpack() { epatch ${FILESDIR}/ldapsdk-gentoo.patch cd ${S} - echo "ororegexp.jar=`java-config -p jakarta-oro-2.0`" > build.properties - echo "jss.jar=`java-config -p jss-3.4`" >> build.properties + echo "ororegexp.jar=$(java-pkg_getjars jakarta-oro-2.0)" > build.properties + echo "jss.jar=$(java-pkg_getjars jss-3.4)" >> build.properties cd ${S}/ldapjdk/lib rm -f *.jar @@ -45,7 +46,7 @@ src_compile() { ant ${antflags} || die "compile failed" } -src_install () { +src_install() { java-pkg_dojar dist/packages/*.jar use doc && java-pkg_dohtml -r dist/doc/* |