From 3f0ffa6a06fe27693f1d44bf23b22ad38ec4f3d8 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Thu, 6 Dec 2012 06:50:31 +0000 Subject: Version bump, update to EAPI5, drop old. (Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) --- app-text/gtranslator/ChangeLog | 9 ++- .../files/gtranslator-2.90.6-gtkspell3.patch | 40 ---------- app-text/gtranslator/gtranslator-2.90.8.ebuild | 89 --------------------- app-text/gtranslator/gtranslator-2.91.4.ebuild | 24 +++--- app-text/gtranslator/gtranslator-2.91.5.ebuild | 90 ++++++++++++++++++++++ 5 files changed, 110 insertions(+), 142 deletions(-) delete mode 100644 app-text/gtranslator/files/gtranslator-2.90.6-gtkspell3.patch delete mode 100644 app-text/gtranslator/gtranslator-2.90.8.ebuild create mode 100644 app-text/gtranslator/gtranslator-2.91.5.ebuild (limited to 'app-text/gtranslator') diff --git a/app-text/gtranslator/ChangeLog b/app-text/gtranslator/ChangeLog index 0ff6f723741e..b8965b3accda 100644 --- a/app-text/gtranslator/ChangeLog +++ b/app-text/gtranslator/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-text/gtranslator # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/ChangeLog,v 1.53 2012/09/15 03:38:18 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/ChangeLog,v 1.54 2012/12/06 06:50:31 tetromino Exp $ + +*gtranslator-2.91.5 (06 Dec 2012) + + 06 Dec 2012; Alexandre Rostovtsev + -files/gtranslator-2.90.6-gtkspell3.patch, -gtranslator-2.90.8.ebuild, + gtranslator-2.91.4.ebuild, +gtranslator-2.91.5.ebuild: + Version bump, update to EAPI5, drop old. 15 Sep 2012; Alexandre Rostovtsev gtranslator-1.9.13.ebuild, gtranslator-2.90.8.ebuild, diff --git a/app-text/gtranslator/files/gtranslator-2.90.6-gtkspell3.patch b/app-text/gtranslator/files/gtranslator-2.90.6-gtkspell3.patch deleted file mode 100644 index d546edf60b59..000000000000 --- a/app-text/gtranslator/files/gtranslator-2.90.6-gtkspell3.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -u -r gtranslator-2.90.5-orig/configure.ac gtranslator-2.90.5/configure.ac ---- gtranslator-2.90.5-orig/configure.ac 2011-08-28 18:59:30.000000000 +0400 -+++ gtranslator-2.90.5/configure.ac 2011-08-28 19:02:23.000000000 +0400 -@@ -87,7 +87,7 @@ - GDA_REQUIRED=4.2.3 - PEAS_REQUIRED=1.0.0 - GDICT_OPTIONAL=0.11.0 --GTKSPELL_OPTIONAL=2.0.16 -+GTKSPELL_OPTIONAL=3.0.0 - JSON_GLIB_OPTIONAL=0.12.0 - - AC_ARG_WITH(gda, -@@ -167,7 +167,7 @@ - fi - - dnl ------------------------------------------------------------------- --dnl Check for gtkspell >= 2.0 and use it if found -+dnl Check for gtkspell >= 3.0 and use it if found - dnl ------------------------------------------------------------------- - have_gtkspell=no - AC_ARG_WITH(gtkspell3, -@@ -177,7 +177,7 @@ - if test x"$with_gtkspell" != "xno" - then - PKG_CHECK_MODULES([GTKSPELL], [ -- gtkspell3-2.0 >= $GTKSPELL_OPTIONAL -+ gtkspell-3.0 >= $GTKSPELL_OPTIONAL - ], have_gtkspell=yes, have_gtkspell=no) - - if test x"$have_gtkspell" = "xyes" -@@ -335,7 +335,7 @@ - echo "Building spell support: ................................YES" - else - echo "Building spell support: ................................NO" -- echo " Requires gtkspell >= $GTKSPELL_OPTIONAL" -+ echo " Requires gtkspell3 >= $GTKSPELL_OPTIONAL" - fi - - echo " -Только в gtranslator-2.90.5: configure.ac~ diff --git a/app-text/gtranslator/gtranslator-2.90.8.ebuild b/app-text/gtranslator/gtranslator-2.90.8.ebuild deleted file mode 100644 index 95e62a8d2006..000000000000 --- a/app-text/gtranslator/gtranslator-2.90.8.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.90.8.ebuild,v 1.4 2012/09/15 03:38:18 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -PYTHON_DEPEND="gnome? 2" - -inherit gnome2 multilib python - -DESCRIPTION="An enhanced gettext po file editor for GNOME" -HOMEPAGE="http://gtranslator.sourceforge.net/" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc gnome spell" - -COMMON_DEPEND=" - >=dev-libs/glib-2.28.0:2 - >=x11-libs/gtk+-3.0.3:3 - >=x11-libs/gtksourceview-3.0.0:3.0 - >=dev-libs/gdl-2.91.91:3 - >=dev-libs/libxml2-2.4.12:2 - >=dev-libs/json-glib-0.12.0 - >=dev-libs/libpeas-1.0.0[gtk] - gnome-extra/libgda:5 - >=app-text/iso-codes-0.35 - - gnome-base/gsettings-desktop-schemas - - gnome? ( - || ( app-dicts/gnome-dictionary =gnome-extra/gnome-utils-3.2* ) - x11-libs/gtk+:3[introspection] ) - spell? ( app-text/gtkspell:3 )" -RDEPEND="${COMMON_DEPEND} - gnome? ( - >=dev-libs/libpeas-1.0.0[gtk,python] - || ( dev-python/pygobject:2[introspection] dev-python/pygobject:3 ) - gnome-extra/gucharmap:2.90[introspection] )" -DEPEND="${COMMON_DEPEND} - >=app-text/scrollkeeper-0.1.4 - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - app-text/gnome-doc-utils - app-text/docbook-xml-dtd:4.1.2 - doc? ( >=dev-util/gtk-doc-1 )" -# eautoreconf requires gnome-base/gnome-common - -pkg_setup() { - DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS" - G2CONF="${G2CONF} - --disable-static - $(use_with gnome dictionary) - $(use_enable gnome introspection) - $(use_with spell gtkspell3)" - - if use gnome; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - gnome2_src_prepare - - if use gnome; then - python_clean_py-compile_files - else - # don't install charmap plugin, it requires gnome-extra/gucharmap - sed -e 's:\scharmap\s: :g' -i plugins/Makefile.* || - die "sed plugins/Makefile.* failed" - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - if use gnome; then - python_need_rebuild - python_mod_optimize /usr/$(get_libdir)/gtranslator/plugins - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - use gnome && python_mod_cleanup /usr/$(get_libdir)/gtranslator/plugins -} diff --git a/app-text/gtranslator/gtranslator-2.91.4.ebuild b/app-text/gtranslator/gtranslator-2.91.4.ebuild index 3801d2526a26..b645fbf6cff4 100644 --- a/app-text/gtranslator/gtranslator-2.91.4.ebuild +++ b/app-text/gtranslator/gtranslator-2.91.4.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.91.4.ebuild,v 1.3 2012/09/15 03:38:18 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.91.4.ebuild,v 1.4 2012/12/06 06:50:31 tetromino Exp $ -EAPI="4" +EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" PYTHON_DEPEND="gnome? 2" @@ -21,11 +21,11 @@ COMMON_DEPEND=" >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4.2:3 >=x11-libs/gtksourceview-3.0.0:3.0 - >=dev-libs/gdl-2.91.91:3 + >=dev-libs/gdl-2.91.91:3= >=dev-libs/libxml2-2.4.12:2 >=dev-libs/json-glib-0.12.0 >=dev-libs/libpeas-1.2[gtk] - gnome-extra/libgda:5 + gnome-extra/libgda:5= >=app-text/iso-codes-0.35 gnome-base/gsettings-desktop-schemas @@ -33,7 +33,7 @@ COMMON_DEPEND=" gnome? ( || ( app-dicts/gnome-dictionary =gnome-extra/gnome-utils-3.2* ) x11-libs/gtk+:3[introspection] ) - spell? ( app-text/gtkspell:3 )" + spell? ( app-text/gtkspell:3= )" RDEPEND="${COMMON_DEPEND} x11-themes/gnome-icon-theme-symbolic gnome? ( @@ -51,13 +51,6 @@ DEPEND="${COMMON_DEPEND} # eautoreconf requires gnome-base/gnome-common pkg_setup() { - DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS" - G2CONF="${G2CONF} - --disable-static - $(use_with gnome dictionary) - $(use_enable gnome introspection) - $(use_with spell gtkspell3)" - if use gnome; then python_set_active_version 2 python_pkg_setup @@ -65,6 +58,13 @@ pkg_setup() { } src_prepare() { + DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS" + G2CONF="${G2CONF} + --disable-static + $(use_with gnome dictionary) + $(use_enable gnome introspection) + $(use_with spell gtkspell3)" + gnome2_src_prepare if use gnome; then diff --git a/app-text/gtranslator/gtranslator-2.91.5.ebuild b/app-text/gtranslator/gtranslator-2.91.5.ebuild new file mode 100644 index 000000000000..e3143ea4e2e4 --- /dev/null +++ b/app-text/gtranslator/gtranslator-2.91.5.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.91.5.ebuild,v 1.1 2012/12/06 06:50:31 tetromino Exp $ + +EAPI="5" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" +PYTHON_DEPEND="gnome? 2" + +inherit gnome2 multilib python + +DESCRIPTION="An enhanced gettext po file editor for GNOME" +HOMEPAGE="http://gtranslator.sourceforge.net/" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="doc gnome spell" + +COMMON_DEPEND=" + >=dev-libs/glib-2.32:2 + >=x11-libs/gtk+-3.4.2:3 + >=x11-libs/gtksourceview-3.0.0:3.0 + >=dev-libs/gdl-2.91.91:3= + >=dev-libs/libxml2-2.4.12:2 + >=dev-libs/json-glib-0.12.0 + >=dev-libs/libpeas-1.2[gtk] + gnome-extra/libgda:5= + >=app-text/iso-codes-0.35 + + gnome-base/gsettings-desktop-schemas + + gnome? ( + || ( app-dicts/gnome-dictionary =gnome-extra/gnome-utils-3.2* ) + x11-libs/gtk+:3[introspection] ) + spell? ( app-text/gtkspell:3= )" +RDEPEND="${COMMON_DEPEND} + x11-themes/gnome-icon-theme-symbolic + gnome? ( + >=dev-libs/libpeas-1.2[gtk,python] + dev-python/pygobject:3 + gnome-extra/gucharmap:2.90[introspection] )" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + app-text/gnome-doc-utils + >=app-text/scrollkeeper-0.1.4 + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + doc? ( >=dev-util/gtk-doc-1 )" +# eautoreconf requires gnome-base/gnome-common + +pkg_setup() { + if use gnome; then + python_set_active_version 2 + python_pkg_setup + fi +} + +src_prepare() { + DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS" + G2CONF="${G2CONF} + --disable-static + $(use_with gnome dictionary) + $(use_enable gnome introspection) + $(use_with spell gtkspell3)" + + gnome2_src_prepare + + if use gnome; then + python_clean_py-compile_files + else + # don't install charmap plugin, it requires gnome-extra/gucharmap + sed -e 's:\scharmap\s: :g' -i plugins/Makefile.* || + die "sed plugins/Makefile.* failed" + fi +} + +pkg_postinst() { + gnome2_pkg_postinst + if use gnome; then + python_need_rebuild + python_mod_optimize /usr/$(get_libdir)/gtranslator/plugins + fi +} + +pkg_postrm() { + gnome2_pkg_postrm + use gnome && python_mod_cleanup /usr/$(get_libdir)/gtranslator/plugins +} -- cgit v1.2.3-65-gdbad