From: Markos Chandras Date: Wed, 3 Mar 2010 17:55:50 +0000 (+0000) Subject: Add svn use flag. Include respective patch. EAPI2fy. Added amd64 keyword. Fixes bug... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ce1a20a1e861f4dd9ee63f71d90f31b94ed3fa42;p=gentoo.git Add svn use flag. Include respective patch. EAPI2fy. Added amd64 keyword. Fixes bug #157014 Package-Manager: portage-2.2_rc63/cvs/Linux x86_64 --- 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 -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 + . EAPI2fy it and keyworded for amd64. Fixes bug + #157014 23 Sep 2009; Patrick Lauer cvsspam-0.2.11.ebuild, cvsspam-0.2.11-r1.ebuild, cvsspam-0.2.12.ebuild: diff --git a/dev-util/cvsspam/Manifest b/dev-util/cvsspam/Manifest index 2f49bca4eb7c..76d39aa35b14 100644 --- a/dev-util/cvsspam/Manifest +++ b/dev-util/cvsspam/Manifest @@ -1,8 +1,6 @@ AUX cvsspam-0.2.11-gentoo.patch 1042 RMD160 78f92916b335c8f91ade3950f6db2e4f83de14e6 SHA1 f3d27348ed31bab499c5bcea6d789c0042666933 SHA256 9e6e8512cba37ede112bc3ba2e266ff3bd729d4e780cf6da0f4dd27103fad131 -DIST cvsspam-0.2.11.tar.gz 63366 RMD160 8e899ee222d3d16933f35c728f5aaafe05b5d538 SHA1 5c52566f05368e4e0597e1c58feaacc8ab491ae9 SHA256 7490556bde81f96464ff51c9a6db3d03ee7f80e116a1560071070758574b6168 +AUX cvsspam-0.2.12-svn.patch 806 RMD160 a58e2dc38b7f49b7a22b7952c62a6118a780cef7 SHA1 078740f1bd8b95628bf63ef13784572234b53c8c SHA256 ec3dd335da17b2bd54f7af3854bf83e9d500e74b623172b59e4ab51ccea96b07 DIST cvsspam-0.2.12.tar.gz 83714 RMD160 678cf9ee82fce36f5caefdd3b720b0e30b66c6b5 SHA1 5bec494a4dbb26af5f70268cccb28f4035beeb33 SHA256 217c53ceebcc7fcbb8949304648b48c7c0805e0c4531d0c85473e8dd685b3e16 -EBUILD cvsspam-0.2.11-r1.ebuild 821 RMD160 f1cf55bdc05f4f6aa4674c72bdd558f8e0a525e0 SHA1 b09ba1b1d3732db3e66c4a73700d4f215f2f3e29 SHA256 c0a05fae8184080e11973627f32a9a64869c03623d9979ea38d97bbbf09f6f23 -EBUILD cvsspam-0.2.11.ebuild 721 RMD160 d87ac60d9a6c3d4be926bc1315219d1f1c72b423 SHA1 4efaf7b19381e1673366854eeade890049bea467 SHA256 a48c49b71e6ae0b1203bcbf1a7473efa49e82c28ff812957cc3a1b9cd4a67afd -EBUILD cvsspam-0.2.12.ebuild 747 RMD160 8c01ff415b1264cc50f313a0441d6b71d0d37308 SHA1 9377d94dc0404cd26aa4dbc52bc2035e3fe3a285 SHA256 1953416c82467f8ff438e27c64d31cc8a1e75dcb091ab3528176f7c65f48a05c -MISC ChangeLog 1881 RMD160 fe6c3b1360be9efa95043f5e8be7a858a5bfaba7 SHA1 31d25b4b82b3b53c50eca101361cce2ec793d279 SHA256 1d0a290cdcb4d9eb823f735228590739ca1b983de8da660cd50390c9b90a4c10 -MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829 +EBUILD cvsspam-0.2.12.ebuild 866 RMD160 063f9779bdbf9ad9769bb81dfbbed519e0667ec7 SHA1 f88b9d71541a9064892d505c4f370a9615e12812 SHA256 260c1623b144c12cf2d82c0f6291f32b2674f411747e185c090bc76671e9b03d +MISC ChangeLog 2186 RMD160 db6938e388e37c2f0a92711bcf99a31bb6b98652 SHA1 6c7e7a26d0b82f2bcca360264fce31b7cb9254b8 SHA256 b185a094ae8dcb183564c4d623a6cfc5bc90391a8b8d8057fbbaefe75c97a795 +MISC metadata.xml 299 RMD160 fb685859536c8da1ebc7be9c99dec2addb1ea155 SHA1 cabab9a849515bec7e333ea465ff55b3d3c9681a SHA256 a7c59aaf88b02143bfcd5abd42c79c47a526856e1a2eeef86d28885fb5121031 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-needed@gentoo.org + + Add subversion support +