"Fix building with gcc-4.1, thanks to Salvatore Ansani in bug #129287. Remove old ebuilds."

(Portage version: 2.1_pre7-r4)

2 files changed, 10 insertions, 54 deletions

diff --git a/dev-db/mysql-administrator/ChangeLog b/dev-db/mysql-administrator/ChangeLog
index 3c24640cba72..5dbaf89c1c01 100644
--- a/dev-db/mysql-administrator/ChangeLog
+++ b/dev-db/mysql-administrator/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/mysql-administrator
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/ChangeLog,v 1.27 2006/02/25 16:27:21 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/ChangeLog,v 1.28 2006/04/08 23:36:28 swegener Exp $
+
+  08 Apr 2006; Sven Wegener <swegener@gentoo.org>
+  -files/1.0.22a-optional-4.1-support.patch,
+  -files/1.1.2-optional-4.1-support.patch, +files/1.1.6-gcc41-fix.patch,
+  -mysql-administrator-1.0.22a.ebuild, -mysql-administrator-1.1.2.ebuild,
+  -mysql-administrator-1.1.4.ebuild, -mysql-administrator-1.1.5.ebuild,
+  mysql-administrator-1.1.6.ebuild:
+  Fix building with gcc-4.1, thanks to Salvatore Ansani in bug #129287. Remove
+  old ebuilds.
 
   25 Feb 2006; Sven Wegener <swegener@gentoo.org>
   mysql-administrator-1.1.6.ebuild:
diff --git a/dev-db/mysql-administrator/mysql-administrator-1.0.22a.ebuild b/dev-db/mysql-administrator/mysql-administrator-1.0.22a.ebuild
deleted file mode 100644
index dd189d76d893..000000000000
--- a/dev-db/mysql-administrator/mysql-administrator-1.0.22a.ebuild
+++ /dev/null
@@ -1,53 +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.0.22a.ebuild,v 1.4 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"
-
-	dohtml -r "${S}"/mysql-administrator/doc/ || die "dohtml failed"
-}