Remove VENDORNAME from Makefile. Closing bug #48229

5 files changed, 23 insertions, 11 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/Manifest b/app-i18n/canna/Manifest
index 1a73328cbbe5..340632609952 100644
--- a/app-i18n/canna/Manifest
+++ b/app-i18n/canna/Manifest
@@ -1,8 +1,8 @@
-MD5 628e37f748467009ef09bc13271d2348 canna-3.6_p4.ebuild 2842
-MD5 22151d44fea4f013ab176a7c15102eb2 canna-3.7.ebuild 3382
-MD5 9c22ff1f7160493339fefe639c5eb00e ChangeLog 6081
+MD5 6114924239c0ca0fed3e859754dda276 canna-3.7_p1.ebuild 3475
+MD5 076a81c8943da48e353e3efe1804d4f8 canna-3.6_p4.ebuild 2917
+MD5 ea6c379232862c506673aca19f976b21 canna-3.7.ebuild 3457
+MD5 4db04eb7f18d95f6cf12464c6671e556 ChangeLog 6256
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 cebcd0f0011d50cae30f52e281a7539c canna-3.7_p1.ebuild 3519
 MD5 248b68ec823c14f763cc3f62221fb7d7 files/canna.confd 306
 MD5 d60168a33fd321ad1a29382cafcb60d3 files/canna.hosts 5
 MD5 67ba430259be85b8791dac27115538b0 files/canna.initd 1005
@@ -11,5 +11,5 @@ MD5 0d09a45d1074f9f4801a48bf8ec3208a files/update-canna-dics_dir 1101
 MD5 2b13f6b61d303f6bf273a325ff3bc411 files/canna-3.7-gentoo.diff.in 5263
 MD5 167b6b59b36ffe7d7ebda5ddd85c930a files/digest-canna-3.7 61
 MD5 c48de658742361ca5549edaddebb3e94 files/digest-canna-3.6_p4 62
-MD5 d817072e9bb7181804fdde1b52427a3f files/canna-kpdef-gentoo.diff 255
 MD5 928c920864a62989dc12b294fa01aac5 files/digest-canna-3.7_p1 63
+MD5 d817072e9bb7181804fdde1b52427a3f files/canna-kpdef-gentoo.diff 255
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