fixfix build

(Portage version: 2.1.1_pre3-r3)

3 files changed, 75 insertions, 4 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/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
 }