Fix missing prototype warnings and use emake to build rather than running CC ourself.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.2 x86_64

4 files changed, 36 insertions, 8 deletions

diff --git a/app-text/unix2dos/ChangeLog b/app-text/unix2dos/ChangeLog
index ce40463b686c..b56aedb33fb0 100644
--- a/app-text/unix2dos/ChangeLog
+++ b/app-text/unix2dos/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/unix2dos
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/unix2dos/ChangeLog,v 1.25 2007/11/06 17:53:58 corsair Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/unix2dos/ChangeLog,v 1.26 2008/09/11 03:11:05 vapier Exp $
+
+  11 Sep 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/unix2dos-2.2-headers.patch, unix2dos-2.2-r1.ebuild:
+  Fix missing prototype warnings and use emake to build rather than running
+  CC ourself.
 
   06 Nov 2007; Markus Rothe <corsair@gentoo.org> unix2dos-2.2-r1.ebuild:
   Stable on ppc64; bug #197747
diff --git a/app-text/unix2dos/Manifest b/app-text/unix2dos/Manifest
index 85174439d2e1..b5fade12b897 100644
--- a/app-text/unix2dos/Manifest
+++ b/app-text/unix2dos/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX unix2dos-2.2-headers.patch 219 RMD160 d5d5f2c23ed1ec72093efc84eb7a8c292cef3a3d SHA1 e73e568d1455a0caea908027a913c519a0c3913c SHA256 a36ef8efcbabdf04c715973905a4aa68d91ae9ea52e75c2d0db80aba22aece7c
 AUX unix2dos-2.2-manpage.patch 888 RMD160 659d5cd24e4720cfba836d4dcf850e079b3fde6f SHA1 b7d107c6a1fef1284cdba6da78696f1b77726ba8 SHA256 5e0a6d4d9a058a09c229de6b9b5baff49bdf6fed2b508871d9a33a9cfe10f40c
 AUX unix2dos-2.2-segfault.patch 2297 RMD160 fa0cb9ba22658bca26c1e51419ee84233a691c06 SHA1 01866b0142c010478df6d430f3e8a26bb6a98a51 SHA256 f11d6fac8a679fe21f6bd3d3526cf4bcc9f4aa1d365361849c998c408ce583a3
 AUX unix2dos-2.2-workaround-rename-EXDEV.patch 1365 RMD160 cd00b69c75b10b1e724e19a42a958790040621ef SHA1 28ac8b5095f39aed53401fca78d705cf757ca059 SHA256 3d0abe030d93d4dfe20ecf96cb3dcfc7981092bdbe2bf32b746259dad7d29219
 AUX unix2dos-mkstemp.patch 543 RMD160 bd1b4912ba41f5c57229745d64c5e2c96e4d26fc SHA1 56d13e28640f978cee3e4c8aeb7d01a61bf8a27f SHA256 d4e4923e97848acfdf9e1970b8dc3a6fc5bd274b25116cea533af8a02d0009dc
 DIST unix2dos-2.2.src.tar.gz 5898 RMD160 7a06b892859d6ac22ae7add2ff2aa2017dbb5a2d SHA1 13af5a831516138027190170deb6960153aa4a1b SHA256 e23d4fc9806b12bc04065123729b95c24b1f3ed48609019ab754b5934559f9aa
-EBUILD unix2dos-2.2-r1.ebuild 844 RMD160 1c2bad6fd184edc1bca59eb16171de3c07298389 SHA1 484e9d0e62d263c756b471a83d0f58f3a3962454 SHA256 dc69a33da41ecf7eda0f153ee66d0faad0a0a800b4d122b039e356e507bddedf
-EBUILD unix2dos-2.2.ebuild 809 RMD160 da0bdd425f091abce181184dea98ae4918bac9af SHA1 98304636898969ff9ad8462c4103f6951be4e444 SHA256 b8ff13049695a5a01c3c37ed63e1378806c9171c46075d9c850c6fbd56eb4312
-MISC ChangeLog 2614 RMD160 b5e73ed42c4247d834f7f3234f9b5a906d775dcd SHA1 575df348116848cf98dbdb974ecf83502b600c9d SHA256 b2a116afb3a4a3f3e61ffe073c7fb7ba0b7d4ba8374ee81db755c9c75c4a84fc
+EBUILD unix2dos-2.2-r1.ebuild 861 RMD160 edf1267b6942fabd1babaab5d5af43971780ee3d SHA1 7c559bc4d0cebdded57c297697c16462d18bf899 SHA256 23c9966a1c712458706b65a5013219fd85c76fdbcc053a055f315518d045bbd4
+MISC ChangeLog 2815 RMD160 5d11cd2ec46b1e143cc6ff7d2030ff914c492ece SHA1 886440a8d53093ef2f35df50dc85dbae90df3d24 SHA256 bd91bdf273deb3402c87718731e75ac23e4bfb69713a6e0483184989aa50d7ab
 MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjIjFIACgkQ67wieSYcaxf9jwCfcg5+I27NG2I4+uH6n8WQ6J75
+MlAAn3I75MF5npTWx7EqVnox4koy1Z1o
+=AB4l
+-----END PGP SIGNATURE-----
diff --git a/app-text/unix2dos/files/unix2dos-2.2-headers.patch b/app-text/unix2dos/files/unix2dos-2.2-headers.patch
new file mode 100644
index 000000000000..c57859ab4c79
--- /dev/null
+++ b/app-text/unix2dos/files/unix2dos-2.2-headers.patch
@@ -0,0 +1,12 @@
+need unistd.h for close() and unlink()
+
+--- unix2dos.c
++++ unix2dos.c
+@@ -62,6 +62,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <utime.h>
++#include <unistd.h>
+ #include <sys/stat.h>
+ #include "unix2dos.h"
+ 
diff --git a/app-text/unix2dos/unix2dos-2.2-r1.ebuild b/app-text/unix2dos/unix2dos-2.2-r1.ebuild
index 9ad41c4dd33d..f31a466cb534 100644
--- a/app-text/unix2dos/unix2dos-2.2-r1.ebuild
+++ b/app-text/unix2dos/unix2dos-2.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/unix2dos/unix2dos-2.2-r1.ebuild,v 1.8 2007/12/11 09:32:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/unix2dos/unix2dos-2.2-r1.ebuild,v 1.9 2008/09/11 03:11:05 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -21,10 +21,11 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-segfault.patch
 	epatch "${FILESDIR}"/${P}-manpage.patch
 	epatch "${FILESDIR}"/${P}-workaround-rename-EXDEV.patch
+	epatch "${FILESDIR}"/${P}-headers.patch
 }
 
 src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o unix2dos unix2dos.c || die
+	emake CC="$(tc-getCC)" unix2dos || die
 }
 
 src_install() {