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

(Portage version: 2.1.2_rc4-r3)
 (Unsigned Manifest commit)

3 files changed, 30 insertions, 68 deletions

diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index da53d4bb12cd..6e16e2bcf507 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1,7 +1,32 @@
-MD5 8e22d487ea7075647e1ddaa009dfdc59 ChangeLog 4291
-MD5 fbf14d026d67672a85470077dd5a75c3 files/digest-xxdiff-3.0.2-r1 65
-MD5 a0f219935566150ae3d2c07126d0754d files/digest-xxdiff-3.1 63
+AUX kdesupport.patch 588 RMD160 e074c1e222915db5a73db9bd183133bb3abed78e SHA1 600cb81828f908791de77a2821a1af0f9f388b99 SHA256 c64273cf6b4368547f5539fa12eb6c40077d625a2a3342b925437ad0c636cbb2
 MD5 90983c130466c6d73a77a59889fbc673 files/kdesupport.patch 588
-MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+RMD160 e074c1e222915db5a73db9bd183133bb3abed78e files/kdesupport.patch 588
+SHA256 c64273cf6b4368547f5539fa12eb6c40077d625a2a3342b925437ad0c636cbb2 files/kdesupport.patch 588
+AUX xxdiff-3.2-kdesupport.patch 492 RMD160 ebaa92902e28f5370b29f1d964e87783b7d28f52 SHA1 3a6a112a6f2bcd203e41ac41dadd2bb852db1258 SHA256 36e8276f74941a71a72ab2b73c542ce57e5a33211731029e2f39ed8605b89a50
+MD5 c65880b1c8aa147319720a59b196b31a files/xxdiff-3.2-kdesupport.patch 492
+RMD160 ebaa92902e28f5370b29f1d964e87783b7d28f52 files/xxdiff-3.2-kdesupport.patch 492
+SHA256 36e8276f74941a71a72ab2b73c542ce57e5a33211731029e2f39ed8605b89a50 files/xxdiff-3.2-kdesupport.patch 492
+DIST xxdiff-3.0.2.tar.gz 1064508
+DIST xxdiff-3.2.tar.bz2 1341967 RMD160 12e7527f39713b925f05b687c2ad8b60459bb670 SHA1 ab2848fd9279f55b5db270f319ad4791154ecf82 SHA256 965534bab462aea8aacb6c35c0683c1079f06d055ff13820584ac862134db2b8
+EBUILD xxdiff-3.0.2-r1.ebuild 1547 RMD160 4a05591cb23f8fe2c68831303226db9c42b29be7 SHA1 8100dee5a4ca3a3132d4bfa67f9433706b21276c SHA256 9e1316b8d4dcf7a79dc4063b4b555a7e86482d0ee6101eef7614ca8fb48d9102
 MD5 e98e2c40d5cd9527666c4efd50e2dcc3 xxdiff-3.0.2-r1.ebuild 1547
-MD5 4ceab596c0c2e4ea4ffadcd9233b5281 xxdiff-3.1.ebuild 1564
+RMD160 4a05591cb23f8fe2c68831303226db9c42b29be7 xxdiff-3.0.2-r1.ebuild 1547
+SHA256 9e1316b8d4dcf7a79dc4063b4b555a7e86482d0ee6101eef7614ca8fb48d9102 xxdiff-3.0.2-r1.ebuild 1547
+EBUILD xxdiff-3.2.ebuild 1345 RMD160 d8181b0e39608aebd0e72f5ac3511620a1b77c3f SHA1 04aae9af541e5bf860b3ae03f6effddd3c8e3902 SHA256 560d3d2572d184cb040cb873c23de35b46bb90ac63c28397c7d5765730385f80
+MD5 a0410785cfb1033fc8d09b78cbb1c7e9 xxdiff-3.2.ebuild 1345
+RMD160 d8181b0e39608aebd0e72f5ac3511620a1b77c3f xxdiff-3.2.ebuild 1345
+SHA256 560d3d2572d184cb040cb873c23de35b46bb90ac63c28397c7d5765730385f80 xxdiff-3.2.ebuild 1345
+MISC ChangeLog 4534 RMD160 7b458b341abebcc970ea790a150ad9f538099f95 SHA1 3309b10ecdbcd3e45340792b41bda0ff53b06b9e SHA256 1776ca3716d318e3499ea2054235f7200c787f9f374c73b3ee5e4378520ada80
+MD5 ebba7e8a17a1e9be75ee3eaca30c9f83 ChangeLog 4534
+RMD160 7b458b341abebcc970ea790a150ad9f538099f95 ChangeLog 4534
+SHA256 1776ca3716d318e3499ea2054235f7200c787f9f374c73b3ee5e4378520ada80 ChangeLog 4534
+MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
+SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e metadata.xml 160
+MD5 fbf14d026d67672a85470077dd5a75c3 files/digest-xxdiff-3.0.2-r1 65
+RMD160 d2b8c0ce3b5a88e63a8f0c726cdacfa6bc54212d files/digest-xxdiff-3.0.2-r1 65
+SHA256 5bf189be5f4f96e4e419614efd2ad4d2fd5ea902c5e0c1bf3cefa14b509edc6c files/digest-xxdiff-3.0.2-r1 65
+MD5 31973bf9cd02fab330d10569ba3d641e files/digest-xxdiff-3.2 238
+RMD160 722852fa60790c2a5169a89419a1f553781c22dc files/digest-xxdiff-3.2 238
+SHA256 18958a9ef1f83acaaae4a5a5afb04a7ab54037c6386bc16519288666d926624f files/digest-xxdiff-3.2 238
diff --git a/dev-util/xxdiff/files/digest-xxdiff-3.1 b/dev-util/xxdiff/files/digest-xxdiff-3.1
deleted file mode 100644
index 21c21459b251..000000000000
--- a/dev-util/xxdiff/files/digest-xxdiff-3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ead4e429e8a084eda46ecbf4d47d4512 xxdiff-3.1.tar.gz 1074150
diff --git a/dev-util/xxdiff/xxdiff-3.1.ebuild b/dev-util/xxdiff/xxdiff-3.1.ebuild
deleted file mode 100644
index 9f16fa2f40f8..000000000000
--- a/dev-util/xxdiff/xxdiff-3.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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
-}