Bump to version 3.2, thanks to Michael Vogt for the ebuild, bug 138844

(Portage version: 2.1.2_rc4-r3)

4 files changed, 86 insertions, 2 deletions

diff --git a/dev-util/xxdiff/ChangeLog b/dev-util/xxdiff/ChangeLog
index 64b7a981a958..31970dd2576b 100644
--- a/dev-util/xxdiff/ChangeLog
+++ b/dev-util/xxdiff/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/xxdiff
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.32 2005/12/24 22:01:16 vanquirius Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.33 2007/01/23 00:12:48 masterdriverz Exp $
+
+*xxdiff-3.2 (23 Jan 2007)
+
+  23 Jan 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  +files/xxdiff-3.2-kdesupport.patch, -xxdiff-3.1.ebuild,
+  +xxdiff-3.2.ebuild:
+  Bump to version 3.2, thanks to Michael Vogt for the ebuild, bug 138844
 
 *xxdiff-3.1 (24 Dec 2005)
 
diff --git a/dev-util/xxdiff/files/digest-xxdiff-3.2 b/dev-util/xxdiff/files/digest-xxdiff-3.2
new file mode 100644
index 000000000000..2beb8d33a69b
--- /dev/null
+++ b/dev-util/xxdiff/files/digest-xxdiff-3.2
@@ -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/files/xxdiff-3.2-kdesupport.patch b/dev-util/xxdiff/files/xxdiff-3.2-kdesupport.patch
new file mode 100644
index 000000000000..9d578cee61a8
--- /dev/null
+++ b/dev-util/xxdiff/files/xxdiff-3.2-kdesupport.patch
@@ -0,0 +1,15 @@
+--- xxdiff.pro.orig	2007-01-22 19:42:25.000000000 +0100
++++ xxdiff.pro	2007-01-22 19:42:40.000000000 +0100
+@@ -35,9 +35,9 @@
+ 
+ 
+ # To enable KDE support, uncomment the following lines:
+-#QMAKE_CFLAGS += -DXX_KDE -I/usr/include/kde
+-#QMAKE_CXXFLAGS += -DXX_KDE -I/usr/include/kde
+-#QMAKE_LIBS += -lkdeui -lkio -lqt-mt
++QMAKE_CFLAGS += -DXX_KDE -I/usr/include/kde
++QMAKE_CXXFLAGS += -DXX_KDE -I/usr/include/kde
++QMAKE_LIBS += -lkdeui -lkio -lqt-mt
+ 
+ 
+ # Enable debugging modes within xxdiff.
diff --git a/dev-util/xxdiff/xxdiff-3.2.ebuild b/dev-util/xxdiff/xxdiff-3.2.ebuild
new file mode 100644
index 000000000000..e5ec626d767f
--- /dev/null
+++ b/dev-util/xxdiff/xxdiff-3.2.ebuild
@@ -0,0 +1,59 @@
+# 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.ebuild,v 1.1 2007/01/23 00:12:48 masterdriverz Exp $
+
+inherit distutils eutils kde-functions
+
+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"
+IUSE="kde python"
+
+DEPEND="=x11-libs/qt-3*
+	kde? ( >=kde-base/kdelibs-3.1 )
+	sys-devel/flex
+	dev-util/yacc"
+RDEPEND="${DEPEND}
+	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
+}
+
+src_compile() {
+	if use python; then
+		distutils_src_compile
+	fi
+
+	cd src
+	make -f Makefile.bootstrap makefile || die "Makefile creation failed"
+	emake || die
+	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
+}