Cleanup.

(Portage version: 2.1.1_pre2-r8)
 (Signed Manifest commit)

4 files changed, 11 insertions, 128 deletions

diff --git a/dev-db/mysql-administrator/Manifest b/dev-db/mysql-administrator/Manifest
index 44ad3be49a73..840693027a88 100644
--- a/dev-db/mysql-administrator/Manifest
+++ b/dev-db/mysql-administrator/Manifest
@@ -1,42 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 1.1.10-i18n-fix.patch 484 RMD160 9dac8291d6ca3772561ca8412e98e633905fb347 SHA1 10607fb3a407717ef2da5e568d5f753d15e7e6b1 SHA256 565b844e970a11e2d7ed8a37191303ed1d95765470c5c2bd25088514fe500b0b size 484
+AUX 1.1.10-i18n-fix.patch 484 RMD160 9dac8291d6ca3772561ca8412e98e633905fb347 SHA1 10607fb3a407717ef2da5e568d5f753d15e7e6b1 SHA256 565b844e970a11e2d7ed8a37191303ed1d95765470c5c2bd25088514fe500b0b
 MD5 8c2e184ddfc7fe08d473c76ce2f94eaa files/1.1.10-i18n-fix.patch 484
 RMD160 9dac8291d6ca3772561ca8412e98e633905fb347 files/1.1.10-i18n-fix.patch 484
 SHA256 565b844e970a11e2d7ed8a37191303ed1d95765470c5c2bd25088514fe500b0b files/1.1.10-i18n-fix.patch 484
-AUX 1.1.6-gcc41-fix.patch 2643 RMD160 70ff0c275efb4514fca1f7ad73d354eef1097885 SHA1 c1e1f6e36457a31dd9df0d3a379c5a18d6f9453f SHA256 118ec71b81d7cfdfb7ec9aa679cd33464f5667a974b703e80803296aee4e54a2 size 2643
-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
-DIST mysql-administrator-1.1.10.tar.gz 15322557 RMD160 63fb0d6f9dbddcf60320c838519bf1428e3cd301 SHA256 c1a417d8eab6c88a081cfe9e54bb38ffd758365c2bd99434c66669cd3d097ae0 size 15322557
-DIST mysql-administrator-1.1.6.tar.gz 12831693 RMD160 d1cf3bc8025e1f80c53ab1098a24654a6feef6e5 SHA256 2c4b9ef41bc68cc10b5feea0a1f241739e144f0a66703adeaab54a73bc7424de size 12831693
-EBUILD mysql-administrator-1.1.10.ebuild 1524 RMD160 4f0317b023b4b41952440f56b75db44ace5344b1 SHA1 923fc34de18cd08d5f03639bf29a880afe9e1f85 SHA256 4b98bc4867b528bf01f82c85328ade33c25087c475fc33e4f71bf510a53590f7 size 1524
+DIST mysql-administrator-1.1.10.tar.gz 15322557 RMD160 63fb0d6f9dbddcf60320c838519bf1428e3cd301 SHA1 2a80a8b25c0fa71dd28b91f70f79718ecc46baa5 SHA256 c1a417d8eab6c88a081cfe9e54bb38ffd758365c2bd99434c66669cd3d097ae0
+EBUILD mysql-administrator-1.1.10.ebuild 1524 RMD160 4f0317b023b4b41952440f56b75db44ace5344b1 SHA1 923fc34de18cd08d5f03639bf29a880afe9e1f85 SHA256 4b98bc4867b528bf01f82c85328ade33c25087c475fc33e4f71bf510a53590f7
 MD5 a27e8f66463bd14710ce16bb9196c9e0 mysql-administrator-1.1.10.ebuild 1524
 RMD160 4f0317b023b4b41952440f56b75db44ace5344b1 mysql-administrator-1.1.10.ebuild 1524
 SHA256 4b98bc4867b528bf01f82c85328ade33c25087c475fc33e4f71bf510a53590f7 mysql-administrator-1.1.10.ebuild 1524
-EBUILD mysql-administrator-1.1.6.ebuild 1523 RMD160 83fa30c0f26d1ac7e1647c9d6bf0ed4e83d04edd SHA1 0015128a488ae828321cece43c08d74d10588d55 SHA256 a9f7c4ef64127cb62dc6f9ee4e7a17dcf9f35972f6283fed830a863347e6ce5f size 1523
-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
-MISC ChangeLog 5621 RMD160 2ecbc1cf1edee7fb63731188f7bbb1c22554a182 SHA1 5598b8062a186277343df386846667caa631296d SHA256 fd4ee0c1952a4c226ec0220d0a8247380c5df136d69881a811ef68bdebb92d35 size 5621
-MD5 7ea59d2404f19456f7d5f6120843d054 ChangeLog 5621
-RMD160 2ecbc1cf1edee7fb63731188f7bbb1c22554a182 ChangeLog 5621
-SHA256 fd4ee0c1952a4c226ec0220d0a8247380c5df136d69881a811ef68bdebb92d35 ChangeLog 5621
-MISC metadata.xml 739 RMD160 4277e900ca0a286e8d728f86b389ef8ca60f7919 SHA1 b17b20e02e7e826565ab4adc8e92408bb1d79aca SHA256 e0b9f5ff698d0d9b9de823c05edda4b48f884feb56bbc2a34dd8b6c97e5ed47c size 739
+MISC ChangeLog 5750 RMD160 b80eeb1cbc92ae8dd4d14900e715fd020a51334b SHA1 513bdb912b6d6fb81b8939e26b44018edf325def SHA256 f67125e85c05cff97aa3168c569088e7e8fefdb543e03351f09a79ad3b95a8bf
+MD5 06e785164d31b96343cb90534d85a8f9 ChangeLog 5750
+RMD160 b80eeb1cbc92ae8dd4d14900e715fd020a51334b ChangeLog 5750
+SHA256 f67125e85c05cff97aa3168c569088e7e8fefdb543e03351f09a79ad3b95a8bf ChangeLog 5750
+MISC metadata.xml 739 RMD160 4277e900ca0a286e8d728f86b389ef8ca60f7919 SHA1 b17b20e02e7e826565ab4adc8e92408bb1d79aca SHA256 e0b9f5ff698d0d9b9de823c05edda4b48f884feb56bbc2a34dd8b6c97e5ed47c
 MD5 970601ab1b0fc8165fea73976d248ead metadata.xml 739
 RMD160 4277e900ca0a286e8d728f86b389ef8ca60f7919 metadata.xml 739
 SHA256 e0b9f5ff698d0d9b9de823c05edda4b48f884feb56bbc2a34dd8b6c97e5ed47c metadata.xml 739
 MD5 ac9c2240432e28a04a255dfc5e1512de files/digest-mysql-administrator-1.1.10 286
 RMD160 1a5ac0425469d67d6ca2255490924cafb2a5403b files/digest-mysql-administrator-1.1.10 286
 SHA256 914d7a648674b33d92bb9fca65346b3ea753a2df251b8ecb92f52bf81364f7be files/digest-mysql-administrator-1.1.10 286
-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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEYkbGI1lqEGTUzyQRAij8AKDOBhoYPjym76H+QyVLGIHhZLXM4QCeLH/J
-VklUhgMiXgNy8AIIXHLnfLo=
-=ua2E
+iD8DBQFEuXUfI1lqEGTUzyQRAkx3AJ45JH9YV/8BWjaE6CH6KCJSHlUs3wCgqqM6
+OmEdiKGl7dvtLfBw13CYrUs=
+=uMO5
 -----END PGP SIGNATURE-----
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
deleted file mode 100644
index 599a51cf46e6..000000000000
--- a/dev-db/mysql-administrator/files/1.1.6-gcc41-fix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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.1.6 b/dev-db/mysql-administrator/files/digest-mysql-administrator-1.1.6
deleted file mode 100644
index 0ca2c5bd092e..000000000000
--- a/dev-db/mysql-administrator/files/digest-mysql-administrator-1.1.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 77c1c5a7b6f750b84873799bc9694ea5 mysql-administrator-1.1.6.tar.gz 12831693
-RMD160 d1cf3bc8025e1f80c53ab1098a24654a6feef6e5 mysql-administrator-1.1.6.tar.gz 12831693
-SHA256 2c4b9ef41bc68cc10b5feea0a1f241739e144f0a66703adeaab54a73bc7424de mysql-administrator-1.1.6.tar.gz 12831693
diff --git a/dev-db/mysql-administrator/mysql-administrator-1.1.6.ebuild b/dev-db/mysql-administrator/mysql-administrator-1.1.6.ebuild
deleted file mode 100644
index 4f7722671b4d..000000000000
--- a/dev-db/mysql-administrator/mysql-administrator-1.1.6.ebuild
+++ /dev/null
@@ -1,58 +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.6.ebuild,v 1.4 2006/04/08 23:37:34 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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/1.1.6-gcc41-fix.patch
-
-	echo "Categories=Application;Development;" >>"${S}"/mysql-administrator/MySQLAdministrator.desktop.in
-}
-
-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!"
-}