fixed patch

4 files changed, 187 insertions, 20 deletions

diff --git a/app-office/qhacc/ChangeLog b/app-office/qhacc/ChangeLog
index d26ecde9cce2..63467ae0dfab 100644
--- a/app-office/qhacc/ChangeLog
+++ b/app-office/qhacc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.17 2004/10/15 09:59:57 dams Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/ChangeLog,v 1.18 2004/10/20 20:12:14 carlo Exp $
+
+  20 Oct 2004; Carsten Lohrke <carlo@gentoo.org>
+  files/qhacc-3.2.1-sandbox.patch, qhacc-3.2.1.ebuild:
+  fixed patch
 
   15 Oct 2004; <dams@gentoo.org> +files/qhacc-3.2.1-mysql_plugin_libs.patch,
   +files/qhacc-3.2.1-psql_plugin_libs.patch, qhacc-3.2.1.ebuild:
diff --git a/app-office/qhacc/Manifest b/app-office/qhacc/Manifest
index 925647450a20..38a2c3fba54a 100644
--- a/app-office/qhacc/Manifest
+++ b/app-office/qhacc/Manifest
@@ -1,15 +1,15 @@
-MD5 ce846bd8370e4233d8e3ea5a31c6dfbd ChangeLog 2454
-MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 27bf4edbb3e2334b0ed8dab2194a9b9d qhacc-2.9.8.ebuild 1099
-MD5 61a87e1d85536676f392b4b02f0dbce9 qhacc-2.9.9.ebuild 1183
+MD5 b2f9813135516f338767489f90d16710 qhacc-3.2.1.ebuild 2005
 MD5 83c62fe0b0205752729a02acccfc3ec3 qhacc-2.9.ebuild 1224
-MD5 56352bd314dd11d20ff2fb7ad6a41287 qhacc-3.2.1.ebuild 2190
-MD5 f9848845170083de3cf3420f27f240c1 files/digest-qhacc-2.9 61
+MD5 61a87e1d85536676f392b4b02f0dbce9 qhacc-2.9.9.ebuild 1183
+MD5 27bf4edbb3e2334b0ed8dab2194a9b9d qhacc-2.9.8.ebuild 1099
+MD5 c6b90050c5a04831eb1995b173061b78 ChangeLog 2574
+MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
+MD5 8411a52d54ebbb2038e2e08a9f43b238 files/qhacc-2.9-mysqlplugin-gcc-3.3.patch 982
+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 83196bf0c0685733494d5f401c3d926f files/qhacc-2.9-gentoo.patch 7175
-MD5 8411a52d54ebbb2038e2e08a9f43b238 files/qhacc-2.9-mysqlplugin-gcc-3.3.patch 982
-MD5 0a30f7749fee7085b311aa0fa46ace8b files/qhacc-3.2.1-sandbox.patch 6470
-MD5 2f6b026212a58b32e415bede86478bba files/qhacc-3.2.1-psql_plugin_libs.patch 822
-MD5 5d4fad5c5dece54cf6376b1cbf836667 files/qhacc-3.2.1-mysql_plugin_libs.patch 834
+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/qhacc-3.2.1-sandbox.patch b/app-office/qhacc/files/qhacc-3.2.1-sandbox.patch
index 74d4cd7a11ce..f547bd0da2cb 100644
--- a/app-office/qhacc/files/qhacc-3.2.1-sandbox.patch
+++ b/app-office/qhacc/files/qhacc-3.2.1-sandbox.patch
@@ -143,3 +143,170 @@
  # 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:
+--- plugins/ofx/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/ofx/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -267,7 +267,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) \
+--- plugins/qif/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/qif/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -266,7 +266,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) \
+--- plugins/xml/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/xml/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -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) \
+--- plugins/psql/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/psql/Makefile.in	2004-10-20 19:13:54.000000000 +0200
+@@ -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) \
+@@ -524,9 +524,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)/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:
+--- plugins/reports/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/reports/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -385,7 +385,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) \
++++ plugins/mysql/Makefile.in	2004-10-20 19:13:32.000000000 +0200
+--- plugins/mysql/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
+@@ -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) \
+@@ -524,9 +524,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)/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)/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:
+--- plugins/cliimp/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/cliimp/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -265,7 +265,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) \
+--- plugins/extprg/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/extprg/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -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) \
+--- plugins/graphs/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/graphs/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -331,7 +331,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) \
+--- plugins/generator/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/generator/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -271,7 +271,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) \
+--- plugins/archiver/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/archiver/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -265,7 +265,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) \
+--- plugins/upgrade/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/upgrade/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -272,7 +272,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) \
+--- plugins/sqlite/Makefile.in.orig	2004-10-20 19:11:02.000000000 +0200
++++ plugins/sqlite/Makefile.in	2004-10-20 19:12:54.000000000 +0200
+@@ -284,7 +284,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) \
diff --git a/app-office/qhacc/qhacc-3.2.1.ebuild b/app-office/qhacc/qhacc-3.2.1.ebuild
index 79d16935d692..02492922a4c6 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.5 2004/10/15 09:59:57 dams Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/qhacc-3.2.1.ebuild,v 1.6 2004/10/20 20:12:14 carlo Exp $
 
 inherit libtool kde-functions eutils
 
@@ -25,9 +25,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	elibtoolize
-	for name in sandbox mysql_plugin_libs psql_plugin_libs; do
-		epatch ${FILESDIR}/${P}-$name.patch || die "failed applying the patch ${P}-$name.patch"
-	done
+	epatch ${FILESDIR}/${P}-sandbox.patch
 }
 
 src_compile() {
@@ -47,10 +45,8 @@ src_install() {
 	# can't do this and I'm too lazy to patch all the Makefiles
 	# mv ${D}/usr/plugins ${D}/usr/lib/qhacc
 	dodir /usr/share/doc/${PF}
-	use doc && mv ${D}/${D}/usr/share/doc/* ${D}/usr/share/doc/${PF}
-	rm -rf ${D}/${D}/usr/share/doc
-	dodir /usr/share/qhacc
-	mv ${D}/${D}/usr/share/* ${D}/usr/share/qhacc
+	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/*