Cleanup duplicate files from files directory. Fixes bug #286379.

Package-Manager: portage-2.2_rc40/cvs/Linux i686

4 files changed, 9 insertions, 47 deletions

diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index d389dad22aac..cd8f79ffb3b9 100644
--- a/dev-db/hsqldb/ChangeLog
+++ b/dev-db/hsqldb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/hsqldb
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.51 2009/10/03 17:15:25 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.52 2009/10/03 17:17:54 betelgeuse Exp $
+
+  03 Oct 2009; Petteri Räty <betelgeuse@gentoo.org>
+  -files/server.properties-r1, -files/sqltool.rc-r1:
+  Cleanup duplicate files from files directory. Fixes bug #286379.
 
   03 Oct 2009; Petteri Räty <betelgeuse@gentoo.org>
   -hsqldb-1.8.0.9-r1.ebuild:
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index 06938fcbfc0e..9e66190cecf0 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -7,17 +7,15 @@ AUX bundle-all-tools.patch 873 RMD160 e13225f63d202fda9d3e54b5141b92f88c2c0b99 S
 AUX hsqldb 464 RMD160 9f491a89bc013085205ddcac0cdcc85b26abe431 SHA1 a947e19e7379da582f4193cb6fbdddc884e52333 SHA256 773d18c752b8392fb1b1677789934ea7a531f8cc0276c18917e21c71b717a3a9
 AUX resolve-config-softlinks.patch 846 RMD160 93d6f30829e446f1b5f4fde6f61ab1efdeebd928 SHA1 f1843f12ce59bf866757eff7b385ef1565dea0f2 SHA256 a7de5886aed87fa040e65d265d5418daee38376ba23742fb97119b629b678517
 AUX server.properties 686 RMD160 c48bc303a028bca284273b969ca01d3dadb20dcd SHA1 bd7a3cd95e451c6bf11b28609819450cf396221c SHA256 be7c54fc356d2b14c26e8ec0eecb79c7fa1c72e84c3475bedcd4d08548beeabd
-AUX server.properties-r1 686 RMD160 c48bc303a028bca284273b969ca01d3dadb20dcd SHA1 bd7a3cd95e451c6bf11b28609819450cf396221c SHA256 be7c54fc356d2b14c26e8ec0eecb79c7fa1c72e84c3475bedcd4d08548beeabd
 AUX sqltool.rc 619 RMD160 095cf1293ef4d40eed83df5f3025202c5a57f493 SHA1 8a98d518192c09401d077120f5217a8706a8fc53 SHA256 76ab1af1b6359c070c00a0d7499d7f628c94cc6c7b7d6bb8fe196ccfe080d637
-AUX sqltool.rc-r1 619 RMD160 095cf1293ef4d40eed83df5f3025202c5a57f493 SHA1 8a98d518192c09401d077120f5217a8706a8fc53 SHA256 76ab1af1b6359c070c00a0d7499d7f628c94cc6c7b7d6bb8fe196ccfe080d637
 DIST hsqldb_1_8_0_10.zip 3519470 RMD160 8b25da02fbc2702a43cc88b0af8eaeb41c0f75a0 SHA1 7168b0f40aa5c72267899601c116d2348d2f56ec SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
 EBUILD hsqldb-1.8.0.10.ebuild 5883 RMD160 10dd3ebcfc3631c8cf723f8aa1b97f30c6439f8b SHA1 9ff7fd832ab82b699826dc53aeb38ed5da1eac79 SHA256 992cf7576ec2d951fbeafe0b25f40e2e0cf402435173c39d3c92aedaef0ef2e2
-MISC ChangeLog 6907 RMD160 9cac2bf6f10236961793ceeca6738e74dfd8d1f3 SHA1 ce29dc22c4ab5e80843c497fabd99aa847479242 SHA256 45bb7a306b4a50b3aea3b197d00b8fc6a7924cdf5d1118014c0699384b6109e4
+MISC ChangeLog 7081 RMD160 3622a8f489a7a5fceb0ef2fb0968066b5364ee9b SHA1 d0f42cdf184c675c02c0a94260c5df0184014499 SHA256 49a5f13a0f6816d37bf8e3f0b53b7ec0dbdf47fdfc5394a5d0131159affccb17
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrHhrkACgkQcxLzpIGCsLSMVwCdHxn3xMp+iYPk5ATfJhMf8tVR
-0vIAoI5C7SBpSFyc3mhSOzuOtYw0PpYV
-=FD8E
+iEYEARECAAYFAkrHh0sACgkQcxLzpIGCsLTIugCfRwH/wZd1qweT3c+y76HitzgG
+kkgAnjxXpJPr0XJaDe02jzH515FO21bO
+=GKkl
 -----END PGP SIGNATURE-----
diff --git a/dev-db/hsqldb/files/server.properties-r1 b/dev-db/hsqldb/files/server.properties-r1
deleted file mode 100644
index 4827d1cb6ec0..000000000000
--- a/dev-db/hsqldb/files/server.properties-r1
+++ /dev/null
@@ -1,20 +0,0 @@
-# Hsqldb Server cfg file.
-# See the UNIX Quick Start and the Advanced Topics chapters
-# of the Hsqldb User Guide.
-
-server.database.0=file:/var/lib/hsqldb/db1
-server.urlid.0=localhost
-
-# Warning!
-# When running hsqldb in Server mode, for each additional database
-# the server.urlid.X entry must have a proper corresponding urlid
-# section in the 'sqltool.rc' file.
-# Otherwise you may have problems with shutting down the server.
-#
-# Note that each server can serve only up to 10 different
-# databases simultaneously (with consecutive {0-9} suffixes).
-
-# An example of additional database.
-#server.database.1=file:/var/lib/hsqldb/newdb/newdb
-#server.dbname.1=newdb
-#server.urlid.1=newdb
diff --git a/dev-db/hsqldb/files/sqltool.rc-r1 b/dev-db/hsqldb/files/sqltool.rc-r1
deleted file mode 100644
index 9284be44867a..000000000000
--- a/dev-db/hsqldb/files/sqltool.rc-r1
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id sqltool.rc,v 1.11 2004/07/18 21:34:35 unsaved Exp $
-
-# This is a sample SqlTool configuration file, a.k.a. rc file.
-
-# This is for a hsqldb Server running with default settings on your local
-# computer (and for which you have not changed the password for "sa").
-urlid localhost
-url jdbc:hsqldb:hsql://localhost
-username sa
-password 
-
-# Each urlid section in this file corresponds to one of the
-# server.urlid.X entries in the 'server.properties' file.
-# This is required by the hsqldb init script.
-
-# An example of additional database.
-#urlid newdb
-#url jdbc:hsqldb:hsql://localhost/newdb
-#username sa
-#password