diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2014-10-07 00:40:54 +0200 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2014-10-07 00:40:54 +0200 |
commit | fe53b8bab7712476f311deca8e0c116354b515f4 (patch) | |
tree | d75e3eb80bff410ad3c2fc018f8b76adb0a554bb /app-editors/gedit | |
parent | gnome-extra/gnome-getting-started-docs: 3.12.1 → 3.14.0 (diff) | |
download | gnome-fe53b8bab7712476f311deca8e0c116354b515f4.tar.gz gnome-fe53b8bab7712476f311deca8e0c116354b515f4.tar.bz2 gnome-fe53b8bab7712476f311deca8e0c116354b515f4.zip |
app-editors/gedit: 3.12.2-r1 → 3.14.0
Diffstat (limited to 'app-editors/gedit')
-rw-r--r-- | app-editors/gedit/Manifest | 10 | ||||
-rw-r--r-- | app-editors/gedit/gedit-3.14.0.ebuild (renamed from app-editors/gedit/gedit-3.12.1.ebuild) | 63 | ||||
-rw-r--r-- | app-editors/gedit/gedit-9999.ebuild | 64 |
3 files changed, 99 insertions, 38 deletions
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest index 93923f81..b492e05f 100644 --- a/app-editors/gedit/Manifest +++ b/app-editors/gedit/Manifest @@ -1,11 +1,11 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 -DIST gedit-3.12.1.tar.xz 2892392 SHA256 8e3edc62102934a8be708b0fdf27b86368fa9ede885628283bf8e91b26bbb67f SHA512 68d6ccff930c89415105fdeb888c9a5e7e64a7468741e71b31773640ac818f1d79dda9ba9d7734b0c2cd0f57e383de468351d26a09f6c2eb2ad11981fa743b91 WHIRLPOOL 10ce6fbc264d2cb0056c1d8688062d68eee5005fe1bb7b86c270cd1c1238378ff2c20863c43a0994274f7e6669d75801127de7bf2517e748dc764bb787a12c38 +DIST gedit-3.14.0.tar.xz 2847576 SHA256 9c74f456cc3c0200a3409c3ece17fae17a22ee38213a53aa29ff8e346cba2f90 SHA512 3bbc904f4125e23b58f419f0eb875a7c9de1fc44e297f5c1208f0f8f82d29df713dbe39ceeb9d098eb3f4d1396193016b16b82aae5a1062241d10e3bbe474a0a WHIRLPOOL 5b8853e3d12bd4cce6104d5ba234187d148eb8c08004e818e782e34f98b456e35ad22746f78c6e77f0912574e940f79d075b615fd1964b0736c7957f01eb4d5a -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREKAAYFAlNYOVQACgkQ1fmVwcYIWAb01ACg1LUd75qtDpWYQRkJeIHWpS2E -lGAAn1WzbAINUz6mKdyu/FE8KVh+aY8q -=kWCX +iEYEAREKAAYFAlQzGncACgkQ1fmVwcYIWAaZIACfR0CT9811MU834jn7Ehkqh1A2 +jL4An0CJCcn64hY1CmnMf24CKnNDuzm6 +=HYMR -----END PGP SIGNATURE----- diff --git a/app-editors/gedit/gedit-3.12.1.ebuild b/app-editors/gedit/gedit-3.14.0.ebuild index d2c5a580..73acad4f 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-9999.ebuild b/app-editors/gedit/gedit-9999.ebuild index 30d24b63..3d76df01 100644 --- a/app-editors/gedit/gedit-9999.ebuild +++ b/app-editors/gedit/gedit-9999.ebuild @@ -6,19 +6,21 @@ 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 if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi 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} )" if [[ ${PV} = 9999 ]]; then IUSE="${IUSE} doc" @@ -31,8 +33,8 @@ fi 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 @@ -53,12 +55,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 @@ -75,20 +78,37 @@ if [[ ${PV} = 9999 ]]; then app-text/yelp-tools" fi +src_prepare() { + vala_src_prepare + gnome2_src_prepare +} + src_configure() { local myconf="" [[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)" 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) \ - ${myconf} + + gedit_configure() { + ECONF_SOURCE=${S} \ + gnome2_src_configure \ + --disable-deprecations \ + --enable-updater \ + --enable-gvfs-metadata \ + $(use_enable introspection) \ + $(use_enable spell) \ + $(use_enable vala) \ + ${myconf} \ + "$@" + } + + 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() { @@ -98,3 +118,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 +} |