Pin gtkmm and gtksourceviewmm dependencies to appropriate slot. Move DOCS to pkg_setup. Clean up old revision.

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

3 files changed, 12 insertions, 49 deletions

diff --git a/dev-cpp/gtksourceviewmm/ChangeLog b/dev-cpp/gtksourceviewmm/ChangeLog
index 72557e1a538d..9cdd4398d511 100644
--- a/dev-cpp/gtksourceviewmm/ChangeLog
+++ b/dev-cpp/gtksourceviewmm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/gtksourceviewmm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtksourceviewmm/ChangeLog,v 1.11 2010/09/11 18:17:55 josejx Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtksourceviewmm/ChangeLog,v 1.12 2011/01/24 16:22:47 eva Exp $
+
+  24 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  -gtksourceviewmm-2.2.0.ebuild, gtksourceviewmm-2.10.1.ebuild:
+  Pin gtkmm and gtksourceviewmm dependencies to appropriate slot. Move DOCS to
+  pkg_setup. Clean up old revision.
 
   11 Sep 2010; Joseph Jezak <josejx@gentoo.org>
   gtksourceviewmm-2.10.1.ebuild:
diff --git a/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.1.ebuild b/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.1.ebuild
index e30d6d9a71cf..af064f5b1956 100644
--- a/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.1.ebuild
+++ b/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.1.ebuild,v 1.5 2010/09/11 18:17:55 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.1.ebuild,v 1.6 2011/01/24 16:22:47 eva Exp $
 
 EAPI="2"
 
@@ -14,17 +14,16 @@ IUSE="doc"
 SLOT="2.0"
 LICENSE="LGPL-2.1"
 
-RDEPEND=">=dev-cpp/gtkmm-2.12
-	>=x11-libs/gtksourceview-2.10.0
+RDEPEND=">=dev-cpp/gtkmm-2.12:2.4
+	>=x11-libs/gtksourceview-2.10.0:2.0
 	!>=dev-cpp/libgtksourceviewmm-1"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( app-doc/doxygen )"
 
-DOCS="AUTHORS ChangeLog* NEWS README"
-
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog* NEWS README"
 	G2CONF="${G2CONF} $(use_enable doc documentation)"
 }
 
diff --git a/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.2.0.ebuild b/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.2.0.ebuild
deleted file mode 100644
index 9a78729b5766..000000000000
--- a/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.2.0.ebuild,v 1.8 2010/08/30 12:13:50 eva Exp $
-
-inherit gnome2
-
-DESCRIPTION="C++ bindings for gtksourceview"
-HOMEPAGE="http://home.gna.org/gtksourceviewmm/"
-
-KEYWORDS="amd64 ppc x86"
-IUSE="doc"
-SLOT="2.0"
-LICENSE="LGPL-2"
-
-RDEPEND=">=dev-cpp/gtkmm-2.4
-	>=x11-libs/gtksourceview-2.1.0
-	!>=dev-cpp/libgtksourceviewmm-1"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS="AUTHORS ChangeLog* NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable doc docs)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Remove docs from SUBDIRS so that docs are not installed, as
-	# we handle it in src_install.
-	sed -i -e 's|^\(SUBDIRS =.*\)docs\(.*\)|\1\2|' Makefile.in || \
-		die "sed Makefile.in failed"
-}
-
-src_install() {
-	gnome2_src_install
-	use doc && dohtml -r docs/reference/html/*
-}