[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/
commit: cbb3804d222c1c889a1fbd59a7501024a9ca3637 Author: Mart Raudsepp gentoo org> AuthorDate: Sat Jan 30 19:40:28 2021 + Commit: Mart Raudsepp gentoo org> CommitDate: Sat Jan 30 20:02:27 2021 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=cbb3804d app-editors/gedit: Drop outdated and live ebuild 3.30.2 or newer has been in main tree for a long time, and the live ebuild is very outdated here on top of autotools. Just drop it as it doesn't have any valid python targets anymore. Bug: https://bugs.gentoo.org/767559 Signed-off-by: Mart Raudsepp gentoo.org> app-editors/gedit/gedit-3.30.2.ebuild | 92 - app-editors/gedit/gedit-.ebuild | 106 -- app-editors/gedit/metadata.xml| 8 --- 3 files changed, 206 deletions(-) diff --git a/app-editors/gedit/gedit-3.30.2.ebuild b/app-editors/gedit/gedit-3.30.2.ebuild deleted file mode 100644 index 19886e8d.. --- a/app-editors/gedit/gedit-3.30.2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -GNOME2_LA_PUNT="yes" # plugins are dlopened -PYTHON_COMPAT=( python3_{4,5,6} ) -VALA_MIN_API_VERSION="0.26" -VALA_USE_DEPEND="vapigen" - -inherit eutils gnome2 multilib python-single-r1 vala virtualx - -DESCRIPTION="A text editor for the GNOME desktop" -HOMEPAGE="https://wiki.gnome.org/Apps/Gedit; - -LICENSE="GPL-2+ CC-BY-SA-3.0" -SLOT="0" - -IUSE="+introspection +python spell vala" -REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )" - -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" - -# X libs are not needed for OSX (aqua) -COMMON_DEPEND=" - >=dev-libs/libxml2-2.5.0:2 - >=dev-libs/glib-2.44:2[dbus] - >=x11-libs/gtk+-3.22.0:3[introspection?] - >=x11-libs/gtksourceview-3.22.0:3.0[introspection?] - >=dev-libs/libpeas-1.14.1[gtk] - - gnome-base/gsettings-desktop-schemas - gnome-base/gvfs - - x11-libs/libX11 - - introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) - python? ( - ${PYTHON_DEPS} - dev-python/pycairo[${PYTHON_USEDEP}] - >=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] - dev-libs/libpeas[python,${PYTHON_USEDEP}] ) - spell? ( >=app-text/gspell-0.2.5:0= ) -" -RDEPEND="${COMMON_DEPEND} - x11-themes/adwaita-icon-theme -" -DEPEND="${COMMON_DEPEND} - ${vala_depend} - app-text/docbook-xml-dtd:4.1.2 - app-text/yelp-tools - dev-util/glib-utils - >=dev-util/gtk-doc-am-1 - >=dev-util/intltool-0.50.1 - >=sys-devel/gettext-0.18 - virtual/pkgconfig -" -# yelp-tools, gnome-common needed to eautoreconf - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" - - gnome2_src_configure \ - --disable-deprecations \ - --disable-updater \ - --enable-gvfs-metadata \ - $(use_enable introspection) \ - $(use_enable spell) \ - $(use_enable python) \ - $(use_enable vala) -} - -src_test() { - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die - GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check -} - -src_install() { - local args=() - # manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations - use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" ) - - gnome2_src_install "${args[@]}" -} diff --git a/app-editors/gedit/gedit-.ebuild b/app-editors/gedit/gedit-.ebuild deleted file mode 100644 index 93634710.. --- a/app-editors/gedit/gedit-.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -GNOME2_LA_PUNT="yes" # plugins are dlopened -PYTHON_COMPAT=( python3_{4,5,6} ) -VALA_MIN_API_VERSION="0.26" -VALA_USE_DEPEND="vapigen" - -inherit eutils gnome2 multilib python-single-r1 vala virtualx -if [[ ${PV} = ]]; then - inherit gnome2-live -fi - -DESCRIPTION="A text editor for the GNOME desktop" -HOMEPAGE="https://wiki.gnome.org/Apps/Gedit; - -LICENSE="GPL-2+ CC-BY-SA-3.0" -SLOT="0" - -IUSE="+introspection +python spell vala" -REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )" - -if [[ ${PV} = ]]; then - IUSE="${IUSE} doc" - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -fi - -# X libs are not needed for OSX (aqua) -COMMON_DEPEND=" - >=dev-libs/libxml2-2.5.0:2 -
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/
commit: 93ecd951ebebcd6920adf9eb41a09847bf6c17c4 Author: Sobhan Mohammadpour gentoo org> AuthorDate: Sat Dec 29 13:58:55 2018 + Commit: Sobhan Mohammadpour gentoo org> CommitDate: Sat Dec 29 13:58:55 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=93ecd951 app-editors/gedit: bump to 3.30.2 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Manifest-Sign-Key: 0x7DF238CF0AA182E1 Signed-off-by: Sobhan Mohammadpour gentoo.org> app-editors/gedit/gedit-3.30.2.ebuild | 92 +++ 1 file changed, 92 insertions(+) diff --git a/app-editors/gedit/gedit-3.30.2.ebuild b/app-editors/gedit/gedit-3.30.2.ebuild new file mode 100644 index ..5887754c --- /dev/null +++ b/app-editors/gedit/gedit-3.30.2.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +GNOME2_LA_PUNT="yes" # plugins are dlopened +PYTHON_COMPAT=( python3_{4,5,6} ) +VALA_MIN_API_VERSION="0.26" +VALA_USE_DEPEND="vapigen" + +inherit eutils gnome2 multilib python-single-r1 vala virtualx + +DESCRIPTION="A text editor for the GNOME desktop" +HOMEPAGE="https://wiki.gnome.org/Apps/Gedit; + +LICENSE="GPL-2+ CC-BY-SA-3.0" +SLOT="0" + +IUSE="+introspection +python spell vala" +REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )" + +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" + +# X libs are not needed for OSX (aqua) +COMMON_DEPEND=" + >=dev-libs/libxml2-2.5.0:2 + >=dev-libs/glib-2.44:2[dbus] + >=x11-libs/gtk+-3.22.0:3[introspection?] + >=x11-libs/gtksourceview-3.22.0:3.0[introspection?] + >=dev-libs/libpeas-1.14.1[gtk] + + gnome-base/gsettings-desktop-schemas + gnome-base/gvfs + + x11-libs/libX11 + + introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) + python? ( + ${PYTHON_DEPS} + dev-python/pycairo[${PYTHON_USEDEP}] + >=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] + dev-libs/libpeas[python,${PYTHON_USEDEP}] ) + spell? ( >=app-text/gspell-0.2.5:0= ) +" +RDEPEND="${COMMON_DEPEND} + x11-themes/adwaita-icon-theme +" +DEPEND="${COMMON_DEPEND} + ${vala_depend} + app-text/docbook-xml-dtd:4.1.2 + app-text/yelp-tools + dev-util/glib-utils + >=dev-util/gtk-doc-am-1 + >=dev-util/intltool-0.50.1 + >=sys-devel/gettext-0.18 + virtual/pkgconfig +" +# yelp-tools, gnome-common needed to eautoreconf + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + vala_src_prepare + gnome2_src_prepare +} + +src_configure() { + DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" + + gnome2_src_configure \ + --disable-deprecations \ + --disable-updater \ + --enable-gvfs-metadata \ + $(use_enable introspection) \ + $(use_enable spell) \ + $(use_enable python) \ + $(use_enable vala) +} + +src_test() { + "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die + GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check +} + +src_install() { + local args=() + # manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations + use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" ) + + gnome2_src_install "${args[@]}" +}
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/
commit: 1b48f02945263ec42141898f31e65e03acdaa6b3 Author: Mart Raudsepp gentoo org> AuthorDate: Sun Aug 5 10:11:20 2018 + Commit: Mart Raudsepp gentoo org> CommitDate: Sun Aug 5 10:11:20 2018 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=1b48f029 app-editors/gedit: sync with main tree changes * Newer gtk+ and gtksourceview deps (just stable release instead of dev) * python 3.6 support Package-Manager: Portage-2.3.43, Repoman-2.3.10 app-editors/gedit/gedit-.ebuild | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app-editors/gedit/gedit-.ebuild b/app-editors/gedit/gedit-.ebuild index 1f26bc5e..47d3a49a 100644 --- a/app-editors/gedit/gedit-.ebuild +++ b/app-editors/gedit/gedit-.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" GNOME2_LA_PUNT="yes" # plugins are dlopened -PYTHON_COMPAT=( python3_{4,5} ) +PYTHON_COMPAT=( python3_{4,5,6} ) VALA_MIN_API_VERSION="0.26" VALA_USE_DEPEND="vapigen" @@ -32,8 +32,8 @@ fi COMMON_DEPEND=" >=dev-libs/libxml2-2.5.0:2 >=dev-libs/glib-2.44:2[dbus] - >=x11-libs/gtk+-3.21.3:3[introspection?] - >=x11-libs/gtksourceview-3.21.2:3.0[introspection?] + >=x11-libs/gtk+-3.22.0:3[introspection?] + >=x11-libs/gtksourceview-3.22.0:3.0[introspection?] >=dev-libs/libpeas-1.14.1[gtk] gnome-base/gsettings-desktop-schemas
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/
commit: 5731c10f517898b2bb539a13b55f86460edd0639 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Sep 2 09:29:51 2017 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sat Sep 2 09:29:51 2017 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=5731c10f app-editors/gedit: sync with gentoo repository Package-Manager: Portage-2.3.8, Repoman-2.3.3 Manifest-Sign-Key: 0x5A56C8CD0C13248A app-editors/gedit/gedit-3.20.0.ebuild | 102 -- app-editors/gedit/gedit-.ebuild | 54 +++--- 2 files changed, 20 insertions(+), 136 deletions(-) diff --git a/app-editors/gedit/gedit-3.20.0.ebuild b/app-editors/gedit/gedit-3.20.0.ebuild deleted file mode 100644 index 0c80.. --- a/app-editors/gedit/gedit-3.20.0.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" # plugins are dlopened -PYTHON_COMPAT=( python3_{3,4,5} ) -VALA_MIN_API_VERSION="0.26" -VALA_USE_DEPEND="vapigen" - -inherit eutils gnome2 multilib python-r1 vala virtualx - -DESCRIPTION="A text editor for the GNOME desktop" -HOMEPAGE="https://wiki.gnome.org/Apps/Gedit; - -LICENSE="GPL-2+ CC-BY-SA-3.0" -SLOT="0" - -IUSE="+introspection +python spell vala" -# python-single-r1 would request disabling PYTHON_TARGETS on libpeas -# we need to fix that -REQUIRED_USE=" - python? ( introspection ) - python? ( ^^ ( $(python_gen_useflags '*') ) ) -" - -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux" - -# X libs are not needed for OSX (aqua) -COMMON_DEPEND=" - >=dev-libs/libxml2-2.5.0:2 - >=dev-libs/glib-2.44:2[dbus] - >=x11-libs/gtk+-3.19.0:3[introspection?] - >=x11-libs/gtksourceview-3.19.4:3.0[introspection?] - >=dev-libs/libpeas-1.14.1[gtk] - - gnome-base/gsettings-desktop-schemas - gnome-base/gvfs - - x11-libs/libX11 - - net-libs/libsoup:2.4 - - introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) - python? ( - ${PYTHON_DEPS} - dev-python/pycairo[${PYTHON_USEDEP}] - >=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] - dev-libs/libpeas[${PYTHON_USEDEP}] ) - spell? ( >=app-text/gspell-0.2.5 ) -" -RDEPEND="${COMMON_DEPEND} - x11-themes/adwaita-icon-theme -" -DEPEND="${COMMON_DEPEND} - ${vala_depend} - app-text/docbook-xml-dtd:4.1.2 - app-text/yelp-tools - dev-libs/libxml2:2 - >=dev-util/gtk-doc-am-1 - >=dev-util/intltool-0.50.1 - dev-util/itstool - >=sys-devel/gettext-0.18 - virtual/pkgconfig -" -# yelp-tools, gnome-common needed to eautoreconf - -pkg_setup() { - use python && [[ ${MERGE_TYPE} != binary ]] && python_setup -} - -src_prepare() { - vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" - - gnome2_src_configure \ - --disable-deprecations \ - --enable-updater \ - --enable-gvfs-metadata \ - $(use_enable introspection) \ - $(use_enable spell) \ - $(use_enable python) \ - $(use_enable vala) -} - -src_test() { - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die - GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check -} - -src_install() { - local args=() - # manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations - use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" ) - - gnome2_src_install "${args[@]}" -} diff --git a/app-editors/gedit/gedit-.ebuild b/app-editors/gedit/gedit-.ebuild index ee5c56c1..1f26bc5e 100644 --- a/app-editors/gedit/gedit-.ebuild +++ b/app-editors/gedit/gedit-.ebuild @@ -1,15 +1,13 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI="5" -GCONF_DEBUG="no" +EAPI="6" GNOME2_LA_PUNT="yes" # plugins are dlopened -PYTHON_COMPAT=( python3_{3,4} ) +PYTHON_COMPAT=( python3_{4,5} ) VALA_MIN_API_VERSION="0.26" VALA_USE_DEPEND="vapigen" -inherit eutils gnome2 multilib python-r1 vala virtualx +inherit eutils gnome2 multilib python-single-r1 vala virtualx if [[ ${PV} = ]]; then inherit gnome2-live fi @@ -21,52 +19,43 @@ LICENSE="GPL-2+ CC-BY-SA-3.0" SLOT="0" IUSE="+introspection +python spell vala" -# python-single-r1 would request disabling PYTHON_TARGETS on libpeas -# we need to fix that -REQUIRED_USE=" - python? ( introspection ) - python? ( ^^ ( $(python_gen_useflags '*') ) ) -" +REQUIRED_USE="python? ( introspection
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/
commit: e011f72c67b1a103f81b1a120eab1b045e02e520 Author: Ole Reifschneider gentoo org> AuthorDate: Sat Mar 26 22:29:19 2016 + Commit: Ole Reifschneider gentoo org> CommitDate: Sat Mar 26 22:29:19 2016 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=e011f72c app-editors/gedit: Bump version to 3.20.0 Package-Manager: portage-2.2.28 RepoMan-Options: --include-arches="amd64" Manifest-Sign-Key: 0xE9E568677E8B4D42 app-editors/gedit/gedit-3.20.0.ebuild | 102 ++ 1 file changed, 102 insertions(+) diff --git a/app-editors/gedit/gedit-3.20.0.ebuild b/app-editors/gedit/gedit-3.20.0.ebuild new file mode 100644 index 000..0c80fff --- /dev/null +++ b/app-editors/gedit/gedit-3.20.0.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" # plugins are dlopened +PYTHON_COMPAT=( python3_{3,4,5} ) +VALA_MIN_API_VERSION="0.26" +VALA_USE_DEPEND="vapigen" + +inherit eutils gnome2 multilib python-r1 vala virtualx + +DESCRIPTION="A text editor for the GNOME desktop" +HOMEPAGE="https://wiki.gnome.org/Apps/Gedit; + +LICENSE="GPL-2+ CC-BY-SA-3.0" +SLOT="0" + +IUSE="+introspection +python spell vala" +# python-single-r1 would request disabling PYTHON_TARGETS on libpeas +# we need to fix that +REQUIRED_USE=" + python? ( introspection ) + python? ( ^^ ( $(python_gen_useflags '*') ) ) +" + +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux" + +# X libs are not needed for OSX (aqua) +COMMON_DEPEND=" + >=dev-libs/libxml2-2.5.0:2 + >=dev-libs/glib-2.44:2[dbus] + >=x11-libs/gtk+-3.19.0:3[introspection?] + >=x11-libs/gtksourceview-3.19.4:3.0[introspection?] + >=dev-libs/libpeas-1.14.1[gtk] + + gnome-base/gsettings-desktop-schemas + gnome-base/gvfs + + x11-libs/libX11 + + net-libs/libsoup:2.4 + + introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) + python? ( + ${PYTHON_DEPS} + dev-python/pycairo[${PYTHON_USEDEP}] + >=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] + dev-libs/libpeas[${PYTHON_USEDEP}] ) + spell? ( >=app-text/gspell-0.2.5 ) +" +RDEPEND="${COMMON_DEPEND} + x11-themes/adwaita-icon-theme +" +DEPEND="${COMMON_DEPEND} + ${vala_depend} + app-text/docbook-xml-dtd:4.1.2 + app-text/yelp-tools + dev-libs/libxml2:2 + >=dev-util/gtk-doc-am-1 + >=dev-util/intltool-0.50.1 + dev-util/itstool + >=sys-devel/gettext-0.18 + virtual/pkgconfig +" +# yelp-tools, gnome-common needed to eautoreconf + +pkg_setup() { + use python && [[ ${MERGE_TYPE} != binary ]] && python_setup +} + +src_prepare() { + vala_src_prepare + gnome2_src_prepare +} + +src_configure() { + DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" + + gnome2_src_configure \ + --disable-deprecations \ + --enable-updater \ + --enable-gvfs-metadata \ + $(use_enable introspection) \ + $(use_enable spell) \ + $(use_enable python) \ + $(use_enable vala) +} + +src_test() { + "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die + GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check +} + +src_install() { + local args=() + # manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations + use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" ) + + gnome2_src_install "${args[@]}" +}
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/
commit: 142a0567b47e6eb098b1b91c5daa3c211ecde9ae Author: Gilles Dartiguelongue eva AT gentoo DOT org AuthorDate: Tue Jun 9 10:08:17 2015 + Commit: Gilles Dartiguelongue eva AT gentoo DOT org CommitDate: Tue Jun 9 13:48:42 2015 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=142a0567 app-editors/gedit: moved to gentoo-x86 app-editors/gedit/gedit-3.16.2.ebuild | 107 -- 1 file changed, 107 deletions(-) diff --git a/app-editors/gedit/gedit-3.16.2.ebuild b/app-editors/gedit/gedit-3.16.2.ebuild deleted file mode 100644 index d774162..000 --- a/app-editors/gedit/gedit-3.16.2.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -GCONF_DEBUG=no -GNOME2_LA_PUNT=yes # plugins are dlopened -PYTHON_COMPAT=( python3_{3,4} ) -VALA_MIN_API_VERSION=0.26 -VALA_USE_DEPEND=vapigen - -inherit eutils gnome2 multilib python-r1 vala virtualx - -DESCRIPTION=A text editor for the GNOME desktop -HOMEPAGE=https://wiki.gnome.org/Apps/Gedit; - -LICENSE=GPL-2+ CC-BY-SA-3.0 -SLOT=0 - -IUSE=+introspection +python spell vala -# python-single-r1 would request disabling PYTHON_TARGETS on libpeas -# we need to fix that -REQUIRED_USE= - python? ( introspection ) - python? ( ^^ ( $(python_gen_useflags '*') ) ) - - -KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux - -# X libs are not needed for OSX (aqua) -COMMON_DEPEND= - =dev-libs/libxml2-2.5.0:2 - =dev-libs/glib-2.40:2[dbus] - =x11-libs/gtk+-3.16:3[introspection?] - =x11-libs/gtksourceview-3.16:3.0[introspection?] - =dev-libs/libpeas-1.7.0[gtk] - - gnome-base/gsettings-desktop-schemas - gnome-base/gvfs - - x11-libs/libX11 - - net-libs/libsoup:2.4 - - introspection? ( =dev-libs/gobject-introspection-0.9.3 ) - python? ( - ${PYTHON_DEPS} - dev-python/pycairo[${PYTHON_USEDEP}] - =dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] - dev-libs/libpeas[${PYTHON_USEDEP}] ) - spell? ( - =app-text/enchant-1.2:= - =app-text/iso-codes-0.35 ) - -RDEPEND=${COMMON_DEPEND} - x11-themes/gnome-icon-theme-symbolic - -DEPEND=${COMMON_DEPEND} - ${vala_depend} - 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.50.1 - =sys-devel/gettext-0.18 - virtual/pkgconfig - -# yelp-tools, gnome-common needed to eautoreconf - -pkg_setup() { - use python [[ ${MERGE_TYPE} != binary ]] python_setup -} - -src_prepare() { - vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - DOCS=AUTHORS BUGS ChangeLog MAINTAINERS NEWS README - - gnome2_src_configure \ - --disable-deprecations \ - --enable-updater \ - --enable-gvfs-metadata \ - $(use_enable introspection) \ - $(use_enable spell) \ - $(use_enable python) \ - $(use_enable vala) \ - ITSTOOL=$(type -P true) -} - -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 -} - -src_install() { - local args=() - # manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations - use python args+=( pyoverridesdir=$(python_get_sitedir)/gi/overrides ) - - gnome2_src_install ${args[@]} -}
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit-plugins/
commit: 6a321a6c014f572d0b129634309b847bcceab58a Author: Gilles Dartiguelongue eva AT gentoo DOT org AuthorDate: Tue Jun 9 10:08:26 2015 + Commit: Gilles Dartiguelongue eva AT gentoo DOT org CommitDate: Tue Jun 9 13:48:42 2015 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=6a321a6c app-editors/gedit-plugins: moved to gentoo-x86 .../gedit-plugins/gedit-plugins-3.16.0.ebuild | 91 -- 1 file changed, 91 deletions(-) diff --git a/app-editors/gedit-plugins/gedit-plugins-3.16.0.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.16.0.ebuild deleted file mode 100644 index cd9b3c1..000 --- a/app-editors/gedit-plugins/gedit-plugins-3.16.0.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -GCONF_DEBUG=no -GNOME2_LA_PUNT=yes # plugins are dlopened -PYTHON_COMPAT=( python3_{3,4} ) -PYTHON_REQ_USE=xml - -inherit eutils gnome2 multilib python-r1 - -DESCRIPTION=Official plugins for gedit -HOMEPAGE=https://wiki.gnome.org/Apps/Gedit/ShippedPlugins; - -LICENSE=GPL-2+ -KEYWORDS=~amd64 ~x86 -SLOT=0 - -IUSE_plugins=charmap git terminal zeitgeist -IUSE=+python ${IUSE_plugins} -# python-single-r1 would request disabling PYTHON_TARGETS on libpeas -REQUIRED_USE= - charmap? ( python ) - git? ( python ) - python? ( ^^ ( $(python_gen_useflags '*') ) ) - terminal? ( python ) - zeitgeist? ( python ) - - -RDEPEND= - =app-editors/gedit-3.16[python?] - =dev-libs/glib-2.32:2 - =dev-libs/libpeas-1.7.0[gtk,python?] - =x11-libs/gtk+-3.9:3 - =x11-libs/gtksourceview-3.14:3.0 - python? ( - ${PYTHON_DEPS} - =app-editors/gedit-3.16[introspection,${PYTHON_USEDEP}] - dev-libs/libpeas[${PYTHON_USEDEP}] - =dev-python/dbus-python-0.82[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] - =x11-libs/gtk+-3.9:3[introspection] - =x11-libs/gtksourceview-3.14:3.0[introspection] - x11-libs/pango[introspection] - x11-libs/gdk-pixbuf:2[introspection] - ) - charmap? ( =gnome-extra/gucharmap-3:2.90[introspection] ) - git? ( =dev-libs/libgit2-glib-0.0.6 ) - terminal? ( x11-libs/vte:2.91[introspection] ) - zeitgeist? ( =gnome-extra/zeitgeist-0.9.12[introspection] ) - -DEPEND=${RDEPEND} - =dev-util/intltool-0.40.0 - sys-devel/gettext - virtual/pkgconfig - - -pkg_setup() { - use python [[ ${MERGE_TYPE} != binary ]] python_setup -} - -src_configure() { - gnome2_src_configure \ - $(use_enable python) \ - $(use_enable zeitgeist) \ - ITSTOOL=$(type -P true) -} - -src_install() { - gnome2_src_install - - # FIXME: crazy !!! - if use python; then - find ${ED}/usr/share/gedit -name *.py* -delete || die - find ${ED}/usr/share/gedit -type d -empty -delete || die - fi - - # FIXME: upstream made this automagic... - clean_plugin charmap - clean_plugin git - clean_plugin terminal -} - -clean_plugin() { - if use !${1} ; then - rm -rf ${ED}/usr/share/gedit/plugins/${1}* - rm -rf ${ED}/usr/$(get_libdir)/gedit/plugins/${1}* - fi -}
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/
commit: 2f91f4c2402eb11e48d434f3903344d752ab55bf Author: Gilles Dartiguelongue eva AT gentoo DOT org AuthorDate: Mon May 25 10:41:28 2015 + Commit: Gilles Dartiguelongue eva AT gentoo DOT org CommitDate: Mon May 25 10:41:28 2015 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2f91f4c2 app-editors/gedit: 3.16.1 → 3.16.2 app-editors/gedit/{gedit-3.16.1.ebuild = gedit-3.16.2.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app-editors/gedit/gedit-3.16.1.ebuild b/app-editors/gedit/gedit-3.16.2.ebuild similarity index 100% rename from app-editors/gedit/gedit-3.16.1.ebuild rename to app-editors/gedit/gedit-3.16.2.ebuild
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/
commit: 74ec5c0624c3789b972872417486f7a3f21b4fe5 Author: Gilles Dartiguelongue eva AT gentoo DOT org AuthorDate: Sun May 17 15:36:37 2015 + Commit: Gilles Dartiguelongue eva AT gentoo DOT org CommitDate: Sun May 17 15:36:37 2015 + URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=74ec5c06 app-editors/gedit: zeitgeist got moved to gedit-plugins app-editors/gedit/metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/app-editors/gedit/metadata.xml b/app-editors/gedit/metadata.xml index ed9bb27..6e0e2ec 100644 --- a/app-editors/gedit/metadata.xml +++ b/app-editors/gedit/metadata.xml @@ -2,7 +2,4 @@ !DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd; pkgmetadata herdgnome/herd - use -flag name=zeitgeistBuild the plugin to inject events to pkggnome-extra/zeitgeist/pkg/flag - /use /pkgmetadata
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/
commit: 2fcf0e687d5b44f59a47977d9851f305c8d4854f Author: Michał Górny mgorny AT gentoo DOT org AuthorDate: Fri Jan 2 22:19:35 2015 + Commit: Michał Górny mgorny AT gentoo DOT org CommitDate: Fri Jan 2 22:19:35 2015 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2fcf0e68 app-editors/gedit: Do not reference Python sitedir w/ USE=-python Fixes bug #531968. --- app-editors/gedit/gedit-.ebuild | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app-editors/gedit/gedit-.ebuild b/app-editors/gedit/gedit-.ebuild index b05445f..de14a5a 100644 --- a/app-editors/gedit/gedit-.ebuild +++ b/app-editors/gedit/gedit-.ebuild @@ -112,6 +112,9 @@ src_test() { } src_install() { + local args=() # manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations - gnome2_src_install pyoverridesdir=$(python_get_sitedir)/gi/overrides + use python args+=( pyoverridesdir=$(python_get_sitedir)/gi/overrides ) + + gnome2_src_install ${args[@]} }
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit-plugins/
commit: 85b878d1f232150bea594a83067ec9d9870f8082 Author: Gilles Dartiguelongue eva AT gentoo DOT org AuthorDate: Mon Dec 15 23:28:43 2014 + Commit: Gilles Dartiguelongue eva AT gentoo DOT org CommitDate: Mon Dec 15 23:28:43 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=85b878d1 app-editors/gedit-plugins: moved to gentoo-x86 --- .../gedit-plugins/gedit-plugins-3.14.1.ebuild | 89 -- 1 file changed, 89 deletions(-) diff --git a/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild deleted file mode 100644 index f009722..000 --- a/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -GCONF_DEBUG=no -GNOME2_LA_PUNT=yes # plugins are dlopened -PYTHON_COMPAT=( python3_{3,4} ) -PYTHON_REQ_USE=xml - -inherit eutils gnome2 multilib python-r1 - -DESCRIPTION=Official plugins for gedit -HOMEPAGE=https://wiki.gnome.org/Apps/Gedit/ShippedPlugins; - -LICENSE=GPL-2+ -KEYWORDS=~amd64 ~x86 -SLOT=0 - -IUSE_plugins=charmap git terminal zeitgeist -IUSE=+python ${IUSE_plugins} -# python-single-r1 would request disabling PYTHON_TARGETS on libpeas -REQUIRED_USE= - charmap? ( python ) - git? ( python ) - python? ( ^^ ( $(python_gen_useflags '*') ) ) - terminal? ( python ) - zeitgeist? ( python ) - - -RDEPEND= - =app-editors/gedit-3.14[python?] - =dev-libs/glib-2.32:2 - =dev-libs/libpeas-1.7.0[gtk,python?] - =x11-libs/gtk+-3.9:3 - =x11-libs/gtksourceview-3.14:3.0 - python? ( - ${PYTHON_DEPS} - =app-editors/gedit-3.14[introspection,${PYTHON_USEDEP}] - dev-libs/libpeas[${PYTHON_USEDEP}] - =dev-python/dbus-python-0.82[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] - =x11-libs/gtk+-3.9:3[introspection] - =x11-libs/gtksourceview-3.14:3.0[introspection] - x11-libs/pango[introspection] - x11-libs/gdk-pixbuf:2[introspection] - ) - charmap? ( =gnome-extra/gucharmap-3:2.90[introspection] ) - git? ( =dev-libs/libgit2-glib-0.0.6 ) - terminal? ( x11-libs/vte:2.91[introspection] ) - zeitgeist? ( =gnome-extra/zeitgeist-0.9.12[introspection] ) - -DEPEND=${RDEPEND} - =dev-util/intltool-0.40.0 - sys-devel/gettext - virtual/pkgconfig - - -pkg_setup() { - use python [[ ${MERGE_TYPE} != binary ]] python_setup -} - -src_configure() { - gnome2_src_configure \ - $(use_enable python) \ - ITSTOOL=$(type -P true) -} - -src_install() { - gnome2_src_install - - # FIXME: crazy !!! - find ${ED}/usr/share/gedit -name *.py* -delete || die - find ${ED}/usr/share/gedit -type d -empty -delete || die - - # FIXME: upstream made this automagic... - clean_plugin charmap - clean_plugin git - clean_plugin terminal - clean_plugin zeitgeist -} - -clean_plugin() { - if use !${1} ; then - rm -rf ${ED}/usr/share/gedit/plugins/${1}* - rm -rf ${ED}/usr/$(get_libdir)/gedit/plugins/${1}* - fi -}
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/
commit: 40a02d3842bfcf9e0827bc2fe4e46bbeb3eed521 Author: Gilles Dartiguelongue eva AT gentoo DOT org AuthorDate: Mon Dec 15 23:28:28 2014 + Commit: Gilles Dartiguelongue eva AT gentoo DOT org CommitDate: Mon Dec 15 23:28:28 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=40a02d38 app-editors/gedit: moved to gentoo-x86, sync live ebuild --- app-editors/gedit/gedit-3.14.2.ebuild | 108 -- app-editors/gedit/gedit-.ebuild | 4 +- app-editors/gedit/patch | 93 - 3 files changed, 2 insertions(+), 203 deletions(-) diff --git a/app-editors/gedit/gedit-3.14.2.ebuild b/app-editors/gedit/gedit-3.14.2.ebuild deleted file mode 100644 index d2baa72..000 --- a/app-editors/gedit/gedit-3.14.2.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -GCONF_DEBUG=no -GNOME2_LA_PUNT=yes # plugins are dlopened -PYTHON_COMPAT=( python3_{3,4} ) -VALA_MIN_API_VERSION=0.26 -VALA_USE_DEPEND=vapigen - -inherit eutils gnome2 multilib python-r1 vala virtualx - -DESCRIPTION=A text editor for the GNOME desktop -HOMEPAGE=https://wiki.gnome.org/Apps/Gedit; - -LICENSE=GPL-2+ CC-BY-SA-3.0 -SLOT=0 - -IUSE=+introspection +python spell vala -# python-single-r1 would request disabling PYTHON_TARGETS on libpeas -# we need to fix that -REQUIRED_USE=python? ( ^^ ( $(python_gen_useflags '*') ) ) - -KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux - -# X libs are not needed for OSX (aqua) -COMMON_DEPEND= - =dev-libs/libxml2-2.5.0:2 - =dev-libs/glib-2.40:2 - =x11-libs/gtk+-3.14:3[introspection?] - =x11-libs/gtksourceview-3.14:3.0[introspection?] - =dev-libs/libpeas-1.7.0[gtk] - - gnome-base/gsettings-desktop-schemas - gnome-base/gvfs - - x11-libs/libX11 - - net-libs/libsoup:2.4 - - introspection? ( =dev-libs/gobject-introspection-0.9.3 ) - python? ( - ${PYTHON_DEPS} - =dev-libs/gobject-introspection-0.9.3 - =x11-libs/gtk+-3:3[introspection] - =x11-libs/gtksourceview-3.6:3.0[introspection] - dev-python/pycairo[${PYTHON_USEDEP}] - =dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] - dev-libs/libpeas[${PYTHON_USEDEP}] ) - spell? ( - =app-text/enchant-1.2:= - =app-text/iso-codes-0.35 ) - -RDEPEND=${COMMON_DEPEND} - x11-themes/gnome-icon-theme-symbolic - -DEPEND=${COMMON_DEPEND} - ${vala_depend} - 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.50.1 - =sys-devel/gettext-0.18 - virtual/pkgconfig - -# yelp-tools, gnome-common needed to eautoreconf - -pkg_setup() { - use python [[ ${MERGE_TYPE} != binary ]] python_setup -} - -src_prepare() { - # FIXME: Not able to set some metadata - #sed -e '/g_test_add_func/d' \ - # -i tests/document-loader.c || die - - vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - DOCS=AUTHORS BUGS ChangeLog MAINTAINERS NEWS README - - gnome2_src_configure \ - --disable-deprecations \ - --enable-updater \ - --enable-gvfs-metadata \ - $(use_enable introspection) \ - $(use_enable spell) \ - $(use_enable vala) \ - $(use_enable python) \ - ITSTOOL=$(type -P true) -} - -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 -} - -src_install() { - # manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations - gnome2_src_install pyoverridesdir=$(python_get_sitedir)/gi/overrides -} diff --git a/app-editors/gedit/gedit-.ebuild b/app-editors/gedit/gedit-.ebuild index ca629cf..b05445f 100644 --- a/app-editors/gedit/gedit-.ebuild +++ b/app-editors/gedit/gedit-.ebuild @@ -5,7 +5,7 @@ EAPI=5 GCONF_DEBUG=no GNOME2_LA_PUNT=yes # plugins are dlopened -PYTHON_COMPAT=( python3_{2,3} ) +PYTHON_COMPAT=( python3_{3,4} ) VALA_MIN_API_VERSION=0.26 VALA_USE_DEPEND=vapigen @@ -98,8 +98,8 @@ src_configure() { --enable-gvfs-metadata \ $(use_enable introspection) \ $(use_enable spell) \ - $(use_enable vala) \ $(use_enable python) \ + $(use_enable vala) \ ITSTOOL=$(type -P true) } diff --git a/app-editors/gedit/patch b/app-editors/gedit/patch deleted
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/
commit: b26711788ce87127f34d53082067fed6549651f7 Author: Rémi Cardona remi AT gentoo DOT org AuthorDate: Thu Dec 4 22:58:39 2014 + Commit: Remi Cardona remi AT gentoo DOT org CommitDate: Thu Dec 4 22:58:55 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b2671178 app-editors/gedit: 3.14.1 → 3.14.2 --- .../{gedit-3.14.1.ebuild = gedit-3.14.2.ebuild} | 0 app-editors/gedit/patch| 93 ++ 2 files changed, 93 insertions(+) diff --git a/app-editors/gedit/gedit-3.14.1.ebuild b/app-editors/gedit/gedit-3.14.2.ebuild similarity index 100% rename from app-editors/gedit/gedit-3.14.1.ebuild rename to app-editors/gedit/gedit-3.14.2.ebuild diff --git a/app-editors/gedit/patch b/app-editors/gedit/patch new file mode 100644 index 000..72cd9b9 --- /dev/null +++ b/app-editors/gedit/patch @@ -0,0 +1,93 @@ +--- gedit-3.14.1.ebuild2014-11-23 23:34:02.263550165 +0100 gedit-3.14.1.ebuild2014-11-24 22:53:47.0 +0100 +@@ -1,15 +1,13 @@ + # Copyright 1999-2014 Gentoo Foundation + # Distributed under the terms of the GNU General Public License v2 + # $Header: $ + + EAPI=5 + GCONF_DEBUG=no + GNOME2_LA_PUNT=yes # plugins are dlopened +-PYTHON_COMPAT=( python3_{2,3} ) ++PYTHON_COMPAT=( python3_{3,4} ) + VALA_MIN_API_VERSION=0.26 + VALA_USE_DEPEND=vapigen + + inherit eutils gnome2 multilib python-r1 vala virtualx + +@@ -67,35 +65,36 @@ + + src_prepare() { + # FIXME: Not able to set some metadata + #sed -e '/g_test_add_func/d' \ + # -i tests/document-loader.c || die + + vala_src_prepare + gnome2_src_prepare + + python_copy_sources + } + + src_configure() { + DOCS=AUTHORS BUGS ChangeLog MAINTAINERS NEWS README + +- local myconf +- myconf= +- --disable-deprecations +- --enable-updater +- --enable-gvfs-metadata +- $(use_enable introspection) +- $(use_enable spell) +- $(use_enable vala) +- $(use_enable python) +- ITSTOOL=$(type -P true) +- +- +- if use python ; then +- python_parallel_foreach_impl gnome2_src_configure ${myconf} +- else +- gnome2_src_configure ${myconf} +- fi ++ gedit_configure() { ++ ECONF_SOURCE=${S} \ ++ gnome2_src_configure \ ++ --disable-deprecations \ ++ --enable-updater \ ++ --enable-gvfs-metadata \ ++ $(use_enable introspection) \ ++ $(use_enable spell) \ ++ $(use_enable vala) \ ++ ITSTOOL=$(type -P true) \ ++ $@ ++ } ++ ++ gedit_py_configure() { ++ mkdir -p ${BUILD_DIR} || die ++ run_in_build_dir gedit_configure --enable-python ++ } ++ ++ # run gedit_py_configure first to avoid out-of-source build for C code ++ use python python_parallel_foreach_impl gedit_py_configure ++ gedit_configure --disable-python + } + + src_test() { +@@ -107,9 +106,13 @@ + } + + src_install() { +- if use python ; then +- python_foreach_impl gnome2_src_install +- else +- gnome2_src_install +- fi ++ gedit_py_install() { ++ pushd ${BUILD_DIR} /dev/null || die ++ # manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations ++ emake DESTDIR=${D} top_builddir=${S} pyoverridesdir=$(python_get_sitedir)/gi/overrides install ++ popd /dev/null ++ } ++ ++ gnome2_src_install ++ use python python_foreach_impl gedit_py_install + }
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit-plugins/
commit: a020a0b83b88165b90f6d887cf140485c9292660 Author: Michał Górny mgorny AT gentoo DOT org AuthorDate: Mon Dec 1 11:45:52 2014 + Commit: Michał Górny mgorny AT gentoo DOT org CommitDate: Mon Dec 1 11:45:52 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a020a0b8 app-editors/gedit-plugins: fix Python support Add a proper REQUIRED_USE for libpeas compatibility, use python_setup() to use the correct implementation. Package-Manager: portage-2.2.14 Manifest-Sign-Key: EFB4464E! --- app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild index 641d4c8..f009722 100644 --- a/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild +++ b/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild @@ -5,7 +5,7 @@ EAPI=5 GCONF_DEBUG=no GNOME2_LA_PUNT=yes # plugins are dlopened -PYTHON_COMPAT=( python3_{2,3} ) +PYTHON_COMPAT=( python3_{3,4} ) PYTHON_REQ_USE=xml inherit eutils gnome2 multilib python-r1 @@ -19,12 +19,13 @@ SLOT=0 IUSE_plugins=charmap git terminal zeitgeist IUSE=+python ${IUSE_plugins} +# python-single-r1 would request disabling PYTHON_TARGETS on libpeas REQUIRED_USE= charmap? ( python ) git? ( python ) + python? ( ^^ ( $(python_gen_useflags '*') ) ) terminal? ( python ) zeitgeist? ( python ) - python? ( ${REQUIRED_PYTHON_USE} ) RDEPEND= @@ -56,6 +57,10 @@ DEPEND=${RDEPEND} virtual/pkgconfig +pkg_setup() { + use python [[ ${MERGE_TYPE} != binary ]] python_setup +} + src_configure() { gnome2_src_configure \ $(use_enable python) \
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/
commit: 283fe267dd73c0cc07156647dafd156c82f3b8c3 Author: Rémi Cardona remi AT gentoo DOT org AuthorDate: Thu Nov 27 23:56:59 2014 + Commit: Remi Cardona remi AT gentoo DOT org CommitDate: Fri Nov 28 08:09:37 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=283fe267 app-editors/gedit: Fix python handling In gedit/gedit-plugins-engine.c, we can see that: - gedit loads python through libpeas (so that's the only version of python it supports), - gedit's introspection data is indeed private and unavailable outside gedit's python interpreter for plugins. So here are the changes done to this ebuild: - drop support for python 3.2, add support for 3.4, - change deps to make sure gedit's python version matches that of libpeas, - adapt ebuild to a regular build with python_setup doing the python selection. Note: using python-single-r1 was impossible because libpeas still supports python2. Using that eclass would have forced users to disable python2 support. --- app-editors/gedit/gedit-3.14.1.ebuild | 45 ++- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/app-editors/gedit/gedit-3.14.1.ebuild b/app-editors/gedit/gedit-3.14.1.ebuild index 2d9be1a..d41d63e 100644 --- a/app-editors/gedit/gedit-3.14.1.ebuild +++ b/app-editors/gedit/gedit-3.14.1.ebuild @@ -5,7 +5,7 @@ EAPI=5 GCONF_DEBUG=no GNOME2_LA_PUNT=yes # plugins are dlopened -PYTHON_COMPAT=( python3_{2,3} ) +PYTHON_COMPAT=( python3_{3,4} ) VALA_MIN_API_VERSION=0.26 VALA_USE_DEPEND=vapigen @@ -18,7 +18,7 @@ LICENSE=GPL-2+ CC-BY-SA-3.0 SLOT=0 IUSE=+introspection +python spell vala -REQUIRED_USE=python? ( ${PYTHON_REQUIRED_USE} ) +REQUIRED_USE=python? ( || ( $(python_gen_useflags 'python3*') ) ) KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux @@ -44,14 +44,14 @@ COMMON_DEPEND= =x11-libs/gtk+-3:3[introspection] =x11-libs/gtksourceview-3.6:3.0[introspection] dev-python/pycairo[${PYTHON_USEDEP}] - =dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] ) + =dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] + dev-libs/libpeas[${PYTHON_USEDEP}] ) spell? ( =app-text/enchant-1.2:= =app-text/iso-codes-0.35 ) RDEPEND=${COMMON_DEPEND} x11-themes/gnome-icon-theme-symbolic - python? ( dev-libs/libpeas[${PYTHON_USEDEP}] ) DEPEND=${COMMON_DEPEND} ${vala_depend} @@ -65,6 +65,10 @@ DEPEND=${COMMON_DEPEND} # yelp-tools, gnome-common needed to eautoreconf +pkg_setup() { + use python python_setup +} + src_prepare() { # FIXME: Not able to set some metadata #sed -e '/g_test_add_func/d' \ @@ -72,30 +76,20 @@ src_prepare() { vala_src_prepare gnome2_src_prepare - - python_copy_sources } src_configure() { DOCS=AUTHORS BUGS ChangeLog MAINTAINERS NEWS README - local myconf - myconf= - --disable-deprecations - --enable-updater - --enable-gvfs-metadata - $(use_enable introspection) - $(use_enable spell) - $(use_enable vala) - $(use_enable python) + gnome2_src_configure \ + --disable-deprecations \ + --enable-updater \ + --enable-gvfs-metadata \ + $(use_enable introspection) \ + $(use_enable spell) \ + $(use_enable vala) \ + $(use_enable python) \ ITSTOOL=$(type -P true) - - - if use python ; then - python_parallel_foreach_impl gnome2_src_configure ${myconf} - else - gnome2_src_configure ${myconf} - fi } src_test() { @@ -107,9 +101,6 @@ src_test() { } src_install() { - if use python ; then - python_foreach_impl gnome2_src_install - else - gnome2_src_install - fi + # manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations + gnome2_src_install pyoverridesdir=$(python_get_sitedir)/gi/overrides }
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/
commit: 7bd51e90949f1491d9d3e4e4011e3830128d037e Author: Michał Górny mgorny AT gentoo DOT org AuthorDate: Fri Nov 28 18:58:11 2014 + Commit: Michał Górny mgorny AT gentoo DOT org CommitDate: Fri Nov 28 18:58:11 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7bd51e90 app-editors/gedit: add proper REQUIRED_USE and MERGE_TYPE check Since libpeas supports at most one version of Python 3, add an appropriate exactly-one-of REQUIRED_USE. Additionally, add a MERGE_TYPE check to pkg_setup to avoid initializing Python in binary package installs. Package-Manager: portage-2.2.14 Manifest-Sign-Key: EFB4464E! --- app-editors/gedit/gedit-3.14.1.ebuild | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app-editors/gedit/gedit-3.14.1.ebuild b/app-editors/gedit/gedit-3.14.1.ebuild index d41d63e..d2baa72 100644 --- a/app-editors/gedit/gedit-3.14.1.ebuild +++ b/app-editors/gedit/gedit-3.14.1.ebuild @@ -18,7 +18,9 @@ LICENSE=GPL-2+ CC-BY-SA-3.0 SLOT=0 IUSE=+introspection +python spell vala -REQUIRED_USE=python? ( || ( $(python_gen_useflags 'python3*') ) ) +# python-single-r1 would request disabling PYTHON_TARGETS on libpeas +# we need to fix that +REQUIRED_USE=python? ( ^^ ( $(python_gen_useflags '*') ) ) KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux @@ -66,7 +68,7 @@ DEPEND=${COMMON_DEPEND} # yelp-tools, gnome-common needed to eautoreconf pkg_setup() { - use python python_setup + use python [[ ${MERGE_TYPE} != binary ]] python_setup } src_prepare() {
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/
commit: c52e9c2f103ff1845b42f5372c22a4725672b200 Author: Michał Górny mgorny AT gentoo DOT org AuthorDate: Fri Nov 28 19:03:11 2014 + Commit: Michał Górny mgorny AT gentoo DOT org CommitDate: Fri Nov 28 19:03:11 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c52e9c2f app-editors/gedit: sync the live ebuild Package-Manager: portage-2.2.14 Manifest-Sign-Key: EFB4464E! --- app-editors/gedit/gedit-.ebuild | 47 +++-- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/app-editors/gedit/gedit-.ebuild b/app-editors/gedit/gedit-.ebuild index 9497a22..ca629cf 100644 --- a/app-editors/gedit/gedit-.ebuild +++ b/app-editors/gedit/gedit-.ebuild @@ -21,7 +21,9 @@ LICENSE=GPL-2+ CC-BY-SA-3.0 SLOT=0 IUSE=+introspection +python spell vala -REQUIRED_USE=python? ( ${PYTHON_REQUIRED_USE} ) +# python-single-r1 would request disabling PYTHON_TARGETS on libpeas +# we need to fix that +REQUIRED_USE=python? ( ^^ ( $(python_gen_useflags '*') ) ) if [[ ${PV} = ]]; then IUSE=${IUSE} doc KEYWORDS= @@ -51,14 +53,14 @@ COMMON_DEPEND= =x11-libs/gtk+-3:3[introspection] =x11-libs/gtksourceview-3.6:3.0[introspection] dev-python/pycairo[${PYTHON_USEDEP}] - =dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] ) + =dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] + dev-libs/libpeas[${PYTHON_USEDEP}] ) spell? ( =app-text/enchant-1.2:= =app-text/iso-codes-0.35 ) RDEPEND=${COMMON_DEPEND} x11-themes/gnome-icon-theme-symbolic - python? ( dev-libs/libpeas[${PYTHON_USEDEP}] ) DEPEND=${COMMON_DEPEND} ${vala_depend} @@ -78,35 +80,27 @@ if [[ ${PV} = ]]; then app-text/yelp-tools fi +pkg_setup() { + use python [[ ${MERGE_TYPE} != binary ]] python_setup +} + src_prepare() { vala_src_prepare gnome2_src_prepare - - python_copy_sources } src_configure() { - local myconf= - [[ ${PV} != ]] myconf=ITSTOOL=$(type -P true) DOCS=AUTHORS BUGS ChangeLog MAINTAINERS NEWS README - local myconf - myconf= - --disable-deprecations - --enable-updater - --enable-gvfs-metadata - $(use_enable introspection) - $(use_enable spell) - $(use_enable vala) - $(use_enable python) + gnome2_src_configure \ + --disable-deprecations \ + --enable-updater \ + --enable-gvfs-metadata \ + $(use_enable introspection) \ + $(use_enable spell) \ + $(use_enable vala) \ + $(use_enable python) \ ITSTOOL=$(type -P true) - - - if use python ; then - python_parallel_foreach_impl gnome2_src_configure ${myconf} - else - gnome2_src_configure ${myconf} - fi } src_test() { @@ -118,9 +112,6 @@ src_test() { } src_install() { - if use python ; then - python_foreach_impl gnome2_src_install - else - gnome2_src_install - fi + # manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations + gnome2_src_install pyoverridesdir=$(python_get_sitedir)/gi/overrides }
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/
commit: 14d21f6866130a12a4b135bbc8b983ca1d580210 Author: Gilles Dartiguelongue eva AT gentoo DOT org AuthorDate: Sun Nov 23 19:33:12 2014 + Commit: Gilles Dartiguelongue eva AT gentoo DOT org CommitDate: Sun Nov 23 19:33:12 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=14d21f68 app-editors/gedit: 3.14.0 → 3.14.1 --- app-editors/gedit/{gedit-3.14.0.ebuild = gedit-3.14.1.ebuild} | 2 +- app-editors/gedit/gedit-.ebuild| 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app-editors/gedit/gedit-3.14.0.ebuild b/app-editors/gedit/gedit-3.14.1.ebuild similarity index 99% rename from app-editors/gedit/gedit-3.14.0.ebuild rename to app-editors/gedit/gedit-3.14.1.ebuild index 339c6ce..2d9be1a 100644 --- a/app-editors/gedit/gedit-3.14.0.ebuild +++ b/app-editors/gedit/gedit-3.14.1.ebuild @@ -25,7 +25,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd # X libs are not needed for OSX (aqua) COMMON_DEPEND= =dev-libs/libxml2-2.5.0:2 - =dev-libs/glib-2.39.5:2 + =dev-libs/glib-2.40:2 =x11-libs/gtk+-3.14:3[introspection?] =x11-libs/gtksourceview-3.14:3.0[introspection?] =dev-libs/libpeas-1.7.0[gtk] diff --git a/app-editors/gedit/gedit-.ebuild b/app-editors/gedit/gedit-.ebuild index 7d06b78..9497a22 100644 --- a/app-editors/gedit/gedit-.ebuild +++ b/app-editors/gedit/gedit-.ebuild @@ -32,7 +32,7 @@ fi # X libs are not needed for OSX (aqua) COMMON_DEPEND= =dev-libs/libxml2-2.5.0:2 - =dev-libs/glib-2.39.5:2 + =dev-libs/glib-2.40:2 =x11-libs/gtk+-3.14:3[introspection?] =x11-libs/gtksourceview-3.14:3.0[introspection?] =dev-libs/libpeas-1.7.0[gtk] @@ -81,6 +81,8 @@ fi src_prepare() { vala_src_prepare gnome2_src_prepare + + python_copy_sources } src_configure() {
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit-plugins/
commit: 6d276f48783b761d71f73e47522dfd626cea5cc6 Author: Gilles Dartiguelongue eva AT gentoo DOT org AuthorDate: Sun Nov 23 19:34:34 2014 + Commit: Gilles Dartiguelongue eva AT gentoo DOT org CommitDate: Sun Nov 23 19:34:34 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6d276f48 app-editors/gedit-plugins: 3.14.0 → 3.14.1 --- .../{gedit-plugins-3.14.0.ebuild = gedit-plugins-3.14.1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app-editors/gedit-plugins/gedit-plugins-3.14.0.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild similarity index 100% rename from app-editors/gedit-plugins/gedit-plugins-3.14.0.ebuild rename to app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit-plugins/
commit: 2107e52f2f38747d6238d26c8974727eb57f3e01 Author: Gilles Dartiguelongue eva AT gentoo DOT org AuthorDate: Sun Oct 26 15:03:57 2014 + Commit: Gilles Dartiguelongue eva AT gentoo DOT org CommitDate: Sun Oct 26 15:04:02 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2107e52f app-editors/gedit-plugins: add description for zeigeist USE flag --- app-editors/gedit-plugins/metadata.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app-editors/gedit-plugins/metadata.xml b/app-editors/gedit-plugins/metadata.xml index d2fd824..cba3f1a 100644 --- a/app-editors/gedit-plugins/metadata.xml +++ b/app-editors/gedit-plugins/metadata.xml @@ -5,8 +5,10 @@ longdescriptionOfficial plugins for gedit/longdescription use flag name=charmapInsert special characters just by clicking on - them/flag + them/flag flag name='git'Shows document changes related to git's HEAD/flag flag name=terminalEmbed a terminal in the bottom pane/flag +flag name=zeitgeistEnable activity tracking via + pkggnome-extra/zeitgeist/pkg/flag /use /pkgmetadata
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/, app-editors/gedit/files/
commit: bd595ad300bd52366175fba9f2f21a245d82c614 Author: Gilles Dartiguelongue eva AT gentoo DOT org AuthorDate: Sun Oct 12 22:25:25 2014 + Commit: Gilles Dartiguelongue eva AT gentoo DOT org CommitDate: Sun Oct 12 23:19:07 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bd595ad3 app-editors/gedit: switch to copy sources Some perl script is driving me crazy not working with out-of-source builds. --- .../gedit/files/gedit-3.14.0-fix-install.patch | 23 app-editors/gedit/gedit-3.14.0.ebuild | 61 +- app-editors/gedit/gedit-.ebuild| 52 -- 3 files changed, 47 insertions(+), 89 deletions(-) diff --git a/app-editors/gedit/files/gedit-3.14.0-fix-install.patch b/app-editors/gedit/files/gedit-3.14.0-fix-install.patch deleted file mode 100644 index e2627ba..000 --- a/app-editors/gedit/files/gedit-3.14.0-fix-install.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 634726ba5be7caa947a676fbe7b8091311b41b62 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue e...@gentoo.org -Date: Sun, 12 Oct 2014 23:20:35 +0200 -Subject: [PATCH] Force creation of directory with out-of-source build - - plugins/externaltools/data/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/plugins/externaltools/data/Makefile.am b/plugins/externaltools/data/Makefile.am -index e3a4707..3a8de2e 100644 a/plugins/externaltools/data/Makefile.am -+++ b/plugins/externaltools/data/Makefile.am -@@ -59,5 +59,6 @@ CLEANFILES +=\ - # generating the .desktop files. - # If the following bug is fixed, this hack can normally be removed: - # https://bugs.launchpad.net/intltool/+bug/605826 -+BUILT_SOURCES = $(externaltools_all_desktop_files) $(externaltools_tools_SCRIPTS) - $(externaltools_all_desktop_files): - $(AM_V_GEN) $(MKDIR_P) $(top_builddir)/plugins/externaltools/data/ --- -2.1.2 - diff --git a/app-editors/gedit/gedit-3.14.0.ebuild b/app-editors/gedit/gedit-3.14.0.ebuild index a8a2570..339c6ce 100644 --- a/app-editors/gedit/gedit-3.14.0.ebuild +++ b/app-editors/gedit/gedit-3.14.0.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{2,3} ) VALA_MIN_API_VERSION=0.26 VALA_USE_DEPEND=vapigen -inherit autotools eutils gnome2 multilib python-r1 vala virtualx +inherit eutils gnome2 multilib python-r1 vala virtualx DESCRIPTION=A text editor for the GNOME desktop HOMEPAGE=https://wiki.gnome.org/Apps/Gedit; @@ -70,39 +70,32 @@ src_prepare() { #sed -e '/g_test_add_func/d' \ # -i tests/document-loader.c || die - # Fix out-of-source build - epatch ${FILESDIR}/${PN}-3.14.0-fix-install.patch - - eautoreconf - vala_src_prepare gnome2_src_prepare + + python_copy_sources } src_configure() { DOCS=AUTHORS BUGS ChangeLog MAINTAINERS NEWS README - gedit_configure() { - ECONF_SOURCE=${S} \ - gnome2_src_configure \ - --disable-deprecations \ - --enable-updater \ - --enable-gvfs-metadata \ - $(use_enable introspection) \ - $(use_enable spell) \ - $(use_enable vala) \ - ITSTOOL=$(type -P true) \ - $@ - } - - gedit_py_configure() { - mkdir -p ${BUILD_DIR} || die - run_in_build_dir gedit_configure --enable-python - } - - # run gedit_py_configure first to avoid out-of-source build for C code - use python python_parallel_foreach_impl gedit_py_configure - gedit_configure --disable-python + local myconf + myconf= + --disable-deprecations + --enable-updater + --enable-gvfs-metadata + $(use_enable introspection) + $(use_enable spell) + $(use_enable vala) + $(use_enable python) + ITSTOOL=$(type -P true) + + + if use python ; then + python_parallel_foreach_impl gnome2_src_configure ${myconf} + else + gnome2_src_configure ${myconf} + fi } src_test() { @@ -114,13 +107,9 @@ src_test() { } src_install() { - gedit_py_install() { - pushd ${BUILD_DIR} /dev/null || die - # manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations - emake DESTDIR=${D} top_builddir=${S} pyoverridesdir=$(python_get_sitedir)/gi/overrides install - popd /dev/null - } - - gnome2_src_install - use python python_foreach_impl gedit_py_install + if use python ; then + python_foreach_impl gnome2_src_install + else + gnome2_src_install + fi } diff --git a/app-editors/gedit/gedit-.ebuild b/app-editors/gedit/gedit-.ebuild
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/, app-editors/gedit/files/
commit: 174bbae71fa8d0b307ef750defdf88074442c995 Author: Gilles Dartiguelongue eva AT gentoo DOT org AuthorDate: Sun Oct 12 21:36:06 2014 + Commit: Gilles Dartiguelongue eva AT gentoo DOT org CommitDate: Sun Oct 12 23:19:04 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=174bbae7 app-editors/gedit: fix out-of-source install --- .../gedit/files/gedit-3.14.0-fix-install.patch | 23 ++ app-editors/gedit/gedit-3.14.0.ebuild | 7 ++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/app-editors/gedit/files/gedit-3.14.0-fix-install.patch b/app-editors/gedit/files/gedit-3.14.0-fix-install.patch new file mode 100644 index 000..e2627ba --- /dev/null +++ b/app-editors/gedit/files/gedit-3.14.0-fix-install.patch @@ -0,0 +1,23 @@ +From 634726ba5be7caa947a676fbe7b8091311b41b62 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue e...@gentoo.org +Date: Sun, 12 Oct 2014 23:20:35 +0200 +Subject: [PATCH] Force creation of directory with out-of-source build + +--- + plugins/externaltools/data/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/externaltools/data/Makefile.am b/plugins/externaltools/data/Makefile.am +index e3a4707..3a8de2e 100644 +--- a/plugins/externaltools/data/Makefile.am b/plugins/externaltools/data/Makefile.am +@@ -59,5 +59,6 @@ CLEANFILES +=\ + # generating the .desktop files. + # If the following bug is fixed, this hack can normally be removed: + # https://bugs.launchpad.net/intltool/+bug/605826 ++BUILT_SOURCES = $(externaltools_all_desktop_files) $(externaltools_tools_SCRIPTS) + $(externaltools_all_desktop_files): + $(AM_V_GEN) $(MKDIR_P) $(top_builddir)/plugins/externaltools/data/ +-- +2.1.2 + diff --git a/app-editors/gedit/gedit-3.14.0.ebuild b/app-editors/gedit/gedit-3.14.0.ebuild index 73acad4..a8a2570 100644 --- a/app-editors/gedit/gedit-3.14.0.ebuild +++ b/app-editors/gedit/gedit-3.14.0.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{2,3} ) VALA_MIN_API_VERSION=0.26 VALA_USE_DEPEND=vapigen -inherit eutils gnome2 multilib python-r1 vala virtualx +inherit autotools eutils gnome2 multilib python-r1 vala virtualx DESCRIPTION=A text editor for the GNOME desktop HOMEPAGE=https://wiki.gnome.org/Apps/Gedit; @@ -70,6 +70,11 @@ src_prepare() { #sed -e '/g_test_add_func/d' \ # -i tests/document-loader.c || die + # Fix out-of-source build + epatch ${FILESDIR}/${PN}-3.14.0-fix-install.patch + + eautoreconf + vala_src_prepare gnome2_src_prepare }
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit-plugins/
commit: afd0a9462d14ea876def5afbcf221614ee3f55a8 Author: Gilles Dartiguelongue eva AT gentoo DOT org AuthorDate: Mon Oct 6 22:52:19 2014 + Commit: Gilles Dartiguelongue eva AT gentoo DOT org CommitDate: Mon Oct 6 22:52:19 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=afd0a946 app-editors/gedit-plugins: 3.12.1 → 3.14.0 --- ...-plugins-3.12.1.ebuild = gedit-plugins-3.14.0.ebuild} | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app-editors/gedit-plugins/gedit-plugins-3.12.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.14.0.ebuild similarity index 81% rename from app-editors/gedit-plugins/gedit-plugins-3.12.1.ebuild rename to app-editors/gedit-plugins/gedit-plugins-3.14.0.ebuild index f7eadf3..641d4c8 100644 --- a/app-editors/gedit-plugins/gedit-plugins-3.12.1.ebuild +++ b/app-editors/gedit-plugins/gedit-plugins-3.14.0.ebuild @@ -17,36 +17,38 @@ LICENSE=GPL-2+ KEYWORDS=~amd64 ~x86 SLOT=0 -IUSE_plugins=charmap git terminal +IUSE_plugins=charmap git terminal zeitgeist IUSE=+python ${IUSE_plugins} REQUIRED_USE= charmap? ( python ) git? ( python ) terminal? ( python ) + zeitgeist? ( python ) python? ( ${REQUIRED_PYTHON_USE} ) RDEPEND= - =app-editors/gedit-3.11.3[python?] + =app-editors/gedit-3.14[python?] =dev-libs/glib-2.32:2 =dev-libs/libpeas-1.7.0[gtk,python?] =x11-libs/gtk+-3.9:3 - =x11-libs/gtksourceview-3.9.2:3.0 + =x11-libs/gtksourceview-3.14:3.0 python? ( ${PYTHON_DEPS} - =app-editors/gedit-3[introspection,${PYTHON_USEDEP}] + =app-editors/gedit-3.14[introspection,${PYTHON_USEDEP}] dev-libs/libpeas[${PYTHON_USEDEP}] =dev-python/dbus-python-0.82[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] =x11-libs/gtk+-3.9:3[introspection] - =x11-libs/gtksourceview-3.9.2:3.0[introspection] + =x11-libs/gtksourceview-3.14:3.0[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) charmap? ( =gnome-extra/gucharmap-3:2.90[introspection] ) git? ( =dev-libs/libgit2-glib-0.0.6 ) - terminal? ( x11-libs/vte:2.90[introspection] ) + terminal? ( x11-libs/vte:2.91[introspection] ) + zeitgeist? ( =gnome-extra/zeitgeist-0.9.12[introspection] ) DEPEND=${RDEPEND} =dev-util/intltool-0.40.0 @@ -71,6 +73,7 @@ src_install() { clean_plugin charmap clean_plugin git clean_plugin terminal + clean_plugin zeitgeist } clean_plugin() {
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/
commit: fe53b8bab7712476f311deca8e0c116354b515f4 Author: Gilles Dartiguelongue eva AT gentoo DOT org AuthorDate: Mon Oct 6 22:40:54 2014 + Commit: Gilles Dartiguelongue eva AT gentoo DOT org CommitDate: Mon Oct 6 22:40:54 2014 + URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fe53b8ba app-editors/gedit: 3.12.2-r1 → 3.14.0 --- .../{gedit-3.12.1.ebuild = gedit-3.14.0.ebuild} | 63 +++-- app-editors/gedit/gedit-.ebuild| 64 -- 2 files changed, 94 insertions(+), 33 deletions(-) diff --git a/app-editors/gedit/gedit-3.12.1.ebuild b/app-editors/gedit/gedit-3.14.0.ebuild similarity index 57% rename from app-editors/gedit/gedit-3.12.1.ebuild rename to app-editors/gedit/gedit-3.14.0.ebuild index d2c5a58..73acad4 100644 --- a/app-editors/gedit/gedit-3.12.1.ebuild +++ b/app-editors/gedit/gedit-3.14.0.ebuild @@ -6,16 +6,18 @@ EAPI=5 GCONF_DEBUG=no GNOME2_LA_PUNT=yes # plugins are dlopened PYTHON_COMPAT=( python3_{2,3} ) +VALA_MIN_API_VERSION=0.26 +VALA_USE_DEPEND=vapigen -inherit eutils gnome2 multilib python-r1 virtualx +inherit eutils gnome2 multilib python-r1 vala virtualx DESCRIPTION=A text editor for the GNOME desktop -HOMEPAGE=http://live.gnome.org/Gedit; +HOMEPAGE=https://wiki.gnome.org/Apps/Gedit; LICENSE=GPL-2+ CC-BY-SA-3.0 SLOT=0 -IUSE=+introspection +python spell zeitgeist +IUSE=+introspection +python spell vala REQUIRED_USE=python? ( ${PYTHON_REQUIRED_USE} ) KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux @@ -24,8 +26,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd COMMON_DEPEND= =dev-libs/libxml2-2.5.0:2 =dev-libs/glib-2.39.5:2 - =x11-libs/gtk+-3.11.6:3[introspection?] - =x11-libs/gtksourceview-3.11.2:3.0[introspection?] + =x11-libs/gtk+-3.14:3[introspection?] + =x11-libs/gtksourceview-3.14:3.0[introspection?] =dev-libs/libpeas-1.7.0[gtk] gnome-base/gsettings-desktop-schemas @@ -46,12 +48,13 @@ COMMON_DEPEND= spell? ( =app-text/enchant-1.2:= =app-text/iso-codes-0.35 ) - zeitgeist? ( =gnome-extra/zeitgeist-0.9.12 ) RDEPEND=${COMMON_DEPEND} x11-themes/gnome-icon-theme-symbolic + python? ( dev-libs/libpeas[${PYTHON_USEDEP}] ) DEPEND=${COMMON_DEPEND} + ${vala_depend} app-text/docbook-xml-dtd:4.1.2 =app-text/scrollkeeper-0.3.11 dev-libs/libxml2:2 @@ -64,23 +67,37 @@ DEPEND=${COMMON_DEPEND} src_prepare() { # FIXME: Not able to set some metadata - sed -e '/g_test_add_func/d' \ - -i tests/document-loader.c || die + #sed -e '/g_test_add_func/d' \ + # -i tests/document-loader.c || die + vala_src_prepare gnome2_src_prepare } src_configure() { DOCS=AUTHORS BUGS ChangeLog MAINTAINERS NEWS README - gnome2_src_configure \ - --disable-deprecations \ - --enable-updater \ - --enable-gvfs-metadata \ - $(use_enable introspection) \ - $(use_enable python) \ - $(use_enable spell) \ - $(use_enable zeitgeist) \ - ITSTOOL=$(type -P true) + + gedit_configure() { + ECONF_SOURCE=${S} \ + gnome2_src_configure \ + --disable-deprecations \ + --enable-updater \ + --enable-gvfs-metadata \ + $(use_enable introspection) \ + $(use_enable spell) \ + $(use_enable vala) \ + ITSTOOL=$(type -P true) \ + $@ + } + + gedit_py_configure() { + mkdir -p ${BUILD_DIR} || die + run_in_build_dir gedit_configure --enable-python + } + + # run gedit_py_configure first to avoid out-of-source build for C code + use python python_parallel_foreach_impl gedit_py_configure + gedit_configure --disable-python } src_test() { @@ -90,3 +107,15 @@ src_test() { unset DBUS_SESSION_BUS_ADDRESS GSETTINGS_SCHEMA_DIR=${S}/data Xemake check } + +src_install() { + gedit_py_install() { + pushd ${BUILD_DIR} /dev/null || die + # manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations + emake DESTDIR=${D} top_builddir=${S} pyoverridesdir=$(python_get_sitedir)/gi/overrides install + popd /dev/null + } + + gnome2_src_install + use python python_foreach_impl gedit_py_install +} diff --git a/app-editors/gedit/gedit-.ebuild b/app-editors/gedit/gedit-.ebuild index 30d24b6..3d76df0 100644 --- a/app-editors/gedit/gedit-.ebuild +++ b/app-editors/gedit/gedit-.ebuild
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/
commit: 87913e0e08c4590c5b4929ba19a51f54316ea9c5 Author: Gilles Dartiguelongue eva AT gentoo DOT org AuthorDate: Wed Apr 23 22:06:12 2014 + Commit: Gilles Dartiguelongue eva AT gentoo DOT org CommitDate: Wed Apr 23 22:13:19 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=87913e0e app-editors/gedit: 3.12.0 → 3.12.1 --- app-editors/gedit/{gedit-3.12.0.ebuild = gedit-3.12.1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app-editors/gedit/gedit-3.12.0.ebuild b/app-editors/gedit/gedit-3.12.1.ebuild similarity index 100% rename from app-editors/gedit/gedit-3.12.0.ebuild rename to app-editors/gedit/gedit-3.12.1.ebuild
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit-plugins/
commit: e24b345d90ccfbf71a496e35dd0990c3d3aa94d3 Author: Gilles Dartiguelongue eva AT gentoo DOT org AuthorDate: Sun Apr 20 19:38:32 2014 + Commit: Gilles Dartiguelongue eva AT gentoo DOT org CommitDate: Sun Apr 20 22:54:58 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e24b345d app-editors/gedit-plugins: 3.10.1 → 3.12.1 --- .../gedit-plugins/gedit-plugins-3.12.1.ebuild | 81 ++ 1 file changed, 81 insertions(+) diff --git a/app-editors/gedit-plugins/gedit-plugins-3.12.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.12.1.ebuild new file mode 100644 index 000..f7eadf3 --- /dev/null +++ b/app-editors/gedit-plugins/gedit-plugins-3.12.1.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +GCONF_DEBUG=no +GNOME2_LA_PUNT=yes # plugins are dlopened +PYTHON_COMPAT=( python3_{2,3} ) +PYTHON_REQ_USE=xml + +inherit eutils gnome2 multilib python-r1 + +DESCRIPTION=Official plugins for gedit +HOMEPAGE=https://wiki.gnome.org/Apps/Gedit/ShippedPlugins; + +LICENSE=GPL-2+ +KEYWORDS=~amd64 ~x86 +SLOT=0 + +IUSE_plugins=charmap git terminal +IUSE=+python ${IUSE_plugins} +REQUIRED_USE= + charmap? ( python ) + git? ( python ) + terminal? ( python ) + python? ( ${REQUIRED_PYTHON_USE} ) + + +RDEPEND= + =app-editors/gedit-3.11.3[python?] + =dev-libs/glib-2.32:2 + =dev-libs/libpeas-1.7.0[gtk,python?] + =x11-libs/gtk+-3.9:3 + =x11-libs/gtksourceview-3.9.2:3.0 + python? ( + ${PYTHON_DEPS} + =app-editors/gedit-3[introspection,${PYTHON_USEDEP}] + dev-libs/libpeas[${PYTHON_USEDEP}] + =dev-python/dbus-python-0.82[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] + =x11-libs/gtk+-3.9:3[introspection] + =x11-libs/gtksourceview-3.9.2:3.0[introspection] + x11-libs/pango[introspection] + x11-libs/gdk-pixbuf:2[introspection] + ) + charmap? ( =gnome-extra/gucharmap-3:2.90[introspection] ) + git? ( =dev-libs/libgit2-glib-0.0.6 ) + terminal? ( x11-libs/vte:2.90[introspection] ) + +DEPEND=${RDEPEND} + =dev-util/intltool-0.40.0 + sys-devel/gettext + virtual/pkgconfig + + +src_configure() { + gnome2_src_configure \ + $(use_enable python) \ + ITSTOOL=$(type -P true) +} + +src_install() { + gnome2_src_install + + # FIXME: crazy !!! + find ${ED}/usr/share/gedit -name *.py* -delete || die + find ${ED}/usr/share/gedit -type d -empty -delete || die + + # FIXME: upstream made this automagic... + clean_plugin charmap + clean_plugin git + clean_plugin terminal +} + +clean_plugin() { + if use !${1} ; then + rm -rf ${ED}/usr/share/gedit/plugins/${1}* + rm -rf ${ED}/usr/$(get_libdir)/gedit/plugins/${1}* + fi +}
[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/
commit: f962459ec94d71ad23656f0fc2430c2d8c7bb0ea Author: Gilles Dartiguelongue eva AT gentoo DOT org AuthorDate: Sun Apr 6 20:40:54 2014 + Commit: Gilles Dartiguelongue eva AT gentoo DOT org CommitDate: Sun Apr 20 22:54:57 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f962459e app-editors/gedit: 3.10.4 → 3.12.0 --- .../{gedit-.ebuild = gedit-3.12.0.ebuild} | 36 +- app-editors/gedit/gedit-.ebuild| 8 ++--- 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/app-editors/gedit/gedit-.ebuild b/app-editors/gedit/gedit-3.12.0.ebuild similarity index 74% copy from app-editors/gedit/gedit-.ebuild copy to app-editors/gedit/gedit-3.12.0.ebuild index a9e49c8..d2c5a58 100644 --- a/app-editors/gedit/gedit-.ebuild +++ b/app-editors/gedit/gedit-3.12.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -8,9 +8,6 @@ GNOME2_LA_PUNT=yes # plugins are dlopened PYTHON_COMPAT=( python3_{2,3} ) inherit eutils gnome2 multilib python-r1 virtualx -if [[ ${PV} = ]]; then - inherit gnome2-live -fi DESCRIPTION=A text editor for the GNOME desktop HOMEPAGE=http://live.gnome.org/Gedit; @@ -20,19 +17,15 @@ SLOT=0 IUSE=+introspection +python spell zeitgeist REQUIRED_USE=python? ( ${PYTHON_REQUIRED_USE} ) -if [[ ${PV} = ]]; then - IUSE=${IUSE} doc - KEYWORDS= -else - KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux -fi + +KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux # X libs are not needed for OSX (aqua) COMMON_DEPEND= =dev-libs/libxml2-2.5.0:2 - =dev-libs/glib-2.37.5:2 - =x11-libs/gtk+-3.9.9:3[introspection?] - =x11-libs/gtksourceview-3.9.91:3.0[introspection?] + =dev-libs/glib-2.39.5:2 + =x11-libs/gtk+-3.11.6:3[introspection?] + =x11-libs/gtksourceview-3.11.2:3.0[introspection?] =dev-libs/libpeas-1.7.0[gtk] gnome-base/gsettings-desktop-schemas @@ -69,15 +62,15 @@ DEPEND=${COMMON_DEPEND} # yelp-tools, gnome-common needed to eautoreconf -if [[ ${PV} = ]]; then - DEPEND=${DEPEND} - doc? ( =dev-util/gtk-doc-1 ) - app-text/yelp-tools -fi +src_prepare() { + # FIXME: Not able to set some metadata + sed -e '/g_test_add_func/d' \ + -i tests/document-loader.c || die + + gnome2_src_prepare +} src_configure() { - local myconf= - [[ ${PV} != ]] myconf=ITSTOOL=$(type -P true) DOCS=AUTHORS BUGS ChangeLog MAINTAINERS NEWS README gnome2_src_configure \ --disable-deprecations \ @@ -87,8 +80,7 @@ src_configure() { $(use_enable python) \ $(use_enable spell) \ $(use_enable zeitgeist) \ - ITSTOOL=$(type -P true) \ - ${myconf} + ITSTOOL=$(type -P true) } src_test() { diff --git a/app-editors/gedit/gedit-.ebuild b/app-editors/gedit/gedit-.ebuild index a9e49c8..30d24b6 100644 --- a/app-editors/gedit/gedit-.ebuild +++ b/app-editors/gedit/gedit-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -30,9 +30,9 @@ fi # X libs are not needed for OSX (aqua) COMMON_DEPEND= =dev-libs/libxml2-2.5.0:2 - =dev-libs/glib-2.37.5:2 - =x11-libs/gtk+-3.9.9:3[introspection?] - =x11-libs/gtksourceview-3.9.91:3.0[introspection?] + =dev-libs/glib-2.39.5:2 + =x11-libs/gtk+-3.11.6:3[introspection?] + =x11-libs/gtksourceview-3.11.2:3.0[introspection?] =dev-libs/libpeas-1.7.0[gtk] gnome-base/gsettings-desktop-schemas