version bump

6 files changed, 593 insertions, 16 deletions

diff --git a/app-office/qhacc/ChangeLog b/app-office/qhacc/ChangeLog
index 975fa2b4877b..416b25b0b9b7 100644
--- a/app-office/qhacc/ChangeLog
+++ b/app-office/qhacc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/qhacc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/ChangeLog,v 1.19 2004/10/21 02:58:37 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/ChangeLog,v 1.20 2004/10/29 19:00:00 carlo Exp $
+
+*qhacc-3.2.2 (29 Oct 2004)
+
+  29 Oct 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/qhacc-3.2.2-sandbox.patch, qhacc-3.2.1.ebuild, +qhacc-3.2.2.ebuild:
+  version bump
 
   20 Oct 2004; Jason Wever <weeve@gentoo.org> qhacc-3.2.1.ebuild:
   Stable on sparc wrt bug #67169.
diff --git a/app-office/qhacc/Manifest b/app-office/qhacc/Manifest
index 33178e53c122..94c64882b744 100644
--- a/app-office/qhacc/Manifest
+++ b/app-office/qhacc/Manifest
@@ -1,15 +1,18 @@
-MD5 b7b06678a8ab1af06fe9163a75269e09 ChangeLog 2675
-MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 27bf4edbb3e2334b0ed8dab2194a9b9d qhacc-2.9.8.ebuild 1099
-MD5 61a87e1d85536676f392b4b02f0dbce9 qhacc-2.9.9.ebuild 1183
+MD5 543e8f8a998a95b7d943a9ea694b18e7 qhacc-3.2.1.ebuild 1806
 MD5 83c62fe0b0205752729a02acccfc3ec3 qhacc-2.9.ebuild 1224
-MD5 a338c413d7511364638e3af84d794a53 qhacc-3.2.1.ebuild 2006
-MD5 f9848845170083de3cf3420f27f240c1 files/digest-qhacc-2.9 61
-MD5 703c28cb8b7fdc28c19e990234c7eea6 files/digest-qhacc-2.9.8 63
-MD5 6c5e6b109aa837699f48c94d253786ce files/digest-qhacc-2.9.9 63
-MD5 8ad038ef57072d0bd84121a74aa30c59 files/digest-qhacc-3.2.1 63
-MD5 83196bf0c0685733494d5f401c3d926f files/qhacc-2.9-gentoo.patch 7175
+MD5 61a87e1d85536676f392b4b02f0dbce9 qhacc-2.9.9.ebuild 1183
+MD5 c5a0cbc66e06c2fa7ae19d4acf14f0e4 qhacc-3.2.2.ebuild 1840
+MD5 27bf4edbb3e2334b0ed8dab2194a9b9d qhacc-2.9.8.ebuild 1099
+MD5 3a0d9b961495051f5a7e1c3551fb0fab ChangeLog 2845
+MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 8411a52d54ebbb2038e2e08a9f43b238 files/qhacc-2.9-mysqlplugin-gcc-3.3.patch 982
+MD5 27867aca5f38687a4e9bd740005e9996 files/qhacc-3.2.2-sandbox.patch 21441
+MD5 83196bf0c0685733494d5f401c3d926f files/qhacc-2.9-gentoo.patch 7175
 MD5 5d4fad5c5dece54cf6376b1cbf836667 files/qhacc-3.2.1-mysql_plugin_libs.patch 834
 MD5 2f6b026212a58b32e415bede86478bba files/qhacc-3.2.1-psql_plugin_libs.patch 822
+MD5 703c28cb8b7fdc28c19e990234c7eea6 files/digest-qhacc-2.9.8 63
+MD5 6c5e6b109aa837699f48c94d253786ce files/digest-qhacc-2.9.9 63
+MD5 8ad038ef57072d0bd84121a74aa30c59 files/digest-qhacc-3.2.1 63
+MD5 4fe6fcff9b37a9455d289ec9e47705e6 files/digest-qhacc-3.2.2 63
+MD5 f9848845170083de3cf3420f27f240c1 files/digest-qhacc-2.9 61
 MD5 a17438e255e4c609d23b7db1e10761c9 files/qhacc-3.2.1-sandbox.patch 14903
diff --git a/app-office/qhacc/files/digest-qhacc-3.2.2 b/app-office/qhacc/files/digest-qhacc-3.2.2
new file mode 100644
index 000000000000..837d15d0e9f8
--- /dev/null
+++ b/app-office/qhacc/files/digest-qhacc-3.2.2
@@ -0,0 +1 @@
+MD5 9f8c30bd56b41bfcb9f5e70090320a59 qhacc-3.2.2.tar.gz 653645
diff --git a/app-office/qhacc/files/qhacc-3.2.2-sandbox.patch b/app-office/qhacc/files/qhacc-3.2.2-sandbox.patch
new file mode 100644
index 000000000000..a2f41e33f413
--- /dev/null
+++ b/app-office/qhacc/files/qhacc-3.2.2-sandbox.patch
@@ -0,0 +1,506 @@
+diff -r -u plugins.orig/aqbank/Makefile.in plugins/aqbank/Makefile.in
+--- plugins.orig/aqbank/Makefile.in	2004-10-29 01:07:10.000000000 +0200
++++ plugins/aqbank/Makefile.in	2004-10-29 01:10:21.000000000 +0200
+@@ -230,7 +230,7 @@
+ target_alias = @target_alias@
+ @AQB_TRUE@noinst_HEADERS = aqbplugin.h
+ @AQB_TRUE@lib_LTLIBRARIES = libaqbio.la
+-@AQB_TRUE@pidir = $(prefix)/plugins
++@AQB_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @AQB_TRUE@dbdir = $(pidir)/db
+ @AQB_TRUE@importdir = $(pidir)/import
+ @AQB_TRUE@exportdir = $(pidir)/export
+@@ -277,7 +277,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -412,7 +412,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(DESTDIR)/$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+diff -r -u plugins.orig/archiver/Makefile.in plugins/archiver/Makefile.in
+--- plugins.orig/archiver/Makefile.in	2004-10-29 01:07:10.000000000 +0200
++++ plugins/archiver/Makefile.in	2004-10-29 01:10:21.000000000 +0200
+@@ -228,7 +228,7 @@
+ target_alias = @target_alias@
+ @ARC_TRUE@noinst_HEADERS = arcplugin.h
+ @ARC_TRUE@lib_LTLIBRARIES = libarcio.la
+-@ARC_TRUE@pidir = $(prefix)/plugins
++@ARC_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @ARC_TRUE@importdir = $(pidir)/import
+ @ARC_TRUE@exportdir = $(pidir)/export
+ @ARC_TRUE@libarcio_la_SOURCES = arcplugin.cpp
+@@ -274,7 +274,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -401,7 +401,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(DESTDIR)/$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+diff -r -u plugins.orig/cliimp/Makefile.in plugins/cliimp/Makefile.in
+--- plugins.orig/cliimp/Makefile.in	2004-10-29 01:07:10.000000000 +0200
++++ plugins/cliimp/Makefile.in	2004-10-29 01:10:21.000000000 +0200
+@@ -230,7 +230,7 @@
+ target_alias = @target_alias@
+ @CLIIMP_TRUE@noinst_HEADERS = cliimpplugin.h
+ @CLIIMP_TRUE@lib_LTLIBRARIES = libcliimpio.la
+-@CLIIMP_TRUE@impdir = $(prefix)/plugins/import
++@CLIIMP_TRUE@impdir = $(DESTDIR)/$(prefix)/plugins/import
+ @CLIIMP_TRUE@libcliimpio_la_SOURCES = cliimpplugin.cpp $(top_srcdir)/src/guiconstants.cpp
+ @CLIIMP_TRUE@RELEASE = 2:0:0
+ @CLIIMP_TRUE@libcliimpio_la_LIBADD = -l$(QHACCQT) -lfiledbio -lqhacc
+@@ -274,7 +274,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -409,7 +409,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(DESTDIR)/$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -529,8 +529,8 @@
+ @CLIIMP_TRUE@	rm -f *.o *.core core *~ .*~ *.la *.lo
+ 
+ @CLIIMP_TRUE@install-data-local:
+-@CLIIMP_TRUE@	mkdir -p $(impdir)
+-@CLIIMP_TRUE@	if test ! -L $(impdir)/libcliimpio.so ; then cd $(impdir) && ln -s $(libdir)/libcliimpio.so $(impdir) ; fi
++@CLIIMP_TRUE@	mkdir -p $(DESTDIR)/$(impdir)
++@CLIIMP_TRUE@	if test ! -L $(DESTDIR)/$(impdir)/libcliimpio.so ; then cd $(DESTDIR)/$(impdir) && ln -s $(DESTDIR)/$(libdir)/libcliimpio.so $(DESTDIR)/$(impdir) ; fi
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -r -u plugins.orig/extprg/Makefile.in plugins/extprg/Makefile.in
+--- plugins.orig/extprg/Makefile.in	2004-10-29 01:07:10.000000000 +0200
++++ plugins/extprg/Makefile.in	2004-10-29 01:10:21.000000000 +0200
+@@ -236,7 +236,7 @@
+ target_alias = @target_alias@
+ @PRG_TRUE@noinst_HEADERS = extprgplugin.h
+ @PRG_TRUE@lib_LTLIBRARIES = libextprgio.la
+-@PRG_TRUE@pidir = $(prefix)/plugins
++@PRG_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @PRG_TRUE@dbdir = $(pidir)/db
+ @PRG_TRUE@importdir = $(pidir)/import
+ @PRG_TRUE@exportdir = $(pidir)/export
+@@ -283,7 +283,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -410,7 +410,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(DESTDIR)/$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+diff -r -u plugins.orig/generator/Makefile.in plugins/generator/Makefile.in
+--- plugins.orig/generator/Makefile.in	2004-10-29 01:07:10.000000000 +0200
++++ plugins/generator/Makefile.in	2004-10-29 01:10:21.000000000 +0200
+@@ -236,7 +236,7 @@
+ target_alias = @target_alias@
+ @GEN_TRUE@noinst_HEADERS = genplugin.h
+ @GEN_TRUE@lib_LTLIBRARIES = libgenio.la
+-@GEN_TRUE@exportdir = $(prefix)/plugins/export
++@GEN_TRUE@exportdir = $(DESTDIR)/$(prefix)/plugins/export
+ @GEN_TRUE@libgenio_la_SOURCES = genplugin.cpp genplugin.h
+ @GEN_TRUE@RELEASE = 1:0:0
+ @GEN_TRUE@libgenio_la_LIBADD = -l$(QHACCQT) -lfiledbio -lqhaccext
+@@ -280,7 +280,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -407,7 +407,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(DESTDIR)/$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+diff -r -u plugins.orig/gpg/Makefile.in plugins/gpg/Makefile.in
+--- plugins.orig/gpg/Makefile.in	2004-10-29 01:07:10.000000000 +0200
++++ plugins/gpg/Makefile.in	2004-10-29 01:10:21.000000000 +0200
+@@ -236,7 +236,7 @@
+ target_alias = @target_alias@
+ @GPG_TRUE@noinst_HEADERS = gpgplugin.h
+ @GPG_TRUE@lib_LTLIBRARIES = libgpgio.la
+-@GPG_TRUE@pidir = $(prefix)/plugins
++@GPG_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @GPG_TRUE@dbdir = $(pidir)/db
+ @GPG_TRUE@importdir = $(pidir)/import
+ @GPG_TRUE@exportdir = $(pidir)/export
+@@ -283,7 +283,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -410,7 +410,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(DESTDIR)/$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+diff -r -u plugins.orig/graphs/Makefile.in plugins/graphs/Makefile.in
+--- plugins.orig/graphs/Makefile.in	2004-10-29 01:07:10.000000000 +0200
++++ plugins/graphs/Makefile.in	2004-10-29 01:10:21.000000000 +0200
+@@ -276,7 +276,7 @@
+ @PGPH_TRUE@									libdoublelinegraph.la libsinglebargraph.la \
+ @PGPH_TRUE@									libdoublebargraph.la libpiegraph.la
+ 
+-@PGPH_TRUE@pidir = $(prefix)/plugins
++@PGPH_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @PGPH_TRUE@graphdir = $(pidir)/graph
+ @PGPH_TRUE@libgraphbase_la_SOURCES = grapher.cpp
+ @PGPH_TRUE@libmonthlygraph_la_SOURCES = monthlygraph.cpp
+@@ -340,7 +340,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -485,7 +485,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(DESTDIR)/$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+diff -r -u plugins.orig/Makefile.in plugins/Makefile.in
+--- plugins.orig/Makefile.in	2004-10-29 01:07:10.000000000 +0200
++++ plugins/Makefile.in	2004-10-29 01:10:21.000000000 +0200
+@@ -380,7 +380,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(DESTDIR)/$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -398,7 +398,7 @@
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d "$(distdir)/$$subdir" \
+-	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(DESTDIR)/$(distdir)/$$subdir" \
+ 	    || exit 1; \
+ 	    distdir=`$(am__cd) $(distdir) && pwd`; \
+ 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+diff -r -u plugins.orig/mysql/Makefile.in plugins/mysql/Makefile.in
+--- plugins.orig/mysql/Makefile.in	2004-10-29 01:07:10.000000000 +0200
++++ plugins/mysql/Makefile.in	2004-10-29 01:13:28.000000000 +0200
+@@ -236,7 +236,7 @@
+ target_alias = @target_alias@
+ @MYSQL_TRUE@noinst_HEADERS = mysqlplugin.h
+ @MYSQL_TRUE@lib_LTLIBRARIES = libmysqlio.la
+-@MYSQL_TRUE@pidir = $(prefix)/plugins
++@MYSQL_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @MYSQL_TRUE@dbdir = $(pidir)/db
+ @MYSQL_TRUE@importdir = $(pidir)/import
+ @MYSQL_TRUE@exportdir = $(pidir)/export
+@@ -283,7 +283,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -410,7 +410,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(DESTDIR)/$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -533,9 +533,9 @@
+ @MYSQL_TRUE@	mkdir -p $(dbdir)
+ @MYSQL_TRUE@	if test ! -L $(dbdir)/libmysqlio.so ; then cd $(dbdir); ln -s $(libdir)/libmysqlio.so $(dbdir) ; fi
+ @MYSQL_TRUE@	mkdir -p $(importdir)
+-@MYSQL_TRUE@	if test ! -L $(importdir)/libmysqlio.so ; then cd $(importdir); ln -s ../../lib/libmysqlio.so $(importdir) ; fi
++@MYSQL_TRUE@	if test ! -L $(importdir)/libmysqlio.so ; then cd $(importdir); ln -s $(libdir)/lib/libmysqlio.so $(importdir) ; fi
+ @MYSQL_TRUE@	mkdir -p $(exportdir)
+-@MYSQL_TRUE@	if test ! -L $(exportdir)/libmysqlio.so ; then cd $(exportdir); ln -s ../../lib/libmysqlio.so $(exportdir) ; fi
++@MYSQL_TRUE@	if test ! -L $(exportdir)/libmysqlio.so ; then cd $(exportdir); ln -s $(libdir)/lib/libmysqlio.so $(exportdir) ; fi
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -r -u plugins.orig/ofx/Makefile.in plugins/ofx/Makefile.in
+--- plugins.orig/ofx/Makefile.in	2004-10-29 01:07:10.000000000 +0200
++++ plugins/ofx/Makefile.in	2004-10-29 01:10:21.000000000 +0200
+@@ -229,7 +229,7 @@
+ target_alias = @target_alias@
+ @OFX_TRUE@noinst_HEADERS = ofxplugin.h
+ @OFX_TRUE@lib_LTLIBRARIES = libofxio.la
+-@OFX_TRUE@pidir = $(prefix)/plugins
++@OFX_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @OFX_TRUE@dbdir = $(pidir)/db
+ @OFX_TRUE@importdir = $(pidir)/import
+ @OFX_TRUE@exportdir = $(pidir)/export
+@@ -276,7 +276,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -411,7 +411,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(DESTDIR)/$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+diff -r -u plugins.orig/psql/Makefile.in plugins/psql/Makefile.in
+--- plugins.orig/psql/Makefile.in	2004-10-29 01:07:10.000000000 +0200
++++ plugins/psql/Makefile.in	2004-10-29 01:13:02.000000000 +0200
+@@ -236,7 +236,7 @@
+ target_alias = @target_alias@
+ @PSQL_TRUE@noinst_HEADERS = psqlplugin.h
+ @PSQL_TRUE@lib_LTLIBRARIES = libpsqlio.la
+-@PSQL_TRUE@pidir = $(prefix)/plugins
++@PSQL_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @PSQL_TRUE@dbdir = $(pidir)/db
+ @PSQL_TRUE@importdir = $(pidir)/import
+ @PSQL_TRUE@exportdir = $(pidir)/export
+@@ -283,7 +283,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -410,7 +410,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(DESTDIR)/$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -533,9 +533,9 @@
+ @PSQL_TRUE@	mkdir -p $(dbdir)
+ @PSQL_TRUE@	if test ! -L $(dbdir)/libpsqlio.so ; then cd $(dbdir); ln -s $(libdir)/libpsqlio.so $(dbdir) ; fi
+ @PSQL_TRUE@	mkdir -p $(importdir)
+-@PSQL_TRUE@	if test ! -L $(importdir)/libpsqlio.so ; then cd $(importdir); ln -s ../../lib/libpsqlio.so $(importdir) ; fi
++@PSQL_TRUE@	if test ! -L $(importdir)/libpsqlio.so ; then cd $(importdir); ln -s $(libdir)/libpsqlio.so $(importdir) ; fi
+ @PSQL_TRUE@	mkdir -p $(exportdir)
+-@PSQL_TRUE@	if test ! -L $(exportdir)/libpsqlio.so ; then cd $(exportdir); ln -s ../../lib/libpsqlio.so $(exportdir) ; fi
++@PSQL_TRUE@	if test ! -L $(exportdir)/libpsqlio.so ; then cd $(exportdir); ln -s $(libdir)/lib/libpsqlio.so $(exportdir) ; fi
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -r -u plugins.orig/qif/Makefile.in plugins/qif/Makefile.in
+--- plugins.orig/qif/Makefile.in	2004-10-29 01:07:10.000000000 +0200
++++ plugins/qif/Makefile.in	2004-10-29 01:10:21.000000000 +0200
+@@ -228,7 +228,7 @@
+ target_alias = @target_alias@
+ @QIF_TRUE@noinst_HEADERS = qifplugin.h
+ @QIF_TRUE@lib_LTLIBRARIES = libqifio.la
+-@QIF_TRUE@pidir = $(prefix)/plugins
++@QIF_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @QIF_TRUE@dbdir = $(pidir)/db
+ @QIF_TRUE@importdir = $(pidir)/import
+ @QIF_TRUE@exportdir = $(pidir)/export
+@@ -275,7 +275,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -402,7 +402,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(DESTDIR)/$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+diff -r -u plugins.orig/reports/Makefile.in plugins/reports/Makefile.in
+--- plugins.orig/reports/Makefile.in	2004-10-29 01:07:10.000000000 +0200
++++ plugins/reports/Makefile.in	2004-10-29 01:10:21.000000000 +0200
+@@ -309,7 +309,7 @@
+ @PGPH_TRUE@									libaves.la libbudget.la libmbudget.la libjournal.la \
+ @PGPH_TRUE@									libtrans.la libacct.la libtbal.la
+ 
+-@PGPH_TRUE@pidir = $(prefix)/plugins
++@PGPH_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @PGPH_TRUE@reportdir = $(pidir)/report
+ @PGPH_TRUE@noinst_LIBRARIES = libtemp.a
+ @PGPH_TRUE@libtemp_a_SOURCES = reporter.cpp
+@@ -394,7 +394,7 @@
+ 	$(RANLIB) libtemp.a
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -552,7 +552,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(DESTDIR)/$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+diff -r -u plugins.orig/sqlite/Makefile.in plugins/sqlite/Makefile.in
+--- plugins.orig/sqlite/Makefile.in	2004-10-29 01:07:10.000000000 +0200
++++ plugins/sqlite/Makefile.in	2004-10-29 01:10:21.000000000 +0200
+@@ -243,7 +243,7 @@
+ target_alias = @target_alias@
+ @SQLL_TRUE@noinst_HEADERS = sqliteplugin.h lfsqliteplugin.h
+ @SQLL_TRUE@lib_LTLIBRARIES = libsqliteio.la liblfsqliteio.la
+-@SQLL_TRUE@pidir = $(prefix)/plugins
++@SQLL_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @SQLL_TRUE@dbdir = $(pidir)/db
+ @SQLL_TRUE@importdir = $(pidir)/import
+ @SQLL_TRUE@exportdir = $(pidir)/export
+@@ -293,7 +293,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -423,7 +423,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(DESTDIR)/$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+diff -r -u plugins.orig/upgrade/Makefile.in plugins/upgrade/Makefile.in
+--- plugins.orig/upgrade/Makefile.in	2004-10-29 01:07:10.000000000 +0200
++++ plugins/upgrade/Makefile.in	2004-10-29 01:10:21.000000000 +0200
+@@ -236,7 +236,7 @@
+ target_alias = @target_alias@
+ @UPG_TRUE@noinst_HEADERS = upgplugin.h
+ @UPG_TRUE@lib_LTLIBRARIES = libupgradeio.la
+-@UPG_TRUE@pidir = $(prefix)/plugins
++@UPG_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @UPG_TRUE@dbdir = $(pidir)/db
+ @UPG_TRUE@libupgradeio_la_SOURCES = upgplugin.cpp upgplugin.h
+ @UPG_TRUE@RELEASE = 2:0:0
+@@ -281,7 +281,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -408,7 +408,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(DESTDIR)/$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+diff -r -u plugins.orig/xml/Makefile.in plugins/xml/Makefile.in
+--- plugins.orig/xml/Makefile.in	2004-10-29 01:07:10.000000000 +0200
++++ plugins/xml/Makefile.in	2004-10-29 01:10:21.000000000 +0200
+@@ -236,7 +236,7 @@
+ target_alias = @target_alias@
+ @XML_TRUE@noinst_HEADERS = xmlplugin.h
+ @XML_TRUE@lib_LTLIBRARIES = libxmlio.la
+-@XML_TRUE@pidir = $(prefix)/plugins
++@XML_TRUE@pidir = $(DESTDIR)/$(prefix)/plugins
+ @XML_TRUE@dbdir = $(pidir)/db
+ @XML_TRUE@importdir = $(pidir)/import
+ @XML_TRUE@exportdir = $(pidir)/export
+@@ -283,7 +283,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(DESTDIR)/$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -410,7 +410,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkdir_p) "$(DESTDIR)/$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
diff --git a/app-office/qhacc/qhacc-3.2.1.ebuild b/app-office/qhacc/qhacc-3.2.1.ebuild
index 45d30be02ace..b1cd4f52d24b 100644
--- a/app-office/qhacc/qhacc-3.2.1.ebuild
+++ b/app-office/qhacc/qhacc-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/qhacc-3.2.1.ebuild,v 1.8 2004/10/21 20:24:18 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/qhacc-3.2.1.ebuild,v 1.9 2004/10/29 19:00:00 carlo Exp $
 
 inherit libtool kde-functions eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qhacc/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc ~alpha"
+KEYWORDS="x86 ppc sparc ~alpha ~hppa"
 IUSE="doc mysql postgres sqlite"
 
 DEPEND="mysql? ( dev-db/mysql++ )
@@ -32,9 +32,7 @@ src_compile() {
 	local myconf="--libdir=/usr/lib/qhacc --bindir=/usr/bin --includedir=/usr/include --datadir=/usr/share/qhacc
 			$(use_enable mysql)
 			$(use_enable postgres psql)
-			$(use_enable mysql)"
-	# libofx would need to be patched 
-	# $(use_enable ofx) $(use_enable ofx ofx-includes /usr/include/libofx)
+			$(use_enable sqlite)"
 
 	econf ${myconf} || die "./configure failed"
 	emake -j 1 || die "make failed"
diff --git a/app-office/qhacc/qhacc-3.2.2.ebuild b/app-office/qhacc/qhacc-3.2.2.ebuild
new file mode 100644
index 000000000000..118164361c5e
--- /dev/null
+++ b/app-office/qhacc/qhacc-3.2.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/qhacc-3.2.2.ebuild,v 1.1 2004/10/29 19:00:00 carlo Exp $
+
+inherit libtool kde-functions eutils
+
+DESCRIPTION="Personal Finance for Qt"
+HOMEPAGE="http://qhacc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qhacc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+IUSE="doc mysql ofx postgres sqlite"
+
+DEPEND="ofx? ( ~dev-libs/libofx-0.7.0 )
+	mysql? ( dev-db/mysql++ )
+	postgres? ( dev-db/postgresql )
+	sqlite? ( dev-db/sqlite )"
+RDEPEND="ofx? ( ~dev-libs/libofx-0.7.0 )
+	mysql? ( dev-db/mysql++ )
+	postgres? ( dev-db/postgresql )
+	sqlite? ( dev-db/sqlite )"
+need-qt 3
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	elibtoolize
+	epatch ${FILESDIR}/${P}-sandbox.patch
+}
+
+src_compile() {
+	local myconf="--libdir=/usr/lib/qhacc --bindir=/usr/bin --includedir=/usr/include --datadir=/usr/share/qhacc
+			$(use_enable mysql)
+			$(use_enable postgres psql)
+			$(use_enable sqlite)
+			$(use_enable ofx) $(use_with ofx ofx-includes /usr/include/libofx)"
+
+	econf ${myconf} || die "./configure failed"
+	emake -j 1 || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "install failed"
+	dodir /usr/share/doc/${PF}
+	use doc && mv ${D}/usr/share/qhacc/doc/* ${D}/usr/share/doc/${PF}
+	rm -rf ${D}/usr/share/qhacc/doc
+	rm ${S}/contrib/easysetup/Makefile*
+	insinto /usr/share/qhacc/easysetup
+	doins ${S}/contrib/easysetup/*
+	rm -rf ${D}/var
+	dodoc AUTHORS ChangeLog COPYING FILE_FORMAT INSTALL NEWS README THANKS TODO UPGRADE
+}
+
+pkg_postinst() {
+	echo ""
+	einfo "A sample configuration is provided in /usr/share/qhacc/easysetup."
+	einfo "copy files: \`mkdir ~/.qhacc ; cp /usr/share/qhacc/easysetup/* ~/.qhacc\`"
+	einfo "run program: \`qhacc -f ~/.qhacc/\`"
+	einfo "set alias: \`echo -e \\\n \"alias qhacc=\\\"qhacc -f ~/.qhacc\\\"\" >> ~/.bashrc\`"
+	echo ""
+}