Add ledger-2.6.1 w.r.t. bug 183938, thus fixing also bug 239608.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.28-rc6 x86_64

3 files changed, 26 insertions, 13 deletions

diff --git a/app-office/ledger/ChangeLog b/app-office/ledger/ChangeLog
index 2cd2cad67f8d..752cb45e1b5d 100644
--- a/app-office/ledger/ChangeLog
+++ b/app-office/ledger/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/ledger
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/ledger/ChangeLog,v 1.7 2007/10/14 23:31:52 opfer Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/ledger/ChangeLog,v 1.8 2008/12/19 21:52:36 loki_val Exp $
+
+*ledger-2.6.1 (19 Dec 2008)
+
+  19 Dec 2008; Peter Alfredsen <loki_val@gentoo.org> -ledger-2.5-r1.ebuild,
+  +ledger-2.6.1.ebuild:
+  Add ledger-2.6.1 w.r.t. bug 183938, thus fixing also bug 239608.
 
 *ledger-2.5-r2 (14 Oct 2007)
 
diff --git a/app-office/ledger/Manifest b/app-office/ledger/Manifest
index eeb60c929436..bd472736993b 100644
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@@ -1,7 +1,8 @@
 AUX 50ledger-gentoo.el 161 RMD160 ebbaeac2a050ea128c4e981894b86d8e68986942 SHA1 72771799a560086c7c0ebcbddb8484493ec77162 SHA256 a4a15d31f9dddd6c2e4bba1f02a15c22d6f123ded9ae8bf07d98e1e64b53fa4f
 AUX 50ledger-mode-gentoo.el 140 RMD160 ff51a34c9859ca4bad42937b12b065c40e09828f SHA1 649e80c0ee167630d634d3e1a859223e9008deba SHA256 9811f26d8b6633f132fa4d717e97e975ae0f4048bca3d2f8804ddd15fe966cc2
 DIST ledger-2.5.tar.gz 829947 RMD160 4380ecc5275df22b48a202e82e0b6a723bcd3c69 SHA1 4ba1053fc65d44201904abf1776d071b2cfe492d SHA256 9def110964965c5dcbb1680ca3d5844ab9d0128d4176d0a90fbd0164fee8031c
-EBUILD ledger-2.5-r1.ebuild 1584 RMD160 d273499668ad16b633eed0384555248bc856cd34 SHA1 67b59a4081c72c238a25e5df5e2f8424fd0cfcbc SHA256 97bcde578a11fecdfc6dfdd66fe336c694e5848f29b4a4b8e5c931a6957581eb
+DIST ledger-2.6.1.tar.gz 658288 RMD160 e6ef6e0acfa125a88927ac399ec8e37fbbe1fe66 SHA1 d00ca4d61f28793c22be892411491d5ff48f156b SHA256 96830d77d3aa6bf6c5778f5dd52169f9b5203fb7daad0e12831abeb35b14f27a
 EBUILD ledger-2.5-r2.ebuild 1699 RMD160 bbb4dbe5b43f6d06cfe4b00f745f154e694ca731 SHA1 13f16d9c577e4fd2efb3724114a66ef8647f9b6c SHA256 a0b644425e2f2176955d07ee6b539bb5f10f6161284cf2765d90e7a99e79ef62
-MISC ChangeLog 1443 RMD160 f135d93216a43b5d8b018662b40037f3d401dd6f SHA1 e7366bdded1acd6ba2baeb75f9daec82ff1e8375 SHA256 0379fba5c5cffe9eee5426caaa28bd88ff1743bed6cc9e430b1f2581a35336d8
+EBUILD ledger-2.6.1.ebuild 1690 RMD160 45af2b10b36db6495c825ac50b58244b13d100f3 SHA1 b8c8deef3a97ebfeb13c777a87198e063f963ac7 SHA256 bdd3c9876071832588dbde20c4f1869f49a5bc7af4abc97a5175a841bb6ffb53
+MISC ChangeLog 1643 RMD160 515b73f51feab865b03a27886c97adcb5e5a653b SHA1 d72c52dbd0f464339608cdfa1512b210aa209d64 SHA256 fc5b9691851e1d581ffdf2e93fe33f01f932ad90f4d6538cac042c23d00b77c6
 MISC metadata.xml 299 RMD160 4fbfb9bf736f390e35663fcfe144982b4f119145 SHA1 dda01420cc21330c3e678295996f6389b4755763 SHA256 9f63d40a10853bdd9bec929b14a619627ad0d2b9776bc40170e587059f2c1016
diff --git a/app-office/ledger/ledger-2.5-r1.ebuild b/app-office/ledger/ledger-2.6.1.ebuild
index b6550e865405..48d2d82e7905 100644
--- a/app-office/ledger/ledger-2.5-r1.ebuild
+++ b/app-office/ledger/ledger-2.6.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/ledger/ledger-2.5-r1.ebuild,v 1.5 2007/09/16 13:32:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ledger/ledger-2.6.1.ebuild,v 1.1 2008/12/19 21:52:36 loki_val Exp $
 
 inherit eutils elisp-common
 
-DESCRIPTION="Ledger is an command-line accounting tool that provides double-entry accounting with a minimum of frills, and yet with a maximum of expressiveness and flexibility."
+DESCRIPTION="A command-line accounting tool that provides double-entry accounting with a minimum of frills, and yet with a maximum of expressiveness and flexibility."
 HOMEPAGE="http://www.newartisans.com/software.html"
 
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -16,12 +16,12 @@ IUSE="emacs debug gnuplot ofx xml"
 
 DEPEND="dev-libs/gmp
 	dev-libs/libpcre
-	ofx? ( >=dev-libs/libofx-0.7 )
+	ofx? ( >=dev-libs/libofx-0.9 )
 	xml? ( dev-libs/expat )
 	emacs? ( virtual/emacs )
 	gnuplot? ( sci-visualization/gnuplot )"
 
-SITEFILE=50ledger-mode-gentoo.el
+SITEFILE=50${PN}-gentoo.el
 
 src_compile() {
 
@@ -29,7 +29,7 @@ src_compile() {
 		$(use_enable xml) \
 		$(use_enable ofx) \
 		$(use_enable debug) \
-		$(use_with	 emacs lispdir ${D}/usr/share/emacs/site-lisp/${PN}) \
+		$(use_with	 emacs lispdir "${D}${SITELISP}/${PN}") \
 		|| die "Configure failed!"
 
 	emake || die "Make failed!"
@@ -37,17 +37,23 @@ src_compile() {
 
 src_install() {
 
-	dodoc sample.dat README NEWS ledger.pdf
+	dodoc sample.dat README NEWS
 
 	## One script uses vi, the outher the Finance perl module
 	## Did not add more use flags though
 	insinto /usr/share/${P}
 	doins scripts/entry scripts/getquote scripts/bal scripts/bal-huquq
 
-	use emacs && elisp-site-file-install ${FILESDIR}/${SITEFILE}
-
 	einstall || die "Installation failed!"
 
+	# Remove timeclock since it is part of Emacs
+	rm -f "${D}${SITELISP}/${PN}"/timeclock.*
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+
 	if use gnuplot; then
 		mv scripts/report ledger-report
 		dobin ledger-report