fixed compilation on non-arts systems

Package-Manager: portage-2.0.51.19

5 files changed, 43 insertions, 10 deletions

diff --git a/x11-terms/kuake/ChangeLog b/x11-terms/kuake/ChangeLog
index 98a3800b14e8..83a35c884622 100644
--- a/x11-terms/kuake/ChangeLog
+++ b/x11-terms/kuake/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/kuake
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/kuake/ChangeLog,v 1.13 2005/03/23 21:47:26 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/kuake/ChangeLog,v 1.14 2005/03/26 11:28:00 voxus Exp $
+
+*kuake-0.3-r3 (26 Mar 2005)
+
+  26 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org -kuake-0.3-r2.ebuild,
+  +kuake-0.3-r3.ebuild,
+  +files/kuake-0.3-noarts-fix.patch:
+  Fixed compilation issue on installations without arts.
 
 *kuake-0.3-r2 (23 Mar 2005)
 
diff --git a/x11-terms/kuake/Manifest b/x11-terms/kuake/Manifest
index 535c8c758d92..2b2fea1bd25e 100644
--- a/x11-terms/kuake/Manifest
+++ b/x11-terms/kuake/Manifest
@@ -1,10 +1,11 @@
-MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 c71bc70342f646092086195ac7478c91 kuake-0.3-r1.ebuild 547
 MD5 971d6674dd70c86795a4697b4940aad4 kuake-0.3.ebuild 462
-MD5 bd5c236558877b3bc5e283d5079a59e8 ChangeLog 1931
-MD5 3c00d8cd8e130207cef21c9c5f05de3b kuake-0.3-r2.ebuild 648
-MD5 bb7537995afee2aafa3a96a90da25305 files/digest-kuake-0.3-r1 61
-MD5 bb7537995afee2aafa3a96a90da25305 files/digest-kuake-0.3-r2 61
+MD5 c71bc70342f646092086195ac7478c91 kuake-0.3-r1.ebuild 547
+MD5 6824c26eb61cc9fee3fa4cba910d262b ChangeLog 2153
+MD5 16606ae12dd10cd997baf64cd873c50c kuake-0.3-r3.ebuild 734
+MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
 MD5 dac3ffc42966b8cd6d6b41c4cfdaa3e6 files/kuake-0.3-alignment-fix.patch 2279
-MD5 bb7537995afee2aafa3a96a90da25305 files/digest-kuake-0.3 61
 MD5 145a7a56478a6076a413f0387f69a655 files/kuake-0.3-dropdown-fix.patch 523
+MD5 bb7537995afee2aafa3a96a90da25305 files/digest-kuake-0.3 61
+MD5 2bfbd56d91c468704f8c3fbed9d9b1c4 files/kuake-0.3-noarts-fix.patch 1056
+MD5 bb7537995afee2aafa3a96a90da25305 files/digest-kuake-0.3-r1 61
+MD5 bb7537995afee2aafa3a96a90da25305 files/digest-kuake-0.3-r3 61
diff --git a/x11-terms/kuake/files/digest-kuake-0.3-r2 b/x11-terms/kuake/files/digest-kuake-0.3-r3
index 06b51c93236f..06b51c93236f 100644
--- a/x11-terms/kuake/files/digest-kuake-0.3-r2
+++ b/x11-terms/kuake/files/digest-kuake-0.3-r3
diff --git a/x11-terms/kuake/files/kuake-0.3-noarts-fix.patch b/x11-terms/kuake/files/kuake-0.3-noarts-fix.patch
new file mode 100644
index 000000000000..df89e0aac559
--- /dev/null
+++ b/x11-terms/kuake/files/kuake-0.3-noarts-fix.patch
@@ -0,0 +1,20 @@
+--- admin/acinclude.m4.in.orig	2005-03-26 13:55:41.000000000 +0300
++++ admin/acinclude.m4.in	2005-03-26 13:55:51.000000000 +0300
+@@ -536,8 +536,6 @@
+         kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs"
+         KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
+         KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
+-        KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
+-        KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
+         KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])
+         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
+       
+@@ -556,8 +554,6 @@
+         AC_SUBST(DCOPIDL)
+         AC_SUBST(DCOPIDL2CPP)
+         AC_SUBST(DCOP_DEPENDENCIES)
+-        AC_SUBST(MCOPIDL)
+-        AC_SUBST(ARTSCCONFIG)
+         AC_SUBST(KDECONFIG)
+ 	AC_SUBST(MEINPROC)
+  	AC_SUBST(KDE_XSL_STYLESHEET)
diff --git a/x11-terms/kuake/kuake-0.3-r2.ebuild b/x11-terms/kuake/kuake-0.3-r3.ebuild
index e314a5883543..3495f4ad5cde 100644
--- a/x11-terms/kuake/kuake-0.3-r2.ebuild
+++ b/x11-terms/kuake/kuake-0.3-r3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/kuake/kuake-0.3-r2.ebuild,v 1.1 2005/03/23 21:47:26 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/kuake/kuake-0.3-r3.ebuild,v 1.1 2005/03/26 11:28:00 voxus Exp $
 
 inherit kde
 
 DESCRIPTION="A Quake-style terminal emulator"
 HOMEPAGE="http://www.nemohackers.org/kuake.php"
-SRC_URI="http://199.231.140.154/software/kuake/${P}.tar.gz"
+SRC_URI="http://199.231.140.154/software/${PN}/${P}.tar.gz"
 
 KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
 LICENSE="GPL-2"
@@ -23,4 +23,9 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-dropdown-fix.patch"
 	epatch "${FILESDIR}/${P}-alignment-fix.patch"
+
+	use arts || {
+		epatch "${FILESDIR}/${P}-noarts-fix.patch"
+		rm -f ${S}/configure
+	}
 }