app-editors/gedit: Bump to version 2.20.2 (bugfix and translations), the libattr patch is now included

(Portage version: 2.1.3.13)

5 files changed, 14 insertions, 38 deletions

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 <remi@gentoo.org>
+  -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 <remi@gentoo.org> 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.2.ebuild
index 37e0e5edda7a..89938586dd05 100644
--- a/app-editors/gedit/gedit-2.20.0.ebuild
+++ b/app-editors/gedit/gedit-2.20.2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $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
 
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	>=app-text/gnome-doc-utils-0.3.2"
 
-DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README THANKS TODO"
+DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
 
 if [[ "${ARCH}" == "PPC" ]] ; then
 	# HACK HACK HACK: someone fix this garbage
@@ -63,8 +63,5 @@ src_unpack() {
 	# 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
 }