Remove old revision.

Package-Manager: portage-2.1.5.2

3 files changed, 8 insertions, 168 deletions

diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index 137e51d93fe4..8ece304f7732 100644
--- a/dev-db/hsqldb/ChangeLog
+++ b/dev-db/hsqldb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/hsqldb
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.43 2008/05/02 14:00:05 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.44 2008/05/30 19:47:27 betelgeuse Exp $
+
+  30 May 2008; Petteri Räty <betelgeuse@gentoo.org> -hsqldb-1.8.0.9.ebuild:
+  Remove old revision.
 
   02 May 2008; Christian Faulhammer <opfer@gentoo.org>
   hsqldb-1.8.0.9-r1.ebuild:
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index e072c6fbe86b..3f51969b8ef1 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -13,13 +13,12 @@ DIST hsqldb_1_7_3_1.zip 2841759 RMD160 48c5e6e6673217caa67a6bc76775d5e676017051
 DIST hsqldb_1_8_0_9.zip 3493449 RMD160 202b3dce4b737f928e57e281f4035df378526ce1 SHA1 fab82a70adedaeb427f8115736bd2c8bb6358556 SHA256 e98d1d8bca15059f4ef4f0d3dde2d75778a5e1bbe8bc12abd4ec2cac39d5adec
 EBUILD hsqldb-1.7.3.1-r3.ebuild 3621 RMD160 bbe349a6dc800bada1fd7922d05ab100ed2f9bc2 SHA1 d860336d1e05565fd30a30be2c6a5065d7bca058 SHA256 2eaa77aff2476a4fdbfb858f539b80b03161da39f25c03d4d3aa07b0246e6a2d
 EBUILD hsqldb-1.8.0.9-r1.ebuild 5466 RMD160 d848f42772bf0741779e16712cc3a4e33d12275b SHA1 6a57803a1e2e2d04f159df8c058b0d2242f7426f SHA256 398f74a8385b763ebaaba0383354485d1ba817d2785a0a865158b024ac96829e
-EBUILD hsqldb-1.8.0.9.ebuild 5134 RMD160 963fa177b6f8d48d7ee62c9bf94f42255fdd937d SHA1 1c98443160cde516de21b17b78c57accc1f94b71 SHA256 086d231c6212e91bebb90f3431b036e1dd241eb7a90e458b9a90ed95ad73cc34
-MISC ChangeLog 5952 RMD160 d75186c57b07719a366afe5f9e27a9084f26922a SHA1 f265e30a7fccfd72b224998f33a8268a3926b611 SHA256 5be59b598371d425626ec535a98d4f7ba121285edafade7a7c53394a50836c44
+MISC ChangeLog 6058 RMD160 a6c29b37f83d8ade4a1c52bb98d677e773575512 SHA1 b967e1e86a2ecbdc5564b5a8bbe03a9c4414e487 SHA256 824ef84f69819f99f18593913afd0e0f46bfb23a9eab3b2f381ba9036a2359e4
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgbHnkACgkQNQqtfCuFneMW5ACdEC5wba69474CwMCoauENJa+g
-xwEAn1h+yV3Vyfs6FmyRca/sRgNBArAQ
-=BXID
+iEYEARECAAYFAkhAWdkACgkQcxLzpIGCsLRj8ACeMcR1fgBC+2qobdHwqjycrGR8
+MnAAnijePjlGwKqrD+fZNtzsMuqogO9y
+=/Kjj
 -----END PGP SIGNATURE-----
diff --git a/dev-db/hsqldb/hsqldb-1.8.0.9.ebuild b/dev-db/hsqldb/hsqldb-1.8.0.9.ebuild
deleted file mode 100644
index 3c58b04dc007..000000000000
--- a/dev-db/hsqldb/hsqldb-1.8.0.9.ebuild
+++ /dev/null
@@ -1,162 +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.8.0.9.ebuild,v 1.7 2007/12/30 17:59:55 tgall Exp $
-
-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="=dev-java/servletapi-2.3*"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
-	app-arch/unzip
-	${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 --into lib servletapi-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
-}