thing actually compiles now

5 files changed, 221 insertions, 9 deletions

diff --git a/app-office/qhacc/ChangeLog b/app-office/qhacc/ChangeLog
index ec891fdc6d95..a4daae1087a1 100644
--- a/app-office/qhacc/ChangeLog
+++ b/app-office/qhacc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/qhacc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/ChangeLog,v 1.2 2003/08/16 05:31:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/ChangeLog,v 1.3 2003/09/17 04:55:18 seemant Exp $
+
+  16 Sep 2003; Seemant Kulleen <seemant@gentoo.org> qhacc-2.9.ebuild,
+  files/qhacc-2.9-gentoo.patch, files/qhacc-2.9-mysqlplugin-gcc-3.3.patch:
+  Now, qhacc actually compiles! Additionally, install locations are fixed,
+  symlinks are fixed, mysql plugin compiles now. Basically, this is what the
+  ebuild should have been. Thanks to Brandy Westcott <brandy@gentoo.org> for
+  finding and fixing this.
 
 *qhacc-2.9 (12 Aug 2003)
 
diff --git a/app-office/qhacc/Manifest b/app-office/qhacc/Manifest
index 43174cc9840a..fffe0fa596a1 100644
--- a/app-office/qhacc/Manifest
+++ b/app-office/qhacc/Manifest
@@ -1,4 +1,6 @@
-MD5 fae2d7e97a3b8d147c624e62e854d7c1 ChangeLog 342
+MD5 f3eb63dc95012d5de66bd59b127a5f99 qhacc-2.9.ebuild 1244
+MD5 b1c26314a7d47f802752e2815100d5e5 ChangeLog 745
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 b3f22f0688c5f5a1598570592def053c qhacc-2.9.ebuild 775
+MD5 8411a52d54ebbb2038e2e08a9f43b238 files/qhacc-2.9-mysqlplugin-gcc-3.3.patch 982
+MD5 83196bf0c0685733494d5f401c3d926f files/qhacc-2.9-gentoo.patch 7175
 MD5 f9848845170083de3cf3420f27f240c1 files/digest-qhacc-2.9 61
diff --git a/app-office/qhacc/files/qhacc-2.9-gentoo.patch b/app-office/qhacc/files/qhacc-2.9-gentoo.patch
new file mode 100644
index 000000000000..2f3ef8ba855e
--- /dev/null
+++ b/app-office/qhacc/files/qhacc-2.9-gentoo.patch
@@ -0,0 +1,145 @@
+diff -ur qhacc-2.9/plugins/cliimp/Makefile.in qhacc-2.9-gentoo/plugins/cliimp/Makefile.in
+--- qhacc-2.9/plugins/cliimp/Makefile.in	2003-09-16 22:18:16.000000000 +1200
++++ qhacc-2.9-gentoo/plugins/cliimp/Makefile.in	2003-09-17 15:32:32.000000000 +1200
+@@ -145,7 +145,7 @@
+ 
+ @CLIIMP_TRUE@lib_LTLIBRARIES = libcliimpio.la
+ 
+-@CLIIMP_TRUE@impdir = $(prefix)/plugins/import
++@CLIIMP_TRUE@impdir = $(pkgdatadir)/plugins/import
+ 
+ @CLIIMP_TRUE@libcliimpio_la_SOURCES = cliimpplugin.cpp
+ 
+@@ -470,7 +470,7 @@
+ 
+ @CLIIMP_TRUE@install-data-local:
+ @CLIIMP_TRUE@	mkdir -p $(impdir)
+-@CLIIMP_TRUE@	if test ! -e $(impdir)/libcliimpio.so ; then cd $(impdir) && ln -s $(libdir)/libcliimpio.so $(impdir) ; fi
++@CLIIMP_TRUE@	if test ! -e $(impdir)/libcliimpio.so ; then cd $(impdir) && ln -s ../../../../lib/libcliimpio.so $(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 -ur qhacc-2.9/plugins/cron/Makefile.in qhacc-2.9-gentoo/plugins/cron/Makefile.in
+--- qhacc-2.9/plugins/cron/Makefile.in	2003-09-16 22:18:16.000000000 +1200
++++ qhacc-2.9-gentoo/plugins/cron/Makefile.in	2003-09-17 15:35:51.000000000 +1200
+@@ -145,7 +145,7 @@
+ 
+ @CRON_TRUE@lib_LTLIBRARIES = libcronio.la
+ 
+-@CRON_TRUE@impdir = $(prefix)/plugins/import
++@CRON_TRUE@impdir = $(pkgdatadir)/plugins/import
+ 
+ @CRON_TRUE@libcronio_la_SOURCES = cronplugin.cpp
+ 
+@@ -470,7 +470,7 @@
+ 
+ @CRON_TRUE@install-data-local:
+ @CRON_TRUE@	mkdir -p $(impdir)
+-@CRON_TRUE@	if test ! -e $(impdir)/libcronio.so ; then cd $(impdir) && ln -s $(libdir)/libcronio.so $(impdir) ; fi
++@CRON_TRUE@	if test ! -e $(impdir)/libcronio.so ; then cd $(impdir) && ln -s ../../../../lib/libcronio.so $(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 -ur qhacc-2.9/plugins/mysql/Makefile.in qhacc-2.9-gentoo/plugins/mysql/Makefile.in
+--- qhacc-2.9/plugins/mysql/Makefile.in	2003-09-16 22:18:16.000000000 +1200
++++ qhacc-2.9-gentoo/plugins/mysql/Makefile.in	2003-09-17 15:36:20.000000000 +1200
+@@ -145,7 +145,7 @@
+ 
+ @MYSQL_TRUE@lib_LTLIBRARIES = libmysqlio.la
+ 
+-@MYSQL_TRUE@pidir = $(prefix)/plugins
++@MYSQL_TRUE@pidir = $(pkgdatadir)/plugins
+ @MYSQL_TRUE@dbdir = $(pidir)/db
+ @MYSQL_TRUE@importdir = $(pidir)/import
+ @MYSQL_TRUE@exportdir = $(pidir)/export
+@@ -156,7 +156,7 @@
+ 
+ @MYSQL_TRUE@libmysqlio_la_LIBADD = -l$(QHACCQT) -lmysqlclient -lsqlplus -lnativedbio
+ 
+-@MYSQL_TRUE@INCLUDES = $(all_includes) -I$(QTINCDIR) -I$(MYSQLINCDIR) -I../../lib
++@MYSQL_TRUE@INCLUDES = $(all_includes) -I$(QTINCDIR) -I$(MYSQLINCDIR) -I$(prefix)/include/mysql++ -I../../lib
+ @MYSQL_TRUE@AM_LDFLAGS = -L$(QTLIBDIR) -L$(MYSQLLIBDIR) -L../../lib
+ @MYSQL_TRUE@LDADD = 
+ 
+@@ -473,11 +473,11 @@
+ 
+ @MYSQL_TRUE@install-data-local:
+ @MYSQL_TRUE@	mkdir -p $(dbdir)
+-@MYSQL_TRUE@	if test ! -e $(dbdir)/libmysqlio.so ; then cd $(dbdir); ln -s $(libdir)/libmysqlio.so $(dbdir) ; fi
++@MYSQL_TRUE@	if test ! -e $(dbdir)/libmysqlio.so ; then cd $(dbdir); ln -s ../../../../lib/libmysqlio.so $(dbdir) ; fi
+ @MYSQL_TRUE@	mkdir -p $(importdir)
+-@MYSQL_TRUE@	if test ! -e $(importdir)/libmysqlio.so ; then cd $(importdir); ln -s ../../lib/libmysqlio.so $(importdir) ; fi
++@MYSQL_TRUE@	if test ! -e $(importdir)/libmysqlio.so ; then cd $(importdir); ln -s ../../../../lib/libmysqlio.so $(importdir) ; fi
+ @MYSQL_TRUE@	mkdir -p $(exportdir)
+-@MYSQL_TRUE@	if test ! -e $(exportdir)/libmysqlio.so ; then cd $(exportdir); ln -s ../../lib/libmysqlio.so $(exportdir) ; fi
++@MYSQL_TRUE@	if test ! -e $(exportdir)/libmysqlio.so ; then cd $(exportdir); ln -s ../../../../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 -ur qhacc-2.9/plugins/qif/Makefile.in qhacc-2.9-gentoo/plugins/qif/Makefile.in
+--- qhacc-2.9/plugins/qif/Makefile.in	2003-09-16 22:18:16.000000000 +1200
++++ qhacc-2.9-gentoo/plugins/qif/Makefile.in	2003-09-17 15:36:41.000000000 +1200
+@@ -145,7 +145,7 @@
+ 
+ @QIF_TRUE@lib_LTLIBRARIES = libqifio.la
+ 
+-@QIF_TRUE@pidir = $(prefix)/plugins
++@QIF_TRUE@pidir = $(pkgdatadir)/plugins
+ @QIF_TRUE@dbdir = $(pidir)/db
+ @QIF_TRUE@importdir = $(pidir)/import
+ @QIF_TRUE@exportdir = $(pidir)/export
+@@ -473,7 +473,7 @@
+ 
+ @QIF_TRUE@install-data-local:
+ @QIF_TRUE@	mkdir -p $(importdir)
+-@QIF_TRUE@	if test ! -e $(importdir)/libqifio.so ; then cd $(importdir); ln -s $(libdir)/libqifio.so $(importdir) ; fi
++@QIF_TRUE@	if test ! -e $(importdir)/libqifio.so ; then cd $(importdir); ln -s ../../../../lib/libqifio.so $(importdir) ; 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 -ur qhacc-2.9/plugins/xml/Makefile.in qhacc-2.9-gentoo/plugins/xml/Makefile.in
+--- qhacc-2.9/plugins/xml/Makefile.in	2003-09-16 22:18:16.000000000 +1200
++++ qhacc-2.9-gentoo/plugins/xml/Makefile.in	2003-09-17 15:37:02.000000000 +1200
+@@ -145,7 +145,7 @@
+ 
+ @XML_TRUE@lib_LTLIBRARIES = libxmlio.la
+ 
+-@XML_TRUE@pidir = $(prefix)/plugins
++@XML_TRUE@pidir = $(pkgdatadir)/plugins
+ @XML_TRUE@dbdir = $(pidir)/db
+ @XML_TRUE@importdir = $(pidir)/import
+ @XML_TRUE@exportdir = $(pidir)/export
+@@ -473,11 +473,11 @@
+ 
+ @XML_TRUE@install-data-local:
+ @XML_TRUE@	mkdir -p $(dbdir)
+-@XML_TRUE@	if test ! -e $(dbdir)/libxmlio.so ; then cd $(dbdir); ln -s $(libdir)/libxmlio.so $(dbdir) ; fi
++@XML_TRUE@	if test ! -e $(dbdir)/libxmlio.so ; then cd $(dbdir); ln -s ../../../../lib/libxmlio.so $(dbdir) ; fi
+ @XML_TRUE@	mkdir -p $(importdir)
+-@XML_TRUE@	if test ! -e $(importdir)/libxmlio.so ; then cd $(importdir); ln -s $(libdir)/libxmlio.so $(importdir) ; fi
++@XML_TRUE@	if test ! -e $(importdir)/libxmlio.so ; then cd $(importdir); ln -s ../../../../lib/libxmlio.so $(importdir) ; fi
+ @XML_TRUE@	mkdir -p $(exportdir)
+-@XML_TRUE@	if test ! -e $(exportdir)/libxmlio.so ; then cd $(exportdir); ln -s $(libdir)/libxmlio.so $(exportdir) ; fi
++@XML_TRUE@	if test ! -e $(exportdir)/libxmlio.so ; then cd $(exportdir); ln -s ../../../../lib/libxmlio.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 -ur qhacc-2.9/qm/Makefile.in qhacc-2.9-gentoo/qm/Makefile.in
+--- qhacc-2.9/qm/Makefile.in	2003-09-16 22:18:15.000000000 +1200
++++ qhacc-2.9-gentoo/qm/Makefile.in	2003-09-17 15:31:20.000000000 +1200
+@@ -174,12 +174,12 @@
+ dataDATA_INSTALL = $(INSTALL_DATA)
+ install-dataDATA: $(data_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)
++	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+ 	@list='$(data_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(dataDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/$$f"; \
+-	  $(dataDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/$$f; \
++	  echo " $(dataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
++	  $(dataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ 	done
+ 
+ uninstall-dataDATA:
diff --git a/app-office/qhacc/files/qhacc-2.9-mysqlplugin-gcc-3.3.patch b/app-office/qhacc/files/qhacc-2.9-mysqlplugin-gcc-3.3.patch
new file mode 100644
index 000000000000..5a5923fdc9f0
--- /dev/null
+++ b/app-office/qhacc/files/qhacc-2.9-mysqlplugin-gcc-3.3.patch
@@ -0,0 +1,29 @@
+--- qhacc-2.9/plugins/mysql/mysqlplugin.cpp	2003-09-16 22:18:16.000000000 +1200
++++ qhacc-2.9-gentoo/plugins/mysql/mysqlplugin.cpp	2003-09-17 14:06:13.000000000 +1200
+@@ -23,6 +23,8 @@
+ 
+ #include <qregexp.h>
+ 
++using namespace std;
++
+ // "factory" function calls
+ extern "C" {
+ 	QHaccPlugin * create(){	return new MySQLDBPlugin; }
+@@ -165,7 +167,7 @@
+ 
+  	try{
+ 		Query query=conn->query();
+-		query<<"select count(*) from "<<table( t );
++		(ostream&)query<<"select count(*) from "<<table( t );
+ 		Result result=query.store();
+ 
+ 		// The Result class has a read-only Random Access Iterator
+@@ -194,7 +196,7 @@
+ 		QString coln=Utils::tcname( t, col );
+ 		//query<<"select "<<selector<<"("+Utils::tcname( t, col )
+ 		//	 <<") from "<<table( t );
+-		query<<"select "<<selector<<"("<<selField( Utils::tcname( t, col ),
++		(ostream&)query<<"select "<<selector<<"("<<selField( Utils::tcname( t, col ),
+ 																							 Utils::tctype( t, col ) )
+ 				 <<") from "<<table( t );
+ 
diff --git a/app-office/qhacc/qhacc-2.9.ebuild b/app-office/qhacc/qhacc-2.9.ebuild
index aa4e5301d01b..2250a790f918 100644
--- a/app-office/qhacc/qhacc-2.9.ebuild
+++ b/app-office/qhacc/qhacc-2.9.ebuild
@@ -1,25 +1,54 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/qhacc-2.9.ebuild,v 1.3 2003/09/08 07:23:08 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/qhacc-2.9.ebuild,v 1.4 2003/09/17 04:55:18 seemant Exp $
 
-inherit kde-base
+inherit kde-base libtool
 need-qt 3
 
+IUSE="mysql xml"
+
 DESCRIPTION="Personal Finance for QT"
 HOMEPAGE="http://qhacc.sourceforge.net"
 SRC_URI="mirror://sourceforge/sourceforge/qhacc/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm"
+
+DEPEND="mysql? ( dev-db/mysql++ )
+	xml? ( dev-libs/libxml sys-libs/zlib )"
+
+src_unpack() {
 
-KEYWORDS="x86"
+	unpack ${A}	
+	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch ${FILESDIR}/${P}-mysqlplugin-gcc-3.3.patch
+
+}
 
 src_compile() {
-	./configure --with-qhacc-includes=${S}/src || die
+
+	elibtoolize
+
+	local myconf=""
+	use mysql || myconf="${myconf} --disable-mysql"
+	use xml || myconf="${myconf} --disable-xml"
+
+	econf ${myconf} || die "configure failed"
+
+	make || die "make failed"
+
+}
+
+src_install() {
+
+	einstall || die "install failed"
+
+	dodir /etc/qhacc
+	cp -R ${S}/contrib/easysetup/* ${D}/etc/qhacc/
 }
 
 pkg_postinst() {
-	mkdir /etc/qhacc
-	cp -R $S/contrib/easysetup/* /etc/qhacc/
 	einfo "Copy the files in /etc/qhacc to ~/.qhacc,
 	You have to run this program with the command:
 	qhacc -f ~/.qhacc/