diff options
author | Pacho Ramos <pacho@gentoo.org> | 2010-07-03 18:52:38 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2010-07-03 18:52:38 +0000 |
commit | d04524a946060d40fcd411a5dfa2ef40aa79d06b (patch) | |
tree | e21622ca0e4779a4c3945f5103f46d93ba62ffb5 /net-irc | |
parent | Bump internal libpng to 1.4.3 (bug #326759). (diff) | |
download | historical-d04524a946060d40fcd411a5dfa2ef40aa79d06b.tar.gz historical-d04524a946060d40fcd411a5dfa2ef40aa79d06b.tar.bz2 historical-d04524a946060d40fcd411a5dfa2ef40aa79d06b.zip |
Fix build against mono-2.6 and allow to only build server
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'net-irc')
-rw-r--r-- | net-irc/smuxi/ChangeLog | 11 | ||||
-rw-r--r-- | net-irc/smuxi/Manifest | 17 | ||||
-rw-r--r-- | net-irc/smuxi/files/smuxi-0.7.1-mono26.patch | 19 | ||||
-rw-r--r-- | net-irc/smuxi/smuxi-0.6.4.ebuild | 40 | ||||
-rw-r--r-- | net-irc/smuxi/smuxi-0.7.1-r1.ebuild (renamed from net-irc/smuxi/smuxi-0.7.1.ebuild) | 21 |
5 files changed, 55 insertions, 53 deletions
diff --git a/net-irc/smuxi/ChangeLog b/net-irc/smuxi/ChangeLog index 25f52e1f8ab1..4791e32a563e 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.5 2010/02/21 11:23:28 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/smuxi/ChangeLog,v 1.6 2010/07/03 18:52:38 pacho Exp $ + +*smuxi-0.7.1-r1 (03 Jul 2010) + + 03 Jul 2010; Pacho Ramos <pacho@gentoo.org> -smuxi-0.6.4.ebuild, + -smuxi-0.7.1.ebuild, +smuxi-0.7.1-r1.ebuild, + +files/smuxi-0.7.1-mono26.patch: + Revision bump fixing building against mono-2.6 (bug #310735 by Diego and + Steev) and allowing to build only server (bug #293952 by Ayron Jungren). + Remove old testing. *smuxi-0.7.1 (21 Feb 2010) diff --git a/net-irc/smuxi/Manifest b/net-irc/smuxi/Manifest index b893ed9b9306..23c9127c0036 100644 --- a/net-irc/smuxi/Manifest +++ b/net-irc/smuxi/Manifest @@ -1,10 +1,19 @@ +-----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.6.3.tar.gz 906997 RMD160 1a14b8190629c99e76777f6f1cee408e8a6140df SHA1 cbdd87e5d6ceaff3520de789185aa9b24ba83eb0 SHA256 ae75dbd729f616eb360f97c5d47430e05662fa8d7c44940210f7c5c36b18b97b -DIST smuxi-0.6.4.tar.gz 742489 RMD160 0b8f06448c6b55e452561760906f0ff0c7934078 SHA1 011b530a63dc401737c2147080d374ccb88aa595 SHA256 773d39082832831545f87dd874d1832aa56f0cdb6821a8bbbc20b4c92dca6b92 DIST smuxi-0.7.1.tar.gz 860304 RMD160 c440b516c08b5a38b421f9ca4e9114259acacaa2 SHA1 b5ee860a491bd497f3bfd0b3c309eb5d5406299c SHA256 7e5a0982c71ddaf275a806248c6331222b47462b0edf85afa35f0ceab8615868 EBUILD smuxi-0.6.3.ebuild 1208 RMD160 365e58523f31e78b3dfd2212195526c1281d9454 SHA1 3a32eca1f2748f4d12624ed034d2ea41cc5ddfdb SHA256 65666a71cfbe763944bf06de989e8c5411f673cf2624c856bb0c74856bc66cbd -EBUILD smuxi-0.6.4.ebuild 1092 RMD160 962884d04bacea75de5ba8f3890360d885646e33 SHA1 acc7f9ac192b49a705699c87e774f57b1d580af1 SHA256 48a14c4ca4e31d5058a09405c8005559b953849c81e903414fd869a0567f7c4e -EBUILD smuxi-0.7.1.ebuild 1091 RMD160 ff43382f09b1d7a9e5ae959a5127af8d44bfaddf SHA1 979f48901334872173061e6bc99b6b98434deae3 SHA256 4fdd64d377398bed26d6e77c5782497a368679b98ea65b3d542bca22b4030095 -MISC ChangeLog 953 RMD160 1d97ce89ecb82b69e200691cde466abd7ee2fb67 SHA1 f107ea10aefa879fe36a7b25ac1373fa5f5edc33 SHA256 5c093e849400f1e0f31e0095b3d86626d0d22b3067cd328e22a6232ae2cc0e3a +EBUILD smuxi-0.7.1-r1.ebuild 1213 RMD160 b291aa892cfcd060816c0c142ae6e2768926cea2 SHA1 51519dad6b10199d62d210ba1a839c3307388e10 SHA256 c7b27d3b45e8be1bc1042e35542974f0e06533fd1df1f9d975f106dcf879b239 +MISC ChangeLog 1304 RMD160 ba6f4f9881408c7c8d1ece195f7f59a7eb7246c7 SHA1 11ce347d06a1d8ecd6c30d7cf0d04801fc7852a0 SHA256 950b8a3accd42ce6a814e4d8c719d92026c025edd140a6b4e8b95fc98610bc5f MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkwvhvwACgkQCaWpQKGI+9QVggCgghZ7+WBxCF61R1C3A5C5xHXF +W7EAn3JKcgbP8N5W9M+I7Ih/Aa8fS7Br +=Mu/L +-----END PGP SIGNATURE----- diff --git a/net-irc/smuxi/files/smuxi-0.7.1-mono26.patch b/net-irc/smuxi/files/smuxi-0.7.1-mono26.patch new file mode 100644 index 000000000000..6a76ec3eda5a --- /dev/null +++ b/net-irc/smuxi/files/smuxi-0.7.1-mono26.patch @@ -0,0 +1,19 @@ +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.6.4.ebuild b/net-irc/smuxi/smuxi-0.6.4.ebuild deleted file mode 100644 index 54aeac4c9e7f..000000000000 --- a/net-irc/smuxi/smuxi-0.6.4.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/smuxi/smuxi-0.6.4.ebuild,v 1.1 2009/08/29 20:57:06 loki_val Exp $ - -EAPI=2 - -inherit base mono - -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" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -LICENSE="|| ( GPL-2 GPL-3 )" - -RDEPEND=">=dev-lang/mono-2.0 - >=dev-dotnet/smartirc4net-0.4.5.1 - >=dev-dotnet/nini-1.1.0-r2 - >=dev-dotnet/log4net-1.2.10-r2 - >=dev-dotnet/gtk-sharp-2.12 - >=dev-dotnet/gconf-sharp-2.12 - >=dev-dotnet/glade-sharp-2.12 - >=dev-dotnet/glib-sharp-2.12" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.25 - >=sys-devel/gettext-0.17 - >=dev-util/pkgconfig-0.23" - -src_configure() { - econf --disable-dependency-tracking \ - --enable-engine-irc \ - --enable-frontend-gnome -} - -src_install() { - emake DESTDIR="${D}" install || die "install failed" - dodoc FEATURES TODO README || die "dodoc failed" -} diff --git a/net-irc/smuxi/smuxi-0.7.1.ebuild b/net-irc/smuxi/smuxi-0.7.1-r1.ebuild index b397bd45e046..c19fa9f766ff 100644 --- a/net-irc/smuxi/smuxi-0.7.1.ebuild +++ b/net-irc/smuxi/smuxi-0.7.1-r1.ebuild @@ -1,10 +1,10 @@ # 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.ebuild,v 1.1 2010/02/21 11:23:28 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/smuxi/smuxi-0.7.1-r1.ebuild,v 1.1 2010/07/03 18:52:38 pacho Exp $ EAPI=2 -inherit base mono +inherit base mono eutils autotools DESCRIPTION="A flexible, irssi-like and user-friendly IRC client for the Gnome Desktop." HOMEPAGE="http://www.smuxi.org/page/Download" @@ -12,26 +12,31 @@ SRC_URI="http://smuxi.meebey.net/jaws/data/files/${P}.tar.gz" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="gnome" LICENSE="|| ( GPL-2 GPL-3 )" RDEPEND=">=dev-lang/mono-2.0 >=dev-dotnet/smartirc4net-0.4.5.1 >=dev-dotnet/nini-1.1.0-r2 >=dev-dotnet/log4net-1.2.10-r2 - >=dev-dotnet/gtk-sharp-2.12 - >=dev-dotnet/gconf-sharp-2.12 - >=dev-dotnet/glade-sharp-2.12 - >=dev-dotnet/glib-sharp-2.12" + 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 )" 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 \ - --enable-frontend-gnome + $(use_enable gnome frontend-gnome) } src_install() { |