QA: remove old EAPI 1, ack by sera

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

3 files changed, 6 insertions, 195 deletions

diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index e5babf4ac699..f34b92ff395d 100644
--- a/dev-db/hsqldb/ChangeLog
+++ b/dev-db/hsqldb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/hsqldb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.78 2014/08/13 09:34:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.79 2014/08/18 19:44:57 creffett Exp $
+
+  18 Aug 2014; Christopher Reffett <2011creffett@gentoo.org>
+  -hsqldb-1.8.1.2-r1.ebuild:
+  QA: remove old EAPI 1, ack by sera
 
   13 Aug 2014; Agostino Sarubbo <ago@gentoo.org> hsqldb-1.8.1.3-r1.ebuild:
   Stable for ppc, wrt bug #488884
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index 70834cfb7b4a..3ee657d01b6a 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX StringComparator.java 1986 SHA256 9f672518cd27d2da5fb9e0a0f7ffe56a872186cdf188cb5840598ed88b959b95 SHA512 a0103b0b8445bfbbe325c73ab65dcf4c22c8fd4dab89cd9d60809b4323263e62da2c20a0c1f2900ee97eb9ca2549730e1d37b7f1bffdfce3d116ca802fe8beaa WHIRLPOOL 7f581b3df177f92bcc7195781dd3edfde633bad76661d3a683294379e53396d61f0688605ea9d2c884846ddae278455306e48910e7b8a1930ad83dac876f5f0c
 AUX TestBug1191815.java 4112 SHA256 e101366203272e942f3d4cd5fce772220f60ad66b4f543858204ddef7b0dc563 SHA512 c37491e2fcea0b4ce6bd641ffe128deaa9a8e38533ec3e607415cb1325a975dd8317c212c0fbf9f42b25de7808869df6ac63dacd53c773455f5d2ca0a58f1f62 WHIRLPOOL cc515a4d4bc9737430945ab1bd0f6b9a5f4735e0d6c207a5cd21a57bf669e5090ab86f9b516dbe17ebd90ec4526f8e8da1c1dbbca2d8e1fd9fb7868153ad4f8d
 AUX hsqldb 464 SHA256 773d18c752b8392fb1b1677789934ea7a531f8cc0276c18917e21c71b717a3a9 SHA512 5b227003a5d2dcc5b43af48f2edcf6e6063b730350082ee475f51d1b83c00cc5c63e009620ecf7dab123f458ee30dfcf810da25a1e67514a972d29de284beb0d WHIRLPOOL c801e93bbaf85196977406627d7191d1f62f22118cab215e8d76d8dec77f089e3ff6a7427753ae939fc753d715c4ee650d8a991e71ff665f3f042aeef480e2c1
@@ -8,27 +5,8 @@ AUX hsqldb-1.8.1.3-java7.patch 13842 SHA256 47e36e85f3224906372b39afc82ddbfebfa0
 AUX resolve-config-softlinks.patch 846 SHA256 a7de5886aed87fa040e65d265d5418daee38376ba23742fb97119b629b678517 SHA512 5510a6f70647bb50d4c8ef6c8341b8d4bf38119fd8849b4086b4548ef19abbbaaa12d552f5602bd91ec24e96d7c4ef51efd8e83b38a841f3276ac478bd2480f4 WHIRLPOOL 432f660861d2e7b5a5ca49f973ebe5bdfe932fae5d3b3db19fd446d765971d7f0e3a7039ff8513a762087ea35d102c824b2a8c5068c1face3c5db6bb455935bb
 AUX server.properties 686 SHA256 be7c54fc356d2b14c26e8ec0eecb79c7fa1c72e84c3475bedcd4d08548beeabd SHA512 c36a1d2e387762f96872d94bdb3a6a2af9edb949be9d33321f9ea4e3fb996baecff6fc3875b6bef8f73a54a6a1cedd71dcdf97c881819cb130b1a2b43ec7e842 WHIRLPOOL d36c355af3e9b18da16c670d8a1b03c3edd9b80d6979f1cc3a44bb503dd3e3b979d9f7dd69d9f73f4abb7002e5d8d6702bb73161a07ebe50e67eeaed62ff8358
 AUX sqltool.rc 619 SHA256 76ab1af1b6359c070c00a0d7499d7f628c94cc6c7b7d6bb8fe196ccfe080d637 SHA512 fff8e7350717230438ec503265988e0b2492c6556b22868511a0f2e8c77352d77170ba977695b69b0184fe0dee34115551df4238aedaf3362c8ded9405efbb7c WHIRLPOOL f5b466f08f2a33203df09776347ec586d1e5d70938472a6e6f22321d9fd5dbd255ec7bfb48436ab6ea25f11f032e08071e52b8da289a5389633ec2451ac29aa8
-DIST hsqldb_1_8_1_2.zip 3516460 SHA256 828776b24364781ae4443d4d64f60eb2a80ab5179637b8415ec91590f82d7bcb SHA512 60b75dfb7e2a464449af94c14424639ebc1de89c062315e94e88f657728e554af5987e9cf5b3d14a002ef5807983adca9e2c897c27560f6126d7ec55649a2d26 WHIRLPOOL 15a3976773950ea7be97f8072db09248657fa5612a6a1187e0f1b06f85da416dd3b9199dcaa1e1f6fad05be3b198b0158062ac52ac7cefce7044fec642f62856
 DIST hsqldb_1_8_1_3.zip 3170550 SHA256 c3669bbebcb5c722b273f20c316af744d4e263bc90cc20fd1e6296dff7cc3d07 SHA512 0483ca3299b63b4931b07d49588c729231efca76a317b9620abbd5039127f3f79449eaa1e9d29c52782c58bdb0cc4879b1e3f30f669d2c02c880818f531a8442 WHIRLPOOL ae025d408ee78683133a7bcb1ea6cc130844abc837abe408fe0ea4cf885e082080cb926fabb47ecc59a0f64463e2f969ce51a9e5acc802bdc4e7ba9a62f9756d
-EBUILD hsqldb-1.8.1.2-r1.ebuild 5493 SHA256 70d51ec0c079fda679024606a27b38d1e49c756f3feae2a6f58e0017ccfa2b92 SHA512 7fe998e3a4ecdc5817771b35e6afbab4080cb4c060e8667de665047bff8418ce7e354d3da75f704f9c908e9635c5d952f5b9b7f9526fcf5a300dfc6339e4fc75 WHIRLPOOL 4d4483180d26845ecb4cc9835db04288051b80adf65d98f70345e7804b71d84b79a29c6329a6be9e6cdd004f93597ba512abc2619dbf49ecf4bf86e957ffbb70
 EBUILD hsqldb-1.8.1.3-r1.ebuild 5736 SHA256 c84108dfa5dc843bd1df6e198b546957290bee96c34df0dfadc4445478b1b5db SHA512 955e12c5fc56d6984d0a222c02085bd2885cab71e46c23cce2cd9d52a7d71b027054dddbff7a7bb22d4a661115e3f5894727bb702e83ac6abb147c6e3c5ad4d6 WHIRLPOOL 6c98a5e5f1e460cec037f0a105e0daadf4bc0e88d0058003bf2d8261b09698c583335b3432cba6e1d139916e1d74f7f03c31d766ba11c8960b590ef323e97ae4
 EBUILD hsqldb-1.8.1.3.ebuild 5658 SHA256 7f215b93dfe3cb209529e0493301e04fe3070443dcbc5e3c264be7768269ac51 SHA512 760b7949275ce387f4571f42ef1bcfaa4d5ea658fa179a07d6f18df66222da67ab008579e0b581b83d6c5a3cbe11a4434509ea02d6b904071348de1a30503ea7 WHIRLPOOL 40cc0a20c7588d0694986ad26c3f5014d7b8162cd8790c9597cb430f2ecf1e871815653a7f58c2c85b41ea655a06c066ee086d4ec52327be72199c396182b06c
-MISC ChangeLog 10673 SHA256 5a0f0c0548d2e922f2fb2500d53f5aa796e6ea11f5a29b8799b81edf2426914e SHA512 1e42bc839f23455ba44432041aa9a05f60ff0f74f179cf720ddc23690b6999cf843dc10e120eeae94dd2a2d82236983d593d65896b9c81f39a66265bb0b7610d WHIRLPOOL 97a375e19e3234063af538317cd782240a3bc511d7bdcf19350aee2e6a167f1f104d47fcfbd38e5670f35f7bc4a01bbb60ddaa3f249c5fd86bc63d830de5bb1b
+MISC ChangeLog 10806 SHA256 1e4c6dee3f4f76e15e273115327df1305101bf063631808536100a6f75426cd3 SHA512 e266a326f9d7fbf81e723545b0573729e5be4614c1fb3103e0264aee45be71d406d65837c539d89674c855d718beb4da80885a4ebcddec5082da835c24be08d9 WHIRLPOOL 7f60fdb6ca1d591cbbbbad9dc48dc8265064ac24d1e734378168b35b55db8f3e3c67afdf8c0e909ee7e6d029e4f5d4f921d096e92f37f4ced3c7cc5e8f83b71c
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJT6zEsAAoJELp701BxlEWfR6AP/1yvw1MV1zwVEGpwJBmpzkK6
-+yZfyUe0+EPCmHFLfDEoJFGAAKMArR/KE67xz3/dJKYF35Kzd5lWT/0msZGTm206
-8NHTk/2YXFtEgW5ZSVJ1r4pX7fWz0ZmVZfmwIiUDj55IR2P2mUbQIlxzIDG3QsUV
-NUDwlRYMs8LM+poEO82PZmeF52Ou0o6Jjg5cnxU9hExKaNx9N76eC3gXfgduTDg/
-p8fP8uSgAAInFnCAmyseboULhZyS/tvrXz081Ci24CIKkb9f7AqwdGd/Il74HbAc
-pLmlZ/L5yseY4PLplena/hzyneTAjcDJSohbNR+tR/SOxZyH96OL/v0g9kYpkB/h
-sgYyomDWZM8/ie3aam0KUc2gNCYiG8J6XSvlpL/UtYaIhqq9fMmJxHlM8Z7ndRgq
-nGXZjIEAJ4jolQ6wt1Q115SF12ez51zJTGGwACtrV1Fg4CeaqImYN1ZjW77RH5d2
-X1QmWnveZImf9w4a46bp1PbAYMEPT2rABhOpX88Zk5iFPItuPpEPwyoUT5JGYoze
-R4lBIYnW8ryAsbw3SKfXY2XRyo+dnAkAnc+TiwPvBvSgDZMi6E8mzBcksn4Mzy15
-Av90+JRilsGZ1Bax5if9tsjW/n6WZ7OkZNE9JPYCvz0L7fILhaFF88wb/0eJqMt1
-SYc18j4KU3Lmu6ePacfr
-=zud2
------END PGP SIGNATURE-----
diff --git a/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild b/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild
deleted file mode 100644
index c9b0e5369745..000000000000
--- a/dev-db/hsqldb/hsqldb-1.8.1.2-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2014 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.10 2014/08/10 19:59:56 slyfox Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source test"
-inherit eutils user 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 GPL-2"
-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/*
-
-	echo "CONFIG_PROTECT=\"${HSQLDB_HOME}\"" > "${T}"/35hsqldb || die
-	doenvd "${T}"/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
-}