From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q8z0U-0000M8-BF for garchives@archives.gentoo.org; Sun, 10 Apr 2011 18:05:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92A0D1C032; Sun, 10 Apr 2011 18:04:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4ECEA1C027 for ; Sun, 10 Apr 2011 18:04:49 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D34A41B409B for ; Sun, 10 Apr 2011 18:04:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3BA7980065 for ; Sun, 10 Apr 2011 18:04:48 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <889308d22c0ff1a6bc88d3d555bc3acde6bccf2f.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: app-editors/gedit/ X-VCS-Repository: proj/gnome X-VCS-Files: app-editors/gedit/gedit-3.0.0.ebuild app-editors/gedit/gedit-9999.ebuild X-VCS-Directories: app-editors/gedit/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 889308d22c0ff1a6bc88d3d555bc3acde6bccf2f Date: Sun, 10 Apr 2011 18:04:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: f602653ca7139c575ff16d9ac315d8dd commit: 889308d22c0ff1a6bc88d3d555bc3acde6bccf2f Author: Gilles Dartiguelongue gentoo org> AuthorDate: Fri Apr 8 15:35:15 2011 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Apr 10 18:03:03 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D889308d2 app-editors/gedit: QAed * Fix tests failing on first install * Handle python optimization properly * Enable plugin updater and gvfs-metadata always (Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --forc= e, signed Manifest commit with key C6085806) --- app-editors/gedit/gedit-3.0.0.ebuild | 50 ++++++++++++++++++++++++++--= ----- app-editors/gedit/gedit-9999.ebuild | 50 ++++++++++++++++++++++++++--= ----- 2 files changed, 78 insertions(+), 22 deletions(-) diff --git a/app-editors/gedit/gedit-3.0.0.ebuild b/app-editors/gedit/ged= it-3.0.0.ebuild index 4297e43..58a3a34 100644 --- a/app-editors/gedit/gedit-3.0.0.ebuild +++ b/app-editors/gedit/gedit-3.0.0.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"GPL-2" SLOT=3D"0" -IUSE=3D"doc +gvfs +introspection python spell" +IUSE=3D"doc +introspection python spell" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else @@ -25,19 +25,23 @@ else fi =20 # X libs are not needed for OSX (aqua) -RDEPEND=3D">=3Dx11-libs/libSM-1.0 - >=3Ddev-libs/libxml2-2.5.0 - >=3Ddev-libs/glib-2.28 +RDEPEND=3D" + >=3Dx11-libs/libSM-1.0 + >=3Ddev-libs/libxml2-2.5.0:2 + >=3Ddev-libs/glib-2.28:2 >=3Dx11-libs/gtk+-3.0:3[introspection?] >=3Dx11-libs/gtksourceview-3.0.0:3.0[introspection?] >=3Ddev-libs/libpeas-0.7.3[gtk] =20 gnome-base/gsettings-desktop-schemas + gnome-base/gvfs + x11-libs/libX11 x11-libs/libICE x11-libs/libSM =20 - gvfs? ( gnome-base/gvfs ) + net-libs/libsoup:2.4 + introspection? ( >=3Ddev-libs/gobject-introspection-0.9.3 ) python? ( >=3Ddev-libs/gobject-introspection-0.9.3 @@ -60,9 +64,8 @@ DEPEND=3D"${RDEPEND} doc? ( >=3Ddev-util/gtk-doc-1 )" # gnome-common and gtk-doc-am needed to eautoreconf =20 -DOCS=3D"AUTHORS BUGS ChangeLog MAINTAINERS NEWS README" - pkg_setup() { + DOCS=3D"AUTHORS BUGS ChangeLog MAINTAINERS NEWS README" # TODO: Zeitgeist support, if GNOME 3 adds it to moduleset (3.2?) G2CONF=3D"${G2CONF} --disable-zeitgeist @@ -70,18 +73,43 @@ pkg_setup() { --disable-maintainer-mode --disable-schemas-compile --disable-scrollkeeper - --disable-updater - $(use_enable gvfs gvfs-metadata) + --enable-updater + --enable-gvfs-metadata $(use_enable introspection) $(use_enable spell)" + + if use python || use introspection; then + python_set_active_version 2 + fi +} + +src_prepare() { + gnome2_src_prepare + + # disable pyc compiling + mv "${S}"/py-compile "${S}"/py-compile.orig + ln -s $(type -P true) "${S}"/py-compile +} + +src_test() { + # FIXME: this should be handled at eclass level + "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die + + GSETTINGS_SCHEMA_DIR=3D"${S}/data" emake check || die "make check faile= d" } =20 pkg_postinst() { gnome2_pkg_postinst - python_mod_optimize /usr/$(get_libdir)/gedit/plugins + if use python; then + python_mod_optimize /usr/$(get_libdir)/gedit/plugins + # FIXME: take care of gi.overrides with USE=3Dintrospection + fi + } =20 pkg_postrm() { gnome2_pkg_postrm - python_mod_cleanup /usr/$(get_libdir)/gedit/plugins + if use python; then + python_mod_cleanup /usr/$(get_libdir)/gedit/plugins + fi } diff --git a/app-editors/gedit/gedit-9999.ebuild b/app-editors/gedit/gedi= t-9999.ebuild index 4297e43..58a3a34 100644 --- a/app-editors/gedit/gedit-9999.ebuild +++ b/app-editors/gedit/gedit-9999.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"GPL-2" SLOT=3D"0" -IUSE=3D"doc +gvfs +introspection python spell" +IUSE=3D"doc +introspection python spell" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else @@ -25,19 +25,23 @@ else fi =20 # X libs are not needed for OSX (aqua) -RDEPEND=3D">=3Dx11-libs/libSM-1.0 - >=3Ddev-libs/libxml2-2.5.0 - >=3Ddev-libs/glib-2.28 +RDEPEND=3D" + >=3Dx11-libs/libSM-1.0 + >=3Ddev-libs/libxml2-2.5.0:2 + >=3Ddev-libs/glib-2.28:2 >=3Dx11-libs/gtk+-3.0:3[introspection?] >=3Dx11-libs/gtksourceview-3.0.0:3.0[introspection?] >=3Ddev-libs/libpeas-0.7.3[gtk] =20 gnome-base/gsettings-desktop-schemas + gnome-base/gvfs + x11-libs/libX11 x11-libs/libICE x11-libs/libSM =20 - gvfs? ( gnome-base/gvfs ) + net-libs/libsoup:2.4 + introspection? ( >=3Ddev-libs/gobject-introspection-0.9.3 ) python? ( >=3Ddev-libs/gobject-introspection-0.9.3 @@ -60,9 +64,8 @@ DEPEND=3D"${RDEPEND} doc? ( >=3Ddev-util/gtk-doc-1 )" # gnome-common and gtk-doc-am needed to eautoreconf =20 -DOCS=3D"AUTHORS BUGS ChangeLog MAINTAINERS NEWS README" - pkg_setup() { + DOCS=3D"AUTHORS BUGS ChangeLog MAINTAINERS NEWS README" # TODO: Zeitgeist support, if GNOME 3 adds it to moduleset (3.2?) G2CONF=3D"${G2CONF} --disable-zeitgeist @@ -70,18 +73,43 @@ pkg_setup() { --disable-maintainer-mode --disable-schemas-compile --disable-scrollkeeper - --disable-updater - $(use_enable gvfs gvfs-metadata) + --enable-updater + --enable-gvfs-metadata $(use_enable introspection) $(use_enable spell)" + + if use python || use introspection; then + python_set_active_version 2 + fi +} + +src_prepare() { + gnome2_src_prepare + + # disable pyc compiling + mv "${S}"/py-compile "${S}"/py-compile.orig + ln -s $(type -P true) "${S}"/py-compile +} + +src_test() { + # FIXME: this should be handled at eclass level + "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die + + GSETTINGS_SCHEMA_DIR=3D"${S}/data" emake check || die "make check faile= d" } =20 pkg_postinst() { gnome2_pkg_postinst - python_mod_optimize /usr/$(get_libdir)/gedit/plugins + if use python; then + python_mod_optimize /usr/$(get_libdir)/gedit/plugins + # FIXME: take care of gi.overrides with USE=3Dintrospection + fi + } =20 pkg_postrm() { gnome2_pkg_postrm - python_mod_cleanup /usr/$(get_libdir)/gedit/plugins + if use python; then + python_mod_cleanup /usr/$(get_libdir)/gedit/plugins + fi }