diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2005-07-10 17:03:10 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2005-07-10 17:03:10 +0000 |
| commit | e506671c7eea5bdef818839fbdf5783c03092fc8 (patch) | |
| tree | 6ab97eff9e2a835b22ff909420f2cf37593a5f91 /dev-db/hsqldb | |
| parent | Added 2005.1 theme. (diff) | |
| download | gentoo-2-e506671c7eea5bdef818839fbdf5783c03092fc8.tar.gz gentoo-2-e506671c7eea5bdef818839fbdf5783c03092fc8.tar.bz2 gentoo-2-e506671c7eea5bdef818839fbdf5783c03092fc8.zip | |
dep fix, cleanup
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-db/hsqldb')
| -rw-r--r-- | dev-db/hsqldb/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild | 32 |
2 files changed, 19 insertions, 18 deletions
diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog index 7e2062e45a8c..cf2e5beac90f 100644 --- a/dev-db/hsqldb/ChangeLog +++ b/dev-db/hsqldb/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-db/hsqldb # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.12 2005/06/04 16:02:23 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.13 2005/07/10 17:03:10 axxo Exp $ + + 10 Jul 2005; Thomas Matthijs <axxo@gentoo.org> hsqldb-1.7.3.1-r1.ebuild: + dep fix, cleanup *hsqldb-1.7.3.1-r1 (04 Jun 2005) diff --git a/dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild b/dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild index c9435ac29376..3ef05e5020cb 100644 --- a/dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild +++ b/dev-db/hsqldb/hsqldb-1.7.3.1-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-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild,v 1.1 2005/06/04 16:02:23 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild,v 1.2 2005/07/10 17:03:10 axxo Exp $ inherit java-pkg eutils @@ -13,22 +13,28 @@ SLOT="0" KEYWORDS="x86 amd64 ppc64 sparc ppc" IUSE="doc jikes source" +RDEPEND=">=virtual/jre-1.4 + =dev-java/servletapi-2.3*" DEPEND=">=virtual/jdk-1.4 app-arch/unzip dev-java/ant-core - =dev-java/servletapi-2.3* jikes? ( dev-java/jikes ) - source? ( app-arch/zip )" -RDEPEND=">=virtual/jre-1.4" + source? ( app-arch/zip ) + ${RDEPEND}" S=${WORKDIR}/${PN} +pkg_setup() { + enewgroup hsqldb + enewuser hsqldb -1 /bin/sh /dev/null hsqldb +} + src_unpack() { unpack ${A} cd ${S}/lib rm *.jar java-pkg_jar-from servletapi-2.3 - cd .. + cd ${S} sed -i -r \ -e "s/etc\/sysconfig/etc\/conf.d/g" \ bin/hsqldb @@ -37,9 +43,8 @@ src_unpack() { einfo "Preparing configuration files..." mkdir conf - JAVA_CMD=$(java-config -J) HSQLDB_JAR=/usr/share/hsqldb/lib/hsqldb.jar - sed -e "s/^JAVA_EXECUTABLE=.*$/JAVA_EXECUTABLE=${JAVA_CMD//\//\\/}/g" \ + sed -e 's/^JAVA_EXECUTABLE=.*$/JAVA_EXECUTABLE=$(which java)/g' \ -e "s/^HSQLDB_JAR_PATH=.*$/HSQLDB_JAR_PATH=${HSQLDB_JAR//\//\\/}/g" \ -e "s/^SERVER_HOME=.*$/SERVER_HOME=\/var\/lib\/hsqldb/g" \ -e "s/^HSQLDB_OWNER=.*$/HSQLDB_OWNER=hsqldb/g" \ @@ -57,7 +62,7 @@ src_compile() { } src_install() { - dojar lib/hsql*.jar + java-pkg_dojar lib/hsql*.jar if use doc; then dodoc doc/*.txt @@ -79,14 +84,7 @@ src_install() { doexe bin/hsqldb dosym /etc/hsqldb/server.properties /var/lib/hsqldb/server.properties dosym /etc/hsqldb/sqltool.rc /var/lib/hsqldb/sqltool.rc -} - -pkg_postinst() { - if ! enewgroup hsqldb || ! enewuser hsqldb -1 /bin/sh /dev/null hsqldb; then - die "Unable to add hsqldb user and hsqldb group." - fi - - chown -R hsqldb:hsqldb /var/lib/hsqldb - chmod o-rwx /var/lib/hsqldb + chown -R hsqldb:hsqldb ${D}/var/lib/hsqldb + chmod o-rwx ${D}/var/lib/hsqldb } |