Cleanup.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 9 insertions, 198 deletions

diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index 6f010f5007cb..d7f765feeef8 100644
--- a/dev-db/hsqldb/ChangeLog
+++ b/dev-db/hsqldb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/hsqldb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.59 2010/05/23 21:07:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.60 2010/06/30 20:36:28 caster Exp $
+
+  30 Jun 2010; Vlastimil Babka <caster@gentoo.org> hsqldb-1.8.0.10.ebuild,
+  -hsqldb-1.8.1.2.ebuild:
+  Cleanup.
 
   23 May 2010; Pacho Ramos <pacho@gentoo.org> hsqldb-1.8.1.2-r1.ebuild:
   stable amd64, bug 314091
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index ebe52413f481..8646db53745a 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 35hsqldb 33 RMD160 7f6db20183f2a6ebfe3054f8c3572b7417a4b5e3 SHA1 2f9b09ee3443889c2f1703f57c6ff80b4760aa69 SHA256 bd41e5568084a4856f102863b82f8103b0c9e1ad38423217f75e21d6842e447c
 AUX StringComparator.java 1986 RMD160 c35a39b06d0c1f61e5e3a7f960f6680891d5190b SHA1 360f6e2012436bd871fa2f7e6859564e393f9294 SHA256 9f672518cd27d2da5fb9e0a0f7ffe56a872186cdf188cb5840598ed88b959b95
 AUX TestBug1191815.java 4112 RMD160 1e416f161a0d0465d39bc00bef2c0dc296556fdd SHA1 0a44dbb0233d339ef7ed1f318c6d59bfa7f7a70e SHA256 e101366203272e942f3d4cd5fce772220f60ad66b4f543858204ddef7b0dc563
@@ -11,15 +8,7 @@ AUX server.properties 686 RMD160 c48bc303a028bca284273b969ca01d3dadb20dcd SHA1 b
 AUX sqltool.rc 619 RMD160 095cf1293ef4d40eed83df5f3025202c5a57f493 SHA1 8a98d518192c09401d077120f5217a8706a8fc53 SHA256 76ab1af1b6359c070c00a0d7499d7f628c94cc6c7b7d6bb8fe196ccfe080d637
 DIST hsqldb_1_8_0_10.zip 3519470 RMD160 8b25da02fbc2702a43cc88b0af8eaeb41c0f75a0 SHA1 7168b0f40aa5c72267899601c116d2348d2f56ec SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
 DIST hsqldb_1_8_1_2.zip 3516460 RMD160 da834ca11e34c8acca6539c54283018b070615e5 SHA1 b550a41d2376869dc156d93bcf16d46d657e540c SHA256 828776b24364781ae4443d4d64f60eb2a80ab5179637b8415ec91590f82d7bcb
-EBUILD hsqldb-1.8.0.10.ebuild 5897 RMD160 eee2534355217f2b6d82af12d5fb0af5f3d614dc SHA1 0c70370451b53333d185d204fd4a721c819bf6cd SHA256 3561a26a1ca5fcdf5462a0a21a64cf145b090f16670fb58ac5127e56fa28b25e
+EBUILD hsqldb-1.8.0.10.ebuild 5858 RMD160 a963b52d0c02e024319f7b6205c292392a60decc SHA1 9c08878df348af983ed192e915c82db81815642d SHA256 1e55a11ad1a0191e6af65580976d66375dbcd40b00e36b62d2403628e17149df
 EBUILD hsqldb-1.8.1.2-r1.ebuild 5834 RMD160 2b86fdad2d7778846fb06b3dc95c8e31586cff37 SHA1 a816b8445b5b3e9d699bd93c7a87347924816b7e SHA256 f0d89c4a5e9cd41e6c2c5b9fcd8e85538471f755e8c948dc6ac7d3a16e3e261c
-EBUILD hsqldb-1.8.1.2.ebuild 5949 RMD160 3572be0b5f8c43fb7fe6843c2c8888ed9a0ace07 SHA1 342ceabd9765ef5b9026fba4454ec74748355a52 SHA256 f4fae350cdcc050ff44dd70dbc279fe4e9a39f8c8e1bc0bb884627f255a0ea84
-MISC ChangeLog 8000 RMD160 59b5363696a96898a003a3270e5b43ea240ca0db SHA1 f0e953f90db0c8f6c74eee9a4a56ff477b6043a3 SHA256 299d69ff4e1fa16aad8372b66118f9b6947665aff6ad60c17dbd14e68501f0f9
+MISC ChangeLog 8114 RMD160 f00d8fc9b93d88af03608b978622992374db1a1a SHA1 bebcebc8bd8069f1878a22b281472d09aeadb8d8 SHA256 bf66877fe103291968497ed347c33b70f60edc117b8464661fc968ac2451656b
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkv5mS0ACgkQCaWpQKGI+9Qt2QCfbVS85a/msP9x2/AI7U/Oi1l/
-ceoAnR5kFgCjLwu91e1WmfY9Q+jAKH0j
-=i+Eh
------END PGP SIGNATURE-----
diff --git a/dev-db/hsqldb/hsqldb-1.8.0.10.ebuild b/dev-db/hsqldb/hsqldb-1.8.0.10.ebuild
index 4767149d1557..96fe7128b8d3 100644
--- a/dev-db/hsqldb/hsqldb-1.8.0.10.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.8.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.10.ebuild,v 1.6 2010/04/05 22:31:38 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.0.10.ebuild,v 1.7 2010/06/30 20:36:28 caster Exp $
 
 EAPI=1
 JAVA_PKG_IUSE="doc source test"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-solaris"
+KEYWORDS="ppc"
 IUSE="java6"
 
 CDEPEND="java-virtuals/servlet-api:2.3"
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.2.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.2.ebuild
deleted file mode 100644
index 8b8b0ebc5e26..000000000000
--- a/dev-db/hsqldb/hsqldb-1.8.1.2.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.8.1.2.ebuild,v 1.2 2010/04/05 22:31:38 caster Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source test"
-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 ~x64-solaris"
-IUSE="java6"
-
-CDEPEND="java-virtuals/servlet-api:2.3"
-RDEPEND="java6? ( >=virtual/jre-1.6 )
-	!java6? ( >=virtual/jre-1.4 )
-	${CDEPEND}"
-DEPEND="java6? ( >=virtual/jdk-1.6 )
-	!java6? ( || ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) )
-	test? ( dev-java/junit:0 )
-	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 --virtual --into lib servlet-api-2.3
-
-	sed -i -r \
-		-e "s#etc/sysconfig#etc/conf.d#g" \
-		bin/hsqldb || die
-
-	java-pkg_filter-compiler jikes
-
-	eant -q -f "${EANT_BUILD_XML}" cleanall > /dev/null
-
-	epatch "${FILESDIR}/resolve-config-softlinks.patch"
-
-	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
-
-	# Missing source file - needed for tests
-	# http://hsqldb.cvs.sourceforge.net/*checkout*/hsqldb/hsqldb-dev/src/org/hsqldb/lib/StringComparator.java?revision=1.1&pathrev=hsqldb_1_8_0_10
-	# http://sourceforge.net/tracker/index.php?func=detail&aid=2008754&group_id=23316&atid=378131
-	cp "${FILESDIR}/StringComparator.java" src/org/hsqldb/lib || die
-	cp "${FILESDIR}/TestBug1191815.java" src/org/hsqldb/test/ || 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_test() {
-	java-pkg_jar-from --into lib junit
-	eant -f ${EANT_BUILD_XML} jartest
-	cd testrun/hsqldb || die
-	./runTest.sh TestSelf || die "TestSelf hsqldb tests failed"
-	# TODO. These fail. Investigate why.
-	#cd "${S}/testrun/sqltool" || die
-	#CLASSPATH="${S}/lib/hsqldb.jar" ./runtests.bash || die "sqltool test failed"
-}
-
-src_install() {
-	java-pkg_dojar lib/hsql*.jar
-
-	if use doc; then
-		dodoc doc/*.txt
-		dohtml -r doc/zaurus
-		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
-
-	# Make sure that files have correct permissions
-	chown -R hsqldb:hsqldb "${D}${HSQLDB_HOME}"
-	chmod o-rwx "${D}${HSQLDB_HOME}"
-
-	# 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
-}
-
-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
-	elog "Example:"
-	echo
-	elog "/etc/hsqldb/server.properties"
-	elog "============================="
-	elog "server.database.1=file:xdb/xdb"
-	elog "server.dbname.1=xdb"
-	elog "server.urlid.1=xdb"
-	elog
-	elog "/etc/hsqldb/sqltool.rc"
-	elog "======================"
-	elog "urlid xdb"
-	elog "url jdbc:hsqldb:hsql://localhost/xdb"
-	elog "username sa"
-	elog "password "
-	echo
-	elog "Also note that each hsqldb server can serve only up to 10"
-	elog "different databases simultaneously (with consecutive {0-9}"
-	elog "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
-	elog "The Hsqldb can be run in multiple modes - read 'Chapter 1. Running'"
-	elog "and Using Hsqldb' in the Hsqldb docs at:"
-	elog "  http://hsqldb.org/web/hsqlDocsFrame.html"
-	elog "If you intend to run it in the Server mode, it is suggested to add the"
-	elog "init script to your start-up scripts, this should be done like this:"
-	elog "  \`rc-update add hsqldb default\`"
-	echo
-
-	# Enable CONFIG_PROTECT for hsqldb
-	env-update
-	elog "Hsqldb stores its database files in ${HSQLDB_HOME} and this directory"
-	elog "is added to the CONFIG_PROTECT list. In order to immediately activate"
-	elog "these settings please do:"
-	elog "  \`env-update && source /etc/profile\`"
-	elog "Otherwise the settings will become active next time you login"
-	echo
-}