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

Package-Manager: portage-2.1.3.13

6 files changed, 26 insertions, 54 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/Manifest b/app-editors/gedit/Manifest
index f0ed8d7ae1ee..a54063aaacb8 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -10,14 +10,10 @@ AUX gedit-2.18.2-libattr.patch 1054 RMD160 b4e3452ed002a972e01ccc9b38f5f15b0f4c0
 MD5 07a9558c57b270f6a97cc781a2f3c1b6 files/gedit-2.18.2-libattr.patch 1054
 RMD160 b4e3452ed002a972e01ccc9b38f5f15b0f4c0486 files/gedit-2.18.2-libattr.patch 1054
 SHA256 78f61a0b32811d986740c4b08c3cd77ad5770ad2f6ba99cbc2bc7ee5e87d8248 files/gedit-2.18.2-libattr.patch 1054
-AUX gedit-2.19.91-libattr.patch 1183 RMD160 11f2940bdef96f48abad970793530f4594ca766f SHA1 5da70a7d333747cb98dd20df204cfaf32e115227 SHA256 87c9e726513ae8e98061bf1c7c2aa57ac7ff27c475fc9b9da15017bf6aeaf657
-MD5 a0e90c40dd2e5510c02c0a47599e468b files/gedit-2.19.91-libattr.patch 1183
-RMD160 11f2940bdef96f48abad970793530f4594ca766f files/gedit-2.19.91-libattr.patch 1183
-SHA256 87c9e726513ae8e98061bf1c7c2aa57ac7ff27c475fc9b9da15017bf6aeaf657 files/gedit-2.19.91-libattr.patch 1183
 DIST gedit-2.16.2.tar.bz2 2851971 RMD160 a15ff0981ee190453fe9a748a601ee03b14a890f SHA1 02e653ed0f8eaf5e147e24d8e4e5291eb94814e3 SHA256 8c5c3d5319d060b0db15c30c48503fde85341fa0f1aa848e99c1f0b825c20b4e
 DIST gedit-2.18.1.tar.bz2 3392618 RMD160 779981214ea91f3d83c726429026553f34149425 SHA1 a9c460872a439ae346e6ec062065d94c9c02bdf0 SHA256 7f6f0e9517a4b8fd741523e04c413e04279ed670001923646f2ea1e2e35929c4
 DIST gedit-2.18.2.tar.bz2 3454560 RMD160 d9845a95ace6dfaf1afb7a3f3e515c48baaf0743 SHA1 3f6a39eea007f4a89f25897b5d99530139032ce6 SHA256 12e4c2e15c1449e92f9f6c7966f4e1829290d5af35b9ec0b9274d8f167a89f44
-DIST gedit-2.20.0.tar.bz2 3755297 RMD160 a9f936ffe416b715ee4f47a01c380e13956c45be SHA1 49ce1d7c22f62c1f6e388b38d1cd8af53cbef153 SHA256 cd8263f5d5439e843f86fd8068c17b68f84d9ffb98c11bdc10c1b63f33f623ac
+DIST gedit-2.20.2.tar.bz2 3811770 RMD160 37b95b428d4acba1a55b7ffba41e868948881b01 SHA1 ada2269502ef7ef18da5387b3b1ca1d368e01d84 SHA256 dd044bdfd21b5eba9c85a7486904f47208a47d668de351820a6900956de3c590
 EBUILD gedit-2.16.2-r1.ebuild 1544 RMD160 22996359068ac60a1dfc11fb0ce0f57d124f6047 SHA1 377ea719aee9a2c15fca34508d64a6af19d41982 SHA256 77d59af4ac693bdc4ab0f8229bfd4573939d8398c8fc9c9eaeee93639400051f
 MD5 ad6f2fc6229ea65c5187a096f58f9e58 gedit-2.16.2-r1.ebuild 1544
 RMD160 22996359068ac60a1dfc11fb0ce0f57d124f6047 gedit-2.16.2-r1.ebuild 1544
@@ -34,14 +30,14 @@ EBUILD gedit-2.18.2.ebuild 1644 RMD160 35bee6e97625e3ab4ae5976c5e08fb2e1ddf6048
 MD5 10de8bc841049ff780e6169a8422cc4a gedit-2.18.2.ebuild 1644
 RMD160 35bee6e97625e3ab4ae5976c5e08fb2e1ddf6048 gedit-2.18.2.ebuild 1644
 SHA256 cca2afa2914e594f8f2d44c2f586804876f1878867d74d8e66532171e1582755 gedit-2.18.2.ebuild 1644
-EBUILD gedit-2.20.0.ebuild 1864 RMD160 fac5600f786d83f182ac3631b05047e9aee41f3f SHA1 4ddc6d5e684d929c3c324158d8a571fcf9a227d8 SHA256 72a2e3b177d8f95c8b56f0637a83e5ae1342d37653e9520e6836cf61bd8bb04e
-MD5 42e180b987e2cbfbd7806ec06222776e gedit-2.20.0.ebuild 1864
-RMD160 fac5600f786d83f182ac3631b05047e9aee41f3f gedit-2.20.0.ebuild 1864
-SHA256 72a2e3b177d8f95c8b56f0637a83e5ae1342d37653e9520e6836cf61bd8bb04e gedit-2.20.0.ebuild 1864
-MISC ChangeLog 24865 RMD160 34a11510e1dfde6ce0b88840b51ae614991788cf SHA1 71c458936a7b51f29f252d8d91420129168bcf74 SHA256 65e99c1e2693c56ff2336dba4d1212fe40c7fed9c2672ae3c01827718ca03fad
-MD5 45d76cde37d2c8d9cddb93a82a90016f ChangeLog 24865
-RMD160 34a11510e1dfde6ce0b88840b51ae614991788cf ChangeLog 24865
-SHA256 65e99c1e2693c56ff2336dba4d1212fe40c7fed9c2672ae3c01827718ca03fad ChangeLog 24865
+EBUILD gedit-2.20.2.ebuild 1758 RMD160 ade8bfbdbe37281ad17f615ad16c49e028d6b202 SHA1 e6cb02d1d951fa5fb9dec0e5e2bc66ab49e9fe64 SHA256 ccc2fa4e85f85aab73b51e8f4b53422c4f11688b44ea9d0e3858a406370de972
+MD5 8d0a5ab4ee81d75060f75c4cdde35e56 gedit-2.20.2.ebuild 1758
+RMD160 ade8bfbdbe37281ad17f615ad16c49e028d6b202 gedit-2.20.2.ebuild 1758
+SHA256 ccc2fa4e85f85aab73b51e8f4b53422c4f11688b44ea9d0e3858a406370de972 gedit-2.20.2.ebuild 1758
+MISC ChangeLog 25114 RMD160 21f6cc2b2a3634432a5b2b66b5d3c6f139dcfb3a SHA1 6dbeee91611690f3ed16ce80d43fb06df6aa5ced SHA256 d97a7555b17900cb1b5f99235eedf6d74a24eb12531268d98ca493ff7fc787a3
+MD5 bc5aee495f2e6b81ecf74e5e46084f9a ChangeLog 25114
+RMD160 21f6cc2b2a3634432a5b2b66b5d3c6f139dcfb3a ChangeLog 25114
+SHA256 d97a7555b17900cb1b5f99235eedf6d74a24eb12531268d98ca493ff7fc787a3 ChangeLog 25114
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -58,6 +54,6 @@ SHA256 51fc2de6835fd466d9ee8d7e747caeee4aa96721a8ca0263bb8adcd463bf8ffb files/di
 MD5 134573f2989192cc7c549cac3fed6d0a files/digest-gedit-2.18.2-r1 244
 RMD160 a560ba960b067e6a9cb352519b0477014eeb46ba files/digest-gedit-2.18.2-r1 244
 SHA256 51fc2de6835fd466d9ee8d7e747caeee4aa96721a8ca0263bb8adcd463bf8ffb files/digest-gedit-2.18.2-r1 244
-MD5 1c3fdae0ba788b2b5a6a3d7c4e06075a files/digest-gedit-2.20.0 244
-RMD160 71b25f3498ae918659d164733908afdcd6f8dcdb files/digest-gedit-2.20.0 244
-SHA256 dc00b874430078476e0bd726d605583bd210e3dad89faf9d9443e7e5fa908d67 files/digest-gedit-2.20.0 244
+MD5 f2a9b3e6772ebd350c464e229395c465 files/digest-gedit-2.20.2 244
+RMD160 e6ad34c4f0daa930db5bf28ddbb0a25c56a31338 files/digest-gedit-2.20.2 244
+SHA256 b9051c2492abe48a0f52034f3acb06e08947ed16f6911717b5c99a6ba98cc51d files/digest-gedit-2.20.2 244
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
 }