bump to 1.08, removed old ebuilds, see #141664

(Portage version: 2.1.1_pre4-r4)

4 files changed, 123 insertions, 1 deletions

diff --git a/dev-util/svk/ChangeLog b/dev-util/svk/ChangeLog
index 7492c26d227e..f3b2e0d38e80 100644
--- a/dev-util/svk/ChangeLog
+++ b/dev-util/svk/ChangeLog
@@ -1,6 +1,17 @@
 # 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.27 2006/03/04 05:52:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/svk/ChangeLog,v 1.28 2006/08/08 14:15:28 kang Exp $
+
+*svk-1.08 (08 Aug 2006)
+
+  08 Aug 2006; Guillaume Destuynder <kang@gentoo.org>
+  -files/svk-1.00-nognupgtest.patch, -files/svk-1.01-nognupgtest.patch,
+  -files/svk-1.02-nognupgtest.patch, -files/svk-1.04-nognupgtest.patch,
+  -files/svk-1.05-nognupgtest.patch, +files/svk-1.08-xxdiff.patch,
+  -svk-1.00.ebuild, -svk-1.01.ebuild, -svk-1.02.ebuild, -svk-1.04.ebuild,
+  -svk-1.05.ebuild, +svk-1.08.ebuild:
+  bump to 1.08. Removed svn-mirror useflag, not very useful. Fix #141664
+  Cleaned up old versions.
 
 *svk-1.07-r1 (04 Mar 2006)
 
diff --git a/dev-util/svk/files/digest-svk-1.08 b/dev-util/svk/files/digest-svk-1.08
new file mode 100644
index 000000000000..cbd05590c3d6
--- /dev/null
+++ b/dev-util/svk/files/digest-svk-1.08
@@ -0,0 +1,3 @@
+MD5 92a90bf73dfa958fd3633ec50c5798b1 SVK-1.08.tar.gz 265976
+RMD160 517fb2000cdf462eaa2587874e5ddf713dae773c SVK-1.08.tar.gz 265976
+SHA256 12d6ca2eee779e200123c9cf3679938c9ef87e91623ee9621f6276edd65928d4 SVK-1.08.tar.gz 265976
diff --git a/dev-util/svk/files/svk-1.08-xxdiff.patch b/dev-util/svk/files/svk-1.08-xxdiff.patch
new file mode 100644
index 000000000000..bd49b8b3efa4
--- /dev/null
+++ b/dev-util/svk/files/svk-1.08-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.08/lib/SVK/Resolve/XXDiff.pm.old	2005-03-28 20:46:18.000000000 -0500
++++ SVK-1.08/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.08.ebuild b/dev-util/svk/svk-1.08.ebuild
new file mode 100644
index 000000000000..93b828b3d889
--- /dev/null
+++ b/dev-util/svk/svk-1.08.ebuild
@@ -0,0 +1,79 @@
+# 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.08.ebuild,v 1.1 2006/08/08 14:15:28 kang 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 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-1.16
+	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
+	>=virtual/perl-File-Spec-3.18
+	>=dev-perl/SVN-Mirror-0.66
+	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 )"
+RDEPEND="${DEPEND}"
+
+
+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.08-xxdiff.patch
+}
+
+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
+}