mysql and psql plugin lib location, unified patch application

diff --git a/app-office/qhacc/ChangeLog b/app-office/qhacc/ChangeLog
index 8833360d84b2a867aadf7ec17e547cd08c314158..d26ecde9cce2f6afcba402753a4d19437db045bb 100644 (file)
--- a/app-office/qhacc/ChangeLog
+++ b/app-office/qhacc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.16 2004/10/14 00:21:47 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/ChangeLog,v 1.17 2004/10/15 09:59:57 dams Exp $
+
+  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:
+  . mysql and psql plugin lib location
+  . unified patch application
 
   14 Oct 2004; Carsten Lohrke <carlo@gentoo.org>
   +files/qhacc-3.2.1-sandbox.patch, qhacc-3.2.1.ebuild:

diff --git a/app-office/qhacc/Manifest b/app-office/qhacc/Manifest
index ed47e3c882a66d3e87aa8c43730499283b438f67..925647450a205b8190e5fdb357904c6337035ea9 100644 (file)
--- a/app-office/qhacc/Manifest
+++ b/app-office/qhacc/Manifest
@@ -1,13 +1,15 @@
-MD5 64cb7d41fb72ef1412fccd73e12239a7 qhacc-3.2.1.ebuild 2074
-MD5 83c62fe0b0205752729a02acccfc3ec3 qhacc-2.9.ebuild 1224
-MD5 61a87e1d85536676f392b4b02f0dbce9 qhacc-2.9.9.ebuild 1183
-MD5 27bf4edbb3e2334b0ed8dab2194a9b9d qhacc-2.9.8.ebuild 1099
-MD5 798e33cce5758a96c9d91e96bbc1e20c ChangeLog 2243
+MD5 ce846bd8370e4233d8e3ea5a31c6dfbd ChangeLog 2454
 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 27bf4edbb3e2334b0ed8dab2194a9b9d qhacc-2.9.8.ebuild 1099
+MD5 61a87e1d85536676f392b4b02f0dbce9 qhacc-2.9.9.ebuild 1183
+MD5 83c62fe0b0205752729a02acccfc3ec3 qhacc-2.9.ebuild 1224
+MD5 56352bd314dd11d20ff2fb7ad6a41287 qhacc-3.2.1.ebuild 2190
+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 f9848845170083de3cf3420f27f240c1 files/digest-qhacc-2.9 61
+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

diff --git a/app-office/qhacc/files/qhacc-3.2.1-mysql_plugin_libs.patch b/app-office/qhacc/files/qhacc-3.2.1-mysql_plugin_libs.patch
new file mode 100644 (file)
index 0000000..4b83ae4
--- /dev/null
+++ b/app-office/qhacc/files/qhacc-3.2.1-mysql_plugin_libs.patch
@@ -0,0 +1,15 @@
+--- plugins/mysql/Makefile.am.old      2004-10-15 10:27:20.107295696 +0200
++++ plugins/mysql/Makefile.am  2004-10-15 10:29:03.160629208 +0200
+@@ -34,8 +34,8 @@
+       mkdir -p $(dbdir)\r
+       if test ! -L $(dbdir)/libmysqlio.so ; then cd $(dbdir); ln -s $(libdir)/libmysqlio.so $(dbdir) ; fi\r
+       mkdir -p $(importdir)\r
+-      if test ! -L $(importdir)/libmysqlio.so ; then cd $(importdir); ln -s ../../lib/libmysqlio.so $(importdir) ; fi\r
++      if test ! -L $(importdir)/libmysqlio.so ; then cd $(importdir); ln -s $(libdir)/libmysqlio.so $(importdir) ; fi\r
+       mkdir -p $(exportdir)\r
+-      if test ! -L $(exportdir)/libmysqlio.so ; then cd $(exportdir); ln -s ../../lib/libmysqlio.so $(exportdir) ; fi\r
++      if test ! -L $(exportdir)/libmysqlio.so ; then cd $(exportdir); ln -s $(libdir)/libmysqlio.so $(exportdir) ; fi\r
+ \r
+-endif
+\ No newline at end of file
++endif\r

diff --git a/app-office/qhacc/files/qhacc-3.2.1-psql_plugin_libs.patch b/app-office/qhacc/files/qhacc-3.2.1-psql_plugin_libs.patch
new file mode 100644 (file)
index 0000000..9aea54e
--- /dev/null
+++ b/app-office/qhacc/files/qhacc-3.2.1-psql_plugin_libs.patch
@@ -0,0 +1,15 @@
+--- plugins/psql/Makefile.am.old       2004-10-15 10:29:16.881543312 +0200
++++ plugins/psql/Makefile.am   2004-10-15 10:29:30.599457872 +0200
+@@ -34,8 +34,8 @@
+       mkdir -p $(dbdir)\r
+       if test ! -L $(dbdir)/libpsqlio.so ; then cd $(dbdir); ln -s $(libdir)/libpsqlio.so $(dbdir) ; fi\r
+       mkdir -p $(importdir)\r
+-      if test ! -L $(importdir)/libpsqlio.so ; then cd $(importdir); ln -s ../../lib/libpsqlio.so $(importdir) ; fi\r
++      if test ! -L $(importdir)/libpsqlio.so ; then cd $(importdir); ln -s $(libdir)/libpsqlio.so $(importdir) ; fi\r
+       mkdir -p $(exportdir)\r
+-      if test ! -L $(exportdir)/libpsqlio.so ; then cd $(exportdir); ln -s ../../lib/libpsqlio.so $(exportdir) ; fi\r
++      if test ! -L $(exportdir)/libpsqlio.so ; then cd $(exportdir); ln -s $(libdir)/libpsqlio.so $(exportdir) ; fi\r
+ \r
+-endif
+\ No newline at end of file
++endif\r

diff --git a/app-office/qhacc/qhacc-3.2.1.ebuild b/app-office/qhacc/qhacc-3.2.1.ebuild
index d50469ccc1b4f679caad25e9f3f88823864c8397..79d16935d69281d1477fe22159ca4b05d8ccf826 100644 (file)
--- 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.4 2004/10/14 00:21:47 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/qhacc-3.2.1.ebuild,v 1.5 2004/10/15 09:59:57 dams Exp $
 
 inherit libtool kde-functions eutils
 
@@ -25,7 +25,9 @@ src_unpack() {
        unpack ${A}
        cd ${S}
        elibtoolize
-       epatch ${FILESDIR}/${P}-sandbox.patch
+       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
 }
 
 src_compile() {