diff options
| author |   Damien Krotkine <dams@gentoo.org> | 2004-10-15 09:59:57 +0000 |
|---|---|---|
| committer | Damien Krotkine <dams@gentoo.org> | 2004-10-15 09:59:57 +0000 |
| commit | d2d3757589436fe945430731dba7f7e3bcb466d1 (patch) | |
| tree | c9ecb42c0aa9b1755c97784783af801305b2135d /app-office/qhacc | |
| parent | Initial ebuild provided by Michael Owen <mowen@costco.com> in bug #65542. (diff) | |
| download | gentoo-2-d2d3757589436fe945430731dba7f7e3bcb466d1.tar.gz gentoo-2-d2d3757589436fe945430731dba7f7e3bcb466d1.tar.bz2 gentoo-2-d2d3757589436fe945430731dba7f7e3bcb466d1.zip | |
mysql and psql plugin lib location, unified patch application
Diffstat (limited to 'app-office/qhacc')
| -rw-r--r-- | app-office/qhacc/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/qhacc/files/qhacc-3.2.1-mysql_plugin_libs.patch | 15 | ||||
| -rw-r--r-- | app-office/qhacc/files/qhacc-3.2.1-psql_plugin_libs.patch | 15 | ||||
| -rw-r--r-- | app-office/qhacc/qhacc-3.2.1.ebuild | 6 |
4 files changed, 40 insertions, 3 deletions
diff --git a/app-office/qhacc/ChangeLog b/app-office/qhacc/ChangeLog index 8833360d84b2..d26ecde9cce2 100644 --- 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/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 index 000000000000..4b83ae4a8e66 --- /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)
+ if test ! -L $(dbdir)/libmysqlio.so ; then cd $(dbdir); ln -s $(libdir)/libmysqlio.so $(dbdir) ; fi
+ mkdir -p $(importdir)
+- if test ! -L $(importdir)/libmysqlio.so ; then cd $(importdir); ln -s ../../lib/libmysqlio.so $(importdir) ; fi
++ if test ! -L $(importdir)/libmysqlio.so ; then cd $(importdir); ln -s $(libdir)/libmysqlio.so $(importdir) ; fi
+ mkdir -p $(exportdir)
+- if test ! -L $(exportdir)/libmysqlio.so ; then cd $(exportdir); ln -s ../../lib/libmysqlio.so $(exportdir) ; fi
++ if test ! -L $(exportdir)/libmysqlio.so ; then cd $(exportdir); ln -s $(libdir)/libmysqlio.so $(exportdir) ; fi
+
+-endif +\ No newline at end of file ++endif
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 index 000000000000..9aea54e1bb18 --- /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)
+ if test ! -L $(dbdir)/libpsqlio.so ; then cd $(dbdir); ln -s $(libdir)/libpsqlio.so $(dbdir) ; fi
+ mkdir -p $(importdir)
+- if test ! -L $(importdir)/libpsqlio.so ; then cd $(importdir); ln -s ../../lib/libpsqlio.so $(importdir) ; fi
++ if test ! -L $(importdir)/libpsqlio.so ; then cd $(importdir); ln -s $(libdir)/libpsqlio.so $(importdir) ; fi
+ mkdir -p $(exportdir)
+- if test ! -L $(exportdir)/libpsqlio.so ; then cd $(exportdir); ln -s ../../lib/libpsqlio.so $(exportdir) ; fi
++ if test ! -L $(exportdir)/libpsqlio.so ; then cd $(exportdir); ln -s $(libdir)/libpsqlio.so $(exportdir) ; fi
+
+-endif +\ No newline at end of file ++endif
diff --git a/app-office/qhacc/qhacc-3.2.1.ebuild b/app-office/qhacc/qhacc-3.2.1.ebuild index d50469ccc1b4..79d16935d692 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.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() { |