fixfix build

Package-Manager: portage-2.1.1_pre3-r3

4 files changed, 88 insertions, 13 deletions

diff --git a/app-dicts/ispell-hu/ChangeLog b/app-dicts/ispell-hu/ChangeLog
index 97a4a5e11afe..9c6f304121ad 100644
--- a/app-dicts/ispell-hu/ChangeLog
+++ b/app-dicts/ispell-hu/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-dicts/ispell-hu
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/ispell-hu/ChangeLog,v 1.8 2006/03/19 18:57:29 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/ispell-hu/ChangeLog,v 1.9 2006/07/21 22:33:16 arj Exp $
+
+  21 Jul 2006; Anders Rune Jensen <arj@gentoo.org> ispell-hu-1.0.ebuild:
+  Fix compile with latest coreutils. Fixes #138228
 
 *ispell-hu-1.0 (19 Mar 2006)
 
diff --git a/app-dicts/ispell-hu/Manifest b/app-dicts/ispell-hu/Manifest
index 45d7f0fce19b..1575f15440ad 100644
--- a/app-dicts/ispell-hu/Manifest
+++ b/app-dicts/ispell-hu/Manifest
@@ -1,6 +1,10 @@
+AUX ispell-hu-1.0-fix-build.patch 2423 RMD160 a6c546420bc7dc4fd4fd8baa0f799fa87365b785 SHA1 ae363ee385ef606e440ecc2e66ae9342f6f060d8 SHA256 b0cff2d8bf7684a7a10c87425b56bd411d2f2b8d8f9077e94f5ac811a2c160be
+MD5 dd2bfbda7854dad74344baf4de37ad72 files/ispell-hu-1.0-fix-build.patch 2423
+RMD160 a6c546420bc7dc4fd4fd8baa0f799fa87365b785 files/ispell-hu-1.0-fix-build.patch 2423
+SHA256 b0cff2d8bf7684a7a10c87425b56bd411d2f2b8d8f9077e94f5ac811a2c160be files/ispell-hu-1.0-fix-build.patch 2423
 DIST magyarispell-0.93.tar.gz 549928
 DIST magyarispell-0.99.4.tar.gz 766039 RMD160 4df896939b0341cf018697ecbc1d773fdcc61a49 SHA256 481581402831d47116ec546daa8031f6c402a2d086ee7d91403b7baab6e7d03d
-DIST magyarispell-1.0.tar.gz 848129 RMD160 43eb244ddef39da5b27872bd677f792bf0b55a6a SHA256 af458167dae76762668abeae966a9e9c59b1b72f513afa8d0f23d614c22e75cb
+DIST magyarispell-1.0.tar.gz 848129 RMD160 43eb244ddef39da5b27872bd677f792bf0b55a6a SHA1 4c32dd50a98600ed32f164621c8a1dc3e7b8241d SHA256 af458167dae76762668abeae966a9e9c59b1b72f513afa8d0f23d614c22e75cb
 EBUILD ispell-hu-0.93.ebuild 665 RMD160 2b5d390294f1b225375e531e9c23e4b21f6cc099 SHA1 25c662ea87d636952a3e7dd029a38846ca382668 SHA256 0fef40a9bed31b3b9ca8c953a0f93a490e8e0ec4783f6691ccee1f7798d1ab41
 MD5 54f4185c3ac9792a4499fe8e84d68a4d ispell-hu-0.93.ebuild 665
 RMD160 2b5d390294f1b225375e531e9c23e4b21f6cc099 ispell-hu-0.93.ebuild 665
@@ -9,14 +13,14 @@ EBUILD ispell-hu-0.99.4.ebuild 797 RMD160 a4c177ce091fc7194da62595ac68ed2ba67e06
 MD5 7911fd180b900776be1ea0fcc6ffc006 ispell-hu-0.99.4.ebuild 797
 RMD160 a4c177ce091fc7194da62595ac68ed2ba67e068d ispell-hu-0.99.4.ebuild 797
 SHA256 e80fbf07d6541437ea9e22ad5c988dd99d78f6e7e51d7398565a89a3b9c2974b ispell-hu-0.99.4.ebuild 797
-EBUILD ispell-hu-1.0.ebuild 875 RMD160 238239d63ad76ecd8e98e80ac5fe23f8563a6c22 SHA1 04be6086f5a1cd513427d7d363ccbc4134879d48 SHA256 6727a6217b39b6b8dcfec7640aeb63aae83b8a5cd9b97cb791ae2012a67fde4c
-MD5 9585bb2a7ec3881bfd2bdc9f795a074f ispell-hu-1.0.ebuild 875
-RMD160 238239d63ad76ecd8e98e80ac5fe23f8563a6c22 ispell-hu-1.0.ebuild 875
-SHA256 6727a6217b39b6b8dcfec7640aeb63aae83b8a5cd9b97cb791ae2012a67fde4c ispell-hu-1.0.ebuild 875
-MISC ChangeLog 1103 RMD160 7940ff977ab5d69ae33d60e05f98980749a57a8b SHA1 4774a6c184e4e914163e8fbd46f6cabbd1f10b66 SHA256 6ccb71a729743897b371d80c3530f2236f1a2536dbcf9c7d4103413a16c36849
-MD5 221c6f8ebc1cb7a148e59263d0d71809 ChangeLog 1103
-RMD160 7940ff977ab5d69ae33d60e05f98980749a57a8b ChangeLog 1103
-SHA256 6ccb71a729743897b371d80c3530f2236f1a2536dbcf9c7d4103413a16c36849 ChangeLog 1103
+EBUILD ispell-hu-1.0.ebuild 864 RMD160 39f10288b2b55b99df0e899b983b30f287789af1 SHA1 cd96f03479a3ef4e9c9a076cbdba9bb55c0bdbb7 SHA256 8277afed9a182e5bf38cda0cbd94db2a7ff4d898a4cf2580a9ba76364d40ff55
+MD5 4b0416b766ccc30c73f63e063e4a8cfe ispell-hu-1.0.ebuild 864
+RMD160 39f10288b2b55b99df0e899b983b30f287789af1 ispell-hu-1.0.ebuild 864
+SHA256 8277afed9a182e5bf38cda0cbd94db2a7ff4d898a4cf2580a9ba76364d40ff55 ispell-hu-1.0.ebuild 864
+MISC ChangeLog 1228 RMD160 aec2bda8990dafad6f10fe567d69f0b1d953d2a3 SHA1 89c6473d29680069f99366996e0a143ef2a67fcf SHA256 532a44cd764b1b2be949fda1a3019cf29087c5313b0f87b5bbdff1c464f3e105
+MD5 7c8f513c58bedcba1e931946b157c501 ChangeLog 1228
+RMD160 aec2bda8990dafad6f10fe567d69f0b1d953d2a3 ChangeLog 1228
+SHA256 532a44cd764b1b2be949fda1a3019cf29087c5313b0f87b5bbdff1c464f3e105 ChangeLog 1228
 MISC metadata.xml 162 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 SHA1 0d9e341c4b61e23adc1f3806989a0236b83257a0 SHA256 9629e7723cb4708c1910c25510cd14da2729d34eed4ebfc1563df4a1ed5e1b22
 MD5 eb03775ece62e57725480e782cd84ee8 metadata.xml 162
 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 metadata.xml 162
diff --git a/app-dicts/ispell-hu/files/ispell-hu-1.0-fix-build.patch b/app-dicts/ispell-hu/files/ispell-hu-1.0-fix-build.patch
new file mode 100644
index 000000000000..472e942adf53
--- /dev/null
+++ b/app-dicts/ispell-hu/files/ispell-hu-1.0-fix-build.patch
@@ -0,0 +1,67 @@
+diff -urN magyarispell-1.0/kr/Makefile magyarispell-1.0-fixed/kr/Makefile
+--- magyarispell-1.0/kr/Makefile	2005-10-24 09:53:53.000000000 +0200
++++ magyarispell-1.0-fixed/kr/Makefile	2006-07-21 19:46:09.000000000 +0200
+@@ -3,14 +3,14 @@
+ 
+ WRKDIR=../tmp
+ 
+-all: h test
++all: h
+ 
+ test:
+ 	@hunmorph ../hu_HU_morph2.aff ../hu_HU_morph2.dic test.txt >../tmp/test.out
+ 	@#diff test.morph ../tmp/test.out && echo 'Elemzés ellenőrizve.' || echo 'Hiba!'
+ 
+ h: hu
+-	sed ':a s#<NOU\(.*\)>+*<NOUN#<NOU\1#;t a \
++	sed ":a s#<NOU\(.*\)>+*<NOUN#<NOU\1#;t a \
+ 	:b s#<VER\(.*\)>+*<VERB#<VER\1#;t b \
+ 	s#~##g; \
+ 	s#_[/(),A-Z]*_noun]#]NOUN{>}#g; \
+@@ -23,8 +23,8 @@
+ 	s#_[/(),A-Z]*_(noun,adj)]#]NOUN{>}#g; \
+ 	s#_[/(),A-Z]*_num]#]NUM{>}#g; \
+ 	s#_[/(),A-Z]*_(adj,present_part)]#]ADJ{>}#g; \
+-	' $(WRKDIR)/hu.aff >../hu_HU_morph2.aff
+-	sed ':a s#<NOU\(.*\)>+*<NOUN#<NOU\1#;t a \
++	" $(WRKDIR)/hu.aff >../hu_HU_morph2.aff
++	sed ":a s#<NOU\(.*\)>+*<NOUN#<NOU\1#;t a \
+ 	:b s#<VER\(.*\)>+*<VERB#<VER\1#;t b \
+ 	s#~##g; \
+ 	s#_[/(),A-Z]*_noun]#]NOUN{>}#g; \
+@@ -37,7 +37,7 @@
+ 	s#_[/(),A-Z]*_(noun,adj)]#]NOUN{>}#g; \
+ 	s#_[/(),A-Z]*_num]#]NUM{>}#g; \
+ 	s#_[/(),A-Z]*_(adj,present_part)]#]ADJ{>}#g; \
+-	' $(WRKDIR)/hu.dic >../hu_HU_morph2.dic
++	" $(WRKDIR)/hu.dic >../hu_HU_morph2.dic
+ 
+ hu: ../hu_HU_morph.aff ../hu_HU_morph.dic
+ 	sed -f csere.txt ../hu_HU_morph.aff >$(WRKDIR)/hu.aff
+diff -urN magyarispell-1.0/Makefile magyarispell-1.0-fixed/Makefile
+--- magyarispell-1.0/Makefile	2005-10-24 09:55:14.000000000 +0200
++++ magyarispell-1.0-fixed/Makefile	2006-07-21 19:46:04.000000000 +0200
+@@ -122,10 +122,10 @@
+ 
+ # egyéb kivételek: az m4 miatt nem megy külön héjprogramba
+ 	@echo "==> kivételek"
+-	@#cat $(SZOTAR)/kivetelek/igekotos/*.1* \
+-	@#	| grep -v ^# | $(M4) | tr "\t" "\n" \
+-	@#	| grep -v ^$$ | sed -e 's/$$/\/X/' \
+-	@#	>> $(DICT)
++	#@cat $(SZOTAR)/kivetelek/igekotos/*.1* \
++	#@	| grep -v ^# | $(M4) | tr "\t" "\n" \
++	#@	| grep -v ^$$ | sed -e 's/$$/\/X/' \
++	#@	>> $(DICT)
+ 	@echo $(EN) ."$(EC)"
+ 	@cat $(SZOTAR)/kivetelek/igekotos/*.2* \
+ 		| grep -v ^# | $(M4) | $(AWK) -f $(AWKDIR)/tovek.awk -v param="/X" \
+@@ -220,7 +220,7 @@
+ install_all: install_myspell install_ispell install_OO 
+ 
+ # ispell opcióval kompilált hashtábla 
+-#ispell: magyar4ispell.hash
++ispell: magyar4ispell.hash
+ 
+ # hu_HU.aff myspell ragozási táblázat és a hu_HU.dic szótár előállítása
+ myspell: magyar4myspell.dict magyar.aff hu_HU.aff hu_HU.dic kr
diff --git a/app-dicts/ispell-hu/ispell-hu-1.0.ebuild b/app-dicts/ispell-hu/ispell-hu-1.0.ebuild
index 566a2a799c2a..28e970432ab5 100644
--- a/app-dicts/ispell-hu/ispell-hu-1.0.ebuild
+++ b/app-dicts/ispell-hu/ispell-hu-1.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/ispell-hu/ispell-hu-1.0.ebuild,v 1.1 2006/03/19 18:57:29 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/ispell-hu/ispell-hu-1.0.ebuild,v 1.2 2006/07/21 22:33:16 arj Exp $
+
+inherit eutils
 
 MY_P=magyarispell-${PV}
 S=${WORKDIR}/${MY_P}
@@ -16,8 +18,7 @@ DEPEND="app-text/ispell"
 IUSE=""
 
 src_compile() {
-	sed "s/#ispell:/ispell:/" Makefile > Makefile.tmp
-	cp Makefile.tmp Makefile
+	epatch ${FILESDIR}/ispell-hu-1.0-fix-build.patch
 	make ispell || die
 }