Applied patch for fbsd wrt bug #157974 (authorized by Caster).

Add ~x86-fbsd keyword.

Package-Manager: portage-2.1.2_rc4

3 files changed, 23 insertions, 17 deletions

diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index d806b0e18b8a..721bff4220b6 100644
--- a/dev-db/hsqldb/ChangeLog
+++ b/dev-db/hsqldb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/hsqldb
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.20 2006/11/26 10:55:46 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.21 2006/12/23 12:39:53 drizzt Exp $
+
+  23 Dec 2006; Timothy Redaelli <drizzt@gentoo.org>
+  hsqldb-1.7.3.1-r3.ebuild:
+  Applied patch for fbsd wrt bug #157974 (authorized by Caster).
+  Add ~x86-fbsd keyword.
 
   26 Nov 2006; Petteri Räty <betelgeuse@gentoo.org>
   hsqldb-1.7.3.1-r3.ebuild:
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index 0d4f58faa191..2009eca3674c 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -30,14 +30,14 @@ EBUILD hsqldb-1.7.3.1-r2.ebuild 3822 RMD160 d1051d5b24ee99a9fc611a968afde292f906
 MD5 6e1de6a6a16ef9ad5c144457bb61d970 hsqldb-1.7.3.1-r2.ebuild 3822
 RMD160 d1051d5b24ee99a9fc611a968afde292f9065fd2 hsqldb-1.7.3.1-r2.ebuild 3822
 SHA256 a6a4ea8b018022bfb84b20951c20476c3d00161429293c7dc847772bba8a2ac8 hsqldb-1.7.3.1-r2.ebuild 3822
-EBUILD hsqldb-1.7.3.1-r3.ebuild 3617 RMD160 24bb78a91d133b8c426c19f4218f608305307d44 SHA1 be6f0469d7be1e3bbe5e921d08ecfa0bdcc91312 SHA256 536fada7b39488502b0c382f59a01199a9066eb55987f8627d8aac7e781dcee4
-MD5 bc7fba1d6495d09bbc3358b45384c8af hsqldb-1.7.3.1-r3.ebuild 3617
-RMD160 24bb78a91d133b8c426c19f4218f608305307d44 hsqldb-1.7.3.1-r3.ebuild 3617
-SHA256 536fada7b39488502b0c382f59a01199a9066eb55987f8627d8aac7e781dcee4 hsqldb-1.7.3.1-r3.ebuild 3617
-MISC ChangeLog 3008 RMD160 b3da4a27a73e158a26dd27febf38305839f75ad6 SHA1 9141a672a03991b5c35ddd06d498c4f696e020e4 SHA256 8877df83aa19efa1796ccc4be057266408bf29d7d5e951fb758323f953fb28cd
-MD5 c5acee7cea2dfd5cb27e7099aaf4264b ChangeLog 3008
-RMD160 b3da4a27a73e158a26dd27febf38305839f75ad6 ChangeLog 3008
-SHA256 8877df83aa19efa1796ccc4be057266408bf29d7d5e951fb758323f953fb28cd ChangeLog 3008
+EBUILD hsqldb-1.7.3.1-r3.ebuild 3676 RMD160 568b1e479d3f6213c6aa7f9e3b7afff13b978704 SHA1 d79acdbc0248660d1647c9bc8723bc3fb7d8c174 SHA256 b032b9a209787c091d76de93e304aacb79beab5a04443d9cab53749159ff8f76
+MD5 6fb71de431fe97145c4fa753642ea931 hsqldb-1.7.3.1-r3.ebuild 3676
+RMD160 568b1e479d3f6213c6aa7f9e3b7afff13b978704 hsqldb-1.7.3.1-r3.ebuild 3676
+SHA256 b032b9a209787c091d76de93e304aacb79beab5a04443d9cab53749159ff8f76 hsqldb-1.7.3.1-r3.ebuild 3676
+MISC ChangeLog 3175 RMD160 bd6d2f8fd3fcd90fa1948f40865e7006cf89e2cc SHA1 42eaf5016b9d21b3f883ca1fd010270a99134fc7 SHA256 ca6b45517008446c10462484beef642850543aab8f92cd32e7db11d9847174a2
+MD5 91b2cd7768bb9270c7ecaaf11e46ef0a ChangeLog 3175
+RMD160 bd6d2f8fd3fcd90fa1948f40865e7006cf89e2cc ChangeLog 3175
+SHA256 ca6b45517008446c10462484beef642850543aab8f92cd32e7db11d9847174a2 ChangeLog 3175
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -52,9 +52,9 @@ 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 v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFaXMNcxLzpIGCsLQRAu8yAJ4n91kcCPMKfhTJCZmlHrzHC+0LwwCeL/7b
-KYpZUI8NuEQ3vmcfGhzKLek=
-=qvB6
+iD8DBQFFjSOgGDyatLGpTbYRAlj/AJ9aMckJYP/jdJmptJUW7TPvISerUgCfZsKm
+lrVt0YdfuSeWpHAMUhkLTGk=
+=rGxL
 -----END PGP SIGNATURE-----
diff --git a/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild b/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild
index fff518829bfe..64270ff20966 100644
--- a/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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-r3.ebuild,v 1.4 2006/11/26 10:55:46 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild,v 1.5 2006/12/23 12:39:53 drizzt Exp $
 
 inherit java-pkg-2 eutils versionator java-ant-2
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="doc source"
 
 CDEP="=dev-java/servletapi-2.3*"
@@ -44,8 +44,9 @@ src_unpack() {
 		rm *.jar
 		java-pkg_jar-from servletapi-2.3
 	cd ${S}
-	sed -i -r \
-		-e "s/etc\/sysconfig/etc\/conf.d/g" \
+	sed -i \
+		-e "s:/etc/sysconfig:/etc/conf.d:" \
+		-e "s:/usr/local/etc/hsqldb.cfg:/etc/conf.d/hsqldb:" \
 			bin/hsqldb
 
 	ant -q -f build/build.xml cleanall || die "failed to clean"