Fix broken compilation on gcc-4.1.

Package-Manager: portage-2.1.1

5 files changed, 76 insertions, 10 deletions

diff --git a/app-mobilephone/sms/ChangeLog b/app-mobilephone/sms/ChangeLog
index 587ad225a45d..4c3197e31e54 100644
--- a/app-mobilephone/sms/ChangeLog
+++ b/app-mobilephone/sms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-mobilephone/sms
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/sms/ChangeLog,v 1.3 2006/04/13 20:03:26 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/sms/ChangeLog,v 1.4 2006/09/24 11:16:40 mrness Exp $
+
+  24 Sep 2006; Alin Nastac <mrness@gentoo.org> +files/sms-2.0.3-gcc41.patch,
+  sms-2.0.3.ebuild:
+  Fix broken compilation on gcc-4.1.
 
   13 Apr 2006; Alin Nastac <mrness@gentoo.org> sms-2.0.3.ebuild:
   Simplify dependencies.
diff --git a/app-mobilephone/sms/Manifest b/app-mobilephone/sms/Manifest
index 1e69f0071576..f9b7ef3cd1f8 100644
--- a/app-mobilephone/sms/Manifest
+++ b/app-mobilephone/sms/Manifest
@@ -1,14 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c79e9ab5495da710ca9a2407bbadf4c5 ChangeLog 2544
-MD5 0a3f42f5ceada89211f4a27766eff6e7 files/digest-sms-2.0.3 60
+AUX sms-2.0.3-gcc41.patch 1187 RMD160 343fd34f1ec9a71e32c5fc500a89d0a7f1cb0398 SHA1 d5d07f4853655b11bd297553e251155cfcfc7a61 SHA256 574c404ed97a5dd2186fb3bc5e161cb67ba399750ff10ebcccfe5e4d0da0a599
+MD5 aadaff5887ac5f59d9d54878694bd0f2 files/sms-2.0.3-gcc41.patch 1187
+RMD160 343fd34f1ec9a71e32c5fc500a89d0a7f1cb0398 files/sms-2.0.3-gcc41.patch 1187
+SHA256 574c404ed97a5dd2186fb3bc5e161cb67ba399750ff10ebcccfe5e4d0da0a599 files/sms-2.0.3-gcc41.patch 1187
+DIST sms-2.0.3.tar.gz 48450 RMD160 20adede9e00fe844141e1dfb6c2e462433c46626 SHA1 7f8bc2591306524e70d205ba47f4cddb18f213c4 SHA256 e7f8792732772e56489232f0e671128e39472609466424d9ac33c1956ebb451f
+EBUILD sms-2.0.3.ebuild 892 RMD160 dbca435fa34fb24ea98e5361f846f330da19620f SHA1 09f1f83224550495aae2a7dcc8b3a28295d87173 SHA256 54c1f5b5e5cb30923895a75fa315ca323ca9dc411910e468f8c9b202aba176b3
+MD5 16a824dabdf05db69a468469003fb0b2 sms-2.0.3.ebuild 892
+RMD160 dbca435fa34fb24ea98e5361f846f330da19620f sms-2.0.3.ebuild 892
+SHA256 54c1f5b5e5cb30923895a75fa315ca323ca9dc411910e468f8c9b202aba176b3 sms-2.0.3.ebuild 892
+MISC ChangeLog 2679 RMD160 5a286990b42010d939673fe92866a92ccbacc73f SHA1 01bc8b15d73a00fe3f6996e72adb5f883878c597 SHA256 a8585ad8d65cd37bff0e1eba6b920aca7ee06345b28e55d61cfd963bdcbc4da8
+MD5 a4edf7826b0e20d57a790b589649d527 ChangeLog 2679
+RMD160 5a286990b42010d939673fe92866a92ccbacc73f ChangeLog 2679
+SHA256 a8585ad8d65cd37bff0e1eba6b920aca7ee06345b28e55d61cfd963bdcbc4da8 ChangeLog 2679
+MISC metadata.xml 626 RMD160 ce1fc43caba122eea3e3eb525e14c1340275916e SHA1 fef799da1bb8ee709b11b61cc51c7e329faec56d SHA256 ad4ec0a8902be8fff4af92a8ba707a0ca00fb5b1553c79bfa8c909cbc26e9f52
 MD5 0c6931ac86bfdd99e623b600cfa74821 metadata.xml 626
-MD5 5ef4b1ba163a171c97276df5ca654bd5 sms-2.0.3.ebuild 814
+RMD160 ce1fc43caba122eea3e3eb525e14c1340275916e metadata.xml 626
+SHA256 ad4ec0a8902be8fff4af92a8ba707a0ca00fb5b1553c79bfa8c909cbc26e9f52 metadata.xml 626
+MD5 44542118211574481940fe1b2d7166d1 files/digest-sms-2.0.3 226
+RMD160 a80b7ff10b73d95749daf09abc23dee9c7d9a957 files/digest-sms-2.0.3 226
+SHA256 c62e3cd0301ca06cb81f09eada09bf36225e63414a6c934207f4f063f0ec4fb0 files/digest-sms-2.0.3 226
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEPq6ajG8pv1lIUX4RApz1AJ93b5zQt0MsAnwZSVupkTQA8/AxxQCgwhPH
-ZImEZUVIgS8yoWkUEeBQk2A=
-=NvGm
+iD8DBQFFFmkk3sf9c6kjmR8RApRQAJ9fW57223PfCzPsSjacM8f71+YHIwCdGT/h
+Sp0V/NiIjoSlEdPX5mGF7CM=
+=+Eqw
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/sms/files/digest-sms-2.0.3 b/app-mobilephone/sms/files/digest-sms-2.0.3
index 891b91798a71..ad1f2b46408c 100644
--- a/app-mobilephone/sms/files/digest-sms-2.0.3
+++ b/app-mobilephone/sms/files/digest-sms-2.0.3
@@ -1 +1,3 @@
 MD5 d238c15e705aa4999aaf459e2fc1e821 sms-2.0.3.tar.gz 48450
+RMD160 20adede9e00fe844141e1dfb6c2e462433c46626 sms-2.0.3.tar.gz 48450
+SHA256 e7f8792732772e56489232f0e671128e39472609466424d9ac33c1956ebb451f sms-2.0.3.tar.gz 48450
diff --git a/app-mobilephone/sms/files/sms-2.0.3-gcc41.patch b/app-mobilephone/sms/files/sms-2.0.3-gcc41.patch
new file mode 100644
index 000000000000..39c7973ca3f2
--- /dev/null
+++ b/app-mobilephone/sms/files/sms-2.0.3-gcc41.patch
@@ -0,0 +1,38 @@
+diff -Nru sms-2.0.3.orig/lib/mr_curl/mr_curl.cc sms-2.0.3/lib/mr_curl/mr_curl.cc
+--- sms-2.0.3.orig/lib/mr_curl/mr_curl.cc	2005-02-04 02:37:39.000000000 +0200
++++ sms-2.0.3/lib/mr_curl/mr_curl.cc	2006-09-24 13:48:25.725464250 +0300
+@@ -4,6 +4,18 @@
+ 
+ using namespace std;
+ 
++size_t Curl_write_data(const void *ptr, size_t size,
++		size_t nmemb, Curl *curl) {
++	curl->buffer->write((const char*)ptr, size * nmemb);
++	return curl->buffer->bad() ? 0 : size*nmemb;
++}
++
++size_t Curl_write_header(const void *ptr, size_t size,
++		size_t nmemb, Curl *curl) {
++	curl->headers->write((const char*)ptr, size * nmemb);
++	return curl->headers->bad() ? 0 : size*nmemb;
++}
++
+ void FormParser::SetPage(const std::string &new_html)
+ {
+ 	action = "";
+@@ -428,15 +440,3 @@
+ 	SetOpt(CURLOPT_SSL_VERIFYHOST, 0);
+ }
+ 
+-size_t Curl_write_data(const void *ptr, size_t size,
+-		size_t nmemb, Curl *curl) {
+-	curl->buffer->write((const char*)ptr, size * nmemb);
+-	return curl->buffer->bad() ? 0 : size*nmemb;
+-}
+-
+-size_t Curl_write_header(const void *ptr, size_t size,
+-		size_t nmemb, Curl *curl) {
+-	curl->headers->write((const char*)ptr, size * nmemb);
+-	return curl->headers->bad() ? 0 : size*nmemb;
+-}
+-
diff --git a/app-mobilephone/sms/sms-2.0.3.ebuild b/app-mobilephone/sms/sms-2.0.3.ebuild
index 5c129a6e2936..4a9110716895 100644
--- a/app-mobilephone/sms/sms-2.0.3.ebuild
+++ b/app-mobilephone/sms/sms-2.0.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/sms/sms-2.0.3.ebuild,v 1.3 2006/04/13 20:03:26 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/sms/sms-2.0.3.ebuild,v 1.4 2006/09/24 11:16:40 mrness Exp $
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 DESCRIPTION="Command line program for sending SMS to Polish GSM mobile phone users"
 HOMEPAGE="http://ceti.pl/~miki/komputery/sms.html"
@@ -18,6 +18,12 @@ DEPEND="sys-libs/gdbm
 	dev-libs/pcre++
 	net-misc/curl"
 
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P}-gcc41.patch"
+}
+
 src_compile() {
 	emake CXX=$(tc-getCXX) CXXFLAGS="${CXXFLAGS} -I./lib" LDFLAGS="-lc" || die "make failed"
 }