Removed link to qalculate from build (see bug #193453).

Package-Manager: portage-2.1.3.9

7 files changed, 76 insertions, 6 deletions

diff --git a/sci-calculators/qalculate-gtk/ChangeLog b/sci-calculators/qalculate-gtk/ChangeLog
index 74747dc731e8..4b007ecb0cc0 100644
--- a/sci-calculators/qalculate-gtk/ChangeLog
+++ b/sci-calculators/qalculate-gtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-calculators/qalculate-gtk
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-gtk/ChangeLog,v 1.21 2007/07/19 02:03:39 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-gtk/ChangeLog,v 1.22 2007/09/24 14:47:30 markusle Exp $
+
+  24 Sep 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/qalculate-gtk-0.9.6-remove-link.patch, qalculate-gtk-0.9.6.ebuild:
+  Removed link to qalculate from build (see bug #193453).
 
   19 Jul 2007; Joseph Jezak <josejx@gentoo.org> qalculate-gtk-0.9.6.ebuild:
   Marked ~ppc for bug #184772.
diff --git a/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.6-remove-link.patch b/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.6-remove-link.patch
new file mode 100644
index 000000000000..eee2315a4e96
--- /dev/null
+++ b/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.6-remove-link.patch
@@ -0,0 +1,30 @@
+diff -Naur qalculate-gtk-0.9.6/src/Makefile.in qalculate-gtk-0.9.6-new/src/Makefile.in
+--- qalculate-gtk-0.9.6/src/Makefile.in	2007-06-17 07:07:35.000000000 -0400
++++ qalculate-gtk-0.9.6-new/src/Makefile.in	2007-09-24 09:59:18.000000000 -0400
+@@ -497,7 +497,7 @@
+ 
+ install-data-am:
+ 
+-install-exec-am: install-binPROGRAMS install-exec-local
++install-exec-am: install-binPROGRAMS 
+ 
+ install-info: install-info-am
+ 
+@@ -530,7 +530,7 @@
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+ 	dvi-am info info-am install install-am install-binPROGRAMS \
+ 	install-data install-data-am install-exec install-exec-am \
+-	install-exec-local install-info install-info-am install-man \
++	install-info install-info-am install-man \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
+@@ -538,8 +538,6 @@
+ 	uninstall-binPROGRAMS uninstall-info-am
+ 
+ 
+-install-exec-local:
+-	cd $(DESTDIR)$(bindir) && rm -f qalculate; $(LN_S) @LN_QALCULATE@ qalculate
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.6.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.6.ebuild
index 318aae5de003..5e52fd2da60a 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.6.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.6.ebuild,v 1.2 2007/07/19 02:03:39 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.6.ebuild,v 1.3 2007/09/24 14:47:30 markusle Exp $
 
 inherit eutils gnome2
 
@@ -33,6 +33,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/gtk-crash-fix.patch
 	epatch "${FILESDIR}"/${P}-check-fix.patch
+	epatch "${FILESDIR}"/${P}-remove-link.patch
 }
 
 src_compile() {
diff --git a/sci-calculators/qalculate-kde/ChangeLog b/sci-calculators/qalculate-kde/ChangeLog
index f5bc5ee95428..34e0118ffa4f 100644
--- a/sci-calculators/qalculate-kde/ChangeLog
+++ b/sci-calculators/qalculate-kde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-calculators/qalculate-kde
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-kde/ChangeLog,v 1.17 2007/07/09 15:48:40 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-kde/ChangeLog,v 1.18 2007/09/24 14:48:58 markusle Exp $
+
+  24 Sep 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/qalculate-kde-0.9.6-remove-link.patch, qalculate-kde-0.9.6.ebuild:
+  Removed link to qalculate from build (see bug #193453)
 
 *qalculate-kde-0.9.6 (09 Jul 2007)
 
diff --git a/sci-calculators/qalculate-kde/files/qalculate-kde-0.9.6-remove-link.patch b/sci-calculators/qalculate-kde/files/qalculate-kde-0.9.6-remove-link.patch
new file mode 100644
index 000000000000..b6daf11f38f7
--- /dev/null
+++ b/sci-calculators/qalculate-kde/files/qalculate-kde-0.9.6-remove-link.patch
@@ -0,0 +1,30 @@
+diff -Naur qalculate-kde-0.9.6/src/Makefile.in qalculate-kde-0.9.6-new/src/Makefile.in
+--- qalculate-kde-0.9.6/src/Makefile.in	2007-06-17 07:34:19.000000000 -0400
++++ qalculate-kde-0.9.6-new/src/Makefile.in	2007-09-24 09:44:29.000000000 -0400
+@@ -772,7 +772,7 @@
+ #>+ 1
+ install-data-am: install-kde-icons  install-shelldesktopDATA install-shellrcDATA
+ 
+-install-exec-am: install-binPROGRAMS install-exec-local
++install-exec-am: install-binPROGRAMS 
+ 
+ install-info: install-info-am
+ 
+@@ -809,7 +809,7 @@
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+ 	install-binPROGRAMS install-data install-data-am install-exec \
+-	install-exec-am install-exec-local install-info \
++	install-exec-am install-info \
+ 	install-info-am install-man install-shelldesktopDATA \
+ 	install-shellrcDATA install-strip installcheck installcheck-am \
+ 	installdirs maintainer-clean maintainer-clean-generic \
+@@ -823,8 +823,6 @@
+ 	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+ 	$(XGETTEXT) *.cpp -o $(podir)/qalculate_kde.pot
+ 
+-install-exec-local:
+-	cd $(DESTDIR)$(bindir) && rm -f qalculate; $(LN_S) qalculate-kde qalculate
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/sci-calculators/qalculate-kde/qalculate-kde-0.9.4.ebuild b/sci-calculators/qalculate-kde/qalculate-kde-0.9.4.ebuild
index 18bd8553f387..3f03eec7438f 100644
--- a/sci-calculators/qalculate-kde/qalculate-kde-0.9.4.ebuild
+++ b/sci-calculators/qalculate-kde/qalculate-kde-0.9.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-kde/qalculate-kde-0.9.4.ebuild,v 1.3 2007/07/15 06:05:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-kde/qalculate-kde-0.9.4.ebuild,v 1.4 2007/09/24 14:48:58 markusle Exp $
 
 myconf="--disable-clntest"
 
diff --git a/sci-calculators/qalculate-kde/qalculate-kde-0.9.6.ebuild b/sci-calculators/qalculate-kde/qalculate-kde-0.9.6.ebuild
index 1bb521fba752..ee3a8f9b6860 100644
--- a/sci-calculators/qalculate-kde/qalculate-kde-0.9.6.ebuild
+++ b/sci-calculators/qalculate-kde/qalculate-kde-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-kde/qalculate-kde-0.9.6.ebuild,v 1.2 2007/07/15 06:05:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-kde/qalculate-kde-0.9.6.ebuild,v 1.3 2007/09/24 14:48:58 markusle Exp $
 
 myconf="--disable-clntest"
 
@@ -22,6 +22,7 @@ DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 src_unpack() {
 	kde_src_unpack
+	epatch "${FILESDIR}"/${P}-remove-link.patch
 }
 
 need-kde 3.1