Version bump for gnome-3.6. Drop useless doc USE flag. Drop old. Switch to global introspection flag.

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

5 files changed, 40 insertions, 164 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index f29b524a05ce..1d967d709533 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.340 2012/05/25 02:08:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.341 2012/12/16 21:27:28 tetromino Exp $
+
+*gedit-3.6.2-r1 (16 Dec 2012)
+
+  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> -gedit-3.2.6.ebuild,
+  -gedit-3.4.1.ebuild, gedit-3.4.2.ebuild, +gedit-3.6.2-r1.ebuild,
+  metadata.xml:
+  Version bump for gnome-3.6. Drop useless doc USE flag. Drop old. Switch to
+  global introspection flag.
 
 *gedit-3.4.2 (25 May 2012)
 
diff --git a/app-editors/gedit/gedit-3.2.6.ebuild b/app-editors/gedit/gedit-3.2.6.ebuild
deleted file mode 100644
index 602853184a0c..000000000000
--- a/app-editors/gedit/gedit-3.2.6.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.2.6.ebuild,v 1.5 2012/05/03 18:33:00 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_DEPEND="2"
-
-inherit gnome2 multilib python eutils virtualx
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Gedit"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +introspection +python spell zeitgeist"
-KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-
-# X libs are not needed for OSX (aqua)
-COMMON_DEPEND="
-	>=x11-libs/libSM-1.0
-	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/glib-2.28:2
-	>=x11-libs/gtk+-3.1.6:3[introspection?]
-	>=x11-libs/gtksourceview-3.0.0:3.0[introspection?]
-	>=dev-libs/libpeas-1.1.0[gtk]
-
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/gvfs
-
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM
-
-	net-libs/libsoup:2.4
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	python? (
-		>=dev-libs/gobject-introspection-0.9.3
-		>=x11-libs/gtk+-3.0:3[introspection]
-		>=x11-libs/gtksourceview-2.91.9:3.0[introspection]
-		dev-python/pycairo
-		>=dev-python/pygobject-3.0.0:3[cairo] )
-	spell? (
-		>=app-text/enchant-1.2
-		>=app-text/iso-codes-0.35 )
-	zeitgeist? ( dev-libs/libzeitgeist )"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic"
-
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.17
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	>=app-text/scrollkeeper-0.3.11
-	>=app-text/gnome-doc-utils-0.9.0
-	~app-text/docbook-xml-dtd-4.1.2
-	doc? ( >=dev-util/gtk-doc-1 )"
-# gnome-common and gtk-doc-am needed to eautoreconf
-
-pkg_setup() {
-	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-	G2CONF="${G2CONF}
-		--disable-deprecations
-		--disable-schemas-compile
-		--disable-scrollkeeper
-		--enable-updater
-		--enable-gvfs-metadata
-		$(use_enable introspection)
-		$(use_enable python)
-		$(use_enable spell)
-		$(use_enable zeitgeist)"
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# disable pyc compiling
-	echo > py-compile
-
-	# Fix missing file in POTFILES.in
-	echo "plugins/quickopen/quickopen/__init__.py" >> po/POTFILES.in
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_mod_optimize /usr/$(get_libdir)/gedit/plugins
-		# FIXME: take care of gi.overrides with USE=introspection
-	fi
-
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	if use python; then
-		python_mod_cleanup /usr/$(get_libdir)/gedit/plugins
-	fi
-}
diff --git a/app-editors/gedit/gedit-3.4.2.ebuild b/app-editors/gedit/gedit-3.4.2.ebuild
index 5295a9907641..c6721ebca81d 100644
--- a/app-editors/gedit/gedit-3.4.2.ebuild
+++ b/app-editors/gedit/gedit-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.4.2.ebuild,v 1.1 2012/05/25 02:08:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.4.2.ebuild,v 1.2 2012/12/16 21:27:28 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,9 +12,9 @@ inherit gnome2 multilib python eutils virtualx
 DESCRIPTION="A text editor for the GNOME desktop"
 HOMEPAGE="http://live.gnome.org/Gedit"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-IUSE="doc +introspection +python spell zeitgeist"
+IUSE="+introspection +python spell zeitgeist"
 KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 
 # X libs are not needed for OSX (aqua)
@@ -53,13 +53,13 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	>=app-text/scrollkeeper-0.3.11
-	dev-libs/libxml2
+	dev-libs/libxml2:2
+	>=dev-util/gtk-doc-am-1
 	>=dev-util/intltool-0.40
 	dev-util/itstool
 	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-# yelp-tools, gnome-common and gtk-doc-am needed to eautoreconf
+	virtual/pkgconfig"
+# yelp-tools, gnome-common needed to eautoreconf
 
 pkg_setup() {
 	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
diff --git a/app-editors/gedit/gedit-3.4.1.ebuild b/app-editors/gedit/gedit-3.6.2-r1.ebuild
index 82583a1f1c90..84944a0e17fc 100644
--- a/app-editors/gedit/gedit-3.4.1.ebuild
+++ b/app-editors/gedit/gedit-3.6.2-r1.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.4.1.ebuild,v 1.3 2012/05/03 18:33:00 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.6.2-r1.ebuild,v 1.1 2012/12/16 21:27:28 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit gnome2 multilib python eutils virtualx
+inherit gnome2 multilib python-single-r1 eutils virtualx
 
 DESCRIPTION="A text editor for the GNOME desktop"
 HOMEPAGE="http://live.gnome.org/Gedit"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ CCPL-Attribution-ShareAlike-3.0"
 SLOT="0"
-IUSE="doc +introspection +python spell zeitgeist"
+IUSE="+introspection +python spell zeitgeist"
 KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 
 # X libs are not needed for OSX (aqua)
@@ -37,31 +37,34 @@ COMMON_DEPEND="
 
 	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
 	python? (
+		${PYTHON_DEPS}
 		>=dev-libs/gobject-introspection-0.9.3
-		>=x11-libs/gtk+-3.0:3[introspection]
-		>=x11-libs/gtksourceview-2.91.9:3.0[introspection]
+		>=x11-libs/gtk+-3:3[introspection]
+		>=x11-libs/gtksourceview-3.6:3.0[introspection]
 		dev-python/pycairo
-		>=dev-python/pygobject-3.0.0:3[cairo] )
+		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] )
 	spell? (
-		>=app-text/enchant-1.2
+		>=app-text/enchant-1.2:=
 		>=app-text/iso-codes-0.35 )
 	zeitgeist? ( dev-libs/libzeitgeist )"
-
 RDEPEND="${COMMON_DEPEND}
 	x11-themes/gnome-icon-theme-symbolic"
-
 DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.17
-	dev-libs/libxml2
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/scrollkeeper-0.3.11
+	dev-libs/libxml2:2
+	>=dev-util/gtk-doc-am-1
 	>=dev-util/intltool-0.40
-	dev-util/itstool
+	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
-	>=app-text/scrollkeeper-0.3.11
-	~app-text/docbook-xml-dtd-4.1.2
-	doc? ( >=dev-util/gtk-doc-1 )"
-# yelp-tools, gnome-common and gtk-doc-am needed to eautoreconf
+"
+# yelp-tools, gnome-common needed to eautoreconf
 
 pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
 	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
 	G2CONF="${G2CONF}
 		--disable-deprecations
@@ -71,16 +74,10 @@ pkg_setup() {
 		$(use_enable introspection)
 		$(use_enable python)
 		$(use_enable spell)
-		$(use_enable zeitgeist)"
+		$(use_enable zeitgeist)
+		ITSTOOL=$(type -P true)"
 
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
 	gnome2_src_prepare
-
-	use python && python_clean_py-compile_files
 }
 
 src_test() {
@@ -90,18 +87,3 @@ src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
 }
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_mod_optimize /usr/$(get_libdir)/gedit/plugins
-		# FIXME: take care of gi.overrides with USE=introspection
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	if use python; then
-		python_mod_cleanup /usr/$(get_libdir)/gedit/plugins
-	fi
-}
diff --git a/app-editors/gedit/metadata.xml b/app-editors/gedit/metadata.xml
index acd4e48c611b..be668a163204 100644
--- a/app-editors/gedit/metadata.xml
+++ b/app-editors/gedit/metadata.xml
@@ -3,8 +3,6 @@
 <pkgmetadata>
 	<herd>gnome</herd>
 	<use>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			for introspection</flag>
 		<flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
 	</use>
 </pkgmetadata>