Cleanup.

(Portage version: 2.1.2.2)

3 files changed, 5 insertions, 128 deletions

diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index 22e8a001e17f..425364873083 100644
--- a/dev-db/hsqldb/ChangeLog
+++ b/dev-db/hsqldb/ChangeLog
@@ -1,6 +1,10 @@
 # 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.22 2007/01/09 15:34:06 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.23 2007/03/13 17:07:13 betelgeuse Exp $
+
+  13 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
+  -hsqldb-1.7.3.1-r2.ebuild:
+  Cleanup.
 
   09 Jan 2007; Vlastimil Babka <caster@gentoo.org> hsqldb-1.7.3.1-r2.ebuild,
   hsqldb-1.7.3.1-r3.ebuild:
diff --git a/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r2 b/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r2
deleted file mode 100644
index 9d363620d762..000000000000
--- a/dev-db/hsqldb/files/digest-hsqldb-1.7.3.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0ae490625de9e48e38dcf4a58501dbf8 hsqldb_1_7_3_1.zip 2841759
-RMD160 48c5e6e6673217caa67a6bc76775d5e676017051 hsqldb_1_7_3_1.zip 2841759
-SHA256 491a40eb8d01afde4a8d86444dc058d905f15f7c59bbacaf62c5e2967884f676 hsqldb_1_7_3_1.zip 2841759
diff --git a/dev-db/hsqldb/hsqldb-1.7.3.1-r2.ebuild b/dev-db/hsqldb/hsqldb-1.7.3.1-r2.ebuild
deleted file mode 100644
index 3973ba406bbe..000000000000
--- a/dev-db/hsqldb/hsqldb-1.7.3.1-r2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2007 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-r2.ebuild,v 1.4 2007/01/09 15:34:06 caster Exp $
-
-inherit java-pkg eutils versionator
-
-MY_PV=$(replace_all_version_separators _ )
-MY_P="${PN}_${MY_PV}"
-
-DESCRIPTION="HSQLDB is the leading SQL relational database engine written in Java."
-HOMEPAGE="http://hsqldb.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-#SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.zip"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc64 ~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
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )
-	${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	java-pkg_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 ${S}
-	sed -i -r \
-		-e "s/etc\/sysconfig/etc\/conf.d/g" \
-			bin/hsqldb
-	einfo "Cleaning build directory..."
-	ant -q -f build/build.xml cleanall || die "failed to clean"
-
-	einfo "Preparing configuration files..."
-	mkdir conf
-	local HSQLDB_JAR=/usr/share/hsqldb/lib/hsqldb.jar
-	sed -e 's:^JAVA_EXECUTABLE=.*$:JAVA_EXECUTABLE=$(java-config --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" \
-		-e 's/^#AUTH_FILE=.*$/AUTH_FILE=${SERVER_HOME}\/sqltool.rc/g' \
-		src/org/hsqldb/sample/sample-hsqldb.cfg > conf/hsqldb
-	cp ${FILESDIR}/server.properties-r1 conf/server.properties
-	cp ${FILESDIR}/sqltool.rc-r1 conf/sqltool.rc
-}
-
-src_compile() {
-	local antflags="jar jarclient jarsqltool"
-	use doc && antflags="${antflags} javadocdev"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant -f build/build.xml ${antflags} || die "Compilation failed."
-}
-
-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/*
-
-	doinitd ${FILESDIR}/hsqldb
-	doconfd conf/hsqldb
-	insinto /etc/hsqldb
-	# Change the ownership of server.properties and sqltool.rc
-	# files to hsqldb:hsqldb. (resolves Bug #111963)
-	insopts -m 0600 -o hsqldb -g hsqldb
-	doins conf/server.properties
-	insopts -m 0600 -o hsqldb -g hsqldb
-	doins conf/sqltool.rc
-
-	dodir /var/lib/hsqldb/bin
-	keepdir /var/lib/hsqldb
-	exeinto /var/lib/hsqldb/bin
-	doexe bin/hsqldb
-	dosym /etc/hsqldb/server.properties /var/lib/hsqldb/server.properties
-	dosym /etc/hsqldb/sqltool.rc /var/lib/hsqldb/sqltool.rc
-	chown -R hsqldb:hsqldb ${D}/var/lib/hsqldb
-	chmod o-rwx ${D}/var/lib/hsqldb
-}
-
-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)"
-	elog ""
-	elog "Example:"
-	elog ""
-	elog "/etc/hsqldb/server.properties"
-	elog "============================="
-	elog "server.database.1=file:/var/lib/hsqldb/newdb/newdb"
-	elog "server.dbname.1=newdb"
-	elog "server.urlid.1=newdb"
-	elog ""
-	elog "/etc/hsqldb/sqltool.rc"
-	elog "======================"
-	elog "urlid newdb"
-	elog "url jdbc:hsqldb:hsql://localhost/newdb"
-	elog "username sa"
-	elog "password "
-	ewarn ""
-	ewarn "Also note that each hsqldb server can serve only up to 10"
-	ewarn "different databases simultaneously (with consecutive {0-9}"
-	ewarn "suffixes in the 'server.properties' file)."
-}