Version bump. Respect CFLAGS and LDFLAGS.

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

4 files changed, 16 insertions, 30 deletions

diff --git a/x11-plugins/msn-pecan/ChangeLog b/x11-plugins/msn-pecan/ChangeLog
index 34275e7f4aeb..b925d37f16c5 100644
--- a/x11-plugins/msn-pecan/ChangeLog
+++ b/x11-plugins/msn-pecan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/msn-pecan
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/msn-pecan/ChangeLog,v 1.3 2009/12/24 09:54:26 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/msn-pecan/ChangeLog,v 1.4 2009/12/24 11:28:33 pva Exp $
+
+*msn-pecan-0.1.0_rc2 (24 Dec 2009)
+
+  24 Dec 2009; Peter Volkov <pva@gentoo.org> -msn-pecan-0.1.0_rc1-r1.ebuild,
+  +msn-pecan-0.1.0_rc2.ebuild, -files/msn-pecan-0.1.0_rc1-oim-crash.patch:
+  Version bump. Respect CFLAGS and LDFLAGS.
 
 *msn-pecan-0.1.0_rc1-r1 (24 Dec 2009)
 
diff --git a/x11-plugins/msn-pecan/Manifest b/x11-plugins/msn-pecan/Manifest
index fa328a5566d3..055c4f79e300 100644
--- a/x11-plugins/msn-pecan/Manifest
+++ b/x11-plugins/msn-pecan/Manifest
@@ -1,7 +1,6 @@
-AUX msn-pecan-0.1.0_rc1-oim-crash.patch 643 RMD160 6d6e49dd7df5146aabb7c8f3ebd40dd0847927cf SHA1 8f451777312775fd46ca4363704cd3b36f229d52 SHA256 41b147ff90f8e43ba90ec115903ffa72a9afc8d2d8d7fedbaa95432148720c67
 DIST msn-pecan-0.0.19.tar.bz2 182250 RMD160 3dd560414cfe6e614dc53ce84c72dd62ef3fef3c SHA1 54b5ec219afd4fe5926db0fc6f2b79ef64302dce SHA256 f06bebffa4ed7eca8336437444c6fc0812499266eefe3c6afd48114442483f84
-DIST msn-pecan-0.1.0-rc1.tar.bz2 235687 RMD160 b4e6c9c04e75547a956859fbb108f3ae08598ccf SHA1 c0cda6950d51467d879184ed2d790086afca9c6b SHA256 c788fab679c0151103c430de96268e8414c59a0b5416b67484cdadf939712bba
+DIST msn-pecan-0.1.0-rc2.tar.bz2 243965 RMD160 5ab0e802aee145f4ed78a857825c7d51d04e0819 SHA1 84b59a3c47c0f9e857ed6e3a6987a417bf2a8cfa SHA256 a6ce1ed48263d81ad1d8346ff2e730c3b4cfb2c222875db703ef9c6d6719e678
 EBUILD msn-pecan-0.0.19.ebuild 1005 RMD160 c13edb75491aa60cf5ffe386956ea01e14778762 SHA1 f1c70dab18b8f4f99fbf7febe306650dd986672a SHA256 d2a114c80c877580a7d08539ca65ad242ca6017dc36d438c17d1e1b998e8d428
-EBUILD msn-pecan-0.1.0_rc1-r1.ebuild 1102 RMD160 d1ae9350106bfdfb269746a083200e087255f808 SHA1 9d92e1ae491c43aa577f05786864a2e9f3ad81bd SHA256 2af9afda121fd083472deb5d95dff34786d01c6771441093d49d4622b5d404c0
-MISC ChangeLog 2745 RMD160 4c6b1dd1a145c72fb207984a7fbc13d9b79f5f69 SHA1 0181c24ddb8e6aafc7307e11f24eb8f45d30a220 SHA256 64231a74fc712bd0081cb5de252b249fe7b4b1163f2aa2d1e88752ae7175c270
+EBUILD msn-pecan-0.1.0_rc2.ebuild 1198 RMD160 d8e7d6e8f484a5ab534260e38bfc4da2e9ca5a43 SHA1 e3236b1eea61ac93cbd36b26d0edb3c8b792c894 SHA256 830cce982753ca63b749a5c6715035cc4d6507b1663f7a015f08fe35c4bd9ba6
+MISC ChangeLog 2978 RMD160 f45b3d29beb0b5915063655003981c2e4386425f SHA1 59a7fbe726969145eb6d30aac4b4cc7d4dcfce60 SHA256 f1810305cd9eddfbf87e4ca936f54f0ec2fd19198bdaa59e3cdf67e16393f163
 MISC metadata.xml 341 RMD160 5bb2b4c4781b23adb3a40e8edda38e865a4fd4d8 SHA1 16eac5fa02391028710af4874bb4d92c37713f01 SHA256 aa464010ab31a9aa05aa2e01536f11c225cba6615b8ea3c7a7abb916f1fc8a2f
diff --git a/x11-plugins/msn-pecan/files/msn-pecan-0.1.0_rc1-oim-crash.patch b/x11-plugins/msn-pecan/files/msn-pecan-0.1.0_rc1-oim-crash.patch
deleted file mode 100644
index 0bdd60143438..000000000000
--- a/x11-plugins/msn-pecan/files/msn-pecan-0.1.0_rc1-oim-crash.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit e0fa9a5bcc356ad20c359cf208bbc84f155cdb71
-Author: Simone Contini <s.contini@oltrelinux.com>
-Date:   Sun Dec 13 10:01:37 2009 +0100
-
-    oim: handle malformed data in process_body_receive
-    
-    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
-
-diff --git a/pn_oim.c b/pn_oim.c
-index 6faaabe..496e3c0 100644
---- a/pn_oim.c
-+++ b/pn_oim.c
-@@ -576,7 +576,8 @@ process_body_receive (OimRequest *oim_request,
-         gchar *end;
-         cur += 2;
-         end = strstr (cur, "\r\n\r\n");
--        *end = '\0';
-+        if (end)
-+            *end = '\0';
-         message = (gchar *) purple_base64_decode (cur, NULL);
-     }
- 
diff --git a/x11-plugins/msn-pecan/msn-pecan-0.1.0_rc1-r1.ebuild b/x11-plugins/msn-pecan/msn-pecan-0.1.0_rc2.ebuild
index cc4ee7c6d963..8e7ddd2e2c18 100644
--- a/x11-plugins/msn-pecan/msn-pecan-0.1.0_rc1-r1.ebuild
+++ b/x11-plugins/msn-pecan/msn-pecan-0.1.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/msn-pecan/msn-pecan-0.1.0_rc1-r1.ebuild,v 1.1 2009/12/24 09:54:26 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/msn-pecan/msn-pecan-0.1.0_rc2.ebuild,v 1.1 2009/12/24 11:28:33 pva Exp $
 
 EAPI="2"
 
@@ -24,11 +24,14 @@ DEPEND="dev-util/pkgconfig
 S=${WORKDIR}/${P/_/-}
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-oim-crash.patch"
+	sed -e "/^LDFLAGS/{s/$/ ${LDFLAGS}/;}" \
+		-e "/^CFLAGS/{s/$/ ${CFLAGS}/;}" -i Makefile || die
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
+	emake CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS=${LDFLAGS} || die "emake failed"
 }
 
 src_install() {