#include fix and clean up wrt #343935

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

4 files changed, 62 insertions, 11 deletions

diff --git a/net-im/cpop/ChangeLog b/net-im/cpop/ChangeLog
index 23c048296beb..6dd5029ddf97 100644
--- a/net-im/cpop/ChangeLog
+++ b/net-im/cpop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/cpop
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/cpop/ChangeLog,v 1.5 2007/02/09 04:15:43 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/cpop/ChangeLog,v 1.6 2010/11/03 11:38:40 ssuominen Exp $
+
+  03 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> cpop-0.0.4.ebuild,
+  +files/cpop-0.0.4-implicit-exit_memset_strlen.patch:
+  #include fix and clean up wrt #343935
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/net-im/cpop/Manifest b/net-im/cpop/Manifest
index df0373b83f89..aec305c654a7 100644
--- a/net-im/cpop/Manifest
+++ b/net-im/cpop/Manifest
@@ -1,4 +1,5 @@
+AUX cpop-0.0.4-implicit-exit_memset_strlen.patch 1211 RMD160 729ee95703db17f4913ab59b1f39ee3c74f1e046 SHA1 8c1f7a12a980a235621df7b9dbd07c51228df08c SHA256 9a51c665e4184d26edbcd220c30626f01c814e9b4e717939ca6e6ecf0cf9dd55
 DIST cpop-0.0.4.tar.gz 68544 RMD160 958f0c869e78da4f6fa5354799a2bf0d513ff70e SHA1 5a3d16d87de023f5bffec38c8d50be27ffd0b073 SHA256 68855387c20ce2adaf5a51464b68fc756acfe197ab9b53dbde910757526f45a8
-EBUILD cpop-0.0.4.ebuild 603 RMD160 86197c1938b8130b256c93c89ee18f057123c576 SHA1 b7b4b6a3b0665eab17b25fcbb476dc883c98a0cb SHA256 44c4cbeaa3962935b6a6bf61f54af3309aece89e5133decac0a12f3f617f7bf1
-MISC ChangeLog 689 RMD160 aac871b567076928c3fef2fd16130a1f517170e3 SHA1 369efb2529ae76e7fd7726c51c5c1bfec03b1a31 SHA256 efb7954f0b3191d59f943ff06421ec1631f7d826354b10222accbb58c11d4a80
+EBUILD cpop-0.0.4.ebuild 718 RMD160 f7cf2ea48c84458cf2b4e3786105d81aaa4deafc SHA1 200a74999cde80ee8a19836b2d27a7896e7ce9e0 SHA256 e0c910e666b3845a627548e2f37ea9dedbb59c26c146620da89bbf10f02dbe52
+MISC ChangeLog 858 RMD160 4aa6c7210ecf5483c3ea05c05f823f5469e60824 SHA1 6d6919a9f4a2b26727fa701cbfaa3aa15a5dfc3f SHA256 2faac298fdc71b29725c7e1fb988d059169ba2d0dab75c72a38d26413a714cd3
 MISC metadata.xml 221 RMD160 66ce46212072ed26cd420705213e39bebcc80954 SHA1 b403c7855e20288b79c87b2c4cd97a04adcd984d SHA256 286ecd08afaf8af48c50edb9673984bb4411d61d44169d73ef643e5a700ef698
diff --git a/net-im/cpop/cpop-0.0.4.ebuild b/net-im/cpop/cpop-0.0.4.ebuild
index 6fa23d7b56c5..17d98ba2125d 100644
--- a/net-im/cpop/cpop-0.0.4.ebuild
+++ b/net-im/cpop/cpop-0.0.4.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/cpop/cpop-0.0.4.ebuild,v 1.5 2004/08/08 00:01:06 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/cpop/cpop-0.0.4.ebuild,v 1.6 2010/11/03 11:38:40 ssuominen Exp $
+
+EAPI=2
+inherit eutils
 
 DESCRIPTION="GTK+ network popup message client. Compatible with the jpop protocol."
 HOMEPAGE="http://www.draxil.uklinux.net/hip/index.pl?page=cpop"
@@ -8,13 +11,18 @@ SRC_URI="http://www.draxil.uklinux.net/hip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND=">=x11-libs/gtk+-2.2.0
-		>=dev-libs/glib-2.0.0"
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-implicit-exit_memset_strlen.patch
+}
 
 src_install() {
-	einstall || die
-	dodoc COPYING ChangeLog INSTALL README
+	emake DESTDIR="${D}" install || die
+	dodoc README
 }
diff --git a/net-im/cpop/files/cpop-0.0.4-implicit-exit_memset_strlen.patch b/net-im/cpop/files/cpop-0.0.4-implicit-exit_memset_strlen.patch
new file mode 100644
index 000000000000..3ce224c2910a
--- /dev/null
+++ b/net-im/cpop/files/cpop-0.0.4-implicit-exit_memset_strlen.patch
@@ -0,0 +1,38 @@
+pop_common.c:5:3: warning: incompatible implicit declaration of built-in function ‘exit’
+pop_common.c:10:3: warning: incompatible implicit declaration of built-in function ‘exit’
+pop_client.c:61:3: warning: incompatible implicit declaration of built-in function ‘exit’
+pop_gui_client.c:58:4: warning: incompatible implicit declaration of built-in function ‘memset’
+pop_gui_client.c:72:27: warning: incompatible implicit declaration of built-in function ‘strlen’
+pop_gui_client.c:128:3: warning: incompatible implicit declaration of built-in function ‘exit’
+
+--- pop_client.c
++++ pop_client.c
+@@ -1,11 +1,11 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <errno.h>
+ #include <glib.h>
+-#include <stdio.h>
+ #include <netdb.h>
+ #include "pop_common.h"
+ #include "pop_client.h"
+--- pop_common.c
++++ pop_common.c
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ void errquit(char *message)
+ {
+   perror(message);
+--- pop_gui_client.c
++++ pop_gui_client.c
+@@ -1,3 +1,5 @@
++#include <stdlib.h>
++#include <string.h>
+ #include <netdb.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>