Fix svk smerge interaction with xxdiff

(Portage version: 2.1_pre4-r1)

5 files changed, 129 insertions, 11 deletions

diff --git a/dev-util/svk/ChangeLog b/dev-util/svk/ChangeLog
index a46f53633c84..7492c26d227e 100644
--- a/dev-util/svk/ChangeLog
+++ b/dev-util/svk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/svk
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/svk/ChangeLog,v 1.26 2006/02/27 19:24:16 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/svk/ChangeLog,v 1.27 2006/03/04 05:52:00 agriffis Exp $
+
+*svk-1.07-r1 (04 Mar 2006)
+
+  04 Mar 2006; Aron Griffis <agriffis@gentoo.org>
+  +files/svk-1.07-xxdiff.patch, +svk-1.07-r1.ebuild:
+  Fix svk smerge interaction with xxdiff
 
 *svk-1.07 (27 Feb 2006)
 
diff --git a/dev-util/svk/Manifest b/dev-util/svk/Manifest
index 014d79b4d60e..b78af4b89d34 100644
--- a/dev-util/svk/Manifest
+++ b/dev-util/svk/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 56d30c3759a57e24f7a14b14c01a083c ChangeLog 3660
 RMD160 51b5019421df5eebd66c070968a13f252c7fa7e6 ChangeLog 3660
 SHA256 1c8974713fb3dfb5cc15913405c498464d1ebc068b83e5e78b8b3d58a2bf821a ChangeLog 3660
@@ -28,6 +25,9 @@ SHA256 956476612a5e46f042c1dba8a21c4bc30db71ac3f6c388d582cf03e64de9f2e4 files/di
 MD5 d5d38eb7e6e72e44df53a8e6a82ef55b files/digest-svk-1.07 226
 RMD160 df5dee98391cf4a94d41e056ee585d8f6cf24144 files/digest-svk-1.07 226
 SHA256 fb83d63c9d37e459735f95ee33b0cee51f7ea40a6e651762a1084a9a057020a4 files/digest-svk-1.07 226
+MD5 d5d38eb7e6e72e44df53a8e6a82ef55b files/digest-svk-1.07-r1 226
+RMD160 df5dee98391cf4a94d41e056ee585d8f6cf24144 files/digest-svk-1.07-r1 226
+SHA256 fb83d63c9d37e459735f95ee33b0cee51f7ea40a6e651762a1084a9a057020a4 files/digest-svk-1.07-r1 226
 MD5 cc0dd7817cfd7332d4df793ce97c28ff files/svk-1.00-nognupgtest.patch 283
 RMD160 c7a5ffa719613d799d93ce02c890ee1ef5e9308a files/svk-1.00-nognupgtest.patch 283
 SHA256 e868ed54ba0686751dfc29462da8dc4452c9c5e5cc4df5b3a421c5529f1f1c6b files/svk-1.00-nognupgtest.patch 283
@@ -43,6 +43,9 @@ SHA256 cd017d3f57202cc5f1a6e66e7af2911d201a0b23012a44eb895913faed54df78 files/sv
 MD5 54e6235911ca6a7bf15ad739dddd441a files/svk-1.05-nognupgtest.patch 294
 RMD160 5a397b8bbd9a6dc357ca42c56c1f455407c89a15 files/svk-1.05-nognupgtest.patch 294
 SHA256 2b94af144ba503f190bae26db624da968544014f1fa2be6185efacb9cd08aca6 files/svk-1.05-nognupgtest.patch 294
+MD5 18dff34632e9bbae618f852ed7c18187 files/svk-1.07-xxdiff.patch 1020
+RMD160 627e9081588cd8a6f834679e8bfc40234e4dfac7 files/svk-1.07-xxdiff.patch 1020
+SHA256 7af4e6d62ffb8aaaef5a14747e61a459f7be01b7806c1b57e77f35d0672eb035 files/svk-1.07-xxdiff.patch 1020
 MD5 abaeaac662a08acda33cbe2d531e7543 metadata.xml 223
 RMD160 071f2a29e6cd015bdabef8ba277e90dee2bd0232 metadata.xml 223
 SHA256 ae2bc880cff89faf2346ca40f20e1c64dae39faed50327712cc3940c26d20a96 metadata.xml 223
@@ -67,13 +70,9 @@ SHA256 9c0f47959d3ae7189897253a5e2cd6db4bdc149e8a53cb408abb50e466c8d42a svk-1.06
 MD5 d86a9d87c25f9abfaed7755970a0e40a svk-1.06.ebuild 1931
 RMD160 23acdbffc273f1827644c0b9df3751703f556fe4 svk-1.06.ebuild 1931
 SHA256 b76e3fd2e49219eab9cdf469198bed72a48e3eb5b6b7e879e38ca80a526e9d68 svk-1.06.ebuild 1931
+MD5 380fedd8ea01020797a1ee15bee5fa69 svk-1.07-r1.ebuild 2031
+RMD160 29030f7fd20ccac08f77a7d0678c8c23084de354 svk-1.07-r1.ebuild 2031
+SHA256 6fc151ef8efb680d46f84c752b8bd4ee45857b50dac1f1657837eba3e219a511 svk-1.07-r1.ebuild 2031
 MD5 ba56c64ebf7b72d6167c4fd233f2e6cf svk-1.07.ebuild 1958
 RMD160 aa5d2eba432025eedcf7330afa8ac44615c9d9a8 svk-1.07.ebuild 1958
 SHA256 c7d064c9c5674afb552848177c61347bc9cd5f586ec1d24a1f417e6df7b45ffc svk-1.07.ebuild 1958
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEA1HsJrHF4yAQTrARAk/cAJ91rIhsWmrMfAxdH4zpgjuOx4apoQCcDJdS
-EfoZfrrqZAb/WTadMaTzCsg=
-=27+y
------END PGP SIGNATURE-----
diff --git a/dev-util/svk/files/digest-svk-1.07-r1 b/dev-util/svk/files/digest-svk-1.07-r1
new file mode 100644
index 000000000000..7062bc78c880
--- /dev/null
+++ b/dev-util/svk/files/digest-svk-1.07-r1
@@ -0,0 +1,3 @@
+MD5 d559ab3e4cd14ebfcb2a13e3218b80f2 SVK-1.07.tar.gz 264640
+RMD160 9ae31a522465ff755a1cb3f83bf80d971beea05c SVK-1.07.tar.gz 264640
+SHA256 e0292003417010f8d52ec0c074c2fb7d218dc42654c2aacc5883434995b2663f SVK-1.07.tar.gz 264640
diff --git a/dev-util/svk/files/svk-1.07-xxdiff.patch b/dev-util/svk/files/svk-1.07-xxdiff.patch
new file mode 100644
index 000000000000..63789dfdecab
--- /dev/null
+++ b/dev-util/svk/files/svk-1.07-xxdiff.patch
@@ -0,0 +1,29 @@
+Date: Sat, 4 Mar 2006 00:40:28 -0500
+From: Aron Griffis <agriffis gentoo org>
+To: svk-dev lists openfoundry org
+Subject: patch for SVK/Resolve/XXDiff.pm
+Message-ID: <20060304054028.GA3958@olive.flatmonk>
+
+The following patch fixes svk smerge with xxdiff.  Here is the
+problem, from xxdiff --help:
+
+  --exit-with-merge-status, -X  If all diff hunks are selected and no
+                                unsaved selections exist, then exit
+                                with code of 0.  Normally, xxdiff will
+                                pass back the diff return code. 
+
+Since diff returns an exit code of 1 when there are differences, svk
+believes that the merge always fails.
+
+--- SVK-1.07/lib/SVK/Resolve/XXDiff.pm.old	2005-03-28 20:46:18.000000000 -0500
++++ SVK-1.07/lib/SVK/Resolve/XXDiff.pm	2006-03-04 00:39:53.000000000 -0500
+@@ -5,7 +5,7 @@
+ sub arguments {
+     my $self = shift;
+     return (
+-        qw( -m -O -M ),
++        qw( -X -m -O -M ),
+         @{$self}{qw( merged yours base theirs )}
+     );
+ }
+
diff --git a/dev-util/svk/svk-1.07-r1.ebuild b/dev-util/svk/svk-1.07-r1.ebuild
new file mode 100644
index 000000000000..0f71fef7b1d8
--- /dev/null
+++ b/dev-util/svk/svk-1.07-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/svk/svk-1.07-r1.ebuild,v 1.1 2006/03/04 05:52:00 agriffis Exp $
+
+inherit eutils perl-module bash-completion
+
+MY_P=${P/svk/SVK}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A decentralized version control system"
+SRC_URI="mirror://cpan/authors/id/C/CL/CLKAO/${MY_P}.tar.gz"
+HOMEPAGE="http://svk.elixus.org/"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="crypt nls pager svn-mirror patch"
+
+DEPEND="
+	>=dev-lang/perl-5.8.7
+	>=dev-util/subversion-1.0.7
+	dev-perl/Algorithm-Annotate
+	dev-perl/Algorithm-Diff
+	>=dev-perl/yaml-0.38
+	dev-perl/Regexp-Shellish
+	>=dev-perl/Data-Hierarchy-0.21
+	>=virtual/perl-File-Temp-0.14
+	dev-perl/Clone
+	dev-perl/Pod-Escapes
+	dev-perl/Pod-Simple
+	>=dev-perl/PerlIO-via-dynamic-0.11
+	>=dev-perl/PerlIO-via-symlink-0.02
+	dev-perl/IO-Digest
+	>=dev-perl/SVN-Simple-0.27
+	dev-perl/TimeDate
+	dev-perl/TermReadKey
+	dev-perl/File-Type
+	dev-perl/URI
+	>=dev-perl/PerlIO-eol-0.13
+	>=dev-perl/Class-Autouse-1.15
+	>=virtual/perl-Getopt-Long-2.34
+	nls? (
+		>=dev-perl/locale-maketext-lexicon-0.42
+		>=dev-perl/Locale-Maketext-Simple-0.12
+	)
+	pager? ( dev-perl/IO-Pager )
+	svn-mirror? (  >=dev-perl/SVN-Mirror-0.66 )
+	patch? (
+		dev-perl/Compress-Zlib
+		dev-perl/FreezeThaw
+	)
+	crypt? ( app-crypt/gnupg )"
+
+
+pkg_setup() {
+	if ! perl -MSVN::Core < /dev/null 2> /dev/null; then
+		eerror "SVN::Core missing or outdated. Please emerge \
+		dev-util/subversion ith the perl USE flag."
+		die "Need Subversion compiled with Perl bindings"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/svk-1.07-xxdiff.patch
+}
+
+src_compile() {
+	export PERL_EXTUTILS_AUTOINSTALL="--skipdeps"
+	perl-module_src_compile
+}
+
+src_install() {
+	perl-module_src_install
+	if use bash-completion; then
+		dobin contrib/svk-completion.pl
+		echo "complete -C ${DESTTREE}/bin/svk-completion.pl -o default svk" \
+		> svk-completion
+		dobashcompletion svk-completion
+	fi
+}