Fix patch to support multilib and mark it stable for amd64 wrt #286873.

Package-Manager: portage-2.2_rc54/cvs/Linux x86_64

4 files changed, 28 insertions, 22 deletions

diff --git a/net-irc/cwirc/ChangeLog b/net-irc/cwirc/ChangeLog
index e4163bc27bb3..4deadce967a8 100644
--- a/net-irc/cwirc/ChangeLog
+++ b/net-irc/cwirc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/cwirc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/cwirc/ChangeLog,v 1.23 2009/04/30 21:17:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/cwirc/ChangeLog,v 1.24 2009/11/30 20:24:11 ssuominen Exp $
+
+  30 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
+  files/cwirc-1.7.1-gentoo.patch, cwirc-2.0.0.ebuild:
+  Fix patch to support multilib and mark it stable for amd64 wrt #286873.
 
   30 Apr 2009; Patrick Lauer <patrick@gentoo.org> cwirc-2.0.0.ebuild:
   Homepage and src_uri fix for #267950, additional ~amd64 keyword for extra
diff --git a/net-irc/cwirc/Manifest b/net-irc/cwirc/Manifest
index 66ac1e21bdef..f676b736817c 100644
--- a/net-irc/cwirc/Manifest
+++ b/net-irc/cwirc/Manifest
@@ -1,5 +1,5 @@
-AUX cwirc-1.7.1-gentoo.patch 662 RMD160 17d783f817a569969eb34e50b970d20225d1eaa6 SHA1 9b24130e6ee0f35b6078bb84ff01d8008a965853 SHA256 8ac6de98ea44db09d7545391706eec0365e9bee40e1d3b92768cf2855ee01cd9
+AUX cwirc-1.7.1-gentoo.patch 617 RMD160 fd0e93eb20b9e38812b6407701c1b7744ffb4e54 SHA1 26549def38d1645429f0c1d064d6c7461590db50 SHA256 4388db975f4a3ced68b7b5f5e0bc74a7a37781d4007ff41f9611f3afa41c8cc3
 DIST cwirc-2.0.0.tar.gz 180759 RMD160 f44f6453399fa2cfb1726febca81502491581a91 SHA1 9cc6426b3f3d7cddf8961151c01722b6360b01e5 SHA256 90e3bfa916fb8e5478739dc4d14b111bb2ffd1d1fd8ea81ab43486dc1e7e35c0
-EBUILD cwirc-2.0.0.ebuild 931 RMD160 3ed74fb74e1682c235e2174407502d15f19281ae SHA1 f445378925d2209ae996b3353546c57eed533b9a SHA256 d14c72411a35118e2069eed0298f614b7bcc7c103452d78865dd644b2abb6eaf
-MISC ChangeLog 3100 RMD160 dcb68f2942c4db92bb576d0150f143c0f1294ab8 SHA1 c241bb28b74ae200926c674b3c4630b3cf1953d7 SHA256 adae9061617de2bdee46d83520b59666af89167f0b1aacb7ff5dd285fbef0bc5
+EBUILD cwirc-2.0.0.ebuild 933 RMD160 1077020085469ef6128e50d50b430daca866a87d SHA1 8d72122a782944f91a068d1ef83a49b351c284c1 SHA256 489b4db78758d17b683ece5731ba943316b3af0961e731172b0090dc0790bd17
+MISC ChangeLog 3285 RMD160 bd3f64c02400e9b2301c77370eb1d3a539d9d0ff SHA1 25ea6aed7d2815192243d1ecaac1deb140919870 SHA256 adad67af0b1419594031ed94c63cd84a6426ff5f5811d1ab7f566d406fe39e55
 MISC metadata.xml 427 RMD160 d225216c0a6cb65a1d74c45c9c0a12e4a1e93045 SHA1 f60b4f42648f4cd18e37005c1d56c339fd7246e2 SHA256 9ec879a36f44116dc56e30970a3416cd4f9440925eda39e6569b235163c4d987
diff --git a/net-irc/cwirc/cwirc-2.0.0.ebuild b/net-irc/cwirc/cwirc-2.0.0.ebuild
index c002719211b9..50dd44257e4f 100644
--- a/net-irc/cwirc/cwirc-2.0.0.ebuild
+++ b/net-irc/cwirc/cwirc-2.0.0.ebuild
@@ -1,36 +1,34 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/cwirc/cwirc-2.0.0.ebuild,v 1.4 2009/04/30 21:17:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/cwirc/cwirc-2.0.0.ebuild,v 1.5 2009/11/30 20:24:11 ssuominen Exp $
 
-inherit eutils toolchain-funcs
+EAPI=2
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="An X-chat plugin for sending and receiving raw morse code over IRC"
 HOMEPAGE="http://myspace.voo.be/pcoupard/cwirc/"
 SRC_URI="http://myspace.voo.be/pcoupard/cwirc/download/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
-RDEPEND="x11-libs/gtk+
+RDEPEND="x11-libs/gtk+:2
 	>=net-irc/xchat-2.0.1"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/cwirc-1.7.1-gentoo.patch
 }
 
 src_compile() {
-	emake STRIP="true" CC="$(tc-getCC)" CFLAGS="${CFLAGS} -DLINUX" || die "emake failed"
+	emake STRIP="true" CC="$(tc-getCC)" CFLAGS="${CFLAGS} -DLINUX" || die
 }
 
 src_install() {
-	make install || die "make install failed"
+	emake DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" install || die
 
 	dodoc README RELEASE_NOTES Changelog
 	docinto schematics
diff --git a/net-irc/cwirc/files/cwirc-1.7.1-gentoo.patch b/net-irc/cwirc/files/cwirc-1.7.1-gentoo.patch
index 8f578004e067..84db7cac5bff 100644
--- a/net-irc/cwirc/files/cwirc-1.7.1-gentoo.patch
+++ b/net-irc/cwirc/files/cwirc-1.7.1-gentoo.patch
@@ -1,7 +1,8 @@
-diff -Naur cwirc-1.7.1-orig/Makefile cwirc-1.7.1/Makefile
---- cwirc-1.7.1-orig/Makefile	2003-11-10 03:20:07.000000000 +0100
-+++ cwirc-1.7.1/Makefile	2003-11-23 19:42:52.000000000 +0100
-@@ -22,10 +22,10 @@
+GNU DESTDIR and multilib directory support
+
+--- Makefile
++++ Makefile
+@@ -22,10 +22,13 @@
  #EXTRA_LDFLAGS=
  
  # Use these with Debian GNU/Linux for example
@@ -10,9 +11,12 @@ diff -Naur cwirc-1.7.1-orig/Makefile cwirc-1.7.1/Makefile
 -#FRONTEND_INSTALL_DIRECTORY=/usr/bin
 -#CWIRC_EXTENSIONS_DIRECTORY=/usr/lib/cwirc/extensions
 +TARGET_OS=LINUX
-+PLUGIN_INSTALL_DIRECTORY=${D}/usr/lib/xchat/plugins
-+FRONTEND_INSTALL_DIRECTORY=${D}/usr/bin
-+CWIRC_EXTENSIONS_DIRECTORY=${D}/usr/lib/cwirc/extensions
++DESTDIR=
++PREFIX=/usr
++LIBDIR=$(PREFIX)/lib
++PLUGIN_INSTALL_DIRECTORY=$(DESTDIR)$(LIBDIR)/xchat/plugins
++FRONTEND_INSTALL_DIRECTORY=$(DESTDIR)$(PREFIX)/bin
++CWIRC_EXTENSIONS_DIRECTORY=$(DESTDIR)$(LIBDIR)/cwirc/extensions
  #EXTRA_LDFLAGS=
  
  # Use these with FreeBSD 5.1 for example