Marked 0.12.1 stable. Removing old ebuilds.

Package-Manager: portage-2.0.51.21-r1

7 files changed, 8 insertions, 85 deletions

diff --git a/dev-db/mergeant/ChangeLog b/dev-db/mergeant/ChangeLog
index 906dc398fb8e..1b0603e7c5de 100644
--- a/dev-db/mergeant/ChangeLog
+++ b/dev-db/mergeant/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/mergeant
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/ChangeLog,v 1.7 2005/01/01 17:35:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/ChangeLog,v 1.8 2005/05/12 03:07:45 leonardop Exp $
+
+  11 May 2005; Leonardo Boshell <leonardop@gentoo.org> mergeant-0.12.1.ebuild:
+  Stable on x86.
 
 *mergeant-0.12.1 (16 Jun 2003)
 
diff --git a/dev-db/mergeant/Manifest b/dev-db/mergeant/Manifest
index f23028d63df4..9244d7777775 100644
--- a/dev-db/mergeant/Manifest
+++ b/dev-db/mergeant/Manifest
@@ -1,8 +1,4 @@
-MD5 3da700dd8b8e9ee87d01e63192f93dc1 ChangeLog 872
-MD5 fd9eeb12c1656093338b4dbd41045120 mergeant-0.11.0.ebuild 1135
-MD5 b85ffe9d49025d122fa668874e61af3f mergeant-0.12.0.ebuild 1226
-MD5 74bca0baa718e231263842ff61db2fb1 mergeant-0.12.1.ebuild 1227
+MD5 b07be5f870bd0b3f73382b93f90d1be9 ChangeLog 968
+MD5 68010de90524a3c0c89f125bf317ab0b mergeant-0.12.1.ebuild 1225
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 fcec4e186e23d014e3fe85eefa2ac7d4 files/digest-mergeant-0.11.0 69
-MD5 7acea0628375a86548ecc40dd5f34c35 files/digest-mergeant-0.12.0 69
 MD5 40c851ac355e64c4e94e52bbeabf5a2d files/digest-mergeant-0.12.1 69
diff --git a/dev-db/mergeant/files/digest-mergeant-0.11.0 b/dev-db/mergeant/files/digest-mergeant-0.11.0
deleted file mode 100644
index 4331db3d7662..000000000000
--- a/dev-db/mergeant/files/digest-mergeant-0.11.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 137b73af05fffed1be0dd470e66e9620 mergeant-0.11.0.tar.bz2 1141924
diff --git a/dev-db/mergeant/files/digest-mergeant-0.12.0 b/dev-db/mergeant/files/digest-mergeant-0.12.0
deleted file mode 100644
index 7de4ef2f6031..000000000000
--- a/dev-db/mergeant/files/digest-mergeant-0.12.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 93bb562a010c2fbab600bed9626f7e15 mergeant-0.12.0.tar.bz2 1206325
diff --git a/dev-db/mergeant/mergeant-0.11.0.ebuild b/dev-db/mergeant/mergeant-0.11.0.ebuild
deleted file mode 100644
index be57c4580860..000000000000
--- a/dev-db/mergeant/mergeant-0.11.0.ebuild
+++ /dev/null
@@ -1,34 +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/mergeant/mergeant-0.11.0.ebuild,v 1.7 2005/01/01 17:35:52 eradicator Exp $
-
-IUSE=""
-
-inherit gnome2 gnome.org
-
-DESCRIPTION="Database admin tool using libgnomedb and libgda"
-HOMEPAGE="http://www.gnome-db.org/"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86"
-
-RDEPEND=">=gnome-extra/libgnomedb-0.11.0
-	>=gnome-extra/libgda-0.11.0
-	>=gnome-base/libbonobo-2.0
-	>=gnome-base/libbonoboui-2.0
-	>=gnome-base/gconf-2.0
-	>=x11-libs/gtk+-2.0
-	>=dev-libs/libxml2-2.5
-	>=gnome-base/libgnomeui-2.0
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=gnome-base/libglade-2.0"
-
-DEPEND=">=dev-util/pkgconfig-0.8
-	>=dev-util/intltool-0.22
-	${RDEPEND}"
-
-src_install() {
-	# redefined libdir so plugins don't get installed in /usr/lib
-	gnome2_src_install "libdir=${D}/usr/share/mergeant/plugins" "dtddir=${D}/usr/share/mergeant/dtd/" "Mergeant_Lang_helpdir=${D}/usr/share/doc/mergeant/C" "scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/" "Pixmapdir=${D}/usr/share/pixmaps/mergeant"
-}
diff --git a/dev-db/mergeant/mergeant-0.12.0.ebuild b/dev-db/mergeant/mergeant-0.12.0.ebuild
deleted file mode 100644
index 47a753c5ccf3..000000000000
--- a/dev-db/mergeant/mergeant-0.12.0.ebuild
+++ /dev/null
@@ -1,40 +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/mergeant/mergeant-0.12.0.ebuild,v 1.5 2005/01/01 17:35:52 eradicator Exp $
-
-IUSE=""
-
-inherit gnome2 gnome.org
-
-DESCRIPTION="Database admin tool using libgnomedb and libgda"
-HOMEPAGE="http://www.gnome-db.org/"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86"
-
-RDEPEND=">=gnome-extra/libgnomedb-0.12.0
-	>=gnome-extra/libgda-0.12.0
-	>=gnome-base/libbonobo-2.0
-	>=gnome-base/libbonoboui-2.0
-	>=gnome-base/gconf-2.0
-	>=x11-libs/gtk+-2.0
-	>=dev-libs/libxml2-2.5
-	>=gnome-base/libgnomeui-2.0
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=gnome-base/libglade-2.0"
-
-DEPEND=">=dev-util/pkgconfig-0.8
-	>=dev-util/intltool-0.22
-	app-text/scrollkeeper
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	gnome2_omf_fix ${S}/doc/Makefile.in
-}
-
-src_install() {
-	# redefined libdir so plugins don't get installed in /usr/lib
-	gnome2_src_install "libdir=${D}/usr/share/mergeant/plugins" "dtddir=${D}/usr/share/mergeant/dtd/" "Mergeant_Lang_helpdir=${D}/usr/share/doc/mergeant/C" "scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/" "Pixmapdir=${D}/usr/share/pixmaps/mergeant"
-}
diff --git a/dev-db/mergeant/mergeant-0.12.1.ebuild b/dev-db/mergeant/mergeant-0.12.1.ebuild
index 45890313dd89..ae2eef6c3b9e 100644
--- a/dev-db/mergeant/mergeant-0.12.1.ebuild
+++ b/dev-db/mergeant/mergeant-0.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/mergeant-0.12.1.ebuild,v 1.4 2005/01/01 17:35:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/mergeant-0.12.1.ebuild,v 1.5 2005/05/12 03:07:45 leonardop Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ DESCRIPTION="Database admin tool using libgnomedb and libgda"
 HOMEPAGE="http://www.gnome-db.org/"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 RDEPEND=">=gnome-extra/libgnomedb-0.12.0
 	>=gnome-extra/libgda-0.12.0