8 files changed, 20 insertions, 45 deletions
diff --git a/app-editors/conglomerate/ChangeLog b/app-editors/conglomerate/ChangeLog
index 04e60591cc02..8a08b5fe82d1 100644
--- a/app-editors/conglomerate/ChangeLog
+++ b/app-editors/conglomerate/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/conglomerate
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/ChangeLog,v 1.4 2003/11/28 22:42:57 lu_zero Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/ChangeLog,v 1.5 2004/02/04 16:36:52 liquidx Exp $
+
+*conglomerate-0.7.11 (04 Feb 2004)
+
+  04 Feb 2004; Alastair Tse <liquidx@gentoo.org> conglomerate-0.7.11.ebuild,
+  conglomerate-0.7.4.ebuild, conglomerate-0.7.5.ebuild,
+  conglomerate-0.7.6.ebuild:
+  version bump (#40173)
 
   28 Nov 2003; Luca Barbato <lu_zero@gentoo.org> conglomerate-0.7.6.ebuild:
   Marked ~ppc
diff --git a/app-editors/conglomerate/Manifest b/app-editors/conglomerate/Manifest
index b1bc80775ce5..840d52884185 100644
--- a/app-editors/conglomerate/Manifest
+++ b/app-editors/conglomerate/Manifest
@@ -1,8 +1,6 @@
-MD5 31c39062f684ecaabdef34267d0276ca conglomerate-0.7.6.ebuild 753
-MD5 a81d8bae5069c7fc1b0ae66d21536641 ChangeLog 810
+MD5 09daa86767b6990c5cacd47a5c5802ed ChangeLog 1033
+MD5 e33ff881c3b7ef85233d371f82c504b0 conglomerate-0.7.11.ebuild 754
+MD5 69ade4338ad75332faf777b5f7c1c468 conglomerate-0.7.6.ebuild 752
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 1ebe6dcb794045851b7ccc73c2f39edb conglomerate-0.7.4.ebuild 710
-MD5 8f619070f6273a39e96b40984a822bee conglomerate-0.7.5.ebuild 746
-MD5 429b9771966bcc22c5a4fc0af8b1cbde files/digest-conglomerate-0.7.5 71
-MD5 285491e6db7fe80daaca46fceaf7abb2 files/digest-conglomerate-0.7.4 70
+MD5 ca4bf14acc138133a52ec9e6e928df7c files/digest-conglomerate-0.7.11 72
 MD5 8e52ee09f46fb63615d44da7e9759b5f files/digest-conglomerate-0.7.6 71
diff --git a/app-editors/conglomerate/conglomerate-0.7.5.ebuild b/app-editors/conglomerate/conglomerate-0.7.11.ebuild
index 3a64bf8458f0..eea43ac89b13 100644
--- a/app-editors/conglomerate/conglomerate-0.7.5.ebuild
+++ b/app-editors/conglomerate/conglomerate-0.7.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/conglomerate-0.7.5.ebuild,v 1.1 2003/10/08 21:41:39 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/conglomerate-0.7.11.ebuild,v 1.1 2004/02/04 16:36:52 liquidx Exp $
 
 inherit gnome2
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE="doc"
 
 RDEPEND="dev-libs/libxml2
diff --git a/app-editors/conglomerate/conglomerate-0.7.4.ebuild b/app-editors/conglomerate/conglomerate-0.7.4.ebuild
deleted file mode 100644
index 6b34d2f5cfeb..000000000000
--- a/app-editors/conglomerate/conglomerate-0.7.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/conglomerate-0.7.4.ebuild,v 1.2 2003/10/08 21:41:39 foser Exp $
-
-inherit gnome2
-
-DESCRIPTION="XML editor"
-HOMEPAGE="http://www.conglomerate.org/"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2
-	dev-libs/libxslt
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=x11-libs/gtksourceview-0.6"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README* TODO"
-
diff --git a/app-editors/conglomerate/conglomerate-0.7.6.ebuild b/app-editors/conglomerate/conglomerate-0.7.6.ebuild
index 21f68f768a39..b6d6ca0814de 100644
--- a/app-editors/conglomerate/conglomerate-0.7.6.ebuild
+++ b/app-editors/conglomerate/conglomerate-0.7.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/conglomerate-0.7.6.ebuild,v 1.2 2003/11/28 22:42:57 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/conglomerate-0.7.6.ebuild,v 1.3 2004/02/04 16:36:52 liquidx Exp $
 
 inherit gnome2
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE="doc"
 
 RDEPEND="dev-libs/libxml2
diff --git a/app-editors/conglomerate/files/digest-conglomerate-0.7.11 b/app-editors/conglomerate/files/digest-conglomerate-0.7.11
new file mode 100644
index 000000000000..c7d1b1664a91
--- /dev/null
+++ b/app-editors/conglomerate/files/digest-conglomerate-0.7.11
@@ -0,0 +1 @@
+MD5 b31b955273944f7636c8c26dada76636 conglomerate-0.7.11.tar.gz 1932492
diff --git a/app-editors/conglomerate/files/digest-conglomerate-0.7.4 b/app-editors/conglomerate/files/digest-conglomerate-0.7.4
deleted file mode 100644
index ad22542e985b..000000000000
--- a/app-editors/conglomerate/files/digest-conglomerate-0.7.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 90acc05143bcce4f7108fbe6669c82f0 conglomerate-0.7.4.tar.gz 846534
diff --git a/app-editors/conglomerate/files/digest-conglomerate-0.7.5 b/app-editors/conglomerate/files/digest-conglomerate-0.7.5
deleted file mode 100644
index 996628a38468..000000000000
--- a/app-editors/conglomerate/files/digest-conglomerate-0.7.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7b2bb48fc04f978bfb44b97a39eb0687 conglomerate-0.7.5.tar.gz 1101791