3.1 version bump, which should fix bug 111255.

(Portage version: 2.1_pre1)

5 files changed, 77 insertions, 5 deletions

diff --git a/dev-util/xxdiff/ChangeLog b/dev-util/xxdiff/ChangeLog
index 18aaca9fd451..64b7a981a958 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.31 2005/09/11 02:21:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.32 2005/12/24 22:01:16 vanquirius Exp $
+
+*xxdiff-3.1 (24 Dec 2005)
+
+  24 Dec 2005; Marcelo Goes <vanquirius@gentoo.org> metadata.xml,
+  +xxdiff-3.1.ebuild:
+  3.1 version bump, which should fix bug 111255. Reported by Clock <clock at
+  twibright dot com>.
 
   10 Sep 2005; Aron Griffis <agriffis@gentoo.org> xxdiff-3.0.2-r1.ebuild:
   Mark 3.0.2-r1 stable on alpha
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index c03bab90584b..5e872f0b8b63 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1,5 +1,7 @@
-MD5 70f06600556327dcfbc31fa03f610042 metadata.xml 155
 MD5 11067a32aae8383dc170eebb0168a614 ChangeLog 4074
-MD5 e98e2c40d5cd9527666c4efd50e2dcc3 xxdiff-3.0.2-r1.ebuild 1547
-MD5 90983c130466c6d73a77a59889fbc673 files/kdesupport.patch 588
 MD5 fbf14d026d67672a85470077dd5a75c3 files/digest-xxdiff-3.0.2-r1 65
+MD5 a0f219935566150ae3d2c07126d0754d files/digest-xxdiff-3.1 63
+MD5 90983c130466c6d73a77a59889fbc673 files/kdesupport.patch 588
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 e98e2c40d5cd9527666c4efd50e2dcc3 xxdiff-3.0.2-r1.ebuild 1547
+MD5 1e0b024a724ee3d133ecf95188265f4e xxdiff-3.1.ebuild 1551
diff --git a/dev-util/xxdiff/files/digest-xxdiff-3.1 b/dev-util/xxdiff/files/digest-xxdiff-3.1
new file mode 100644
index 000000000000..21c21459b251
--- /dev/null
+++ b/dev-util/xxdiff/files/digest-xxdiff-3.1
@@ -0,0 +1 @@
+MD5 ead4e429e8a084eda46ecbf4d47d4512 xxdiff-3.1.tar.gz 1074150
diff --git a/dev-util/xxdiff/metadata.xml b/dev-util/xxdiff/metadata.xml
index dc439f7e84f5..20ce219711a2 100644
--- a/dev-util/xxdiff/metadata.xml
+++ b/dev-util/xxdiff/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+<herd>no-herd</herd>
 </pkgmetadata>
diff --git a/dev-util/xxdiff/xxdiff-3.1.ebuild b/dev-util/xxdiff/xxdiff-3.1.ebuild
new file mode 100644
index 000000000000..9f16fa2f40f8
--- /dev/null
+++ b/dev-util/xxdiff/xxdiff-3.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-3.1.ebuild,v 1.1 2005/12/24 22:01:16 vanquirius Exp $
+
+inherit 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.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="kde"
+
+DEPEND="=x11-libs/qt-3*
+	kde? ( >=kde-base/kdelibs-3.1 )"
+
+RDEPEND="${DEPEND}
+	sys-apps/diffutils"
+
+DEPEND="${DEPEND}
+	=dev-util/tmake-1.8*"
+
+set-kdedir 3
+
+src_unpack() {
+	unpack ${A}
+
+	if use kde; then
+		cd "${S}"/src
+		cp "${FILESDIR}"/kdesupport.patch "${T}"/
+		sed -i -e "s:/usr/kde/3.1:${KDEDIR}:g" "${T}"/kdesupport.patch
+		epatch "${T}"/kdesupport.patch
+	fi
+}
+
+src_compile() {
+	cd src
+	tmake -o Makefile xxdiff.pro
+
+	### borrowed from kde.eclass #
+	#
+	# fix the sandbox errors "can't writ to .kde or .qt" problems.
+	# this is a fake homedir that is writeable under the sandbox, so that the build
+	# process can do anything it wants with it.
+	REALHOME="${HOME}"
+	mkdir -p "${T}"/fakehome/.kde
+	mkdir -p "${T}"/fakehome/.qt
+	export HOME="${T}/fakehome"
+
+	# things that should access the real homedir
+	[ -d "${REALHOME}/.ccache" ] && ln -sf "${REALHOME}/.ccache" "${HOME}/"
+
+	emake || die
+}
+
+src_install () {
+	dobin bin/xxdiff bin/xxdiff-cvs-diff bin/xxdiff-encrypted bin/xxdiff-find-grep-sed bin/xxdiff-match
+	doman src/xxdiff.1
+	dodoc README CHANGES TODO
+}