Version bump. Fixed broken configure script (bug #496736). Removed old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 35 insertions, 7 deletions

diff --git a/dev-util/dwdiff/ChangeLog b/dev-util/dwdiff/ChangeLog
index 6ceb3abdca75..b333ce5a8aea 100644
--- a/dev-util/dwdiff/ChangeLog
+++ b/dev-util/dwdiff/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/dwdiff
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dwdiff/ChangeLog,v 1.9 2013/02/07 09:55:14 pinkbyte Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dwdiff/ChangeLog,v 1.10 2014/01/02 09:33:14 polynomial-c Exp $
+
+*dwdiff-2.0.7 (02 Jan 2014)
+
+  02 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> -dwdiff-2.0.4.ebuild,
+  +dwdiff-2.0.7.ebuild, +files/dwdiff-2.0.7-configure_fixes.patch:
+  Version bump. Fixed broken configure script (bug #496736). Removed old.
 
 *dwdiff-2.0.4-r1 (07 Feb 2013)
 
diff --git a/dev-util/dwdiff/dwdiff-2.0.4.ebuild b/dev-util/dwdiff/dwdiff-2.0.7.ebuild
index 074b01a02bfb..29de180c5681 100644
--- a/dev-util/dwdiff/dwdiff-2.0.4.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dwdiff/dwdiff-2.0.4.ebuild,v 1.1 2012/06/17 09:34:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dwdiff/dwdiff-2.0.7.ebuild,v 1.1 2014/01/02 09:33:14 polynomial-c Exp $
 
-EAPI=4
-inherit toolchain-funcs
+EAPI=5
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A front-end for the diff program that operates at the word level instead of the line level"
 HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
@@ -14,13 +14,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="nls"
 
-COMMON_DEPEND="dev-libs/icu"
+COMMON_DEPEND="dev-libs/icu:="
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/diffutils"
 DEPEND="${COMMON_DEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.0.7-configure_fixes.patch
 	sed -i \
 		-e '/INSTALL/s:COPYING::' \
 		Makefile.in || die
diff --git a/dev-util/dwdiff/files/dwdiff-2.0.7-configure_fixes.patch b/dev-util/dwdiff/files/dwdiff-2.0.7-configure_fixes.patch
new file mode 100644
index 000000000000..e93f37f5762b
--- /dev/null
+++ b/dev-util/dwdiff/files/dwdiff-2.0.7-configure_fixes.patch
@@ -0,0 +1,21 @@
+--- dwdiff-2.0.7/config.pkg
++++ dwdiff-2.0.7/config.pkg
+@@ -104,6 +104,7 @@
+ 
+ 	if [ "yes" = "${with_dwfilter}" ] ; then
+ 		cat > .config.c <<EOF
++#include <sys/types.h>
+ #include <unistd.h>
+ 
+ int main(int argc, char *argv[]) {
+@@ -114,8 +115,8 @@
+ 		clean .config.o
+ 
+ 		test_link "required functions for dwfilter" || {
+-			checkfunction "fork" 'pid_t pid = fork();' "<unistd.h>"
+-			checkfunction "open" 'execvp("test", NULL);' "<unistd.h>"
++			checkfunction "fork" 'pid_t pid = fork();' "<unistd.h>" "<sys/types.h>"
++			checkfunction "open" 'execvp("test", NULL);' "<unistd.h>" "<sys/types.h>"
+ 			check_message_result "!! A required function for dwfilter is not availabe. Try configuring with --without-dwfilter"
+ 			exit 1
+ 		}