Switched to java-virtuals/servlet-api, set EAPI=1 and switched to slot deps

(Portage version: 2.1.4.1)

2 files changed, 170 insertions, 2 deletions

diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index 661d2b12b89b..4bd7ec14a8e6 100644
--- a/dev-db/hsqldb/ChangeLog
+++ b/dev-db/hsqldb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/hsqldb
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.36 2007/12/30 17:59:55 tgall Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.37 2008/02/14 02:48:10 wltjr Exp $
+
+*hsqldb-1.8.0.9-r1 (14 Feb 2008)
+
+  14 Feb 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  +hsqldb-1.8.0.9-r1.ebuild:
+  Switched to java-virtuals/servlet-api, set EAPI=1 and switched to slot deps
 
   30 Dec 2007; Tom Gall <tgall@gentoo.org> hsqldb-1.8.0.9.ebuild:
   stable on ppc64; bug 201799
diff --git a/dev-db/hsqldb/hsqldb-1.8.0.9-r1.ebuild b/dev-db/hsqldb/hsqldb-1.8.0.9-r1.ebuild
new file mode 100644
index 000000000000..b47cf63cb660
--- /dev/null
+++ b/dev-db/hsqldb/hsqldb-1.8.0.9-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.0.9-r1.ebuild,v 1.1 2008/02/14 02:48:10 wltjr Exp $
+
+EAPI=1
+JAVA_PKG_IUSE="doc source"
+inherit eutils versionator java-pkg-2 java-ant-2
+
+MY_PV=$(replace_all_version_separators _ )
+MY_P="${PN}_${MY_PV}"
+
+DESCRIPTION="The leading SQL relational database engine written in Java."
+HOMEPAGE="http://hsqldb.org"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+# doesn't like Java 1.6 due to JDBC changes
+CDEPEND="java-virtuals/servlet-api:2.3"
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
+	${CDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+HSQLDB_JAR=/usr/share/hsqldb/lib/hsqldb.jar
+HSQLDB_HOME=/var/lib/hsqldb
+
+pkg_setup() {
+	enewgroup hsqldb
+	enewuser hsqldb -1 /bin/sh /dev/null hsqldb
+
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -v lib/*.jar || die
+	java-pkg_jar-from --virtual --into lib servlet-api-2.3
+
+	sed -i -r \
+		-e "s#etc/sysconfig#etc/conf.d#g" \
+		bin/hsqldb || die
+
+	eant -q -f "${EANT_BUILD_XML}" cleanall > /dev/null
+
+	epatch "${FILESDIR}/resolve-config-softlinks.patch"
+	java-pkg_filter-compiler jikes
+
+	mkdir conf
+	sed -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" \
+		-e 's/^#AUTH_FILE=.*$/AUTH_FILE=${SERVER_HOME}\/sqltool.rc/g' \
+		src/org/hsqldb/sample/sample-hsqldb.cfg > conf/hsqldb || die
+	cp "${FILESDIR}/server.properties" conf/ || die
+	cp "${FILESDIR}/sqltool.rc" conf/ || die
+}
+
+# EANT_BUILD_XML used also in src_unpack
+EANT_BUILD_XML="build/build.xml"
+EANT_BUILD_TARGET="jar jarclient jarsqltool jarutil"
+EANT_DOC_TARGET="javadocdev"
+
+src_install() {
+	java-pkg_dojar lib/hsql*.jar
+
+	if use doc; then
+		dodoc doc/*.txt
+		java-pkg_dohtml -r doc/guide
+		java-pkg_dohtml -r doc/src
+	fi
+	use source && java-pkg_dosrc src/*
+
+	# Install env file for CONFIG_PROTECT support
+	doenvd "${FILESDIR}/35hsqldb" || die
+
+	# Put init, configuration and authorization files in /etc
+	doinitd "${FILESDIR}/hsqldb" || die
+	doconfd conf/hsqldb || die
+	dodir /etc/hsqldb
+	insinto /etc/hsqldb
+	# Change the ownership of server.properties and sqltool.rc
+	# files to hsqldb:hsqldb. (resolves Bug #111963)
+	insopts -m0600 -o hsqldb -g hsqldb
+	doins conf/server.properties || die
+	insopts -m0600 -o hsqldb -g hsqldb
+	doins conf/sqltool.rc || die
+
+	# Install init script
+	dodir "${HSQLDB_HOME}/bin"
+	keepdir "${HSQLDB_HOME}"
+	exeinto "${HSQLDB_HOME}/bin"
+	doexe bin/hsqldb || die
+
+	# Create symlinks to authorization files in the server home dir
+	# (required by the hqldb init script)
+	insinto "${HSQLDB_HOME}"
+	dosym /etc/hsqldb/server.properties "${HSQLDB_HOME}/server.properties" || die
+	dosym /etc/hsqldb/sqltool.rc "${HSQLDB_HOME}/sqltool.rc" || die
+
+	# Make sure that files have correct permissions
+	chown -R hsqldb:hsqldb "${D}${HSQLDB_HOME}"
+	chmod o-rwx "${D}${HSQLDB_HOME}"
+}
+
+pkg_postinst() {
+	ewarn "If you intend to run Hsqldb in Server mode and you want to create"
+	ewarn "additional databases, remember to put correct information in both"
+	ewarn "'server.properties' and 'sqltool.rc' files."
+	ewarn "(read the 'Init script Setup Procedure' section of the 'Chapter 3."
+	ewarn "UNIX Quick Start' in the Hsqldb docs for more information)"
+	echo
+	einfo "Example:"
+	echo
+	einfo "/etc/hsqldb/server.properties"
+	einfo "============================="
+	einfo "server.database.1=file:xdb/xdb"
+	einfo "server.dbname.1=xdb"
+	einfo "server.urlid.1=xdb"
+	einfo
+	einfo "/etc/hsqldb/sqltool.rc"
+	einfo "======================"
+	einfo "urlid xdb"
+	einfo "url jdbc:hsqldb:hsql://localhost/xdb"
+	einfo "username sa"
+	einfo "password "
+	echo
+	einfo "Also note that each hsqldb server can serve only up to 10"
+	einfo "different databases simultaneously (with consecutive {0-9}"
+	einfo "suffixes in the 'server.properties' file)."
+	echo
+	ewarn "For data manipulation use:"
+	ewarn
+	ewarn "# java -classpath ${HSQLDB_JAR} org.hsqldb.util.DatabaseManager"
+	ewarn "# java -classpath ${HSQLDB_JAR} org.hsqldb.util.DatabaseManagerSwing"
+	ewarn "# java -classpath ${HSQLDB_JAR} org.hsqldb.util.SqlTool \\"
+	ewarn "  --rcFile /var/lib/hsqldb/sqltool.rc <dbname>"
+	echo
+	einfo "The Hsqldb can be run in multiple modes - read 'Chapter 1. Running'"
+	einfo "and Using Hsqldb' in the Hsqldb docs at:"
+	einfo "  http://hsqldb.org/web/hsqlDocsFrame.html"
+	einfo "If you intend to run it in the Server mode, it is suggested to add the"
+	einfo "init script to your start-up scripts, this should be done like this:"
+	einfo "  \`rc-update add hsqldb default\`"
+	echo
+
+	# Enable CONFIG_PROTECT for hsqldb
+	env-update
+	einfo "Hsqldb stores its database files in ${HSQLDB_HOME} and this directory"
+	einfo "is added to the CONFIG_PROTECT list. In order to immediately activate"
+	einfo "these settings please do:"
+	einfo "  \`env-update && source /etc/profile\`"
+	einfo "Otherwise the settings will become active next time you login"
+	echo
+}