summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-05-03 21:43:22 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-05-03 21:43:22 +0000
commit6c5e77f09fd3e16bac7b31728a258acc0753f55e (patch)
tree3bfc9f47bb2a2f77655c8741d9a8f3883e98a287 /app-text
parentwhitespace (diff)
downloadhistorical-6c5e77f09fd3e16bac7b31728a258acc0753f55e.tar.gz
historical-6c5e77f09fd3e16bac7b31728a258acc0753f55e.tar.bz2
historical-6c5e77f09fd3e16bac7b31728a258acc0753f55e.zip
Rename xls2csv to xls2csv-catdoc wrt #314657 by Diego E. Pettenò.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'app-text')
-rw-r--r--app-text/catdoc/ChangeLog8
-rw-r--r--app-text/catdoc/Manifest14
-rw-r--r--app-text/catdoc/catdoc-0.94.2-r2.ebuild (renamed from app-text/catdoc/catdoc-0.94.2-r1.ebuild)8
3 files changed, 16 insertions, 14 deletions
diff --git a/app-text/catdoc/ChangeLog b/app-text/catdoc/ChangeLog
index 660e756c0e52..1aad4bc77618 100644
--- a/app-text/catdoc/ChangeLog
+++ b/app-text/catdoc/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-text/catdoc
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/ChangeLog,v 1.25 2010/02/22 21:07:22 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/ChangeLog,v 1.26 2010/05/03 21:43:22 ssuominen Exp $
+
+*catdoc-0.94.2-r2 (03 May 2010)
+
+ 03 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+ +catdoc-0.94.2-r2.ebuild:
+ Rename xls2csv to xls2csv-catdoc wrt #314657 by Diego E. Pettenò.
22 Feb 2010; Jonathan Callen <abcd@gentoo.org> catdoc-0.94.2-r1.ebuild:
Transfer prefix keywords, bump EAPI
diff --git a/app-text/catdoc/Manifest b/app-text/catdoc/Manifest
index 9ec2756c17ba..4c4b32cf3472 100644
--- a/app-text/catdoc/Manifest
+++ b/app-text/catdoc/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX catdoc-0.94.2+autoconf-2.63.patch 479 RMD160 a3051c3c2272740ac780e1762a346a9ea4b8526c SHA1 12738333d62fea28fcab052a4b7e930cd416af23 SHA256 1b15644b2cf8ba2c09bdd5c463736c8a5dd22089a4fd1c3a9cbd230752441210
AUX catdoc-0.94.2-flags.patch 1371 RMD160 a2238c01abb11378eb8156715506b8d8418dc7e7 SHA1 f572f3d0af29fdfdc9d4b87f40fbfcf18d337522 SHA256 bebe4055f8f26ccd33a1f26d5dced8ccbf6eed2a2be72e8649cec6372790b5d0
DIST catdoc-0.94.2.tar.gz 146012 RMD160 59eb7a026fd3a2dae74a3e7f01a58266f7efaf72 SHA1 50ce9d7cb24ad6b10a856c9c24183e2b0a11ca04 SHA256 03c98b103664e5d1b63de110854e93c2453bc10be5634f86c280303eb843d362
-EBUILD catdoc-0.94.2-r1.ebuild 1120 RMD160 82edf12f3d7c8e1f40780af5486a6f3d7e9dde2a SHA1 d4da4b81414a276b1a4543c0494cdc99fc6ef49f SHA256 c1d561c1b9f85c447139c43cfddbc42b8d49c5bc88360fd2ce7e55a57828b9cb
+EBUILD catdoc-0.94.2-r2.ebuild 1306 RMD160 1472923ec0e80b77d70ab8838e739e2030ecac6f SHA1 bdad19abc0f49770ee077841bd21d2f1eb700fb1 SHA256 6fd929f3b8920b6080529379fd363d5398bb5960d669a6ac3e6e652633109e3c
EBUILD catdoc-0.94.2.ebuild 872 RMD160 599e33573e10730b77e5736510a4299ebb6a4bd6 SHA1 cea5bca47199db45015f3dedf6a0c95210ed872f SHA256 d26ea0a27ab63b11f9b1b08de2000a03ff822892a0934f905d922fd74c36ecbf
-MISC ChangeLog 3151 RMD160 39ad4ef6b16fdfe98c045a51ce7bbc677b126076 SHA1 bee6d712270cbb9daa133182bd7ae0930a510d5c SHA256 b93de1d71186bcd6c1263b2b8bcc2551dda5e04821520169aafff65450c68e2e
+MISC ChangeLog 3341 RMD160 28ffd0c15acb0ebe6501972e8cc64d67fc9a201d SHA1 3b2cc896de6d32be911603b7da8af12ae93bd405 SHA256 3ebeb5256c4c793e66bbf32cdf51846a2b66fcdd9d529969b03d0cb32d710c9c
MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuC8hEACgkQOypDUo0oQOpY7QCgpDjcPK8VNlHsr/y1k+OJOhqo
-oBwAnjIp5dwAfA/Za/1igRvfijgh/BaA
-=2XKl
------END PGP SIGNATURE-----
diff --git a/app-text/catdoc/catdoc-0.94.2-r1.ebuild b/app-text/catdoc/catdoc-0.94.2-r2.ebuild
index b16390b7d344..843b1b62d7ed 100644
--- a/app-text/catdoc/catdoc-0.94.2-r1.ebuild
+++ b/app-text/catdoc/catdoc-0.94.2-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.2-r1.ebuild,v 1.3 2010/02/22 21:07:22 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.2-r2.ebuild,v 1.1 2010/05/03 21:43:22 ssuominen Exp $
EAPI=3
WANT_AUTOMAKE=none
@@ -42,5 +42,11 @@ src_compile() {
src_install() {
emake -j1 mandir="${EPREFIX}"/usr/share/man/man1 install || die
+
+ if [[ -e ${D}/usr/bin/xls2csv ]]; then
+ einfo "Renaming xls2csv to xls2csv-${PN} because of bug 314657."
+ mv -vf "${D}"/usr/bin/xls2csv "${D}"/usr/bin/xls2csv-${PN} || die
+ fi
+
dodoc ${DOCS}
}