From f49aa4040a2542e326f3dcb957da53c4aa0d457f Mon Sep 17 00:00:00 2001 From: Rémi Cardona Date: Tue, 16 Oct 2007 19:50:02 +0000 Subject: app-editors/gedit: Bump to version 2.20.2 (bugfix and translations), the libattr patch is now included (Portage version: 2.1.3.13) --- app-editors/gedit/ChangeLog | 10 +++- app-editors/gedit/files/digest-gedit-2.20.0 | 3 - app-editors/gedit/files/digest-gedit-2.20.2 | 3 + .../gedit/files/gedit-2.19.91-libattr.patch | 29 --------- app-editors/gedit/gedit-2.20.0.ebuild | 70 ---------------------- app-editors/gedit/gedit-2.20.2.ebuild | 67 +++++++++++++++++++++ 6 files changed, 79 insertions(+), 103 deletions(-) delete mode 100644 app-editors/gedit/files/digest-gedit-2.20.0 create mode 100644 app-editors/gedit/files/digest-gedit-2.20.2 delete mode 100644 app-editors/gedit/files/gedit-2.19.91-libattr.patch delete mode 100644 app-editors/gedit/gedit-2.20.0.ebuild create mode 100644 app-editors/gedit/gedit-2.20.2.ebuild (limited to 'app-editors') diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog index 69a9c81bb03e..8fa38ae8bd3d 100644 --- a/app-editors/gedit/ChangeLog +++ b/app-editors/gedit/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-editors/gedit # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.209 2007/10/11 18:07:39 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.210 2007/10/16 19:50:02 remi Exp $ + +*gedit-2.20.2 (16 Oct 2007) + + 16 Oct 2007; Rémi Cardona + -files/gedit-2.19.91-libattr.patch, -gedit-2.20.0.ebuild, + +gedit-2.20.2.ebuild: + Bump to version 2.20.2 (bugfix and translations), the libattr patch is now + included 11 Oct 2007; Rémi Cardona gedit-2.20.0.ebuild: onliner to fix QA warning (turns out the code was broken anyway) diff --git a/app-editors/gedit/files/digest-gedit-2.20.0 b/app-editors/gedit/files/digest-gedit-2.20.0 deleted file mode 100644 index 4301188f652d..000000000000 --- a/app-editors/gedit/files/digest-gedit-2.20.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 6c14d4f3583c921bdd551df6cd822289 gedit-2.20.0.tar.bz2 3755297 -RMD160 a9f936ffe416b715ee4f47a01c380e13956c45be gedit-2.20.0.tar.bz2 3755297 -SHA256 cd8263f5d5439e843f86fd8068c17b68f84d9ffb98c11bdc10c1b63f33f623ac gedit-2.20.0.tar.bz2 3755297 diff --git a/app-editors/gedit/files/digest-gedit-2.20.2 b/app-editors/gedit/files/digest-gedit-2.20.2 new file mode 100644 index 000000000000..4e5b80b5f272 --- /dev/null +++ b/app-editors/gedit/files/digest-gedit-2.20.2 @@ -0,0 +1,3 @@ +MD5 4a51623224cfe0c6ac872e191a14ac8f gedit-2.20.2.tar.bz2 3811770 +RMD160 37b95b428d4acba1a55b7ffba41e868948881b01 gedit-2.20.2.tar.bz2 3811770 +SHA256 dd044bdfd21b5eba9c85a7486904f47208a47d668de351820a6900956de3c590 gedit-2.20.2.tar.bz2 3811770 diff --git a/app-editors/gedit/files/gedit-2.19.91-libattr.patch b/app-editors/gedit/files/gedit-2.19.91-libattr.patch deleted file mode 100644 index b3f434d4cbd9..000000000000 --- a/app-editors/gedit/files/gedit-2.19.91-libattr.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gedit-2.19.91.orig/configure.ac gedit-2.19.91/configure.ac ---- gedit-2.19.91.orig/configure.ac 2007-08-28 03:44:13.000000000 -0400 -+++ gedit-2.19.91/configure.ac 2007-09-13 16:04:46.000000000 -0400 -@@ -138,8 +138,16 @@ AC_SUBST(SPELL_PLUGIN_DIR) - dnl ================================================================ - dnl libattr checks - dnl ================================================================ -+AC_MSG_CHECKING([whether libattr support is requested]) -+AC_ARG_ENABLE([attr], -+ AS_HELP_STRING([--enable-attr],[Enable libattr support]), -+ [enable_attr=$enableval have_attr=$enableval], -+ [enable_attr=autodetect have_attr=yes]) -+AC_MSG_RESULT([$enable_attr]) - --AC_CHECK_LIB(attr, attr_copy_fd) -+if test "x$have_attr" != "xno"; then -+ AC_CHECK_LIB([attr], [attr_copy_fd], [], [have_attr=no]) -+fi - - dnl ================================================================ - dnl Start of pkg-config checks -@@ -367,6 +375,7 @@ Configuration: - Compiler: ${CC} - Python Plugins Support: $enable_python - Spell Plugin enabled: $enable_enchant -+ Libattr enabled: $have_attr - " - - dnl uncomment this in developement releases diff --git a/app-editors/gedit/gedit-2.20.0.ebuild b/app-editors/gedit/gedit-2.20.0.ebuild deleted file mode 100644 index 37e0e5edda7a..000000000000 --- a/app-editors/gedit/gedit-2.20.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.20.0.ebuild,v 1.4 2007/10/12 16:27:35 mr_bones_ Exp $ - -inherit gnome2 eutils autotools - -DESCRIPTION="A text editor for the GNOME desktop" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="doc python spell xattr" - -RDEPEND=">=gnome-base/gconf-2 - xattr? ( sys-apps/attr ) - >=dev-libs/glib-2.13.5 - >=x11-libs/gtk+-2.11.6 - =x11-libs/gtksourceview-2* - >=gnome-base/libgnomeui-2.16 - >=gnome-base/libglade-2.5.1 - >=gnome-base/libgnomeprintui-2.12.1 - >=gnome-base/gnome-vfs-2.16 - spell? ( - >=app-text/enchant-1.2 - app-text/iso-codes - ) - python? ( - >=dev-python/pygobject-2.11.5 - >=dev-python/pygtk-2.9.7 - >=dev-python/pygtksourceview-2 - )" - -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/pkgconfig-0.9 - >=app-text/scrollkeeper-0.3.11 - >=dev-util/intltool-0.35 - >=app-text/gnome-doc-utils-0.3.2" - -DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README THANKS TODO" - -if [[ "${ARCH}" == "PPC" ]] ; then - # HACK HACK HACK: someone fix this garbage - MAKEOPTS="${MAKEOPTS} -j1" -fi - -pkg_setup() { - G2CONF="$(use_enable python) $(use_enable spell) $(use_enable xattr attr)" -} - -src_unpack() { - gnome2_src_unpack - - # Remove symbols that are not meant to be part of the docs, and - # break compilation if USE="doc -python" (bug #158638). - if use !python && use doc; then - epatch "${FILESDIR}"/${PN}-2.16.2-no_python_module_docs.patch - fi - - echo "gedit/gtksourceprintjob.c" >> po/POTFILES.in - - # chown on fbsd doesn't have --reference. Bug #183691 - epatch "${FILESDIR}"/${PN}-2.18.1-fbsd.patch - - # Make libattr optional; bug #191989 - epatch "${FILESDIR}"/${PN}-2.19.91-libattr.patch - - AT_M4DIR="./m4" eautoreconf -} diff --git a/app-editors/gedit/gedit-2.20.2.ebuild b/app-editors/gedit/gedit-2.20.2.ebuild new file mode 100644 index 000000000000..89938586dd05 --- /dev/null +++ b/app-editors/gedit/gedit-2.20.2.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.20.2.ebuild,v 1.1 2007/10/16 19:50:02 remi Exp $ + +inherit gnome2 eutils autotools + +DESCRIPTION="A text editor for the GNOME desktop" +HOMEPAGE="http://www.gnome.org/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="doc python spell xattr" + +RDEPEND=">=gnome-base/gconf-2 + xattr? ( sys-apps/attr ) + >=dev-libs/glib-2.13.5 + >=x11-libs/gtk+-2.11.6 + =x11-libs/gtksourceview-2* + >=gnome-base/libgnomeui-2.16 + >=gnome-base/libglade-2.5.1 + >=gnome-base/libgnomeprintui-2.12.1 + >=gnome-base/gnome-vfs-2.16 + spell? ( + >=app-text/enchant-1.2 + app-text/iso-codes + ) + python? ( + >=dev-python/pygobject-2.11.5 + >=dev-python/pygtk-2.9.7 + >=dev-python/pygtksourceview-2 + )" + +DEPEND="${RDEPEND} + sys-devel/gettext + >=dev-util/pkgconfig-0.9 + >=app-text/scrollkeeper-0.3.11 + >=dev-util/intltool-0.35 + >=app-text/gnome-doc-utils-0.3.2" + +DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README" + +if [[ "${ARCH}" == "PPC" ]] ; then + # HACK HACK HACK: someone fix this garbage + MAKEOPTS="${MAKEOPTS} -j1" +fi + +pkg_setup() { + G2CONF="$(use_enable python) $(use_enable spell) $(use_enable xattr attr)" +} + +src_unpack() { + gnome2_src_unpack + + # Remove symbols that are not meant to be part of the docs, and + # break compilation if USE="doc -python" (bug #158638). + if use !python && use doc; then + epatch "${FILESDIR}"/${PN}-2.16.2-no_python_module_docs.patch + fi + + echo "gedit/gtksourceprintjob.c" >> po/POTFILES.in + + # chown on fbsd doesn't have --reference. Bug #183691 + epatch "${FILESDIR}"/${PN}-2.18.1-fbsd.patch + + AT_M4DIR="./m4" eautoreconf +} -- cgit v1.2.3-65-gdbad