13 files changed, 154 insertions, 23 deletions
diff --git a/kde-base/smoke/ChangeLog b/kde-base/smoke/ChangeLog
index 18acf4653958..a8ee82d9099d 100644
--- a/kde-base/smoke/ChangeLog
+++ b/kde-base/smoke/ChangeLog
@@ -1,6 +1,83 @@
 # ChangeLog for kde-base/smoke
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/ChangeLog,v 1.1 2004/11/06 17:23:33 danarmak Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/ChangeLog,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> smoke-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> smoke-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*smoke-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +smoke-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*smoke-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +smoke-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> smoke-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*smoke-3.5.0_beta2 (19 Oct 2005)
+
+  19 Oct 2005; Dan Armak <danarmak@gentoo.org> +smoke-3.5.0_beta2.ebuild:
+  New version. Reminder: prerelease versions are permanently package.masked.
+
+*smoke-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +smoke-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  09 Jul 2005; Jason Wever <weeve@gentoo.org> smoke-3.4.1.ebuild:
+  Added ~sparc keyword.
+
+*smoke-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +smoke-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  18 Apr 2005; Herbie Hopkins <herbs@gentoo.org> smoke-3.4.0.ebuild:
+  Added ~amd64 keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> smoke-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> smoke-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  28 Feb 2005; Caleb Tennis <caleb@gentoo.org>
+  +files/no_knotifywidgetbase.diff:
+  Patch gets rid of knotifywidgetbase.h, which isn't exported
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+  19 Feb 2005; Dan Armak <danarmak@gentoo.org> smoke-3.3.1.ebuild:
+  Disabled enable-final in smoke-3.3.1. It was disabled in 3.4.0_beta2 some
+  time ago. Building smoke with enable-final is possible, but takes at least
+  1.5GB RAM.
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org> smoke-3.3.1.ebuild:
+  Added x86 (stable) keyword.
+
+*smoke-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +smoke-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  10 Dec 2004; Dan Armak <danarmak@gentoo.org> files/no-gtk-glib-check.diff,
+  smoke-3.3.1.ebuild:
+  Fixed compile failure when gtk is not installed.
+
+  25 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Added missing digest entries.
 
 *smoke-3.3.1 (06 Nov 2004)
 
diff --git a/kde-base/smoke/Manifest b/kde-base/smoke/Manifest
index 2183237b6049..5d448270097c 100644
--- a/kde-base/smoke/Manifest
+++ b/kde-base/smoke/Manifest
@@ -1,4 +1,26 @@
-MD5 f20c65466830f0da592094c94cd7f3bb smoke-3.3.1.ebuild 433
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9550142e317f6aaa9aa990d7a64f33c6 ChangeLog 3267
+MD5 6830fc45ae55313b9f8515babcf58b79 files/digest-smoke-3.3.1 71
+MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-smoke-3.4.1 221
+MD5 8b94700e5ddd1504207b279995e101c7 files/digest-smoke-3.4.2 300
+MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-smoke-3.5.0 71
+MD5 7b7cadef2c4eb7dc5409c01c4e689481 files/digest-smoke-3.5.0_beta2 225
+MD5 a41ac4f23e006a6c9c1a8c780b3aca01 files/digest-smoke-3.5.0_rc1 312
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
 MD5 92a2bf7b4c3eebd09d53b684b22513af files/parallel-make.diff 1696
-MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
-MD5 7f621b97f9a40145be94ed6c01cb1f2d files/digest-smoke-3.3.1 146
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 701f61e8efb8d7e88e99b0512a0098e1 smoke-3.3.1.ebuild 1058
+MD5 d19f393c142dce968ca099403d048e1a smoke-3.4.1.ebuild 1071
+MD5 0838a6715496f1786c4a560c2684af3c smoke-3.4.2.ebuild 1370
+MD5 9c2676178fef8ae840c33bf6899b644f smoke-3.5.0.ebuild 1435
+MD5 4b370de60b93ccc871ffd41a3f059d3f smoke-3.5.0_beta2.ebuild 1440
+MD5 e7b7729b6c3b5acdec5e430c2d045c00 smoke-3.5.0_rc1.ebuild 1439
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhyPyntT9W3vfTuoRAsOWAKCTrqEdX7sv6SofJ3f4UxPjIpRD4ACfY7qT
+s/5QNtcEb3Gcu+rBs4bKyOM=
+=/DmL
+-----END PGP SIGNATURE-----
diff --git a/kde-base/smoke/files/digest-smoke-3.3.1 b/kde-base/smoke/files/digest-smoke-3.3.1
index 64edf11dedc4..a16df2f0cf51 100644
--- a/kde-base/smoke/files/digest-smoke-3.3.1
+++ b/kde-base/smoke/files/digest-smoke-3.3.1
@@ -1,2 +1 @@
 MD5 fd64783a92e66a2405b9e25f7322c222 kdebindings-3.3.1.tar.bz2 7168111
-MD5 a676a142e64fe0575a0d0415101a1b00 smoke-3.3.1-0-makefiles.tar.bz2 19210
diff --git a/kde-base/smoke/files/digest-smoke-3.4.1 b/kde-base/smoke/files/digest-smoke-3.4.1
index 6e4205dc862e..5b7e04575b24 100644
--- a/kde-base/smoke/files/digest-smoke-3.4.1
+++ b/kde-base/smoke/files/digest-smoke-3.4.1
@@ -1,2 +1,3 @@
 MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
 MD5 18a4e2c42d34bb86279e691498482951 kdebindings-3.4.1.tar.bz2 7219233
diff --git a/kde-base/smoke/files/digest-smoke-3.4.2 b/kde-base/smoke/files/digest-smoke-3.4.2
index 6a8795734858..487d1b1d2260 100644
--- a/kde-base/smoke/files/digest-smoke-3.4.2
+++ b/kde-base/smoke/files/digest-smoke-3.4.2
@@ -1 +1,4 @@
+MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
+MD5 04031d3888f2a1cf7abbadf0931cc475 kdebindings-3.4.1-3.4.2.tar.xdelta 449690
 MD5 1ee2348e03b0af625679d0bb2c8aad2b kdebindings-3.4.2.tar.bz2 7214122
diff --git a/kde-base/smoke/files/no-gtk-glib-check.diff b/kde-base/smoke/files/no-gtk-glib-check.diff
index 90fe098df490..ad9a6fb8977a 100644
--- a/kde-base/smoke/files/no-gtk-glib-check.diff
+++ b/kde-base/smoke/files/no-gtk-glib-check.diff
@@ -1,5 +1,6 @@
---- Makefile.am.orig	2004-10-08 15:23:14.000000000 +0200
-+++ Makefile.am	2004-10-29 22:01:41.662032792 +0200
+diff -urN Makefile.am Makefile.am
+--- Makefile.am	2004-11-29 17:08:25.000000000 +0200
++++ Makefile.am	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -9,8 +10,9 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
---- Makefile.am.in.orig	2004-08-05 21:57:23.000000000 +0300
-+++ Makefile.am.in	2004-10-29 22:01:45.358470848 +0200
+diff -urN Makefile.am.in Makefile.am.in
+--- Makefile.am.in	2004-08-05 21:57:23.000000000 +0300
++++ Makefile.am.in	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -20,3 +22,16 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
+diff -urN configure.in.in configure.in.in
+--- configure.in.in	2004-10-03 09:11:28.000000000 +0200
++++ configure.in.in	2004-12-10 20:56:37.916902232 +0200
+@@ -104,9 +104,6 @@
+ 
+ ])
+ 
+-AM_PATH_GLIB([1.2.6])
+-AM_PATH_GTK([1.2.6])
+-
+ # check for CSANT compiler
+ 
+ AC_DEFUN([KDE_CHECK_CSANT],[
diff --git a/kde-base/smoke/metadata.xml b/kde-base/smoke/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/smoke/metadata.xml
+++ b/kde-base/smoke/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/smoke/smoke-3.3.1.ebuild b/kde-base/smoke/smoke-3.3.1.ebuild
index c5cc4e285e83..2bdcfa65ee63 100644
--- a/kde-base/smoke/smoke-3.3.1.ebuild
+++ b/kde-base/smoke/smoke-3.3.1.ebuild
@@ -1,14 +1,28 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.3.1.ebuild,v 1.1 2004/11/06 17:23:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.3.1.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY="kalyptus/kalyptus kalyptus/*.pm"
+KM_MAKEFILESREV=1
+MAXKDEVER=3.3.2
+KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine: a language-agnostic bindings generator for qt and kde"
-KEYWORDS="~x86"
+HOMEPAGE="http://developer.kde.org/language-bindings/smoke/"
+
+KEYWORDS="x86"
 IUSE=""
 DEPEND="dev-lang/perl"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff $FILESDIR/parallel-make.diff"
 
+# enable-final works, but requires at least 1.5GB of RAM to complete without swapping,
+# so it's best to turn it off here. (I don't have that much RAM, so can't estimate
+# how much would be enough, but it's at least that much... --danarmak)
+src_compile() {
+	kde-meta_src_compile myconf
+	# override myconf's setting of enable-final
+	myconf="$myconf --disable-final"
+	kde-meta_src_compile configure make
+}
diff --git a/kde-base/smoke/smoke-3.4.1.ebuild b/kde-base/smoke/smoke-3.4.1.ebuild
index 9f84d1bf91d0..08315f70f1e9 100644
--- a/kde-base/smoke/smoke-3.4.1.ebuild
+++ b/kde-base/smoke/smoke-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.4.1.ebuild,v 1.1 2005/05/25 21:23:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY="kalyptus/kalyptus kalyptus/*.pm"
@@ -12,7 +12,7 @@ inherit kde-meta
 DESCRIPTION="Scripting Meta Object Kompiler Engine: a language-agnostic bindings generator for qt and kde"
 HOMEPAGE="http://developer.kde.org/language-bindings/smoke/"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 DEPEND="dev-lang/perl"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff
diff --git a/kde-base/smoke/smoke-3.4.2.ebuild b/kde-base/smoke/smoke-3.4.2.ebuild
index da65252e74af..ec6490774603 100644
--- a/kde-base/smoke/smoke-3.4.2.ebuild
+++ b/kde-base/smoke/smoke-3.4.2.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.4.2.ebuild,v 1.1 2005/07/28 21:16:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY="kalyptus/kalyptus kalyptus/*.pm"
 KM_MAKEFILESREV=1
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine: a language-agnostic bindings generator for qt and kde"
 HOMEPAGE="http://developer.kde.org/language-bindings/smoke/"
 
-KEYWORDS=" ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc ~x86"
 IUSE=""
 DEPEND="dev-lang/perl
 	dev-python/qscintilla" # QScintilla is an optional dep, there's a configure flag for it, but I don't want
diff --git a/kde-base/smoke/smoke-3.5.0.ebuild b/kde-base/smoke/smoke-3.5.0.ebuild
index d9cc58e8cf5c..926c50d7bd43 100644
--- a/kde-base/smoke/smoke-3.5.0.ebuild
+++ b/kde-base/smoke/smoke-3.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.5.0.ebuild,v 1.1 2005/11/22 22:14:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY="kalyptus/kalyptus kalyptus/*.pm"
diff --git a/kde-base/smoke/smoke-3.5.0_beta2.ebuild b/kde-base/smoke/smoke-3.5.0_beta2.ebuild
index 05cd481de33e..ddf6ab2d7c86 100644
--- a/kde-base/smoke/smoke-3.5.0_beta2.ebuild
+++ b/kde-base/smoke/smoke-3.5.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.5.0_beta2.ebuild,v 1.1 2005/10/19 18:38:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY="kalyptus/kalyptus kalyptus/*.pm"
@@ -12,7 +12,7 @@ inherit kde-meta
 DESCRIPTION="Scripting Meta Object Kompiler Engine: a language-agnostic bindings generator for qt and kde"
 HOMEPAGE="http://developer.kde.org/language-bindings/smoke/"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="dev-lang/perl
 	dev-python/qscintilla" # QScintilla is an optional dep, there's a configure flag for it, but I don't want
diff --git a/kde-base/smoke/smoke-3.5.0_rc1.ebuild b/kde-base/smoke/smoke-3.5.0_rc1.ebuild
index 915faf521ddc..51c2c1bb616d 100644
--- a/kde-base/smoke/smoke-3.5.0_rc1.ebuild
+++ b/kde-base/smoke/smoke-3.5.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY="kalyptus/kalyptus kalyptus/*.pm"