Remove iconv patch for now, as it breaks builds.

Package-Manager: portage-2.1.2.4

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index 9f471d8a76c8aa0524539d897562c14322bb8564..762bbda681a9a2a0db4ebfa51831f393de0a09b4 100644 (file)
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/scite
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.65 2007/04/19 22:09:11 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.66 2007/04/21 12:47:58 nelchael Exp $
+
+  21 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/scite-1.73-iconv.patch, scite-1.73.ebuild:
+  Remove iconv patch for now, as it breaks builds.
 
   19 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org>
   +files/scite-1.73-iconv.patch, scite-1.73.ebuild:

diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index ad6347fff755b7e983b559f6dd11d602d7e7e79a..bb7fa0b5e879fe365b1c06bd7b5152a1e10bfa54 100644 (file)
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -5,10 +5,6 @@ AUX scite-1.72-install.patch 796 RMD160 54e598b9ed974bcd24e8fe4ef46bf6f5c037356b
 MD5 95ea30a65640fb6a0149413208179d45 files/scite-1.72-install.patch 796
 RMD160 54e598b9ed974bcd24e8fe4ef46bf6f5c037356b files/scite-1.72-install.patch 796
 SHA256 c8e2a3ea36c43ffb9c3f8f7175f79f8a2e3f1eccef4323ba22571d198ebe2294 files/scite-1.72-install.patch 796
-AUX scite-1.73-iconv.patch 954 RMD160 52fb98cb4e7b7a7db31030577f68475b09206233 SHA1 c125bc8e1d14ebaaf45ba1a854c15f4b74a1d34b SHA256 4935109616e4bd9ab1030651a17eb26fdecd984492428cb2699ded748216df44
-MD5 1408673123d1962d713ef8d9b6e3ff0e files/scite-1.73-iconv.patch 954
-RMD160 52fb98cb4e7b7a7db31030577f68475b09206233 files/scite-1.73-iconv.patch 954
-SHA256 4935109616e4bd9ab1030651a17eb26fdecd984492428cb2699ded748216df44 files/scite-1.73-iconv.patch 954
 AUX scite-1.73-install.patch 796 RMD160 54e598b9ed974bcd24e8fe4ef46bf6f5c037356b SHA1 4867e253ae7831fdae2e0425441fee24c176d694 SHA256 c8e2a3ea36c43ffb9c3f8f7175f79f8a2e3f1eccef4323ba22571d198ebe2294
 MD5 95ea30a65640fb6a0149413208179d45 files/scite-1.73-install.patch 796
 RMD160 54e598b9ed974bcd24e8fe4ef46bf6f5c037356b files/scite-1.73-install.patch 796
@@ -23,14 +19,14 @@ EBUILD scite-1.72.ebuild 1862 RMD160 ec5457be0aded4d43982f6d1bcc8cff8d66add13 SH
 MD5 06bc55f30eb992afaa14122707bc9da6 scite-1.72.ebuild 1862
 RMD160 ec5457be0aded4d43982f6d1bcc8cff8d66add13 scite-1.72.ebuild 1862
 SHA256 4fecc63808b6ba8255de1a7e8ac356bf2bcdf0aabf31f2c8b5fbb1f95f5fd47c scite-1.72.ebuild 1862
-EBUILD scite-1.73.ebuild 1905 RMD160 36db3f132093296aa648fea5eac833b09f953641 SHA1 66abcde5beb00b369f268adc81fd0e5b3cff1015 SHA256 45cdbbd52817cbc80bc3a92595b5191b1bd2ec8f2d5fd4852f29b3bae7a4316e
-MD5 5db32ce9e274c3db04d038e4dfe80e51 scite-1.73.ebuild 1905
-RMD160 36db3f132093296aa648fea5eac833b09f953641 scite-1.73.ebuild 1905
-SHA256 45cdbbd52817cbc80bc3a92595b5191b1bd2ec8f2d5fd4852f29b3bae7a4316e scite-1.73.ebuild 1905
-MISC ChangeLog 10192 RMD160 a19a2700e2a0a75c8fc3603a53015263e965fe7c SHA1 81d51c6c2419532cc7c826ffae8d37876500862f SHA256 e95008990fa3d6c8f3348e4e7638907aee1cd78623b26f86b5946d6b3e37d2dc
-MD5 31a490038b8b0bce42f7a2de753662d3 ChangeLog 10192
-RMD160 a19a2700e2a0a75c8fc3603a53015263e965fe7c ChangeLog 10192
-SHA256 e95008990fa3d6c8f3348e4e7638907aee1cd78623b26f86b5946d6b3e37d2dc ChangeLog 10192
+EBUILD scite-1.73.ebuild 1868 RMD160 57c180de671cf0238e5061507c672482cea1aba6 SHA1 a0ba3d086505e77aa6d19383eb52fdd0f4457255 SHA256 b5e04b100ac77fdfe9d699abca9f1fda922dae7c7acedecc6574528a85a9ed3a
+MD5 f7f2074a04814836fa25c6057292a8b5 scite-1.73.ebuild 1868
+RMD160 57c180de671cf0238e5061507c672482cea1aba6 scite-1.73.ebuild 1868
+SHA256 b5e04b100ac77fdfe9d699abca9f1fda922dae7c7acedecc6574528a85a9ed3a scite-1.73.ebuild 1868
+MISC ChangeLog 10349 RMD160 5deac08df9b4ee66dadd818e43f9659da7ca280d SHA1 9a4ff078c87bbc49e82fd8fce2d6e0ffac025dfb SHA256 563735d45bf1147601b49c3e2eec90372ac42f94bd85adfe6a811f8ab40d4c98
+MD5 3e186e607d6b6cb3ae5523092a098eac ChangeLog 10349
+RMD160 5deac08df9b4ee66dadd818e43f9659da7ca280d ChangeLog 10349
+SHA256 563735d45bf1147601b49c3e2eec90372ac42f94bd85adfe6a811f8ab40d4c98 ChangeLog 10349
 MISC metadata.xml 304 RMD160 809312aa3c6eb0e2b42bfe747cbafdcf21947ff1 SHA1 8523f14def71e343644655b7890f96e14864216c SHA256 a562714322c75636ca3a75c641035e41d6066319a292473fd1811fe7ac70d655
 MD5 013655633e03ee4396e6da8e45481935 metadata.xml 304
 RMD160 809312aa3c6eb0e2b42bfe747cbafdcf21947ff1 metadata.xml 304
@@ -44,7 +40,7 @@ SHA256 acce6a6481c0193caad48a16d0851a6a18179479b78acafbcdd6e64bfa89743a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGJ+iygo/w9rxVVVERAlExAJ4/aTJooubZuD5TJi+i5hD0J6Po2gCfWqKF
-G5SurQGB7q+BMd7C3Y7Lx5o=
-=xwqd
+iD8DBQFGKggrgo/w9rxVVVERAvndAJ9iWczEeRFjJrBWqFv0+aH7bnzfLACfVQEu
+WvEjLo6jSuIRwS0GLTCfi98=
+=MKlv
 -----END PGP SIGNATURE-----

diff --git a/app-editors/scite/files/scite-1.73-iconv.patch b/app-editors/scite/files/scite-1.73-iconv.patch
deleted file mode 100644 (file)
index 840ac22..0000000
--- a/app-editors/scite/files/scite-1.73-iconv.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- scite/gtk/makefile.old     2007-04-19 21:19:30.000000000 +0200
-+++ scite/gtk/makefile 2007-04-19 21:20:10.000000000 +0200
-@@ -26,11 +26,13 @@
- CONFIGFLAGS=pkg-config --cflags gtk+-2.0
- CONFIGLIB=pkg-config --libs gtk+-2.0 gthread-2.0
- CONFIGTHREADS=
-+CONFIGICONV=-liconv
- gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
- else
- CONFIGFLAGS=gtk-config --cflags
- CONFIGLIB=gtk-config --libs
- CONFIGTHREADS=glib-config --libs gthread
-+CONFIGICONV=
- gnomeprefix:=$(shell gnome-config --prefix 2>/dev/null)
- endif
- ifndef prefix
-@@ -103,7 +105,7 @@
- $(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \
- MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \
-       $(COMPLIB) $(LUA_OBJS)
--      $(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ `$(CONFIGLIB)`
-+      $(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ `$(CONFIGLIB)` $(CONFIGICONV)
- 
- # Automatically generate header dependencies with "make deps"
- include deps.mak

diff --git a/app-editors/scite/scite-1.73.ebuild b/app-editors/scite/scite-1.73.ebuild
index f008da76a0ece52ef2def8a395681688752df0a4..42bace296e08e400fe10af27dfeb6983967d2cca 100644 (file)
--- a/app-editors/scite/scite-1.73.ebuild
+++ b/app-editors/scite/scite-1.73.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/scite/scite-1.73.ebuild,v 1.2 2007/04/19 22:09:11 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.73.ebuild,v 1.3 2007/04/21 12:47:58 nelchael Exp $
 
 inherit toolchain-funcs eutils
 
@@ -42,7 +42,6 @@ src_unpack() {
                -e 's#-g root#-g 0#' \
                || die "error patching makefile"
        epatch ${FILESDIR}/${P}-install.patch
-       epatch ${FILESDIR}/${P}-iconv.patch
 }
 
 src_compile() {