Add svn use flag. Include respective patch. EAPI2fy. Added amd64 keyword. Fixes bug #157014

(Portage version: 2.2_rc63/cvs/Linux x86_64)

6 files changed, 55 insertions, 63 deletions

diff --git a/dev-util/cvsspam/ChangeLog b/dev-util/cvsspam/ChangeLog
index a77b5eaa9be9..632668de15e2 100644
--- a/dev-util/cvsspam/ChangeLog
+++ b/dev-util/cvsspam/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cvsspam
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsspam/ChangeLog,v 1.13 2009/09/23 17:43:19 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsspam/ChangeLog,v 1.14 2010/03/03 17:55:50 hwoarang Exp $
+
+  03 Mar 2010; Markos Chandras <hwoarang@gentoo.org> -cvsspam-0.2.11.ebuild,
+  -cvsspam-0.2.11-r1.ebuild, cvsspam-0.2.12.ebuild,
+  +files/cvsspam-0.2.12-svn.patch:
+  Add svn use flag. Include patch from Ben Taitelbaum
+  <btaitelb@cs.oberlin.edu>. EAPI2fy it and keyworded for amd64. Fixes bug
+  #157014
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> cvsspam-0.2.11.ebuild,
   cvsspam-0.2.11-r1.ebuild, cvsspam-0.2.12.ebuild:
diff --git a/dev-util/cvsspam/cvsspam-0.2.11-r1.ebuild b/dev-util/cvsspam/cvsspam-0.2.11-r1.ebuild
deleted file mode 100644
index 500ea3cb2bdd..000000000000
--- a/dev-util/cvsspam/cvsspam-0.2.11-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsspam/cvsspam-0.2.11-r1.ebuild,v 1.5 2009/09/23 17:43:19 patrick Exp $
-
-inherit eutils
-
-DESCRIPTION="Utility to send colored HTML CVS-mails"
-SRC_URI="http://www.badgers-in-foil.co.uk/projects/cvsspam/${P}.tar.gz"
-HOMEPAGE="http://www.badgers-in-foil.co.uk/projects/cvsspam/"
-LICENSE="GPL-2"
-DEPEND=""
-RDEPEND="dev-lang/ruby"
-KEYWORDS="ppc x86"
-SLOT="0"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-src_install() {
-	dobin collect_diffs.rb || die
-	dobin cvsspam.rb || die
-	dobin record_lastdir.rb || die
-	insinto /etc/cvsspam || die
-	doins cvsspam.conf || die
-
-	dohtml cvsspam-doc.html
-	dodoc CREDITS TODO cvsspam-doc.pdf
-}
diff --git a/dev-util/cvsspam/cvsspam-0.2.11.ebuild b/dev-util/cvsspam/cvsspam-0.2.11.ebuild
deleted file mode 100644
index c6c4fea5ec7d..000000000000
--- a/dev-util/cvsspam/cvsspam-0.2.11.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsspam/cvsspam-0.2.11.ebuild,v 1.6 2009/09/23 17:43:19 patrick Exp $
-
-DESCRIPTION="Utility to send colored HTML CVS-mails"
-SRC_URI="http://www.badgers-in-foil.co.uk/projects/cvsspam/${P}.tar.gz"
-HOMEPAGE="http://www.badgers-in-foil.co.uk/projects/cvsspam/"
-LICENSE="GPL-2"
-DEPEND=""
-RDEPEND="dev-lang/ruby"
-KEYWORDS="x86 ppc"
-SLOT="0"
-IUSE=""
-
-src_install () {
-	dobin collect_diffs.rb || die
-	dobin cvsspam.rb || die
-	dobin record_lastdir.rb || die
-	insinto /etc/cvsspam || die
-	doins cvsspam.conf || die
-
-	dohtml cvsspam-doc.html
-	dodoc CREDITS TODO cvsspam-doc.pdf
-}
diff --git a/dev-util/cvsspam/cvsspam-0.2.12.ebuild b/dev-util/cvsspam/cvsspam-0.2.12.ebuild
index cbc917963051..b63908f4b1b7 100644
--- a/dev-util/cvsspam/cvsspam-0.2.12.ebuild
+++ b/dev-util/cvsspam/cvsspam-0.2.12.ebuild
@@ -1,18 +1,26 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsspam/cvsspam-0.2.12.ebuild,v 1.3 2009/09/23 17:43:19 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvsspam/cvsspam-0.2.12.ebuild,v 1.4 2010/03/03 17:55:50 hwoarang Exp $
 
+EAPI="2"
 inherit eutils
 
 DESCRIPTION="Utility to send colored HTML CVS-mails"
 SRC_URI="http://www.badgers-in-foil.co.uk/projects/cvsspam/releases/${P}.tar.gz"
 HOMEPAGE="http://www.badgers-in-foil.co.uk/projects/cvsspam/"
+
 LICENSE="GPL-2"
 DEPEND=""
-RDEPEND="dev-lang/ruby"
-KEYWORDS="~x86 ~ppc"
+RDEPEND="dev-lang/ruby
+	svn? ( dev-util/subversion )"
+KEYWORDS="~amd64 ~x86 ~ppc"
+
 SLOT="0"
-IUSE=""
+IUSE="svn"
+
+src_prepare() {
+	use svn && epatch "${FILESDIR}/${P}-svn.patch"
+}
 
 src_install() {
 	dobin collect_diffs.rb || die
diff --git a/dev-util/cvsspam/files/cvsspam-0.2.12-svn.patch b/dev-util/cvsspam/files/cvsspam-0.2.12-svn.patch
new file mode 100644
index 000000000000..3278f94bc005
--- /dev/null
+++ b/dev-util/cvsspam/files/cvsspam-0.2.12-svn.patch
@@ -0,0 +1,30 @@
+--- cvsspam.rb.old	2006-12-02 13:36:48.000000000 -0500
++++ cvsspam.rb	2006-12-02 13:38:28.000000000 -0500
+@@ -1386,12 +1386,10 @@
+ $allTags = Hash.new
+ 
+ File.open("#{$logfile}.emailtmp", File::RDWR|File::CREAT|File::TRUNC) do |mail|
++  reader = LogReader.new($stdin)
+ 
+   $diff_output_limiter = OutputSizeLimiter.new(mail, $mail_size_limit)
+ 
+-  File.open($logfile) do |log|
+-    reader = LogReader.new(log)
+-
+     until reader.eof
+       handler = $handlers[reader.currentLineCode]
+       if handler == nil
+@@ -1399,12 +1397,11 @@
+       end
+       handler.handleLines(reader.getLines, $diff_output_limiter)
+     end
+-  end
+ 
+ end
+ 
+ if $subjectPrefix == nil
+-  $subjectPrefix = "[CVS #{Repository.array.join(',')}]"
++  $subjectPrefix = "[SVN #{Repository.array.join(',')}]"
+ end
+ 
+ if $files_in_subject
diff --git a/dev-util/cvsspam/metadata.xml b/dev-util/cvsspam/metadata.xml
index 9f3fdee2246b..5d323d0f2f12 100644
--- a/dev-util/cvsspam/metadata.xml
+++ b/dev-util/cvsspam/metadata.xml
@@ -5,4 +5,7 @@
 	<maintainer>
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
+	<use>
+	<flag name="svn">Add subversion support</flag>
+	</use>
 </pkgmetadata>