dep fixes

4 files changed, 23 insertions, 13 deletions

diff --git a/dev-cpp/libgnomeuimm/ChangeLog b/dev-cpp/libgnomeuimm/ChangeLog
index c946c91466a6..e61ba74da5ca 100644
--- a/dev-cpp/libgnomeuimm/ChangeLog
+++ b/dev-cpp/libgnomeuimm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/libgnomeuimm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgnomeuimm/ChangeLog,v 1.16 2004/06/24 21:50:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgnomeuimm/ChangeLog,v 1.17 2004/07/13 22:51:56 foser Exp $
+
+  14 Jul 2004; foser <foser@gentoo.org> libgnomeuimm-2.0.0.ebuild :
+  2.0 : Fix *mm deps to get the right slots (#56789)
+  2.6 : Make the SLOT more logical
 
   12 Jun 2004; Travis Tilley <lv@gentoo.org> libgnomeuimm-2.0.0.ebuild:
   stable on amd64
diff --git a/dev-cpp/libgnomeuimm/Manifest b/dev-cpp/libgnomeuimm/Manifest
index 441ea4cf601e..cf73f60335d5 100644
--- a/dev-cpp/libgnomeuimm/Manifest
+++ b/dev-cpp/libgnomeuimm/Manifest
@@ -1,7 +1,7 @@
-MD5 4f02e42f34d505b98c1121f55ce1752e libgnomeuimm-2.6.0.ebuild 791
-MD5 a5341e8c897c5f305e03400f4f8996ea ChangeLog 2624
+MD5 c9d1b5f7d9bb8fdbae8c565909f8d2e4 libgnomeuimm-2.6.0.ebuild 789
+MD5 0a51642a35879b6e2c9e2e57e8b417eb ChangeLog 2778
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 2961a0015f6c51b615d96b10145dd730 libgnomeuimm-2.0.0.ebuild 909
+MD5 ee223e9982d8718eb632e75bf6d7faa5 libgnomeuimm-2.0.0.ebuild 930
 MD5 e4bafc3bf0fd1bb08c2fadcb67af456e files/libgnomeuimm-2.0.0-gcc2_fix.patch 1237
 MD5 c83a0a49099d8d0393c0aaff4cfffcfa files/digest-libgnomeuimm-2.0.0 70
 MD5 a31cbb5db3510846c6a7d2ecba43c4c3 files/digest-libgnomeuimm-2.6.0 71
diff --git a/dev-cpp/libgnomeuimm/libgnomeuimm-2.0.0.ebuild b/dev-cpp/libgnomeuimm/libgnomeuimm-2.0.0.ebuild
index fb50815dae83..036eb40be2e8 100644
--- a/dev-cpp/libgnomeuimm/libgnomeuimm-2.0.0.ebuild
+++ b/dev-cpp/libgnomeuimm/libgnomeuimm-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgnomeuimm/libgnomeuimm-2.0.0.ebuild,v 1.12 2004/06/24 21:50:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgnomeuimm/libgnomeuimm-2.0.0.ebuild,v 1.13 2004/07/13 22:51:56 foser Exp $
 
 inherit gnome2 eutils
 
@@ -13,24 +13,29 @@ SLOT="1.0"
 KEYWORDS="x86 ppc sparc hppa amd64"
 IUSE=""
 
-RDEPEND=">=gnome-base/libgnomeui-2.0.0
-	>=dev-cpp/libgnomemm-1.3.10
-	>=dev-cpp/libgnomecanvasmm-2.0
-	>=dev-cpp/gconfmm-2.0.1
-	>=dev-cpp/gtkmm-2.0.0
-	>=dev-cpp/libglademm-2.0.0"
+RDEPEND=">=gnome-base/libgnomeui-2
+	=dev-cpp/libgnomemm-2.0*
+	=dev-cpp/libgnomecanvasmm-2.0*
+	=dev-cpp/gconfmm-2.0*
+	=dev-cpp/gtkmm-2.2*
+	|| ( =dev-cpp/libglademm-2.2* =dev-cpp/libglademm-2.0* )"
+
 DEPEND=">=dev-util/pkgconfig-0.12.0
 	${RDEPEND}"
 
 DOCS="AUTHORS ChangeLog NEWS INSTALL TODO"
 
 src_unpack() {
+
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gcc2_fix.patch
+
 }
 
 src_compile() {
+
 	use amd64 && aclocal -I scripts && automake && autoconf
 	gnome2_src_compile
+
 }
diff --git a/dev-cpp/libgnomeuimm/libgnomeuimm-2.6.0.ebuild b/dev-cpp/libgnomeuimm/libgnomeuimm-2.6.0.ebuild
index 3e15ca1fe96c..1989ab2b1a9f 100644
--- a/dev-cpp/libgnomeuimm/libgnomeuimm-2.6.0.ebuild
+++ b/dev-cpp/libgnomeuimm/libgnomeuimm-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgnomeuimm/libgnomeuimm-2.6.0.ebuild,v 1.5 2004/06/24 21:50:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgnomeuimm/libgnomeuimm-2.6.0.ebuild,v 1.6 2004/07/13 22:51:56 foser Exp $
 
 inherit gnome2 eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="C++ bindings for libgnomeui"
 HOMEPAGE="http://gtkmm.sourceforge.net/"
 
 LICENSE="LGPL-2.1"
-SLOT="1.1"
+SLOT="2.6"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
@@ -18,6 +18,7 @@ RDEPEND=">=gnome-base/libgnomeui-2.6
 	>=dev-cpp/gconfmm-2.6
 	>=dev-cpp/libglademm-2.4
 	>=dev-cpp/gnome-vfsmm-2.6"
+
 DEPEND=">=dev-util/pkgconfig-0.12.0
 	${RDEPEND}"