summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-08-08 02:07:23 +0000
committerMike Frysinger <vapier@gentoo.org>2006-08-08 02:07:23 +0000
commit6ea791343f73a0eeffa2f4e145ca0d9796adebe8 (patch)
tree28dc32eb8608dd05b3462cc42434f8977240b359 /app-text/hunspell
parentuse PF instead of PVR and save config file to $PORTAGE_CONFIGROOT (diff)
downloadgentoo-2-6ea791343f73a0eeffa2f4e145ca0d9796adebe8.tar.gz
gentoo-2-6ea791343f73a0eeffa2f4e145ca0d9796adebe8.tar.bz2
gentoo-2-6ea791343f73a0eeffa2f4e145ca0d9796adebe8.zip
Patch the makefile rather than using autopoint so we dont require cvs #142997.
(Portage version: 2.1.1_pre4)
Diffstat (limited to 'app-text/hunspell')
-rw-r--r--app-text/hunspell/ChangeLog6
-rw-r--r--app-text/hunspell/files/hunspell-1.1.4-gettext.patch16
-rw-r--r--app-text/hunspell/hunspell-1.1.4-r1.ebuild4
3 files changed, 23 insertions, 3 deletions
diff --git a/app-text/hunspell/ChangeLog b/app-text/hunspell/ChangeLog
index ab6ef9883f18..f1b07fcf9546 100644
--- a/app-text/hunspell/ChangeLog
+++ b/app-text/hunspell/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/hunspell
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.18 2006/08/06 01:25:54 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.19 2006/08/08 02:07:23 vapier Exp $
+
+ 08 Aug 2006; Mike Frysinger <vapier@gentoo.org>
+ +files/hunspell-1.1.4-gettext.patch, hunspell-1.1.4-r1.ebuild:
+ Patch the makefile rather than using autopoint so we dont require cvs #142997.
06 Aug 2006; Kevin F. Quinn <kevquinn@gentoo.org>
hunspell-1.1.4-r1.ebuild:
diff --git a/app-text/hunspell/files/hunspell-1.1.4-gettext.patch b/app-text/hunspell/files/hunspell-1.1.4-gettext.patch
new file mode 100644
index 000000000000..2a726b8abedc
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.1.4-gettext.patch
@@ -0,0 +1,16 @@
+fix Makefile.in.in rather than running `autopoint` as that requires cvs
+
+http://bugs.gentoo.org/142565
+http://bugs.gentoo.org/142997
+
+--- po/Makefile.in.in
++++ po/Makefile.in.in
+@@ -27,7 +27,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = @MKINSTALLDIRS@
++mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@
diff --git a/app-text/hunspell/hunspell-1.1.4-r1.ebuild b/app-text/hunspell/hunspell-1.1.4-r1.ebuild
index 09993321a4dc..a7a0342656af 100644
--- a/app-text/hunspell/hunspell-1.1.4-r1.ebuild
+++ b/app-text/hunspell/hunspell-1.1.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.1.4-r1.ebuild,v 1.11 2006/08/06 01:25:54 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.1.4-r1.ebuild,v 1.12 2006/08/08 02:07:23 vapier Exp $
inherit fixheadtails eutils multilib autotools
@@ -32,7 +32,7 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-renameexes.patch
# Recalculate the mkinstalldirs stuff (see bug #142565)
- autopoint -f || die "Failed to auto-po-int"
+ epatch "${FILESDIR}"/${P}-gettext.patch
# Set AT_M4DIR to workaround eautoreconf limitation (see bug #142565)
export AT_M4DIR="${S}/m4"
# Makefile.am modified, libtool added, hence autoreconf