Version bump with some UI improvements (bug #339830 by Thomas Kahle), remove old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 27 insertions, 129 deletions

diff --git a/net-irc/smuxi/ChangeLog b/net-irc/smuxi/ChangeLog
index ac802c88b689..dd7c8a4dad4d 100644
--- a/net-irc/smuxi/ChangeLog
+++ b/net-irc/smuxi/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-irc/smuxi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/smuxi/ChangeLog,v 1.11 2010/09/23 22:16:29 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/smuxi/ChangeLog,v 1.12 2010/10/05 20:36:34 pacho Exp $
+
+*smuxi-0.8 (05 Oct 2010)
+
+  05 Oct 2010; Pacho Ramos <pacho@gentoo.org>
+  -files/smuxi-0.6.3-infinite-loop.patch, -files/smuxi-0.6.3-mono-2.2.patch,
+  -smuxi-0.7.1-r1.ebuild, -files/smuxi-0.7.1-mono26.patch,
+  +smuxi-0.8.ebuild:
+  Version bump with some UI improvements (bug #339830 by Thomas Kahle),
+  remove old.
 
   23 Sep 2010; Markos Chandras <hwoarang@gentoo.org> smuxi-0.7.2.1.ebuild:
   Stable on amd64 wrt bug #336851
diff --git a/net-irc/smuxi/files/smuxi-0.6.3-infinite-loop.patch b/net-irc/smuxi/files/smuxi-0.6.3-infinite-loop.patch
deleted file mode 100644
index 7ff07123ebdf..000000000000
--- a/net-irc/smuxi/files/smuxi-0.6.3-infinite-loop.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From: Mirco Bauer <meebey@meebey.net>
-Date: Sun, 5 Apr 2009 20:34:13 +0000 (+0200)
-Subject: set subdir variable to "po" in all po-*/Makefile.in.in files
-X-Git-Url: http://git.qnetp.net/?p=smuxi.git;a=commitdiff_plain;h=81669b0fcb404562d9d0da99d9605b3f64c07af2
-
-set subdir variable to "po" in all po-*/Makefile.in.in files
-
-This doesn't really make sense to me as that causes to always stamp the same file (po/stamp-it) instead of each po directory, but this is how intltoolize wants it.
-At the same time this finally fixes the endless build loop if the source files are laying on xfs or tmpfs (which support more precise timestamps). (closes: #156)
----
-
-diff --git a/po-Engine-IRC/Makefile.in.in b/po-Engine-IRC/Makefile.in.in
-index 27268fc..3add1c1 100644
---- a/po-Engine-IRC/Makefile.in.in
-+++ b/po-Engine-IRC/Makefile.in.in
-@@ -35,7 +35,7 @@ datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
- itlocaledir = $(prefix)/$(DATADIRNAME)/locale
--subdir = po-Engine-IRC
-+subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
- # Until it can be supposed, use the safe fallback:
-diff --git a/po-Engine/Makefile.in.in b/po-Engine/Makefile.in.in
-index b84aa3a..2ec381e 100644
---- a/po-Engine/Makefile.in.in
-+++ b/po-Engine/Makefile.in.in
-@@ -35,7 +35,7 @@ datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
- itlocaledir = $(prefix)/$(DATADIRNAME)/locale
--subdir = po-Engine
-+subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
- # Until it can be supposed, use the safe fallback:
-diff --git a/po-Frontend-GNOME-IRC/Makefile.in.in b/po-Frontend-GNOME-IRC/Makefile.in.in
-index 70d5713..5f70427 100644
---- a/po-Frontend-GNOME-IRC/Makefile.in.in
-+++ b/po-Frontend-GNOME-IRC/Makefile.in.in
-@@ -35,7 +35,7 @@ datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
- itlocaledir = $(prefix)/$(DATADIRNAME)/locale
--subdir = po-Frontend-GNOME-IRC
-+subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
- # Until it can be supposed, use the safe fallback:
-diff --git a/po-Frontend-GNOME/Makefile.in.in b/po-Frontend-GNOME/Makefile.in.in
-index 1e74fca..9567482 100644
---- a/po-Frontend-GNOME/Makefile.in.in
-+++ b/po-Frontend-GNOME/Makefile.in.in
-@@ -35,7 +35,7 @@ datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
- itlocaledir = $(prefix)/$(DATADIRNAME)/locale
--subdir = po-Frontend-GNOME
-+subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
- # Until it can be supposed, use the safe fallback:
-diff --git a/po-Server/Makefile.in.in b/po-Server/Makefile.in.in
-index 925fe32..edffc6e 100644
---- a/po-Server/Makefile.in.in
-+++ b/po-Server/Makefile.in.in
-@@ -35,7 +35,7 @@ datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
- itlocaledir = $(prefix)/$(DATADIRNAME)/locale
--subdir = po-Server
-+subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
- # Until it can be supposed, use the safe fallback:
diff --git a/net-irc/smuxi/files/smuxi-0.6.3-mono-2.2.patch b/net-irc/smuxi/files/smuxi-0.6.3-mono-2.2.patch
deleted file mode 100644
index ce831f8501be..000000000000
--- a/net-irc/smuxi/files/smuxi-0.6.3-mono-2.2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/Frontend-GNOME/FindGroupChatDialog.cs	2008-12-26 16:42:42.000000000 -0700
-+++ src/Frontend-GNOME/FindGroupChatDialog.cs	2009-01-12 16:55:35.000000000 -0700
-@@ -115,12 +115,14 @@
-                 f_ListStore.Clear();
-                 CancelFindThread();
-                 
-+                EventHandler d = delegate {
-+                    GdkWindow.Cursor = new Gdk.Cursor(Gdk.CursorType.Watch);
-+                };
-+
-                 GroupChatModel filter =  new GroupChatModel(null, nameFilter, null);
-                 f_FindThread = new Thread(new ThreadStart(delegate {
-                     try {
--                        Gtk.Application.Invoke(delegate {
--                            GdkWindow.Cursor = new Gdk.Cursor(Gdk.CursorType.Watch);
--                        });
-+                        Gtk.Application.Invoke(d);
-                         
-                         IList<GroupChatModel> chats = f_ProtocolManager.FindGroupChats(filter);
-                         
diff --git a/net-irc/smuxi/files/smuxi-0.7.1-mono26.patch b/net-irc/smuxi/files/smuxi-0.7.1-mono26.patch
deleted file mode 100644
index 6a76ec3eda5a..000000000000
--- a/net-irc/smuxi/files/smuxi-0.7.1-mono26.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 1b7ebd1dfcca090b3e8510947d9ea8a54d919b09
-Author: Mirco Bauer <meebey@meebey.net>
-Date:   Sun Jun 6 19:28:02 2010 +0200
-
-    Fixed build issue with xbuild on Mono 2.6 (closes: #380)
-
-diff --git a/lib/Twitterizer.Framework/Makefile.am b/lib/Twitterizer.Framework/Makefile.am
-index 8de6969..1116489 100644
---- a/lib/Twitterizer.Framework/Makefile.am
-+++ b/lib/Twitterizer.Framework/Makefile.am
-@@ -6,7 +6,7 @@ ASSEMBLY_NAME = Twitterizer.Framework.dll
- ASSEMBLY_TARGET = $(OUTPUT_DIR)/$(ASSEMBLY_NAME)
- KEY_FILE = $(srcdir)/Twitterizer.Framework.snk
- BUILD_FILE = $(srcdir)/Twitterizer.Framework.vs2008.csproj
--XBUILD_FLAGS = /p:Configuration=Debug /p:NoWarn=CS0168 /p:OutputPath=$(abspath $(OUTPUT_DIR)) /p:BaseIntermediateOutputPath=$(abspath $(OBJECT_DIR))/
-+XBUILD_FLAGS = /p:Configuration=Debug /p:NoWarn=0168 /p:OutputPath=$(abspath $(OUTPUT_DIR)) /p:BaseIntermediateOutputPath=$(abspath $(OBJECT_DIR))/
- 
- # magic automake variables
- if ENABLE_ENGINE_TWITTER
diff --git a/net-irc/smuxi/smuxi-0.7.1-r1.ebuild b/net-irc/smuxi/smuxi-0.8.ebuild
index 83bb58f86049..bf25198beb36 100644
--- a/net-irc/smuxi/smuxi-0.7.1-r1.ebuild
+++ b/net-irc/smuxi/smuxi-0.8.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/smuxi/smuxi-0.7.1-r1.ebuild,v 1.3 2010/07/11 12:52:04 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/smuxi/smuxi-0.8.ebuild,v 1.1 2010/10/05 20:36:34 pacho Exp $
 
 EAPI=2
 
-inherit base mono eutils autotools
+inherit base mono eutils
 
 DESCRIPTION="A flexible, irssi-like and user-friendly IRC client for the Gnome Desktop."
-HOMEPAGE="http://www.smuxi.org/page/Download"
-SRC_URI="http://smuxi.meebey.net/jaws/data/files/${P}.tar.gz"
+HOMEPAGE="http://www.smuxi.org/main/"
+SRC_URI="http://www.smuxi.org/jaws/data/files/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnome"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gnome libnotify"
 LICENSE="|| ( GPL-2 GPL-3 )"
 
 RDEPEND=">=dev-lang/mono-2.0
@@ -22,21 +22,25 @@ RDEPEND=">=dev-lang/mono-2.0
 	gnome? ( >=dev-dotnet/gtk-sharp-2.12
 		 >=dev-dotnet/gconf-sharp-2.12
 		 >=dev-dotnet/glade-sharp-2.12
-		 >=dev-dotnet/glib-sharp-2.12 )"
+		 >=dev-dotnet/glib-sharp-2.12 )
+	libnotify? ( dev-dotnet/notify-sharp )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.25
 	>=sys-devel/gettext-0.17
 	>=dev-util/pkgconfig-0.23"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-mono26.patch"
-	eautoreconf
-}
-
 src_configure() {
 	econf	--disable-dependency-tracking	\
 		--enable-engine-irc		\
-		$(use_enable gnome frontend-gnome)
+		--without-indicate		\
+		$(use_enable debug)		\
+		$(use_enable gnome frontend-gnome) \
+		$(use_with libnotify notify)
+}
+
+src_compile() {
+	# This is not parallel build safe, see upstream bug #515
+	emake -j1 || die "emake failed"
 }
 
 src_install() {