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

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

6 files changed, 33 insertions, 138 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/Manifest b/net-irc/smuxi/Manifest
index e78ec959bcc3..c53ba16d7f29 100644
--- a/net-irc/smuxi/Manifest
+++ b/net-irc/smuxi/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX smuxi-0.6.3-infinite-loop.patch 3019 RMD160 12cd692df7e017ae8dfd1e2bef38b9631eeccb3a SHA1 9ea5c7114d699c16513377a36fff968901e43716 SHA256 b96bc4eb83e68249edb03a3e6b2213ecd8bcac9bb7e763646c5bf7c7621e9e02
-AUX smuxi-0.6.3-mono-2.2.patch 982 RMD160 e33dc0139d4b94225ebb71bc85fd64652e7152f3 SHA1 863a24f3f27113d77cb657719123d45e8312e36b SHA256 86c8640c5fae959496504119aba1fcf7c7a28c20b6ce37e8da8a6974afd03c81
-AUX smuxi-0.7.1-mono26.patch 970 RMD160 9caff9de18ac9a9cb646a196b42c26de8de63003 SHA1 7ef36ee5ca334f554fbec76aa7b0a956ae984ad2 SHA256 58a4b7543c6f51668e5a75005080c04520ca826e228d030fd49752faf2bd332c
-DIST smuxi-0.7.1.tar.gz 860304 RMD160 c440b516c08b5a38b421f9ca4e9114259acacaa2 SHA1 b5ee860a491bd497f3bfd0b3c309eb5d5406299c SHA256 7e5a0982c71ddaf275a806248c6331222b47462b0edf85afa35f0ceab8615868
 DIST smuxi-0.7.2.1.tar.gz 905833 RMD160 1fad869aae843e0f3cbe30366986c3f51cd5536a SHA1 94cbc0f5bee6cd2e1ff8c8f72d714270c80e5875 SHA256 9a313a04b41fd3f56874ebfdee5fe5c618b7208532edaaf13dbb62743d73e1ad
-EBUILD smuxi-0.7.1-r1.ebuild 1211 RMD160 2cf12bf2266ef576d5ac253d185892803dc167bd SHA1 39427d969ef878b46d645908090d23d7c36799a0 SHA256 234766b54ec9e622ebf660f551dbef54b20a35a44ee4fe75e7a78c6415974cc8
+DIST smuxi-0.8.tar.gz 1135506 RMD160 83116c213d7c5454d290f61f0b89aab04c4a35f2 SHA1 50ad828a771cf8387ad6c8f9ab0123daf97488ea SHA256 76ac79b24e0ac3aa7994fd56c70bef34c0bcd435b0acf4be5135aea5e0e8a41a
 EBUILD smuxi-0.7.2.1.ebuild 1131 RMD160 8755a4a61209c3b68835962af9174f704dc6dbdc SHA1 8e848b4cbf3b1c8cff143315651703313c2918e2 SHA256 a709130ab2c1091ecf7629a1fa7846831ceee1706cf4a1f66e4af0c4748e205b
-MISC ChangeLog 1923 RMD160 ba3ccfaa1afac2b09363700bfc26cff03de44067 SHA1 737c1fbd0e38a96670bc0e259d1de14ae3dae7de SHA256 1cbe7c1af4b715255b3bb6cf1870d14d069b26a72086653567aa7fe2f69a520a
+EBUILD smuxi-0.8.ebuild 1363 RMD160 7a0c6d485d68f8520964b3863db6baf15e448e1f SHA1 5e04f912865dc4e31341f96679f0503c8b528ea0 SHA256 db29c744fa6ca5fdf0fb22f73cea73c6603b3d56558bb8c46012d062371e5d2f
+MISC ChangeLog 2236 RMD160 e5bbfe974fed4b500f45f0735b4aadf7f122a1e6 SHA1 c9cb8193bfcc6dcf7fef9a00c50a8a3539974e0f SHA256 e390ae772fe003759629ede545b3860974d87156582d190bde1736ded7291106
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyb0YMACgkQ9/cejkQaxBBy2wCfSjnec5UJDywwfKxl54m8u+SA
-RDIAn0aj/5vQ882x/mAPJEO7KXD4Upxm
-=lTkS
+iEYEARECAAYFAkyrjFoACgkQCaWpQKGI+9TCYgCeIVsYgp+2Q0tmobZ7q60eqcny
+5mgAnRKrUNtaP8Yty6/zLTVs5w0TNjds
+=vTiN
 -----END PGP SIGNATURE-----
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() {