diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2005-02-14 05:38:52 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2005-02-14 05:38:52 +0000 |
commit | e9bc0fc26e80bc9a0e7e193810f37eba31ba4678 (patch) | |
tree | ba3b7a66b7a58e3a2c37c36ca77d555407cbc88c /dev-db | |
parent | Updated to latest version (diff) | |
download | historical-e9bc0fc26e80bc9a0e7e193810f37eba31ba4678.tar.gz historical-e9bc0fc26e80bc9a0e7e193810f37eba31ba4678.tar.bz2 historical-e9bc0fc26e80bc9a0e7e193810f37eba31ba4678.zip |
Remove old builds as they were broken in lots of cases on modern systems.
Package-Manager: portage-2.0.51.16
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/mysql++/ChangeLog | 11 | ||||
-rw-r--r-- | dev-db/mysql++/Manifest | 26 | ||||
-rw-r--r-- | dev-db/mysql++/files/digest-mysql++-1.7.9-r3 | 6 | ||||
-rw-r--r-- | dev-db/mysql++/files/digest-mysql++-1.7.9-r4 | 6 | ||||
-rw-r--r-- | dev-db/mysql++/files/mysql++-1.7.9-gcc_throw.patch | 204 | ||||
-rw-r--r-- | dev-db/mysql++/files/mysql++-1.7.9-missing.patch | 22 | ||||
-rw-r--r-- | dev-db/mysql++/files/mysql++-1.7.9-mysql4-gcc295.patch | 12 | ||||
-rw-r--r-- | dev-db/mysql++/files/mysql++-1.7.9-mysql4-gcc3.patch | 12 | ||||
-rw-r--r-- | dev-db/mysql++/files/mysql++-1.7.9-r5_gcc333.patch | 19 | ||||
-rw-r--r-- | dev-db/mysql++/files/mysql++-1.7.9_example.patch | 36 | ||||
-rw-r--r-- | dev-db/mysql++/files/mysql++-1.7.9_gcc333.patch | 19 | ||||
-rw-r--r-- | dev-db/mysql++/mysql++-1.7.9-r3.ebuild | 102 | ||||
-rw-r--r-- | dev-db/mysql++/mysql++-1.7.9-r4.ebuild | 106 |
13 files changed, 23 insertions, 558 deletions
diff --git a/dev-db/mysql++/ChangeLog b/dev-db/mysql++/ChangeLog index d2b8e6bd8499..55beac099a2d 100644 --- a/dev-db/mysql++/ChangeLog +++ b/dev-db/mysql++/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-db/mysql++ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.30 2005/01/28 22:02:08 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.31 2005/02/14 05:38:52 robbat2 Exp $ + + 13 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> + -files/mysql++-1.7.9-gcc_throw.patch, -files/mysql++-1.7.9-missing.patch, + -files/mysql++-1.7.9-mysql4-gcc295.patch, + -files/mysql++-1.7.9-mysql4-gcc3.patch, + -files/mysql++-1.7.9-r5_gcc333.patch, -files/mysql++-1.7.9_example.patch, + -files/mysql++-1.7.9_gcc333.patch, -mysql++-1.7.9-r3.ebuild, + -mysql++-1.7.9-r4.ebuild: + Remove old builds as they were broken in lots of cases on modern systems. 28 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> mysql++-1.7.26.ebuild: Stable on ppc. diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest index 5f49faed7a5c..25a7c8e6e77a 100644 --- a/dev-db/mysql++/Manifest +++ b/dev-db/mysql++/Manifest @@ -1,15 +1,15 @@ -MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + MD5 72ee175390e12178b10bec2ec9090700 mysql++-1.7.26.ebuild 1726 -MD5 d809a14839d42c2385f0a2e1ce70c10c ChangeLog 4603 -MD5 fa18a351efc482c247d8b0ae972b43bf mysql++-1.7.9-r3.ebuild 3695 -MD5 b18b162d91eb52060678dddf1f1a92af mysql++-1.7.9-r4.ebuild 3845 -MD5 5ac32002d3e432c050e274928b7a1d78 files/mysql++-1.7.9-missing.patch 2922 -MD5 13b4cad28b5dfaa0f580276962effada files/digest-mysql++-1.7.9-r4 397 -MD5 12c5b600d90bb67d1be6d702152e7d9f files/mysql++-1.7.9-r5_gcc333.patch 1047 -MD5 29dd283bdc19e7542a9f50501d4eda70 files/mysql++-1.7.9_example.patch 1203 -MD5 027947f703cc541c6b056955cf5606be files/mysql++-1.7.9-gcc_throw.patch 7310 -MD5 54b8d3ba432ce4cad6c23fa32ac17042 files/mysql++-1.7.9-mysql4-gcc295.patch 421 +MD5 1464e1a89294ec5a4a384a48343b96cd ChangeLog 5063 +MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163 MD5 65084d7d1a78fed8de0e81c773c9eeab files/digest-mysql++-1.7.26 66 -MD5 13b4cad28b5dfaa0f580276962effada files/digest-mysql++-1.7.9-r3 397 -MD5 526598f80750489676ac49881bba7a69 files/mysql++-1.7.9_gcc333.patch 1047 -MD5 229dd0f10e6cee31e2f93df59b5f6742 files/mysql++-1.7.9-mysql4-gcc3.patch 426 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.6 (GNU/Linux) +Comment: Robbat2 @ Orbis-Terrarum Networks + +iD8DBQFCEDnmPpIsIjIzwiwRAjw/AJ0a1v8tT9sT2TJPm+/l8VwECd/vtwCfRL7H +NrwHkds69dUfjZGqAmRZ2CQ= +=gxKt +-----END PGP SIGNATURE----- diff --git a/dev-db/mysql++/files/digest-mysql++-1.7.9-r3 b/dev-db/mysql++/files/digest-mysql++-1.7.9-r3 deleted file mode 100644 index 350f469fb3e5..000000000000 --- a/dev-db/mysql++/files/digest-mysql++-1.7.9-r3 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 1312fb4e33dcce07fac5fa9c2ac801f7 mysql++-1.7.9.tar.gz 749476 -MD5 118d30c7ffd7e5ad49b78415acaac0bb mysql++-gcc-3.0.patch.gz 21357 -MD5 f7358e00675fde37caa7a4aa1baa48d1 mysql++-gcc-3.2.patch.gz 2451 -MD5 51ae8cfd340cdf4a2d08d04ee3e01296 mysql++-gcc-3.2.2.patch.gz 416 -MD5 c80d705e300b76ab07e10344eb8f19d3 patch_gcc_3.3.gz 19755 -MD5 de17e2c7f20b5bad69ea677ce614a1ca mysqlplus-gcc-3.4.patch.gz 3888 diff --git a/dev-db/mysql++/files/digest-mysql++-1.7.9-r4 b/dev-db/mysql++/files/digest-mysql++-1.7.9-r4 deleted file mode 100644 index 350f469fb3e5..000000000000 --- a/dev-db/mysql++/files/digest-mysql++-1.7.9-r4 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 1312fb4e33dcce07fac5fa9c2ac801f7 mysql++-1.7.9.tar.gz 749476 -MD5 118d30c7ffd7e5ad49b78415acaac0bb mysql++-gcc-3.0.patch.gz 21357 -MD5 f7358e00675fde37caa7a4aa1baa48d1 mysql++-gcc-3.2.patch.gz 2451 -MD5 51ae8cfd340cdf4a2d08d04ee3e01296 mysql++-gcc-3.2.2.patch.gz 416 -MD5 c80d705e300b76ab07e10344eb8f19d3 patch_gcc_3.3.gz 19755 -MD5 de17e2c7f20b5bad69ea677ce614a1ca mysqlplus-gcc-3.4.patch.gz 3888 diff --git a/dev-db/mysql++/files/mysql++-1.7.9-gcc_throw.patch b/dev-db/mysql++/files/mysql++-1.7.9-gcc_throw.patch deleted file mode 100644 index 219b368504a4..000000000000 --- a/dev-db/mysql++/files/mysql++-1.7.9-gcc_throw.patch +++ /dev/null @@ -1,204 +0,0 @@ -diff -rc mysql++-1.7.9/sqlplusint/connection1.hh mysql++-1.7.9.patched/sqlplusint/connection1.hh -*** mysql++-1.7.9/sqlplusint/connection1.hh Wed Feb 19 20:57:09 2003 ---- mysql++-1.7.9.patched/sqlplusint/connection1.hh Wed Feb 19 21:01:07 2003 -*************** -*** 11,19 **** - #include <vector.h> - #include <deque.h> - #include <list.h> -! #include <slist.h> -! #include <set.h> -! #include <map.h> - #include <multiset.h> - #include "define_short" - #include "exceptions.hh" ---- 11,19 ---- - #include <vector.h> - #include <deque.h> - #include <list.h> -! #include <ext/slist> -! #include <set> -! #include <map> - #include <multiset.h> - #include "define_short" - #include "exceptions.hh" -diff -rc mysql++-1.7.9/sqlplusint/convert1.hh mysql++-1.7.9.patched/sqlplusint/convert1.hh -*** mysql++-1.7.9/sqlplusint/convert1.hh Sat May 19 18:44:48 2001 ---- mysql++-1.7.9.patched/sqlplusint/convert1.hh Wed Feb 19 21:01:07 2003 -*************** -*** 16,22 **** - operator TYPE () {return num;}\ - };\ - -! extern double strtod (const char *, char **); - - mysql__convert(float, strtod) - mysql__convert(double, strtod) ---- 16,22 ---- - operator TYPE () {return num;}\ - };\ - -! extern double strtod (const char *, char **) throw (); - - mysql__convert(float, strtod) - mysql__convert(double, strtod) -*************** -*** 33,40 **** - operator TYPE () {return num;}\ - };\ - -! extern long strtol(const char *str, char **ptr, int base); -! extern unsigned long strtoul(const char *str, char **ptr, int base); - - mysql__convert(char, strtol) - mysql__convert(signed char, strtol) ---- 33,40 ---- - operator TYPE () {return num;}\ - };\ - -! extern long strtol(const char *str, char **ptr, int base) throw(); -! extern unsigned long strtoul(const char *str, char **ptr, int base) throw(); - - mysql__convert(char, strtol) - mysql__convert(signed char, strtol) -*************** -*** 58,65 **** - extern "C" { - extern char *longlong2str(longlong val,char *dst,int radix); - extern char *longlong10_to_str(longlong val,char *dst,int radix); -! extern longlong strtoll(const char *nptr,char **endptr,int base); -! extern ulonglong strtoull(const char *nptr,char **endptr,int base); - } - mysql__convert(longlong, strtoll) - mysql__convert(ulonglong, strtoull) ---- 58,65 ---- - extern "C" { - extern char *longlong2str(longlong val,char *dst,int radix); - extern char *longlong10_to_str(longlong val,char *dst,int radix); -! extern longlong strtoll(const char *nptr,char **endptr,int base) throw(); -! extern ulonglong strtoull(const char *nptr,char **endptr,int base) throw(); - } - mysql__convert(longlong, strtoll) - mysql__convert(ulonglong, strtoull) -diff -rc mysql++-1.7.9/sqlplusint/exceptions.hh mysql++-1.7.9.patched/sqlplusint/exceptions.hh -*** mysql++-1.7.9/sqlplusint/exceptions.hh Wed Feb 19 20:57:09 2003 ---- mysql++-1.7.9.patched/sqlplusint/exceptions.hh Wed Feb 19 21:04:50 2003 -*************** -*** 13,39 **** - //: Exception thrown when a BadQuery is encountered - class BadQuery : public exception { - public: -! BadQuery(const string &er = "") : error(er) {} -! const string error; //: The error message - virtual const char* what( void ) const { return error.c_str(); } - }; - - //: Exception structure thrown when a bad conversion takes place - class BadConversion : public exception { -! const string _what; - public: - const char* type_name; //: -! const string data; //: - size_t retrieved; //: - size_t actual_size;//: - BadConversion(const char* tn, const char* d, size_t r, size_t a) -! : _what(string("Tried to convert \"") + string(d ? d : "") + "\" to a \"" + string(tn ? tn : "")), - type_name(tn), data(d), retrieved(r), actual_size(a) {}; - -! BadConversion(const string &wt, const char* tn, const char* d, size_t r, size_t a) - : _what(wt), type_name(tn), data(d), retrieved(r), actual_size(a) {}; - -! BadConversion(const string& wt = "") - : _what(wt), type_name("unknown"), data(""), retrieved(0), actual_size(0) {}; - - virtual const char* what( void ) const { return _what.c_str(); } ---- 13,39 ---- - //: Exception thrown when a BadQuery is encountered - class BadQuery : public exception { - public: -! BadQuery(const std::string &er = "") : error(er) {} -! const std::string error; //: The error message - virtual const char* what( void ) const { return error.c_str(); } - }; - - //: Exception structure thrown when a bad conversion takes place - class BadConversion : public exception { -! const std::string _what; - public: - const char* type_name; //: -! const std::string data; //: - size_t retrieved; //: - size_t actual_size;//: - BadConversion(const char* tn, const char* d, size_t r, size_t a) -! : _what(std::string("Tried to convert \"") + std::string(d ? d : "") + "\" to a \"" + std::string(tn ? tn : "")), - type_name(tn), data(d), retrieved(r), actual_size(a) {}; - -! BadConversion(const std::string &wt, const char* tn, const char* d, size_t r, size_t a) - : _what(wt), type_name(tn), data(d), retrieved(r), actual_size(a) {}; - -! BadConversion(const std::string& wt = "") - : _what(wt), type_name("unknown"), data(""), retrieved(0), actual_size(0) {}; - - virtual const char* what( void ) const { return _what.c_str(); } -*************** -*** 42,50 **** - //: Thrown when a *Null* value is trying to be converted into a type - //: it can't convert to. - class BadNullConversion : public exception { -! const string _what; - public: -! BadNullConversion(const string &wt = "") : _what(wt) {} - virtual const char* what( void ) const { return _what.c_str(); } - }; - ---- 42,50 ---- - //: Thrown when a *Null* value is trying to be converted into a type - //: it can't convert to. - class BadNullConversion : public exception { -! const std::string _what; - public: -! BadNullConversion(const std::string &wt = "") : _what(wt) {} - virtual const char* what( void ) const { return _what.c_str(); } - }; - -*************** -*** 52,60 **** - // Thrown when not enough parameters are provided for a - // template query. - class SQLQueryNEParms : public exception { -! const string _what; - public: -! SQLQueryNEParms(const char *c) : _what(string(c ? c : "")), error(c) {} - const char* error; //: - virtual const char* what( void ) const { return _what.c_str(); } - }; ---- 52,60 ---- - // Thrown when not enough parameters are provided for a - // template query. - class SQLQueryNEParms : public exception { -! const std::string _what; - public: -! SQLQueryNEParms(const char *c) : _what(std::string(c ? c : "")), error(c) {} - const char* error; //: - virtual const char* what( void ) const { return _what.c_str(); } - }; -diff -rc mysql++-1.7.9/sqlplusint/result1.hh mysql++-1.7.9.patched/sqlplusint/result1.hh -*** mysql++-1.7.9/sqlplusint/result1.hh Wed Feb 19 20:57:09 2003 ---- mysql++-1.7.9.patched/sqlplusint/result1.hh Wed Feb 19 21:03:09 2003 -*************** -*** 149,155 **** - // yet. - // - class Result : public ResUse, -! public const_subscript_container<Result,Row,const Row> - { - friend class Connection; - public: ---- 149,155 ---- - // yet. - // - class Result : public ResUse, -! virtual public const_subscript_container<Result,Row,const Row> - { - friend class Connection; - public: diff --git a/dev-db/mysql++/files/mysql++-1.7.9-missing.patch b/dev-db/mysql++/files/mysql++-1.7.9-missing.patch deleted file mode 100644 index 473502c7e4ea..000000000000 --- a/dev-db/mysql++/files/mysql++-1.7.9-missing.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- mysql++-1.7.9/sqlplusint/Makefile.am.ori 2003-10-02 22:38:59.000000000 +0200 -+++ mysql++-1.7.9/sqlplusint/Makefile.am 2003-10-02 22:39:22.000000000 +0200 -@@ -22,7 +22,7 @@ - sql_query3.hh sql_string1.hh sql_string2.hh sql_string3.hh stream2string1.hh \ - stream2string2.hh stream2string3.hh tiny_int1.hh tiny_int2.hh tiny_int3.hh \ - type_info1.hh type_info2.hh type_info3.hh vallist1.hh vallist2.hh vallist3.hh \ -- string_util.hh mysql++ exceptions.hh define_short defs -+ string_util.hh mysql++ exceptions.hh define_short defs undef_short - - all-local: custom.hh custom-macros.hh - ---- mysql++-1.7.9/sqlplusint/Makefile.in.ori 2003-10-02 22:39:09.000000000 +0200 -+++ mysql++-1.7.9/sqlplusint/Makefile.in 2003-10-02 22:39:47.000000000 +0200 -@@ -92,7 +92,7 @@ - - libsqlplus_la_LDFLAGS = -version-info $(SQLPLUS_MAJOR_VERSION):$(SQLPLUS_MINOR_VERSION):$(SQLPLUS_MICRO_VERSION) - --include_HEADERS = sqlplus.hh coldata1.hh coldata2.hh coldata3.hh coldata4.hh compare1.hh compare2.hh compare3.hh connection0.hh connection1.hh connection2.hh connection3.hh const_string1.hh const_string2.hh const_string3.hh convert1.hh convert2.hh convert3.hh custom-macros.hh custom.hh datetime1.hh datetime2.hh datetime3.hh field_names1.hh field_names2.hh field_names3.hh field_types1.hh field_types2.hh field_types3.hh fields1.hh fields2.hh manip1.hh manip2.hh manip3.hh null1.hh null2.hh null3.hh query1.hh query2.hh query3.hh resiter1.hh result1.hh result2.hh result3.hh row1.hh row2.hh row3.hh set1.hh set2.hh set3.hh sql_query0.hh sql_query1.hh sql_query2.hh sql_query3.hh sql_string1.hh sql_string2.hh sql_string3.hh stream2string1.hh stream2string2.hh stream2string3.hh tiny_int1.hh tiny_int2.hh tiny_int3.hh type_info1.hh type_info2.hh type_info3.hh vallist1.hh vallist2.hh vallist3.hh string_util.hh mysql++ exceptions.hh define_short defs -+include_HEADERS = sqlplus.hh coldata1.hh coldata2.hh coldata3.hh coldata4.hh compare1.hh compare2.hh compare3.hh connection0.hh connection1.hh connection2.hh connection3.hh const_string1.hh const_string2.hh const_string3.hh convert1.hh convert2.hh convert3.hh custom-macros.hh custom.hh datetime1.hh datetime2.hh datetime3.hh field_names1.hh field_names2.hh field_names3.hh field_types1.hh field_types2.hh field_types3.hh fields1.hh fields2.hh manip1.hh manip2.hh manip3.hh null1.hh null2.hh null3.hh query1.hh query2.hh query3.hh resiter1.hh result1.hh result2.hh result3.hh row1.hh row2.hh row3.hh set1.hh set2.hh set3.hh sql_query0.hh sql_query1.hh sql_query2.hh sql_query3.hh sql_string1.hh sql_string2.hh sql_string3.hh stream2string1.hh stream2string2.hh stream2string3.hh tiny_int1.hh tiny_int2.hh tiny_int3.hh type_info1.hh type_info2.hh type_info3.hh vallist1.hh vallist2.hh vallist3.hh string_util.hh mysql++ exceptions.hh define_short defs undef_short - - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h exceptions.hh diff --git a/dev-db/mysql++/files/mysql++-1.7.9-mysql4-gcc295.patch b/dev-db/mysql++/files/mysql++-1.7.9-mysql4-gcc295.patch deleted file mode 100644 index ffe449b2596b..000000000000 --- a/dev-db/mysql++/files/mysql++-1.7.9-mysql4-gcc295.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur mysql++-1.7.9-old/sqlplusint/connection.cc mysql++-1.7.9/sqlplusint/connection.cc ---- mysql++-1.7.9-old/sqlplusint/connection.cc 2003-05-08 12:20:12.000000000 -0700 -+++ mysql++-1.7.9/sqlplusint/connection.cc 2003-05-08 12:23:50.000000000 -0700 -@@ -109,7 +109,7 @@ - } - - string Connection::info () { -- char *i = mysql_info(&mysql); -+ const char *i = mysql_info(&mysql); - if (!i) - return string(); - else diff --git a/dev-db/mysql++/files/mysql++-1.7.9-mysql4-gcc3.patch b/dev-db/mysql++/files/mysql++-1.7.9-mysql4-gcc3.patch deleted file mode 100644 index b0d02962ed2f..000000000000 --- a/dev-db/mysql++/files/mysql++-1.7.9-mysql4-gcc3.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur mysql++-1.7.9-old/sqlplusint/connection.cc mysql++-1.7.9/sqlplusint/connection.cc ---- mysql++-1.7.9-old/sqlplusint/connection.cc 2003-05-08 12:20:12.000000000 -0700 -+++ mysql++-1.7.9/sqlplusint/connection.cc 2003-05-08 12:23:50.000000000 -0700 -@@ -109,7 +109,7 @@ - } - - std::string Connection::info () { -- char *i = mysql_info(&mysql); -+ const char *i = mysql_info(&mysql); - if (!i) - return string(); - else diff --git a/dev-db/mysql++/files/mysql++-1.7.9-r5_gcc333.patch b/dev-db/mysql++/files/mysql++-1.7.9-r5_gcc333.patch deleted file mode 100644 index 98780e2e4f5e..000000000000 --- a/dev-db/mysql++/files/mysql++-1.7.9-r5_gcc333.patch +++ /dev/null @@ -1,19 +0,0 @@ -*** mysql++-1.7.9/sqlplusint/type_info1.hh Sat May 19 20:44:48 2001 ---- mysql++-1.7.9-patched/sqlplusint/type_info1.hh Sat May 1 16:08:18 2004 -*************** -*** 28,34 **** - const bool _default; - mysql_ti_sql_type_info (const mysql_ti_sql_type_info &b); // can't do - mysql_ti_sql_type_info& operator=(const mysql_ti_sql_type_info &b); // " " -! mysql_ti_sql_type_info () {} - // OEP - didn't init _base_type and _default mysql_ti_sql_type_info () {} - // all private, only mysql_type_info can - // create because there *must* be only one copy ---- 28,34 ---- - const bool _default; - mysql_ti_sql_type_info (const mysql_ti_sql_type_info &b); // can't do - mysql_ti_sql_type_info& operator=(const mysql_ti_sql_type_info &b); // " " -! mysql_ti_sql_type_info () : _base_type(0), _default(false) {} - // OEP - didn't init _base_type and _default mysql_ti_sql_type_info () {} - // all private, only mysql_type_info can - // create because there *must* be only one copy diff --git a/dev-db/mysql++/files/mysql++-1.7.9_example.patch b/dev-db/mysql++/files/mysql++-1.7.9_example.patch deleted file mode 100644 index 5969e7571140..000000000000 --- a/dev-db/mysql++/files/mysql++-1.7.9_example.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -rc mysql++-1.7.9/Makefile.am mysql++-1.7.9-patched/Makefile.am -*** mysql++-1.7.9/Makefile.am Tue Dec 3 18:29:44 2002 ---- mysql++-1.7.9-patched/Makefile.am Tue Dec 3 18:29:54 2002 -*************** -*** 1,4 **** - EXTRA_DIST = .version Configure doc devel - - #SUBDIRS = sqlplusint examples doc -! SUBDIRS = sqlplusint examples ---- 1,4 ---- - EXTRA_DIST = .version Configure doc devel - - #SUBDIRS = sqlplusint examples doc -! SUBDIRS = sqlplusint -diff -rc mysql++-1.7.9/Makefile.in mysql++-1.7.9-patched/Makefile.in -*** mysql++-1.7.9/Makefile.in Tue Dec 3 18:29:44 2002 ---- mysql++-1.7.9-patched/Makefile.in Tue Dec 3 18:30:06 2002 -*************** -*** 79,86 **** - - EXTRA_DIST = .version Configure doc devel - -! #SUBDIRS = sqlplusint examples doc -! SUBDIRS = sqlplusint examples - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = config.h ./sqlplusint/exceptions.hh ---- 79,86 ---- - - EXTRA_DIST = .version Configure doc devel - -! #SUBDIRS = sqlplusint doc -! SUBDIRS = sqlplusint - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = config.h ./sqlplusint/exceptions.hh diff --git a/dev-db/mysql++/files/mysql++-1.7.9_gcc333.patch b/dev-db/mysql++/files/mysql++-1.7.9_gcc333.patch deleted file mode 100644 index 5917847c3193..000000000000 --- a/dev-db/mysql++/files/mysql++-1.7.9_gcc333.patch +++ /dev/null @@ -1,19 +0,0 @@ -*** mysql++-1.7.9/sqlplusint/type_info1.hh Sat May 19 20:44:48 2001 ---- mysql++-1.7.9-patched/sqlplusint/type_info1.hh Sat May 1 16:08:18 2004 -*************** -*** 28,34 **** - const bool _default; - mysql_ti_sql_type_info (const mysql_ti_sql_type_info &b); // can't do - mysql_ti_sql_type_info& operator=(const mysql_ti_sql_type_info &b); // " " -! mysql_ti_sql_type_info () {} - // OEP - didn't init _base_type and _default mysql_ti_sql_type_info () {} - // all private, only mysql_type_info can - // create because there *must* be only one copy ---- 28,34 ---- - const bool _default; - mysql_ti_sql_type_info (const mysql_ti_sql_type_info &b); // can't do - mysql_ti_sql_type_info& operator=(const mysql_ti_sql_type_info &b); // " " -! mysql_ti_sql_type_info : _base_type(0), _default(false) () {} - // OEP - didn't init _base_type and _default mysql_ti_sql_type_info () {} - // all private, only mysql_type_info can - // create because there *must* be only one copy diff --git a/dev-db/mysql++/mysql++-1.7.9-r3.ebuild b/dev-db/mysql++/mysql++-1.7.9-r3.ebuild deleted file mode 100644 index 95cf3d24a626..000000000000 --- a/dev-db/mysql++/mysql++-1.7.9-r3.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-1.7.9-r3.ebuild,v 1.11 2005/01/01 17:37:25 eradicator Exp $ - -inherit gcc eutils gnuconfig - -DESCRIPTION="C++ API interface to the MySQL database" -# This is the download page but includes links to other places -HOMEPAGE="http://www.mysql.org/downloads/api-mysql++.html" -SRC_URI_BASE="mirror://mysql/Downloads/${PN}" -SRC_URI=" - ${SRC_URI_BASE}/${P}.tar.gz - ${SRC_URI_BASE}/${PN}-gcc-3.0.patch.gz - ${SRC_URI_BASE}/${PN}-gcc-3.2.patch.gz - ${SRC_URI_BASE}/${PN}-gcc-3.2.2.patch.gz - ${SRC_URI_BASE}/patch_gcc_3.3.gz - ${SRC_URI_BASE}/mysqlplus-gcc-3.4.patch.gz - " - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="x86 ~alpha ~hppa ~mips sparc ppc ~amd64" -IUSE="" - -DEPEND=">=dev-db/mysql-3.23.49" - -src_unpack() { - unpack ${P}.tar.gz - EPATCH_OPTS="-p1 -d ${S}" - if [ `gcc-major-version` -eq 3 ] ; then - if [ `gcc-minor-version` -ne 3 ] ; then - EPATCH_SINGLE_MSG="Patching for gcc 3.0..." \ - epatch ${DISTDIR}/mysql++-gcc-3.0.patch.gz - if [ `gcc-minor-version` -eq 2 ] ; then - EPATCH_SINGLE_MSG="Patching for gcc 3.2..." \ - epatch ${DISTDIR}/mysql++-gcc-3.2.patch.gz - if [ `gcc-micro-version` -ge 2 ] ; then - EPATCH_SINGLE_MSG="Patching for gcc >=3.2.2..." \ - epatch ${DISTDIR}/mysql++-gcc-3.2.2.patch.gz - fi - elif [ `gcc-minor-version` -eq 4 ] ; then - EPATCH_SINGLE_MSG="Patching for gcc 3.4 (patch for 3.2 needed first)..." \ - epatch ${DISTDIR}/mysql++-gcc-3.2.patch.gz - EPATCH_SINGLE_MSG="Patching for gcc 3.4..." \ - epatch ${DISTDIR}/mysqlplus-gcc-3.4.patch.gz - fi - # Doesn't work for gcc-3.3 - EPATCH_SINGLE_MSG="Patching to fix some warnings and errors..." \ - epatch ${FILESDIR}/mysql++-1.7.9-gcc_throw.patch - # This is included in mysql++-gcc-3.2.2.patch.gz - #EPATCH_SINGLE_MSG="Patch for const char* error" \ - elif [ `gcc-minor-version` -eq 3 ] ; then - mv ${S}/sqlplusint/Makefile.in ${S}/sqlplusint/Makefile.in.old - EPATCH_SINGLE_MSG="Patching for gcc 3.3..." \ - epatch ${DISTDIR}/patch_gcc_3.3.gz - fi - #epatch ${FILESDIR}/mysql++-1.7.9-mysql4-gcc3.patch - else - EPATCH_SINGLE_MSG="Patch for const char* error" \ - epatch ${FILESDIR}/mysql++-1.7.9-mysql4-gcc295.patch - fi - EPATCH_SINGLE_MSG="Fixing examples directory bug..." \ - epatch ${FILESDIR}/mysql++-1.7.9_example.patch - - # add undef_short to list of include files for installation - epatch ${FILESDIR}/mysql++-1.7.9-missing.patch -} - -src_compile() { - gnuconfig_update - local myconf - # we want C++ exceptions turned on - myconf="--enable-exceptions" - # We do this because of the large number of header files installed to the include directory - # This is a breakage compared to previous versions that installed straight to /usr/include - myconf="${myconf} --includedir=/usr/include/mysql++" - # not including the directives to where MySQL is because it seems to find it - # just fine without - # force the cflags into place otherwise they get totally ignored by configure - CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS} ${CXXFLAGS}" \ - econf \ - --enable-exceptions \ - --includedir=/usr/include/mysql++ || die "econf failed" - - emake || die "unable to make" -} - -src_install() { - make DESTDIR=${D} install || die - # install the docs and HTML pages - dodoc README LGPL - dodoc doc/* - dohtml doc/man-html/* - prepalldocs - ewarn "The MySQL++ include directory has changed compared to previous versions" - ewarn "It was previously /usr/include, but now it is /usr/include/mysql++" -} - -pkg_postinst() { - ewarn "The MySQL++ include directory has changed compared to previous versions" - ewarn "It was previously /usr/include, but now it is /usr/include/mysql++" -} diff --git a/dev-db/mysql++/mysql++-1.7.9-r4.ebuild b/dev-db/mysql++/mysql++-1.7.9-r4.ebuild deleted file mode 100644 index 1d571548122e..000000000000 --- a/dev-db/mysql++/mysql++-1.7.9-r4.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-1.7.9-r4.ebuild,v 1.6 2005/01/01 17:37:25 eradicator Exp $ - -inherit gcc eutils gnuconfig - -DESCRIPTION="C++ API interface to the MySQL database" -# This is the download page but includes links to other places -HOMEPAGE="http://www.mysql.org/downloads/api-mysql++.html" -SRC_URI_BASE="mirror://mysql/Downloads/${PN}" -SRC_URI=" - ${SRC_URI_BASE}/${P}.tar.gz - ${SRC_URI_BASE}/${PN}-gcc-3.0.patch.gz - ${SRC_URI_BASE}/${PN}-gcc-3.2.patch.gz - ${SRC_URI_BASE}/${PN}-gcc-3.2.2.patch.gz - ${SRC_URI_BASE}/patch_gcc_3.3.gz - ${SRC_URI_BASE}/mysqlplus-gcc-3.4.patch.gz - " - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~x86 alpha ~hppa ~mips ~sparc ~ppc ~amd64" -IUSE="" - -DEPEND=">=dev-db/mysql-3.23.49" - -src_unpack() { - unpack ${P}.tar.gz - EPATCH_OPTS="-p1 -d ${S}" - if [ `gcc-major-version` -eq 3 ] ; then - if [ `gcc-minor-version` -ne 3 ] ; then - EPATCH_SINGLE_MSG="Patching for gcc 3.0..." \ - epatch ${DISTDIR}/mysql++-gcc-3.0.patch.gz - if [ `gcc-minor-version` -eq 2 ] ; then - EPATCH_SINGLE_MSG="Patching for gcc 3.2..." \ - epatch ${DISTDIR}/mysql++-gcc-3.2.patch.gz - if [ `gcc-micro-version` -ge 2 ] ; then - EPATCH_SINGLE_MSG="Patching for gcc >=3.2.2..." \ - epatch ${DISTDIR}/mysql++-gcc-3.2.2.patch.gz - fi - elif [ `gcc-minor-version` -eq 4 ] ; then - EPATCH_SINGLE_MSG="Patching for gcc 3.4 (patch for 3.2 needed first)..." \ - epatch ${DISTDIR}/mysql++-gcc-3.2.patch.gz - EPATCH_SINGLE_MSG="Patching for gcc 3.4..." \ - epatch ${DISTDIR}/mysqlplus-gcc-3.4.patch.gz - fi - # Doesn't work for gcc-3.3 - EPATCH_SINGLE_MSG="Patching to fix some warnings and errors..." \ - epatch ${FILESDIR}/mysql++-1.7.9-gcc_throw.patch - # This is included in mysql++-gcc-3.2.2.patch.gz - #EPATCH_SINGLE_MSG="Patch for const char* error" \ - elif [ `gcc-minor-version` -eq 3 ]; then - mv ${S}/sqlplusint/Makefile.in ${S}/sqlplusint/Makefile.in.old - EPATCH_SINGLE_MSG="Patching for gcc 3.3..." \ - epatch ${DISTDIR}/patch_gcc_3.3.gz - if [ `gcc-micro-version` -eq 3 ]; then - EPATCH_SINGLE_MSG="Patching for gcc 3.3.3..." \ - epatch ${FILESDIR}/mysql++-1.7.9_gcc333.patch - fi - fi - #epatch ${FILESDIR}/mysql++-1.7.9-mysql4-gcc3.patch - else - EPATCH_SINGLE_MSG="Patch for const char* error" \ - epatch ${FILESDIR}/mysql++-1.7.9-mysql4-gcc295.patch - fi - EPATCH_SINGLE_MSG="Fixing examples directory bug..." \ - epatch ${FILESDIR}/mysql++-1.7.9_example.patch - - # add undef_short to list of include files for installation - epatch ${FILESDIR}/mysql++-1.7.9-missing.patch -} - -src_compile() { - gnuconfig_update - local myconf - # we want C++ exceptions turned on - myconf="--enable-exceptions" - # We do this because of the large number of header files installed to the include directory - # This is a breakage compared to previous versions that installed straight to /usr/include - myconf="${myconf} --includedir=/usr/include/mysql++" - # not including the directives to where MySQL is because it seems to find it - # just fine without - # force the cflags into place otherwise they get totally ignored by configure - CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS} ${CXXFLAGS}" \ - econf \ - --enable-exceptions \ - --includedir=/usr/include/mysql++ || die "econf failed" - - emake || die "unable to make" -} - -src_install() { - make DESTDIR=${D} install || die - # install the docs and HTML pages - dodoc README LGPL - dodoc doc/* - dohtml doc/man-html/* - prepalldocs - ewarn "The MySQL++ include directory has changed compared to previous versions" - ewarn "It was previously /usr/include, but now it is /usr/include/mysql++" -} - -pkg_postinst() { - ewarn "The MySQL++ include directory has changed compared to previous versions" - ewarn "It was previously /usr/include, but now it is /usr/include/mysql++" -} |