From: Petteri Räty Date: Tue, 13 Mar 2007 17:07:13 +0000 (+0000) Subject: Cleanup. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=170fb6c3737da5aa7690c3650e1541162d6697fa;p=gentoo.git Cleanup. Package-Manager: portage-2.1.2.2 --- 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 + -hsqldb-1.7.3.1-r2.ebuild: + Cleanup. 09 Jan 2007; Vlastimil Babka hsqldb-1.7.3.1-r2.ebuild, hsqldb-1.7.3.1-r3.ebuild: diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest index 1d9bdeb2cbfd..39f7eec96a6d 100644 --- a/dev-db/hsqldb/Manifest +++ b/dev-db/hsqldb/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX hsqldb 461 RMD160 243068472de473fbef068ffc328d50f3de1f8d0b SHA1 187a7e3ec9386c70bd5ed9282dcef71644f6ba13 SHA256 6d0bc448f54fee5beadef10e3ddd5750f495abc46e2be4825963dabbddc5151a MD5 e49b3a828d2623b4b12e5546ee5c7da6 files/hsqldb 461 RMD160 243068472de473fbef068ffc328d50f3de1f8d0b files/hsqldb 461 @@ -23,18 +26,14 @@ EBUILD hsqldb-1.7.3.1-r1.ebuild 2502 RMD160 837d911ac5d89e382a74a987f5e4cfd8a749 MD5 38831adc4b27fe8d9e7f8c5d5c77ee2c hsqldb-1.7.3.1-r1.ebuild 2502 RMD160 837d911ac5d89e382a74a987f5e4cfd8a749ea56 hsqldb-1.7.3.1-r1.ebuild 2502 SHA256 5324e57b952b3820f762b62386a9611b778b1e0924afe586ac553e6cae8c2355 hsqldb-1.7.3.1-r1.ebuild 2502 -EBUILD hsqldb-1.7.3.1-r2.ebuild 3805 RMD160 94d90e1c025b30864d2ac25735df76fd1849207d SHA1 d317412ee533269476edff1f6d5a01688dab0213 SHA256 f9b09c898ff6525ee1ad20e5c2948ed3c1492695a04bc319a832a81d788fdbbe -MD5 c1345fb94496a6cfaad274eaad8e6b17 hsqldb-1.7.3.1-r2.ebuild 3805 -RMD160 94d90e1c025b30864d2ac25735df76fd1849207d hsqldb-1.7.3.1-r2.ebuild 3805 -SHA256 f9b09c898ff6525ee1ad20e5c2948ed3c1492695a04bc319a832a81d788fdbbe hsqldb-1.7.3.1-r2.ebuild 3805 EBUILD hsqldb-1.7.3.1-r3.ebuild 3673 RMD160 5206406b92879e55a13830d722b053de4087e96d SHA1 3a310d5edf3f55a8a9cac65da7bad94c588b6914 SHA256 7343d45798dc7df2c70502480123535fe607cffcdd8bfc0461872c703e89824a MD5 6bca8100cc0d8afd886e8738d60cab39 hsqldb-1.7.3.1-r3.ebuild 3673 RMD160 5206406b92879e55a13830d722b053de4087e96d hsqldb-1.7.3.1-r3.ebuild 3673 SHA256 7343d45798dc7df2c70502480123535fe607cffcdd8bfc0461872c703e89824a hsqldb-1.7.3.1-r3.ebuild 3673 -MISC ChangeLog 3306 RMD160 41b91d6d6d17b7cea84d23ebe09fe96264b8e4ac SHA1 9f53290b093ba319959db0dd8ba62a86e8f84220 SHA256 41b439c39cb65ba5ffa1629720cda74c5f39c385d411f46d2d3257a039c9dbd7 -MD5 1be0530ffd8a7e6f2635cc06cbf06498 ChangeLog 3306 -RMD160 41b91d6d6d17b7cea84d23ebe09fe96264b8e4ac ChangeLog 3306 -SHA256 41b439c39cb65ba5ffa1629720cda74c5f39c385d411f46d2d3257a039c9dbd7 ChangeLog 3306 +MISC ChangeLog 3404 RMD160 0336e618a1b510662ad1f073f7258f8cf0c11dac SHA1 4a8cce1975231e0faaed64b090b43b3adef5885d SHA256 28bff22dcf5bf0ff45dfd6bc87e5fe6b71d14e275dca66748887ad76923577b4 +MD5 2084c89de35949764b5132dcf190f0f0 ChangeLog 3404 +RMD160 0336e618a1b510662ad1f073f7258f8cf0c11dac ChangeLog 3404 +SHA256 28bff22dcf5bf0ff45dfd6bc87e5fe6b71d14e275dca66748887ad76923577b4 ChangeLog 3404 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158 @@ -42,9 +41,13 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata MD5 471a41687c1918a2cf96debd809b0f8b files/digest-hsqldb-1.7.3.1-r1 238 RMD160 6a25f0ec3b556ae4fadb7d103bbbff934e9aaa69 files/digest-hsqldb-1.7.3.1-r1 238 SHA256 0ecc6ec70a0db5046776b8738be22a06b72b6ca44709502edb6f721fdba9dbdb files/digest-hsqldb-1.7.3.1-r1 238 -MD5 471a41687c1918a2cf96debd809b0f8b files/digest-hsqldb-1.7.3.1-r2 238 -RMD160 6a25f0ec3b556ae4fadb7d103bbbff934e9aaa69 files/digest-hsqldb-1.7.3.1-r2 238 -SHA256 0ecc6ec70a0db5046776b8738be22a06b72b6ca44709502edb6f721fdba9dbdb files/digest-hsqldb-1.7.3.1-r2 238 MD5 471a41687c1918a2cf96debd809b0f8b files/digest-hsqldb-1.7.3.1-r3 238 RMD160 6a25f0ec3b556ae4fadb7d103bbbff934e9aaa69 files/digest-hsqldb-1.7.3.1-r3 238 SHA256 0ecc6ec70a0db5046776b8738be22a06b72b6ca44709502edb6f721fdba9dbdb files/digest-hsqldb-1.7.3.1-r3 238 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFF9tpNcxLzpIGCsLQRAj3YAJ96G1uUJixtHer/SXooCNxHgGPj2QCfSvHx +qUmblg5iMvtgXt+1XxNVprw= +=RET/ +-----END PGP SIGNATURE----- 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)." -}