New revision adding a debug useflag to enable/disable the debug codepaths (the default was enabled), to respect users' CFLAGS/CXXFLAGS and compiler chosen, and to remove the getopt replacement when the target system already contains the getopt_long function. Also add ~x86-fbsd keyword as per bug #178435.

(Portage version: 2.1.2.7)

3 files changed, 89 insertions, 1 deletions

diff --git a/dev-util/xxdiff/ChangeLog b/dev-util/xxdiff/ChangeLog
index de916d5807a4..8075a233c708 100644
--- a/dev-util/xxdiff/ChangeLog
+++ b/dev-util/xxdiff/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/xxdiff
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.40 2007/04/21 19:09:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.41 2007/05/24 16:05:32 flameeyes Exp $
+
+*xxdiff-3.2-r1 (24 May 2007)
+
+  24 May 2007; Diego Pettenò <flameeyes@gentoo.org> +xxdiff-3.2-r1.ebuild:
+  New revision adding a debug useflag to enable/disable the debug codepaths
+  (the default was enabled), to respect users' CFLAGS/CXXFLAGS and compiler
+  chosen, and to remove the getopt replacement when the target system already
+  contains the getopt_long function. Also add ~x86-fbsd keyword as per bug
+  #178435.
 
   21 Apr 2007; Raúl Porcel <armin76@gentoo.org> xxdiff-3.2.ebuild:
   ia64 stable
diff --git a/dev-util/xxdiff/files/digest-xxdiff-3.2-r1 b/dev-util/xxdiff/files/digest-xxdiff-3.2-r1
new file mode 100644
index 000000000000..2beb8d33a69b
--- /dev/null
+++ b/dev-util/xxdiff/files/digest-xxdiff-3.2-r1
@@ -0,0 +1,3 @@
+MD5 301ff399a1e4be8b68c38c3e27c0b1ad xxdiff-3.2.tar.bz2 1341967
+RMD160 12e7527f39713b925f05b687c2ad8b60459bb670 xxdiff-3.2.tar.bz2 1341967
+SHA256 965534bab462aea8aacb6c35c0683c1079f06d055ff13820584ac862134db2b8 xxdiff-3.2.tar.bz2 1341967
diff --git a/dev-util/xxdiff/xxdiff-3.2-r1.ebuild b/dev-util/xxdiff/xxdiff-3.2-r1.ebuild
new file mode 100644
index 000000000000..e2906b28a429
--- /dev/null
+++ b/dev-util/xxdiff/xxdiff-3.2-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-3.2-r1.ebuild,v 1.1 2007/05/24 16:05:32 flameeyes Exp $
+
+inherit distutils eutils kde-functions toolchain-funcs
+
+DESCRIPTION="A graphical file and directories comparator and merge tool."
+HOMEPAGE="http://xxdiff.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="kde python debug"
+
+RDEPEND="=x11-libs/qt-3*
+	kde? ( >=kde-base/kdelibs-3.1 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	|| ( sys-devel/bison dev-util/yacc )"
+
+RDEPEND="${RDEPEND}
+	sys-apps/diffutils"
+
+set-kdedir 3
+
+src_unpack() {
+	unpack ${A}
+
+	if use kde; then
+		cd "${S}/src"
+		epatch "${FILESDIR}/${P}-kdesupport.patch"
+		sed -i "s:/usr/include/kde:${KDEDIR}/include:g" xxdiff.pro
+		sed -i "s:QMAKE_LIBS +=:QMAKE_LIBS+= -L${KDEDIR}/lib:g" xxdiff.pro
+	fi
+
+	use debug || sed -i -e '/CONFIG/s:debug::' "${S}/src/xxdiff.pro"
+
+	# The getopt replacements used here are a bit of a moot point for
+	# some systems, and they are also causing warnings. Remove them when
+	# they are not needed.
+	if use elibc_glibc || use elibc_uclibc || use elibc_FreeBSD; then
+		rm "${S}"/src/getopt{1.c,.c,.h} || die "unable to remove getopt"
+		sed -i -e '/getopt/d' "${S}/src/xxdiff.pro" || die "unable to remove getopt"
+	fi
+}
+
+src_compile() {
+	if use python; then
+		distutils_src_compile
+	fi
+
+	cd src
+	make -f Makefile.bootstrap makefile || die "Makefile creation failed"
+	emake \
+		CC="$(tc-getCC) ${CFLAGS}" \
+		CXX="$(tc-getCXX) ${CXXFLAGS}" \
+		LINK="$(tc-getCXX) ${LDFLAGS}" \
+		|| die "make failed"
+	cd ../doc
+	emake || die "Doc failed"
+
+}
+
+src_install () {
+	if use python; then
+		distutils_src_install
+	fi
+
+	dobin bin/xxdiff bin/xx-cvs-diff bin/xx-encrypted bin/xx-find-grep-sed bin/xx-match
+	doman src/xxdiff.1
+	dodoc README CHANGES TODO
+	cd doc
+	dodoc xxdiff-doc.html
+}