add partial patch to build with uclibc submitted by René Rhéaume via bug #554532

Package-Manager: portage-2.2.20/cvs/Linux x86_64

5 files changed, 52 insertions, 6 deletions

diff --git a/app-cdr/cdw/ChangeLog b/app-cdr/cdw/ChangeLog
index 653e1722e9d1..faf2c0bf8a2f 100644
--- a/app-cdr/cdw/ChangeLog
+++ b/app-cdr/cdw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/cdw
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdw/ChangeLog,v 1.63 2015/03/26 18:26:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdw/ChangeLog,v 1.64 2015/07/16 04:06:40 mr_bones_ Exp $
+
+  16 Jul 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/cdw-0.8.0-uclibc.patch, cdw-0.8.0.ebuild, cdw-9999.ebuild:
+  add partial patch to build with uclibc submitted by René Rhéaume via bug
+  #554532
 
   26 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> -cdw-0.7.1.ebuild,
   -files/cdw-0.7.1-asneeded.patch:
diff --git a/app-cdr/cdw/Manifest b/app-cdr/cdw/Manifest
index 878bfc10e8fd..2ae4d24cef93 100644
--- a/app-cdr/cdw/Manifest
+++ b/app-cdr/cdw/Manifest
@@ -1,5 +1,6 @@
+AUX cdw-0.8.0-uclibc.patch 740 SHA256 b97d885027dfc5867099d0ae12bd55d3447c112b711d7318b8c297a2d4d1533c SHA512 1b2a1101037d7999f361b686685509745d71e953ce45dcd33cb52d73510ee684faaea1b6715627a2944068ebacf5130b9a881bbc73061714c4d1643233042c93 WHIRLPOOL 440f8e7fad3e35b17b639eb3d2971cfaeb42c9986271ca331e79b6764e59f840f0b3b7a63364bf007757933b6c305d99dc79e837b7027297d8010e077a629ae0
 DIST cdw-0.8.0.tar.gz 849851 SHA256 8f5bd7ed41bc07a84c5aa693bed3c38420e60ba6a3b5ae6ff8e41d78a4665fd2 SHA512 67fd9e397800187baafff425fd77ae9ba679a7b396736004f305accea3c3c9ca215d70dac0410fd8ef9ed016f7ce11c3859c84bfa04e3234cee84201605175d0 WHIRLPOOL 1ad447f47bb8d1fdd5868aa0c6a5bba2f76d65aa93a7be6841823215794c094a25f8e03be6573b3d46256ad33e8d20185e5f790b3f1b5320623b74fd7a2eef6c
-EBUILD cdw-0.8.0.ebuild 645 SHA256 f5e2bb91da36f7501425b3bdc543a14faa6ab17cea80db7f6d6687883afa295a SHA512 f62052adc7afe22ee28a1e013b1ce97e9376d97b2c762e212b5d8fe24b9f2b976f5f8dc84e57983d98d936fab44254ded4e0c18f1709775548c2d944657d3557 WHIRLPOOL be83698459529460eede2b4026da0e1a9bc7212e127da2a21016c7ac67ff351a22e27fcef0a29c9a98e95c25018af034503652f269fd12eb527db15c805dd9d6
-EBUILD cdw-9999.ebuild 815 SHA256 314dc0ca0065b1f4be179abbfe1cb51fe05ce0f2bb588486ba1657650a72a15c SHA512 de2f2b4193e1e246a3c7c1d7893802f6f102aeeb16e324373e9269d694a9d82aeb1e7cafaefb636358674ce0e9df4bdfe56b92746ffb341ce6b7bfe95a2c60f0 WHIRLPOOL 5f46ca893b7c95f5c17ba046bd3f57c7a60b20b2a8b61e15e521d3ebe078e458017886fa7000485ae5221bb3d1443961bab5746c102de01da83cc134fdc09c18
-MISC ChangeLog 7583 SHA256 aa16aaf3353c82528e8498d7c233555f9753a265ac71e90fc61a4434b5c25725 SHA512 0944ec1fcb2f93e116ce45a0f8e5034fb2f2607f3e06838fc54bc0ca551bba5872af9e3ce9adf7ee416d28b4c6d59752bc54d37b1f9b1c3e1ea9be719e033778 WHIRLPOOL e474319110ec141443ba995fe0375ccf64635be8885a883b306496869e9ac659509615110dcd3f735d0b2dad7b03e8066606d250156f516e62a21fef1eb06bab
+EBUILD cdw-0.8.0.ebuild 744 SHA256 2bf66528a6708af059ee99f763e2fb734ef73f5876ccec210f4b6f2f6a88ab82 SHA512 d3209f50ee20d59607632ab28d5f288c86b97b9dd69375e924e2f1afe401b4ccfc20e4a849e166ac8adbc1073159250d1f3b3ea5380abf028d29fc92b991e952 WHIRLPOOL d6495a0ac59843e5174c8e9460287f992033e48ac01b0f8fede329013c30e44f489a742fae756c5607836a49394b05390e0ce097dbe254925cfaa0c456618e14
+EBUILD cdw-9999.ebuild 833 SHA256 09b5fa0bc49e9e5fd519ddd8bb87e340b9947bca1e367a42317e9c2d5aefcd9b SHA512 584966b9f6a9eb43d3cf333db42f83bd8f843e6bbeb426e91483a5c0c479138370ec22d0d0aba6e334f560880806d14555e029a439afd50b9504ce02b317bf86 WHIRLPOOL 07d1b8761ddeb366c204178b25c34239fca10869595c2460f38501f7d802925b3dfce1e11d482d0e3305fa93e436bb5e3bb287b7cb165a4ed72f93ae50251b4c
+MISC ChangeLog 7794 SHA256 0418de754dd70c1749e812d83e7e3a5582ac2125b470078a54b2688f4f4a26d9 SHA512 6f06842aaee429457995fc2f42f24b03743a46aca2f7db6285bfaeb4cd249b2625c1286c591b22882ccd1627c00ee232b20c13f1ff31ab195fec6aa468655c81 WHIRLPOOL a320d3f4839f7774c0e6e2bf40308e2ea0af43a0f24401b45538085eaaeaf10223e91bbb8478ab6057fde4ec9a2f1e51a65edbe4e8c8b80f045862d8a0945e81
 MISC metadata.xml 259 SHA256 563f38a3f3386a850ea11ce0ad1ad9b9cbc5fb7c586f58045b5bef6aa9132cc1 SHA512 edb06556a0cfb6e9a5aa6e5a2e219bcfadc7bb64cd44341282bb6abf0da511762b1cbf75c5986c6d14cbd995bbb41b8bf9fe63d8a3065dca225b2db1cbb8867a WHIRLPOOL 1c0ec1ec9b392a3f0eeac0750bc2e4a88fc5c4c93da555e105c1ca1a9290f198085338509839e12dacd6db7e4a87b70949cefee5de9ea6a1301c68270b39dcee
diff --git a/app-cdr/cdw/cdw-0.8.0.ebuild b/app-cdr/cdw/cdw-0.8.0.ebuild
index da3b2dd94f35..4d9d301bd198 100644
--- a/app-cdr/cdw/cdw-0.8.0.ebuild
+++ b/app-cdr/cdw/cdw-0.8.0.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdw/cdw-0.8.0.ebuild,v 1.4 2015/03/25 14:01:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdw/cdw-0.8.0.ebuild,v 1.5 2015/07/16 04:06:40 mr_bones_ Exp $
 
 EAPI=5
+inherit eutils
+
 DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
 HOMEPAGE="http://cdw.sourceforge.net"
 SRC_URI="mirror://sourceforge/cdw/${P}.tar.gz"
@@ -17,6 +19,11 @@ DEPEND="virtual/cdrtools
 	dev-libs/libburn
 	dev-libs/libcdio[-minimal]
 	sys-libs/ncurses[unicode]"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-uclibc.patch
+}
 
 src_install() {
 	DOCS="AUTHORS ChangeLog NEWS README THANKS cdw.conf" \
diff --git a/app-cdr/cdw/cdw-9999.ebuild b/app-cdr/cdw/cdw-9999.ebuild
index f849c8874a48..11459eb2c461 100644
--- a/app-cdr/cdw/cdw-9999.ebuild
+++ b/app-cdr/cdw/cdw-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdw/cdw-9999.ebuild,v 1.4 2015/02/19 09:58:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdw/cdw-9999.ebuild,v 1.5 2015/07/16 04:06:40 mr_bones_ Exp $
 
 EAPI=5
 ECVS_SERVER="cdw.cvs.sourceforge.net:/cvsroot/cdw"
@@ -23,6 +23,7 @@ DEPEND="virtual/cdrtools
 	dev-libs/libburn
 	dev-libs/libcdio[-minimal]
 	sys-libs/ncurses[unicode]"
+RDEPEND=${DEPEND}
 
 S=${WORKDIR}/${ECVS_MODULE}
 
diff --git a/app-cdr/cdw/files/cdw-0.8.0-uclibc.patch b/app-cdr/cdw/files/cdw-0.8.0-uclibc.patch
new file mode 100644
index 000000000000..eedf7e13642b
--- /dev/null
+++ b/app-cdr/cdw/files/cdw-0.8.0-uclibc.patch
@@ -0,0 +1,32 @@
+--- cdw-0.8.0/src/main.c
++++ cdw-0.8.0-uclibc/src/main.c
+@@ -44,7 +44,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifndef __UCLIBC__
+ #include <mcheck.h>
++#endif
+ #include <signal.h> /* sig_atomic_t */
+ 
+ #include <dirent.h> /* PATH_MAX */
+--- cdw-0.8.0/src/tasks/cdw_create_image.c
++++ cdw-0.8.0-uclibc/src/tasks/cdw_create_image.c
+@@ -21,6 +21,7 @@
+ 
+ #include <inttypes.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ 
+ #include "cdw_file_manager.h"
+ #include "gettext.h"
+--- cdw-0.8.0/src/utilities/cdw_utils.c
++++ cdw-0.8.0-uclibc/src/utilities/cdw_utils.c
+@@ -28,6 +28,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #include "cdw_logging.h"
+ #include "gettext.h"