summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-db/mysql-administrator/Manifest53
-rw-r--r--dev-db/mysql-administrator/files/1.0.22a-optional-4.1-support.patch16
-rw-r--r--dev-db/mysql-administrator/files/1.1.2-optional-4.1-support.patch16
-rw-r--r--dev-db/mysql-administrator/files/1.1.6-gcc41-fix.patch44
-rw-r--r--dev-db/mysql-administrator/files/digest-mysql-administrator-1.0.22a3
-rw-r--r--dev-db/mysql-administrator/files/digest-mysql-administrator-1.1.23
-rw-r--r--dev-db/mysql-administrator/files/digest-mysql-administrator-1.1.43
-rw-r--r--dev-db/mysql-administrator/files/digest-mysql-administrator-1.1.53
-rw-r--r--dev-db/mysql-administrator/mysql-administrator-1.1.2.ebuild51
-rw-r--r--dev-db/mysql-administrator/mysql-administrator-1.1.4.ebuild49
-rw-r--r--dev-db/mysql-administrator/mysql-administrator-1.1.5.ebuild49
-rw-r--r--dev-db/mysql-administrator/mysql-administrator-1.1.6.ebuild5
12 files changed, 61 insertions, 234 deletions
diff --git a/dev-db/mysql-administrator/Manifest b/dev-db/mysql-administrator/Manifest
index 15974b23afd9..a94ee6d50019 100644
--- a/dev-db/mysql-administrator/Manifest
+++ b/dev-db/mysql-administrator/Manifest
@@ -1,52 +1,25 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 6e7a8a684609689ea5a2fe8c630e5268 ChangeLog 4985
-RMD160 de526474243dc39383ebc5be875d28319a6c15ae ChangeLog 4985
-SHA256 6cc62626af3b890d1fc41aca4e440e1b9518b1886282f4b5cfdc8814e5abf727 ChangeLog 4985
-MD5 a86763ed63c1e913c62e1d3bf05758d7 files/1.0.22a-optional-4.1-support.patch 913
-RMD160 430df09db603861bf55b30a036dd8da37db3907c files/1.0.22a-optional-4.1-support.patch 913
-SHA256 9c9d25bf03ea2f66b20852cda81d577e85e90a4c4f11dde3eae1b4d5612fe2f7 files/1.0.22a-optional-4.1-support.patch 913
-MD5 60eb595eccb61a19e02a1861cc279ef3 files/1.1.2-optional-4.1-support.patch 901
-RMD160 37add9c469f6d27ecf62d119e7a90dda894dec15 files/1.1.2-optional-4.1-support.patch 901
-SHA256 177f1a1e3ce45c21001dd6602b6a1c7be5eb44dc1456b77ef9a65769fb8304ab files/1.1.2-optional-4.1-support.patch 901
-MD5 daf5daef69ae4d8c5244fcef0cef647c files/digest-mysql-administrator-1.0.22a 286
-RMD160 a8e4e53458c2b02ed1924eab76a61e5edb98c281 files/digest-mysql-administrator-1.0.22a 286
-SHA256 0b2bb6298deb65e6aa0e2d3a1279a7c8bc18817b9d8d5c1dc4b769c83218500d files/digest-mysql-administrator-1.0.22a 286
-MD5 cad8310bea2e323ce6aa717466aef2d7 files/digest-mysql-administrator-1.1.2 283
-RMD160 44cfc27ac883d65899dfea2792d2d706d404125c files/digest-mysql-administrator-1.1.2 283
-SHA256 2883fe57fb6d9a6be27915aef22852778001895358566904466f0de9564d1800 files/digest-mysql-administrator-1.1.2 283
-MD5 ec1bc4638def69ae3463f99ed08530e2 files/digest-mysql-administrator-1.1.4 283
-RMD160 e37efce5333a567f82ee4c1bbe6c4f9b6c3b1103 files/digest-mysql-administrator-1.1.4 283
-SHA256 bcd61c8720b15cfa80733db9a997fe65855fa0694c77b2c49fc4895eb5e38d7d files/digest-mysql-administrator-1.1.4 283
-MD5 7df100879a0c9099bf345c3a8b0df578 files/digest-mysql-administrator-1.1.5 283
-RMD160 8c02170755eff631c8a347d6937ea16e21c873ab files/digest-mysql-administrator-1.1.5 283
-SHA256 d9af80dccc9286d5690fc060540fef31dad771029afcaa1304dc146f59bea5b6 files/digest-mysql-administrator-1.1.5 283
+MD5 081be29bdea79655a5a93c11f70ed412 ChangeLog 5430
+RMD160 4716551a48c20ffc0bc35cfdd55d62a062e42a49 ChangeLog 5430
+SHA256 7057e6a3e13771a838af0096796115e9fe98b526dea65e75099d1a47899fe179 ChangeLog 5430
+MD5 33e1a887ba321fbba5eee68853c5caf2 files/1.1.6-gcc41-fix.patch 2643
+RMD160 70ff0c275efb4514fca1f7ad73d354eef1097885 files/1.1.6-gcc41-fix.patch 2643
+SHA256 118ec71b81d7cfdfb7ec9aa679cd33464f5667a974b703e80803296aee4e54a2 files/1.1.6-gcc41-fix.patch 2643
MD5 03e862b3b0ced7eca997f4a7eacb19f9 files/digest-mysql-administrator-1.1.6 283
RMD160 126a1924a485f33a73903a2057323728b36c21f4 files/digest-mysql-administrator-1.1.6 283
SHA256 8da6c35c7e9051e1522d66f5882a043a7f8c3b84b02699bc66ab2c33e87646c6 files/digest-mysql-administrator-1.1.6 283
MD5 970601ab1b0fc8165fea73976d248ead metadata.xml 739
RMD160 4277e900ca0a286e8d728f86b389ef8ca60f7919 metadata.xml 739
SHA256 e0b9f5ff698d0d9b9de823c05edda4b48f884feb56bbc2a34dd8b6c97e5ed47c metadata.xml 739
-MD5 b8cd23cd419f8814c62c403dab537411 mysql-administrator-1.0.22a.ebuild 1376
-RMD160 0d4ed638d904ee089825944ff6392f478489564b mysql-administrator-1.0.22a.ebuild 1376
-SHA256 4e8048c22d01f0e66649edaef0c2292223719fae36628a4244a5887083d5b5b6 mysql-administrator-1.0.22a.ebuild 1376
-MD5 8954d20c48ce3533b6134de69fb9e121 mysql-administrator-1.1.2.ebuild 1307
-RMD160 42cbe47f6c0358e8fb68433d56469e6eef83b5f9 mysql-administrator-1.1.2.ebuild 1307
-SHA256 c6eebb492dd46c67e5624d989e0e387f1d18df252ccf98530fd930646d54f8c7 mysql-administrator-1.1.2.ebuild 1307
-MD5 40e583b9dfd0be99ec58ea7448d4061f mysql-administrator-1.1.4.ebuild 1332
-RMD160 2e4a12a8cfe32a457cd5b6c32dfb7a5f86c6355f mysql-administrator-1.1.4.ebuild 1332
-SHA256 10479ed9bd627eb09c2feff0dfcc09f8b82331871c877494a7242d3a8c50fe2d mysql-administrator-1.1.4.ebuild 1332
-MD5 0d8da5742f6a2ab873ccd868beaad2a8 mysql-administrator-1.1.5.ebuild 1332
-RMD160 f35e9a7d0b8088ba9ffff5830ee7aab23114005a mysql-administrator-1.1.5.ebuild 1332
-SHA256 61a57d97b10324232a387e73ad6c1e50b4695319bae53266c42c195fd01f51d4 mysql-administrator-1.1.5.ebuild 1332
-MD5 d38b70cd18d1f4f916cd27894013cf5f mysql-administrator-1.1.6.ebuild 1467
-RMD160 f247e3077b6c7df90c255b1baf71433ae4a4ea61 mysql-administrator-1.1.6.ebuild 1467
-SHA256 b213e9746c48654ae695cd1a9a3f45ced3f1db79b7fab3033178daa85b7c1d1c mysql-administrator-1.1.6.ebuild 1467
+MD5 00ff8f047691fc98b066691f7db2b869 mysql-administrator-1.1.6.ebuild 1523
+RMD160 83fa30c0f26d1ac7e1647c9d6bf0ed4e83d04edd mysql-administrator-1.1.6.ebuild 1523
+SHA256 a9f7c4ef64127cb62dc6f9ee4e7a17dcf9f35972f6283fed830a863347e6ce5f mysql-administrator-1.1.6.ebuild 1523
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
-iD8DBQFEGzrUI1lqEGTUzyQRAhAHAJ9GOBHRl3qaOm71RZkpkBHyhDsVHwCcDrkf
-EhCabD+rN+vDvK+rzo5EI/4=
-=X0pm
+iD8DBQFEOElJI1lqEGTUzyQRAhbjAKCe3xJn3tuPbnJp8D/XT3SZasDQVACg3CyJ
+3DMsuXl1HJfbhXtcYl4XxcY=
+=nbg5
-----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-administrator/files/1.0.22a-optional-4.1-support.patch b/dev-db/mysql-administrator/files/1.0.22a-optional-4.1-support.patch
deleted file mode 100644
index 4e0be6f73f70..000000000000
--- a/dev-db/mysql-administrator/files/1.0.22a-optional-4.1-support.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur mysql-administrator-1.0.22a.orig/mysql-gui-common/library/source/myx_library.c mysql-administrator-1.0.22a/mysql-gui-common/library/source/myx_library.c
---- mysql-administrator-1.0.22a.orig/mysql-gui-common/library/source/myx_library.c 2005-06-06 16:12:15.000000000 +0200
-+++ mysql-administrator-1.0.22a/mysql-gui-common/library/source/myx_library.c 2005-06-17 16:02:40.579309365 +0200
-@@ -581,10 +581,12 @@
- //of mysql_real_connect are in utf8
- //mysql_options(mysql, MYSQL_SET_CHARSET_NAME, "utf8");
-
-+#if MYSQL_VERSION_ID >= 40100
- if (myx_mysql_get_private(mysql)->embedded)
- mysql_options(mysql, MYSQL_OPT_USE_EMBEDDED_CONNECTION, (char *)1);
- else
- mysql_options(mysql, MYSQL_OPT_USE_REMOTE_CONNECTION, (char *)1);
-+#endif
-
- if (!mysql_real_connect(mysql, user_conn->hostname, user_conn->username,
- user_conn->password, user_conn->schema,
diff --git a/dev-db/mysql-administrator/files/1.1.2-optional-4.1-support.patch b/dev-db/mysql-administrator/files/1.1.2-optional-4.1-support.patch
deleted file mode 100644
index 148e0fc88ba6..000000000000
--- a/dev-db/mysql-administrator/files/1.1.2-optional-4.1-support.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur mysql-administrator-1.0.22a.orig/mysql-gui-common/library/source/myx_library.c mysql-administrator-1.0.22a/mysql-gui-common/library/source/myx_library.c
---- mysql-administrator-1.0.22a.orig/mysql-gui-common/library/source/myx_library.c 2005-06-06 16:12:15.000000000 +0200
-+++ mysql-administrator-1.0.22a/mysql-gui-common/library/source/myx_library.c 2005-06-17 16:02:40.579309365 +0200
-@@ -581,10 +581,12 @@
- //of mysql_real_connect are in utf8
- //mysql_options(mysql, MYSQL_SET_CHARSET_NAME, "utf8");
-
-+#if MYSQL_VERSION_ID >= 40100
- if (myx_mysql_get_private(mysql)->embedded)
- mysql_options(mysql, MYSQL_OPT_USE_EMBEDDED_CONNECTION, (char *)1);
- else
- mysql_options(mysql, MYSQL_OPT_USE_REMOTE_CONNECTION, (char *)1);
-+#endif
-
- if (!mysql_real_connect(mysql, user_conn->hostname, user_conn->username,
- user_conn->password, user_conn->schema,
diff --git a/dev-db/mysql-administrator/files/1.1.6-gcc41-fix.patch b/dev-db/mysql-administrator/files/1.1.6-gcc41-fix.patch
new file mode 100644
index 000000000000..599a51cf46e6
--- /dev/null
+++ b/dev-db/mysql-administrator/files/1.1.6-gcc41-fix.patch
@@ -0,0 +1,44 @@
+--- mysql-query-browser-1.1.18/mysql-gui-common/source/linux/MCrontab.h.orig 2005-03-13 13:16:59.000000000 +0000
++++ mysql-query-browser-1.1.18/mysql-gui-common/source/linux/MCrontab.h 2006-03-22 15:22:19.000000000 +0000
+@@ -41,7 +41,7 @@
+ public:
+ bool find_entry_by_comment(const std::string &comment, Entry &entry);
+
+- bool MCrontab::remove_entry_with_comment(const std::string &comment,
++ bool remove_entry_with_comment(const std::string &comment,
+ const std::string &command="");
+
+ void add_entry(Entry &entry, const std::string &comment);
+--- mysql-query-browser-1.1.18/mysql-gui-common/source/linux/MGPreferences.h.orig 2005-03-13 13:16:59.000000000 +0000
++++ mysql-query-browser-1.1.18/mysql-gui-common/source/linux/MGPreferences.h 2006-03-22 15:22:09.000000000 +0000
+@@ -40,7 +40,7 @@
+ virtual MYX_APPLICATION_OPTIONS *prepare_options()= 0;
+
+ const char *find_value(MYX_OPTION_GROUP *group, const char *name);
+- std::list<const char *>MGOptions::find_values(MYX_OPTION_GROUP *group, const char *name);
++ std::list<const char *> find_values(MYX_OPTION_GROUP *group, const char *name);
+
+ void add_group(MYX_APPLICATION_OPTIONS *options, const char *name,
+ const std::list<ValuePair> &values);
+--- ./mysql-administrator/source/linux/MDataInterface.h 2005-10-07 16:53:54.000000000 +0200
++++ ./mysql-administrator/source/linux/MDataInterface.h.orig 2006-04-09 00:07:49.000000000 +0200
+@@ -84,7 +84,7 @@
+
+ MYX_SCHEMA_TABLE_STATUS *get_schema_table_status(const Glib::ustring &catalog_name,
+ const Glib::ustring &schema_name);
+- MYX_SCHEMA_ENTITY_STATUS *MDataInterface::get_schema_entity_status(
++ MYX_SCHEMA_ENTITY_STATUS *get_schema_entity_status(
+ const Glib::ustring &catalog_name,
+ const Glib::ustring &schema_name);
+
+--- ./mysql-administrator/source/linux/MACatalogsPanel.cc.orig 2006-04-09 00:14:59.000000000 +0200
++++ ./mysql-administrator/source/linux/MACatalogsPanel.cc 2006-04-09 00:15:18.000000000 +0200
+@@ -67,7 +67,7 @@
+ }
+
+ protected:
+- void CellRendererProgress::render_vfunc(const Glib::RefPtr<Gdk::Window>& window,
++ void render_vfunc(const Glib::RefPtr<Gdk::Window>& window,
+ Gtk::Widget& widget,
+ const Gdk::Rectangle& bg_area,
+ const Gdk::Rectangle& cell_area,
diff --git a/dev-db/mysql-administrator/files/digest-mysql-administrator-1.0.22a b/dev-db/mysql-administrator/files/digest-mysql-administrator-1.0.22a
deleted file mode 100644
index 1f415c2be0a0..000000000000
--- a/dev-db/mysql-administrator/files/digest-mysql-administrator-1.0.22a
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ed0f1af3eb7be03c2785ad9057492b75 mysql-administrator-1.0.22a.tar.gz 7444056
-RMD160 004f58d64bb73befc24b10d8b9262a71435ee868 mysql-administrator-1.0.22a.tar.gz 7444056
-SHA256 0bdd965173d81e55ecf98cde8720e4e27f51ea42259331ea840251aa6572d819 mysql-administrator-1.0.22a.tar.gz 7444056
diff --git a/dev-db/mysql-administrator/files/digest-mysql-administrator-1.1.2 b/dev-db/mysql-administrator/files/digest-mysql-administrator-1.1.2
deleted file mode 100644
index 1474ae70ccfa..000000000000
--- a/dev-db/mysql-administrator/files/digest-mysql-administrator-1.1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3d8bfbadbe160d9cd73ce3cce1eb088a mysql-administrator-1.1.2.tar.gz 11313947
-RMD160 054ef2ab63126173205ea9a6ecfc0e2bcdafe127 mysql-administrator-1.1.2.tar.gz 11313947
-SHA256 5cec7035c5648ca5a96e223e928a2979b93d9d0de4cb6a7028032a34b1f4ad46 mysql-administrator-1.1.2.tar.gz 11313947
diff --git a/dev-db/mysql-administrator/files/digest-mysql-administrator-1.1.4 b/dev-db/mysql-administrator/files/digest-mysql-administrator-1.1.4
deleted file mode 100644
index d540e5f8ad23..000000000000
--- a/dev-db/mysql-administrator/files/digest-mysql-administrator-1.1.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8df63d4788fb7bd3ac1e33c8dfaaa11e mysql-administrator-1.1.4.tar.gz 11717134
-RMD160 fe818ddf293f77f4570b186085dbfe76e2c3a0f8 mysql-administrator-1.1.4.tar.gz 11717134
-SHA256 c9c830317995c92c3d771ef76d50e5b713ca90abfaf7a8d222b974b175649ed5 mysql-administrator-1.1.4.tar.gz 11717134
diff --git a/dev-db/mysql-administrator/files/digest-mysql-administrator-1.1.5 b/dev-db/mysql-administrator/files/digest-mysql-administrator-1.1.5
deleted file mode 100644
index e8162e1384f3..000000000000
--- a/dev-db/mysql-administrator/files/digest-mysql-administrator-1.1.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f50a3505d50e024e8a775c2cd4a2ecf6 mysql-administrator-1.1.5.tar.gz 12888932
-RMD160 5cfeae9583e95828cb13f9f7ec37e471038e75aa mysql-administrator-1.1.5.tar.gz 12888932
-SHA256 ebaca5fca6cf8314b7297f7c23364848fe18b100d6bcf5b250a6ca3efe8cb18f mysql-administrator-1.1.5.tar.gz 12888932
diff --git a/dev-db/mysql-administrator/mysql-administrator-1.1.2.ebuild b/dev-db/mysql-administrator/mysql-administrator-1.1.2.ebuild
deleted file mode 100644
index 3b2e361d0f62..000000000000
--- a/dev-db/mysql-administrator/mysql-administrator-1.1.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/mysql-administrator-1.1.2.ebuild,v 1.2 2006/03/17 22:40:07 swegener Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="MySQL Administrator"
-HOMEPAGE="http://www.mysql.com/products/tools/administrator/"
-SRC_URI="mirror://mysql/Downloads/MySQLAdministrationSuite/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-
-RDEPEND="dev-db/mysql
- >=dev-libs/libpcre-4.4
- >=dev-libs/libxml2-2.6.2
- >=gnome-base/libglade-2
- >=dev-libs/glib-2
- =dev-cpp/gtkmm-2.2*"
-
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.12.0
- >=app-text/scrollkeeper-0.3.11"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/${PV}-optional-4.1-support.patch
-}
-
-src_compile() {
- cd "${S}"/mysql-gui-common
- econf --with-commondirname=common/administrator || die "econf failed"
- emake -j1 || die "emake failed"
-
- cd "${S}"/mysql-administrator
- econf --with-commondirname=common/administrator || die "econf failed"
- emake -j1 || die "emake failed"
-}
-
-src_install() {
- USE_DESTDIR=1
-
- cd "${S}"/mysql-gui-common
- gnome2_src_install || die "gnome2_src_install failed"
-
- cd "${S}"/mysql-administrator
- gnome2_src_install || die "gnome2_src_install failed"
-}
diff --git a/dev-db/mysql-administrator/mysql-administrator-1.1.4.ebuild b/dev-db/mysql-administrator/mysql-administrator-1.1.4.ebuild
deleted file mode 100644
index 60afd1e5df3e..000000000000
--- a/dev-db/mysql-administrator/mysql-administrator-1.1.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/mysql-administrator-1.1.4.ebuild,v 1.2 2006/03/17 22:40:07 swegener Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="MySQL Administrator"
-HOMEPAGE="http://www.mysql.com/products/tools/administrator/"
-SRC_URI="mirror://mysql/Downloads/MySQLAdministrationSuite/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-
-RDEPEND="dev-db/mysql
- >=dev-libs/libpcre-4.4
- >=dev-libs/libxml2-2.6.2
- >=gnome-base/libglade-2
- >=dev-libs/glib-2
- =dev-cpp/gtkmm-2.8*"
-
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.12.0
- >=app-text/scrollkeeper-0.3.11"
-
-src_compile() {
- cd "${S}"/mysql-gui-common
- econf --with-commondirname=common/administrator || die "econf failed"
- emake -j1 || die "emake failed"
-
- cd "${S}"/mysql-administrator
- econf --with-commondirname=common/administrator || die "econf failed"
- emake -j1 || die "emake failed"
-}
-
-src_install() {
- USE_DESTDIR=1
-
- cd "${S}"/mysql-gui-common
- gnome2_src_install || die "gnome2_src_install failed"
-
- cd "${S}"/mysql-administrator
- gnome2_src_install || die "gnome2_src_install failed"
-}
-
-pkg_postinst() {
- einfo "To use the 'Edit Table Data' feature,"
- einfo "you need to emerge dev-db/mysql-query-browser!"
-}
diff --git a/dev-db/mysql-administrator/mysql-administrator-1.1.5.ebuild b/dev-db/mysql-administrator/mysql-administrator-1.1.5.ebuild
deleted file mode 100644
index d777ab9f0a3f..000000000000
--- a/dev-db/mysql-administrator/mysql-administrator-1.1.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/mysql-administrator-1.1.5.ebuild,v 1.2 2006/03/17 22:40:07 swegener Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="MySQL Administrator"
-HOMEPAGE="http://www.mysql.com/products/tools/administrator/"
-SRC_URI="mirror://mysql/Downloads/MySQLAdministrationSuite/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-
-RDEPEND="dev-db/mysql
- >=dev-libs/libpcre-4.4
- >=dev-libs/libxml2-2.6.2
- >=gnome-base/libglade-2
- >=dev-libs/glib-2
- =dev-cpp/gtkmm-2.8*"
-
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.12.0
- >=app-text/scrollkeeper-0.3.11"
-
-src_compile() {
- cd "${S}"/mysql-gui-common
- econf --with-commondirname=common/administrator || die "econf failed"
- emake -j1 || die "emake failed"
-
- cd "${S}"/mysql-administrator
- econf --with-commondirname=common/administrator || die "econf failed"
- emake -j1 || die "emake failed"
-}
-
-src_install() {
- USE_DESTDIR=1
-
- cd "${S}"/mysql-gui-common
- gnome2_src_install || die "gnome2_src_install failed"
-
- cd "${S}"/mysql-administrator
- gnome2_src_install || die "gnome2_src_install failed"
-}
-
-pkg_postinst() {
- einfo "To use the 'Edit Table Data' feature,"
- einfo "you need to emerge dev-db/mysql-query-browser!"
-}
diff --git a/dev-db/mysql-administrator/mysql-administrator-1.1.6.ebuild b/dev-db/mysql-administrator/mysql-administrator-1.1.6.ebuild
index 45e14ddca3aa..4f7722671b4d 100644
--- a/dev-db/mysql-administrator/mysql-administrator-1.1.6.ebuild
+++ b/dev-db/mysql-administrator/mysql-administrator-1.1.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/mysql-administrator-1.1.6.ebuild,v 1.3 2006/03/17 22:40:07 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/mysql-administrator-1.1.6.ebuild,v 1.4 2006/04/08 23:37:34 swegener Exp $
inherit gnome2 eutils
@@ -25,6 +25,9 @@ DEPEND="${RDEPEND}
src_unpack() {
unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}"/1.1.6-gcc41-fix.patch
echo "Categories=Application;Development;" >>"${S}"/mysql-administrator/MySQLAdministrator.desktop.in
}