Respect LDFLAGS (bug #335171), CC. Build PIC. Set SONAME (bug #214536). Set RDEPEND. Fix missing includes.

Package-Manager: portage-2.2.0_alpha10/cvs/Linux i686

4 files changed, 60 insertions, 13 deletions

diff --git a/dev-util/dirdiff/ChangeLog b/dev-util/dirdiff/ChangeLog
index bfc162af11a0..a2b49e3e2ec9 100644
--- a/dev-util/dirdiff/ChangeLog
+++ b/dev-util/dirdiff/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/dirdiff
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dirdiff/ChangeLog,v 1.8 2007/02/09 03:06:13 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dirdiff/ChangeLog,v 1.9 2010/12/31 16:05:37 jer Exp $
+
+*dirdiff-2.1-r1 (31 Dec 2010)
+
+  31 Dec 2010; Jeroen Roovers <jer@gentoo.org> +dirdiff-2.1-r1.ebuild,
+  +files/dirdiff-2.1-include.patch:
+  Respect LDFLAGS (bug #335171), CC. Build PIC. Set SONAME (bug #214536). Set
+  RDEPEND. Fix missing includes.
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/dev-util/dirdiff/Manifest b/dev-util/dirdiff/Manifest
index c9ce782bc173..3ab3bf5c3a6a 100644
--- a/dev-util/dirdiff/Manifest
+++ b/dev-util/dirdiff/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX dirdiff-2.1-include.patch 314 RMD160 a77332d72cae9a0ad313e46f2cfea1ab79b779af SHA1 1c060014f7fa70283a81fa38204d369d7ea8dc6d SHA256 faedaf8053619fb773aef44bfa55240910d10015d6a3f4cbdc6f45b81fb5e55d
 DIST dirdiff-2.1.tar.gz 43105 RMD160 280ead77db4371eee2d6cc6d5df3ee362585fbb0 SHA1 baa355b2eae4886de57a47cb69d8214c7545c0e8 SHA256 cb373654d5788027804355e355df0695862c3bfc1f6a3fc6014722b3156a9252
+EBUILD dirdiff-2.1-r1.ebuild 858 RMD160 1586a531a565e7fa6e2690d6c584dad655c7aded SHA1 ee1e1e76ac7c79339adfa7d8a66d9414e8321539 SHA256 3ba8f2d72b2cecf029cd7ce6659a54c6e1912c3b6958e85e29f9cc33fb3d5a74
 EBUILD dirdiff-2.1.ebuild 698 RMD160 716423a4bbec2ed6c1b6ec335bf16b35c7a9c377 SHA1 cc102c288573f8c97ced3457fb9a142d40e6c76c SHA256 5d2e2305d65d59eecce1700fde5bc0d104e458c5fe157ce518d7948ff444f952
-MISC ChangeLog 1379 RMD160 275afd80b5f8923c9295b70f7f195792a20be31b SHA1 921a624b00c2b402dc25f8f5229832de80d343dc SHA256 95e7f44b21ddf23dacd823725324b9927d081591a9cd0536154dc493b2d93142
+MISC ChangeLog 1623 RMD160 639b323efa32b3cc4beabb627ba117aecd21de0e SHA1 e15167681023e4e29be1d2ddbdcab50d31dba90f SHA256 38ff43d42186f2afa8f025b6db3a036e0271ddc795b19b508e0af07629e6a529
 MISC metadata.xml 232 RMD160 854b06094287201d0b98f2b21d36054db25d81cd SHA1 cc4f98e9ee0102aea687d71cf3af924cf156edbb SHA256 21382e863647add08888c924279a4b931b2b90ccd0cf5e526ee74a3d5e1fd0df
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzQXZkACgkQ9/cejkQaxBAzUwCfSatsQTS7+kE0fOQpmU+/33SQ
-9pkAn3e19LuGkxBHL6bZkarkySz0e5Tm
-=xAvo
------END PGP SIGNATURE-----
diff --git a/dev-util/dirdiff/dirdiff-2.1-r1.ebuild b/dev-util/dirdiff/dirdiff-2.1-r1.ebuild
new file mode 100644
index 000000000000..f090ef7cbc77
--- /dev/null
+++ b/dev-util/dirdiff/dirdiff-2.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dirdiff/dirdiff-2.1-r1.ebuild,v 1.1 2010/12/31 16:05:37 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A tool for differing and merging directories"
+SRC_URI="http://samba.org/ftp/paulus/${P}.tar.gz"
+HOMEPAGE="http://samba.org/ftp/paulus/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/tk
+		dev-lang/tcl"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-include.patch
+	sed -i Makefile -e 's|=-O3|+=|g' || die "sed Makefile"
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CFLAGS="${CFLAGS} -fPIC ${LDFLAGS} -Wl,-soname,libfilecmp.so.0" \
+		|| die
+}
+
+src_install() {
+	dobin dirdiff || die
+	dolib.so libfilecmp.so.0.0 || die
+	dodoc README
+}
diff --git a/dev-util/dirdiff/files/dirdiff-2.1-include.patch b/dev-util/dirdiff/files/dirdiff-2.1-include.patch
new file mode 100644
index 000000000000..acaed3cf8026
--- /dev/null
+++ b/dev-util/dirdiff/files/dirdiff-2.1-include.patch
@@ -0,0 +1,10 @@
+--- a/filecmp.c	2005-04-19 12:22:01.000000000 +0200
++++ b/filecmp.c	2010-12-30 20:23:24.000000000 +0100
+@@ -11,6 +11,7 @@
+ #include <ctype.h>
+ #include <tcl.h>
+ #include <sys/fcntl.h>
++#include <unistd.h> /* close() read() */
+ 
+ #define BSIZE		32768
+ #define MAXTAGLEN	512	/* max tag length for sanity, < BSIZE */