Tighten dependency on gtkhtml to avoid empty package - bug 249540 - and bump to get all who were affected by this. Also made the gtkhtml dependency be autogenerated by versionator, to prevent any future cluster-file-system-checks.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.28-rc4 x86_64

4 files changed, 35 insertions, 20 deletions

diff --git a/dev-dotnet/gtkhtml-sharp/ChangeLog b/dev-dotnet/gtkhtml-sharp/ChangeLog
index 7a81cebcac7b..19bebeed4dc2 100644
--- a/dev-dotnet/gtkhtml-sharp/ChangeLog
+++ b/dev-dotnet/gtkhtml-sharp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-dotnet/gtkhtml-sharp
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtkhtml-sharp/ChangeLog,v 1.65 2008/11/28 00:23:53 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtkhtml-sharp/ChangeLog,v 1.66 2008/12/01 23:02:31 loki_val Exp $
+
+*gtkhtml-sharp-2.24.0-r2 (01 Dec 2008)
+
+  01 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -gtkhtml-sharp-2.24.0-r1.ebuild, +gtkhtml-sharp-2.24.0-r2.ebuild:
+  Tighten dependency on gtkhtml to avoid empty package - bug 249540 - and
+  bump to get all who were affected by this. Also made the gtkhtml
+  dependency be autogenerated by versionator, to prevent any future
+  cluster-file-system-checks.
 
 *gtkhtml-sharp-2.24.0-r1 (27 Nov 2008)
 
diff --git a/dev-dotnet/gtkhtml-sharp/Manifest b/dev-dotnet/gtkhtml-sharp/Manifest
index 7967ac308e1a..089b45922b4e 100644
--- a/dev-dotnet/gtkhtml-sharp/Manifest
+++ b/dev-dotnet/gtkhtml-sharp/Manifest
@@ -8,7 +8,7 @@ DIST gtk-sharp-2.8.2-configurable.diff.gz 1397 RMD160 19c010397051b077d6f168a7db
 DIST gtk-sharp-2.8.2.tar.gz 2167942 RMD160 90b450617b1a817047a948ef28d45077cb3f9e59 SHA1 79d6b334c8fa43ed70ec7098186ec0f171a9e575 SHA256 faea3c9da2691d09b9d273c10f6f8949a462695cb02051a531f88ae057463a20
 EBUILD gtkhtml-sharp-1.0.10.ebuild 522 RMD160 8ad17322a5ba798ea4cd83c4149bee9e80105259 SHA1 cb5ca21bca2f8592beaad55a9822a4d4ff6e30b5 SHA256 f341476905df4e7655cd497c2ecf16fe4dea41079df7f75773a4b00309b3d780
 EBUILD gtkhtml-sharp-2.16.0.ebuild 699 RMD160 0ece464b187b0faf7d42bc8203b69f325551d069 SHA1 4e5421f02ac9ab58db21e083faf2b237c8bce30e SHA256 febb77188fdae5f5b3e8f47b82780f4a3889e3cc1bf533a209cac70df7992565
-EBUILD gtkhtml-sharp-2.24.0-r1.ebuild 444 RMD160 7c82faedf066d3b6e64f9e4d4605cfec6eee6a0c SHA1 a5c725039d0a78b97142b5b1a3011f1984399013 SHA256 23921ab69413025e5c3e9492f449db1ea77f589df2e27d02300e9b9f7c6e3a51
+EBUILD gtkhtml-sharp-2.24.0-r2.ebuild 716 RMD160 291f17192915efbd2f402aa38d7ad866690b4a53 SHA1 e16dcaa1ad6d4b2b2eb98a6dd200c7f7c681a8ff SHA256 527e76f6652b98481490981d31d087fe99fd838337b0b4c37624aece10e16c6e
 EBUILD gtkhtml-sharp-2.8.2.ebuild 595 RMD160 9a03fee222d8691bc609441c202eed25764c6435 SHA1 73fd12d1cce0d1fd1ae0fd3dafd34b6eda3579cb SHA256 3f629635669e5050b704d1db7e8b2f46f0aba251a60cdb89d3b58868aa5a09b5
-MISC ChangeLog 9042 RMD160 14df98acbed8592c9e01add6ffed961f19d07f3d SHA1 0bf2de3e5afd2dbc2c87a6473119fe545c1b063c SHA256 a6b2fc7e21cb8166cfabfceb0bee57d17c5cdc3760bb1596c5126669c3c9519f
+MISC ChangeLog 9443 RMD160 d1be05dfcf53c354706735a71c865659dd559050 SHA1 5e93b462ddd76dc88a3cec7702cfbeb921c63d63 SHA256 d566c10b1c71f1b9a78123a4a1a37b666598b3b319ab9a47f33a8e0e605512b8
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
diff --git a/dev-dotnet/gtkhtml-sharp/gtkhtml-sharp-2.24.0-r1.ebuild b/dev-dotnet/gtkhtml-sharp/gtkhtml-sharp-2.24.0-r1.ebuild
deleted file mode 100644
index 6449b87ca58e..000000000000
--- a/dev-dotnet/gtkhtml-sharp/gtkhtml-sharp-2.24.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtkhtml-sharp/gtkhtml-sharp-2.24.0-r1.ebuild,v 1.1 2008/11/28 00:23:53 loki_val Exp $
-
-EAPI=2
-
-GTK_SHARP_REQUIRED_VERSION="2.12"
-
-inherit gtk-sharp-module
-
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-
-RDEPEND="=dev-dotnet/gnome-sharp-${PV}*
-	>=gnome-extra/gtkhtml-3.16"
-DEPEND="${RDEPEND}"
diff --git a/dev-dotnet/gtkhtml-sharp/gtkhtml-sharp-2.24.0-r2.ebuild b/dev-dotnet/gtkhtml-sharp/gtkhtml-sharp-2.24.0-r2.ebuild
new file mode 100644
index 000000000000..f83de6468524
--- /dev/null
+++ b/dev-dotnet/gtkhtml-sharp/gtkhtml-sharp-2.24.0-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtkhtml-sharp/gtkhtml-sharp-2.24.0-r2.ebuild,v 1.1 2008/12/01 23:02:31 loki_val Exp $
+
+EAPI=2
+
+GTK_SHARP_REQUIRED_VERSION="2.12"
+
+inherit gtk-sharp-module versionator
+
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
+
+
+#NOTE: gtkhtml dependency must follow gtkhtml-sharp version.
+#i.e.	gtkhtml-sharp-2.24.0 >=gtkhtml-3.24
+#	gtkhtml-sharp-2.16.0 >=gtkhtml-3.16
+#	See bug 249540 for unpleasant side effects.
+
+RDEPEND="=dev-dotnet/gnome-sharp-${PV}*
+	>=gnome-extra/gtkhtml-$(($(get_version_component_range 1) + 1 )).$(get_version_component_range 2)"
+DEPEND="${RDEPEND}"