commit: 40a02d3842bfcf9e0827bc2fe4e46bbeb3eed521
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 15 23:28:28 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 15 23:28:28 2014 +0000
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-9999.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..0000000
--- 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-9999.ebuild
b/app-editors/gedit/gedit-9999.ebuild
index ca629cf..b05445f 100644
--- a/app-editors/gedit/gedit-9999.ebuild
+++ b/app-editors/gedit/gedit-9999.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 file mode 100644
index 72cd9b9..0000000
--- a/app-editors/gedit/patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- gedit-3.14.1.ebuild 2014-11-23 23:34:02.263550165 +0100
-+++ gedit-3.14.1.ebuild 2014-11-24 22:53:47.000000000 +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
- }
