net-print/omni: use only one gtkmm and libsigc++ slot (see bugs #228463 and #228485)

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r6 x86_64

4 files changed, 17 insertions, 13 deletions

diff --git a/net-print/omni/ChangeLog b/net-print/omni/ChangeLog
index c871b360d6c0..46f51ec439cf 100644
--- a/net-print/omni/ChangeLog
+++ b/net-print/omni/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/omni
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/omni/ChangeLog,v 1.13 2007/04/07 20:33:01 opfer Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/omni/ChangeLog,v 1.14 2008/07/11 07:33:44 remi Exp $
+
+  11 Jul 2008; Rémi Cardona <remi@gentoo.org> omni-0.9.1.ebuild,
+  omni-0.9.2.ebuild:
+  use only one gtkmm and libsigc++ slot (see bugs #228463 and #228485)
 
   07 Apr 2007; Christian Faulhammer <opfer@gentoo.org> omni-0.9.2.ebuild:
   stable x86, bug 160047
diff --git a/net-print/omni/Manifest b/net-print/omni/Manifest
index 60a9dbdb80ab..edc592fe9471 100644
--- a/net-print/omni/Manifest
+++ b/net-print/omni/Manifest
@@ -5,7 +5,7 @@ DIST Omni-0.9.2.tar.gz 4222308 RMD160 2e9dcc4194e1df0fce2cf1659411fff9e6e7b00c S
 DIST OmniArchitecture.0.3.pdf 169117 RMD160 8b75b1f55cbb93d3b7ec6c29046927e136c891ce SHA1 20d982f1f5245433dc3585db2b5b1a9335df7cd2 SHA256 98a6d83586f6ca53354cc2c8f6a7739197993223d5e9d9f67b6292de12906bd0
 DIST OmniEpsonVendor-0.9.2.tar.gz 8493387 RMD160 817a78002e3b96d3f99d644237421c1e3b7fb9ba SHA1 c551c0d6f4142f0072366cfaee310148460e7e36 SHA256 63b1e30b4a4fc12f11d67ca019468e014dce0638f8845a501e2392a298692da7
 DIST omni-0.9.2-foomatic.tar.bz2 91000 RMD160 36a8dd1fdf15bcaa91a1a741d6b057dbe8431ec3 SHA1 a8e21ae0084c9860902ba98fa711c87d0435b4d1 SHA256 0d0b8613cd705db7fdb8aed95306a377537fbf443d53414889f2348131ca8199
-EBUILD omni-0.9.1.ebuild 1556 RMD160 08eaa85e19d97a685748fecd41ef2f0e31401338 SHA1 024570539e25d5804ce49389181f9786b3efb29a SHA256 9c374cf6405b3eea8415eee4a7c8793ffe9e79e6503583cb5a5b4aec9865f43f
-EBUILD omni-0.9.2.ebuild 1831 RMD160 3d7eb358d53f3e092a3fd88ed611225b6b522775 SHA1 de23e4343b781cd41cd2f23375a7c8730b13805c SHA256 19b2d5012bc6ce870c9d9eb4e9503f9498243aab59a2a4a73f34c5b96b8fc318
-MISC ChangeLog 1601 RMD160 b0d3ce5a3ca8135d14ec595b6e404ed43698c8a9 SHA1 1b945cd516f3b9ba2d831f336f999af57eebb0ac SHA256 a6c1b28518bf0b2ee65e806d6d836cfb8e68c576c22d290a66e9150d0c1401e7
+EBUILD omni-0.9.1.ebuild 1548 RMD160 8aff7f6d1e4fd9ebd690e6329570aa14aea9e6d8 SHA1 291be893c6ae08ae391f6fa66de403a52bbc360a SHA256 53499c5ddc0d09feb527a2a8a2d57a7447bff38cd86c9c89c6da171294c0dcd6
+EBUILD omni-0.9.2.ebuild 1823 RMD160 afacb9b75dca7f912abfc2c762fc4a5226180776 SHA1 f3d5d42badce6b74e001930bfd3d0f9e500cd507 SHA256 5947623bba04bd4fc1a12e420479467a1078098a85016d4e16f271f646874c1b
+MISC ChangeLog 1759 RMD160 5adf7b9a27ce6438f4c4f18cc2b784de3aed4905 SHA1 78448698c9f8ff6a126ed2d625d31c7297cf886e SHA256 4a80a80c34d8e9ef9e7afc2b9df52e2001554dbadfd5a749db196cca9cf31f7b
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/net-print/omni/omni-0.9.1.ebuild b/net-print/omni/omni-0.9.1.ebuild
index 95ac87e52a45..d876c33f7f23 100644
--- a/net-print/omni/omni-0.9.1.ebuild
+++ b/net-print/omni/omni-0.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/omni/omni-0.9.1.ebuild,v 1.6 2007/07/13 07:15:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/omni/omni-0.9.1.ebuild,v 1.7 2008/07/11 07:33:44 remi Exp $
 
 inherit eutils
 
@@ -15,8 +15,8 @@ RDEPEND="virtual/ghostscript
 	>=dev-libs/libxml-1.8.6
 	=dev-libs/glib-1*
 	cups? ( >=net-print/cups-1.1.14 )
-	X? ( >=dev-cpp/gtkmm-1.2.5 )
-	>=dev-libs/libsigc++-1.01
+	X? ( =dev-cpp/gtkmm-1.2* )
+	=dev-libs/libsigc++-1.0*
 	foomaticdb? ( net-print/foomatic-db-engine )"
 
 S="${WORKDIR}/Omni"
diff --git a/net-print/omni/omni-0.9.2.ebuild b/net-print/omni/omni-0.9.2.ebuild
index ffe16dc6c8c2..9ea6aa67b6e1 100644
--- a/net-print/omni/omni-0.9.2.ebuild
+++ b/net-print/omni/omni-0.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/omni/omni-0.9.2.ebuild,v 1.7 2007/07/13 07:15:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/omni/omni-0.9.2.ebuild,v 1.8 2008/07/11 07:33:44 remi Exp $
 
 WANT_AUTOMAKE="1.6"
 WANT_AUTOCONF="latest"
@@ -21,8 +21,8 @@ RDEPEND="virtual/ghostscript
 	dev-libs/libxml2
 	=dev-libs/glib-1*
 	cups? ( >=net-print/cups-1.1.14 )
-	X? ( >=dev-cpp/gtkmm-1.2.5 )
-	>=dev-libs/libsigc++-1.01
+	X? ( =dev-cpp/gtkmm-1.2* )
+	=dev-libs/libsigc++-1.0*
 	foomaticdb? ( net-print/foomatic-db-engine )"
 
 S="${WORKDIR}/Omni"