Revbump to remove java6 flag and make it mandatory.

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

4 files changed, 190 insertions, 14 deletions

diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index 13dd3800a559..d29ad19098c3 100644
--- a/dev-db/hsqldb/ChangeLog
+++ b/dev-db/hsqldb/ChangeLog
@@ -1,6 +1,12 @@
 # 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.55 2010/04/05 22:31:38 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.56 2010/04/05 22:36:44 caster Exp $
+
+*hsqldb-1.8.1.2-r1 (05 Apr 2010)
+
+  05 Apr 2010; Vlastimil Babka <caster@gentoo.org>
+  +hsqldb-1.8.1.2-r1.ebuild:
+  Revbump to remove java6 flag and make it mandatory.
 
   05 Apr 2010; Vlastimil Babka <caster@gentoo.org> hsqldb-1.8.0.10.ebuild,
   hsqldb-1.8.1.2.ebuild:
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index a30a9a18c3e1..73ce8885a192 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -9,6 +9,7 @@ AUX sqltool.rc 619 RMD160 095cf1293ef4d40eed83df5f3025202c5a57f493 SHA1 8a98d518
 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.1.2-r1.ebuild 5838 RMD160 ffc6c7e36866b8168fe3646aa317708e6912f628 SHA1 c742f003b11da5c42dc17bc45ada93c6b4ed382c SHA256 71538cb27a9d9b5766d740947e848174c851fbce80aca713bd491b54844b9c53
 EBUILD hsqldb-1.8.1.2.ebuild 5949 RMD160 3572be0b5f8c43fb7fe6843c2c8888ed9a0ace07 SHA1 342ceabd9765ef5b9026fba4454ec74748355a52 SHA256 f4fae350cdcc050ff44dd70dbc279fe4e9a39f8c8e1bc0bb884627f255a0ea84
-MISC ChangeLog 7522 RMD160 02d974e3fd911475ce6888cc9cc671c100422bef SHA1 edc2b2cbe7f317a7cd8d3235d8545bf95ce9cbfc SHA256 e9c9a9087cdee151fcb5a446412395448466ea22dc5732e714d32e81e9dc7fda
+MISC ChangeLog 7691 RMD160 418eefead3faa4ef2b007a91637f03b5917ce5eb SHA1 0f700de19186be0d26506b5db420419732e7ee54 SHA256 ef664a7d873dc80f07acbefa89d726882d418d45e81935181824231a75b13ad8
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild
new file mode 100644
index 000000000000..2d9850505a47
--- /dev/null
+++ b/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild
@@ -0,0 +1,180 @@
+# 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-r1.ebuild,v 1.1 2010/04/05 22:36:44 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=""
+
+CDEPEND="java-virtuals/servlet-api:2.3"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	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
+}
diff --git a/dev-db/octopus/Manifest b/dev-db/octopus/Manifest
index 47f045918ede..a380433f183f 100644
--- a/dev-db/octopus/Manifest
+++ b/dev-db/octopus/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX octopus-3.0.1-gentoo-build.xml 15173 RMD160 f41c4f0f35c6ba82a7bffbabc3bc92ea287bbfd2 SHA1 d445125369890ea3a7f7b35938a1674f8540785d SHA256 9e4ee3eee4b814e041dd2ded687c3d4aa556357ccf66047c3f66b1627ea10a4b
 AUX octopus-jdk-1.5.patch 5528 RMD160 daf63fa18083a347a48527f888630361f1f88a2e SHA1 304e85c4cc6f16ac404716faed21bf66664d1d72 SHA256 86d3989a5c8641966af58c5e1dda3278816d98383409227b547cbac81fda5fbb
 DIST octopus-3.0-1.src.tar.gz 25968343 RMD160 cb55e7fb574f522c4396bc83905dca9d8e94b983 SHA1 403f96abcab23429ddb6f4d8709326f73521e263 SHA256 9f37514f0540c64aba2163b4c4faa5d5327db6c7f1946fcbe7dc0a36a2097cac
 DIST octopus-xmls-3.0.1.tar.bz2 22492 RMD160 c99466a70cf1d7ab17a69c606fad49fc3bdf8279 SHA1 1e829160ed7f0137f8d59d007a98ec2816d80cb7 SHA256 e92e32cfca1955e7de2cd6a02bdd9bf279b2cf9471bd0ba93a4e13532e4f4095
-EBUILD octopus-3.0.1-r2.ebuild 1968 RMD160 04abb4faaa25fb27cd53d61809a81432d1b90f1c SHA1 d883e4ca605c05964441f33766723470dce1ae89 SHA256 c97215046078a70fde6c6d4dda0b6aa256e2eb5f849affa268157b33a2675cbc
 EBUILD octopus-3.0.1-r3.ebuild 2011 RMD160 cc5358b8ed8a7a7ff145c78b9e2bba51f02f1ea1 SHA1 3c10a5ad47ed640d6ee3325efdbe5978f764715f SHA256 023b9252c0619c871112013a528e3939195ecd9b92997f8a941b32eb1a5141f5
-MISC ChangeLog 2735 RMD160 b265890dff4d724e3389d18aa8ae5df3a208bc6b SHA1 b434f62dbacaa850dfb40a02e38ea032fd6beeb5 SHA256 5a9bc43c361845b4e0dc8229b15ee4eb2fdfae06baef82a7e4bb155a44bb46ff
+MISC ChangeLog 2827 RMD160 d58592c9e191aec2802ab8735f9a9233ff861691 SHA1 b6ede224e5534cce422958ef3b51a0cbb757b70f SHA256 7ddc0f7029869188656d3703775574300711160887a5c5c75b8aa1ad289d3711
 MISC metadata.xml 360 RMD160 3866ff6e15925bf44afaf6495d232310977bcf10 SHA1 2d8d9bf19917f3177a76cf27ece6bb094f8a06e3 SHA256 276d2a4e636b8f732db4f61630d7d0737aa8ebcd2192ead0907cc8f3e664bd52
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAksgJxAACgkQkKaRLQcq0GKOhACcCjqxBtb44gGnz45GjXzv9kw5
-9AAAn0AfLsB9hrlAqoyPsOv5FNNoXi60
-=8h+r
------END PGP SIGNATURE-----