From: Carsten Lohrke Date: Sun, 12 Dec 2004 21:16:32 +0000 (+0000) Subject: clean up X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dbadf1a0a64fbe86e6f9d5ccfba445db4e4e613f;p=gentoo.git clean up --- diff --git a/app-office/qhacc/ChangeLog b/app-office/qhacc/ChangeLog index ab88b3ddfe50..523db648f5d5 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.21 2004/12/11 18:28:06 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/qhacc/ChangeLog,v 1.22 2004/12/12 21:16:32 carlo Exp $ + + 12 Dec 2004; Carsten Lohrke + -files/qhacc-2.9-gentoo.patch, -files/qhacc-2.9-mysqlplugin-gcc-3.3.patch, + -qhacc-2.9.8.ebuild, -qhacc-2.9.9.ebuild, -qhacc-2.9.ebuild: + clean up 11 Dec 2004; Bryan Østergaard qhacc-3.2.1.ebuild: Stable on alpha. diff --git a/app-office/qhacc/files/digest-qhacc-2.9 b/app-office/qhacc/files/digest-qhacc-2.9 deleted file mode 100644 index 9b7ca8a267a0..000000000000 --- a/app-office/qhacc/files/digest-qhacc-2.9 +++ /dev/null @@ -1 +0,0 @@ -MD5 5df88c785d1f30cd60592eabeda4467c qhacc-2.9.tar.gz 400922 diff --git a/app-office/qhacc/files/digest-qhacc-2.9.8 b/app-office/qhacc/files/digest-qhacc-2.9.8 deleted file mode 100644 index 94140c9da691..000000000000 --- a/app-office/qhacc/files/digest-qhacc-2.9.8 +++ /dev/null @@ -1 +0,0 @@ -MD5 a7ab274784e4e9132cb40c6b0c13332c qhacc-2.9.8.tar.gz 489572 diff --git a/app-office/qhacc/files/digest-qhacc-2.9.9 b/app-office/qhacc/files/digest-qhacc-2.9.9 deleted file mode 100644 index ecff1f7e777d..000000000000 --- a/app-office/qhacc/files/digest-qhacc-2.9.9 +++ /dev/null @@ -1 +0,0 @@ -MD5 23a228406206ca32a88a17c30f6a7b2e qhacc-2.9.9.tar.gz 520459 diff --git a/app-office/qhacc/files/qhacc-2.9-gentoo.patch b/app-office/qhacc/files/qhacc-2.9-gentoo.patch deleted file mode 100644 index 2f3ef8ba855e..000000000000 --- a/app-office/qhacc/files/qhacc-2.9-gentoo.patch +++ /dev/null @@ -1,145 +0,0 @@ -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 deleted file mode 100644 index 5a5923fdc9f0..000000000000 --- a/app-office/qhacc/files/qhacc-2.9-mysqlplugin-gcc-3.3.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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 - -+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 "<