summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMamoru Komachi <usata@gentoo.org>2004-05-06 11:31:57 +0000
committerMamoru Komachi <usata@gentoo.org>2004-05-06 11:31:57 +0000
commit7a5069e836d63961162ad865f1dfbf74e811e9ba (patch)
treeac2fb44c7996cd912cb2f956a66767e4089eb537 /app-i18n/canna
parentstable on amd64 (Manifest recommit) (diff)
downloadgentoo-2-7a5069e836d63961162ad865f1dfbf74e811e9ba.tar.gz
gentoo-2-7a5069e836d63961162ad865f1dfbf74e811e9ba.tar.bz2
gentoo-2-7a5069e836d63961162ad865f1dfbf74e811e9ba.zip
Remove VENDORNAME from Makefile. Closing bug #48229
Diffstat (limited to 'app-i18n/canna')
-rw-r--r--app-i18n/canna/ChangeLog6
-rw-r--r--app-i18n/canna/canna-3.6_p4.ebuild6
-rw-r--r--app-i18n/canna/canna-3.7.ebuild6
-rw-r--r--app-i18n/canna/canna-3.7_p1.ebuild6
4 files changed, 18 insertions, 6 deletions
diff --git a/app-i18n/canna/ChangeLog b/app-i18n/canna/ChangeLog
index 77fa94425593..3fdc0a0e8c47 100644
--- a/app-i18n/canna/ChangeLog
+++ b/app-i18n/canna/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-i18n/canna
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.35 2004/05/04 18:12:04 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.36 2004/05/06 11:31:57 usata Exp $
+
+ 06 May 2004; Mamoru KOMACHI,c10344,, <usata@gentoo.org> canna-3.6_p4.ebuild,
+ canna-3.7.ebuild, canna-3.7_p1.ebuild:
+ Remove VENDORNAME from Makefile. Closing bug #48229
*canna-3.7_p1 (05 May 2004)
diff --git a/app-i18n/canna/canna-3.6_p4.ebuild b/app-i18n/canna/canna-3.6_p4.ebuild
index d6733928080e..915e6aa4fea9 100644
--- a/app-i18n/canna/canna-3.6_p4.ebuild
+++ b/app-i18n/canna/canna-3.6_p4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.6_p4.ebuild,v 1.13 2004/05/04 18:12:04 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.6_p4.ebuild,v 1.14 2004/05/06 11:31:57 usata Exp $
inherit cannadic eutils
@@ -36,6 +36,10 @@ src_unpack() {
src_compile() {
xmkmf || die
make Makefiles || die
+
+ # Remove VENDORNAME, see bug #48229
+ sed -i -e "/VENDORNAME/d" Makefile
+
# make includes
make canna || die
diff --git a/app-i18n/canna/canna-3.7.ebuild b/app-i18n/canna/canna-3.7.ebuild
index 3cb1983ed7a7..99de25764690 100644
--- a/app-i18n/canna/canna-3.7.ebuild
+++ b/app-i18n/canna/canna-3.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7.ebuild,v 1.7 2004/05/04 18:12:04 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7.ebuild,v 1.8 2004/05/06 11:31:57 usata Exp $
inherit cannadic eutils
@@ -38,6 +38,10 @@ src_unpack() {
src_compile() {
xmkmf || die
+
+ # Remove VENDORNAME, see bug #48229
+ sed -i -e "/VENDORNAME/d" Makefile
+
#make libCannaDir=../lib/canna canna || die
make canna || die
diff --git a/app-i18n/canna/canna-3.7_p1.ebuild b/app-i18n/canna/canna-3.7_p1.ebuild
index 689d641f8f2c..96d26c6168ee 100644
--- a/app-i18n/canna/canna-3.7_p1.ebuild
+++ b/app-i18n/canna/canna-3.7_p1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p1.ebuild,v 1.1 2004/05/04 18:12:04 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p1.ebuild,v 1.2 2004/05/06 11:31:57 usata Exp $
inherit cannadic eutils
@@ -39,8 +39,8 @@ src_compile() {
xmkmf || die
- # put quotes around VENDORNAME if any, see bug #48229
- sed -i -e '/VENDORNAME/s/= \(.*\)$/= "\1"/g' Makefile || die
+ # Remove VENDORNAME, see bug #48229
+ sed -i -e '/VENDORNAME/d' Makefile
#make libCannaDir=../lib/canna canna || die
make canna || die