summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Redaelli <drizzt@gentoo.org>2006-12-23 12:39:53 +0000
committerTimothy Redaelli <drizzt@gentoo.org>2006-12-23 12:39:53 +0000
commit587dc65fe065a88e9d0fb45aa18f9bc43cc95a29 (patch)
tree5d8b52e3021238d97bcf61eb434545568ba7083e /dev-db/hsqldb
parentAdd ~x86-fbsd keyword (diff)
downloadgentoo-2-587dc65fe065a88e9d0fb45aa18f9bc43cc95a29.tar.gz
gentoo-2-587dc65fe065a88e9d0fb45aa18f9bc43cc95a29.tar.bz2
gentoo-2-587dc65fe065a88e9d0fb45aa18f9bc43cc95a29.zip
Applied patch for fbsd wrt bug #157974 (authorized by Caster).
Add ~x86-fbsd keyword. (Portage version: 2.1.2_rc4)
Diffstat (limited to 'dev-db/hsqldb')
-rw-r--r--dev-db/hsqldb/ChangeLog7
-rw-r--r--dev-db/hsqldb/hsqldb-1.7.3.1-r3.ebuild9
2 files changed, 11 insertions, 5 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/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"