summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2010-09-15 10:26:22 +0000
committerFabian Groffen <grobian@gentoo.org>2010-09-15 10:26:22 +0000
commited2c6a348f492a6b0c7462cd6023653477e76999 (patch)
treebd380fd1fbda0cb9fc149be74492aeec6d3e7492 /app-text/catdoc
parentHonour Gentoo LDFLAGS, rationalizing Makefile - see bug #337411. (diff)
downloadhistorical-ed2c6a348f492a6b0c7462cd6023653477e76999.tar.gz
historical-ed2c6a348f492a6b0c7462cd6023653477e76999.tar.bz2
historical-ed2c6a348f492a6b0c7462cd6023653477e76999.zip
Make ebuild completely Prefix aware (instead of half), fix wordview logic (inverted) and configure argument, marked ~x86-solaris
Package-Manager: portage-2.2.01.15553-prefix/cvs/SunOS i386
Diffstat (limited to 'app-text/catdoc')
-rw-r--r--app-text/catdoc/ChangeLog6
-rw-r--r--app-text/catdoc/Manifest4
-rw-r--r--app-text/catdoc/catdoc-0.94.2-r2.ebuild12
3 files changed, 13 insertions, 9 deletions
diff --git a/app-text/catdoc/ChangeLog b/app-text/catdoc/ChangeLog
index 1aad4bc77618..76911572e862 100644
--- a/app-text/catdoc/ChangeLog
+++ b/app-text/catdoc/ChangeLog
@@ -1,6 +1,10 @@
# 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.26 2010/05/03 21:43:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/ChangeLog,v 1.27 2010/09/15 10:26:22 grobian Exp $
+
+ 15 Sep 2010; Fabian Groffen <grobian@gentoo.org> catdoc-0.94.2-r2.ebuild:
+ Make ebuild completely Prefix aware (instead of half), fix wordview logic
+ (inverted) and configure argument, marked ~x86-solaris
*catdoc-0.94.2-r2 (03 May 2010)
diff --git a/app-text/catdoc/Manifest b/app-text/catdoc/Manifest
index 4c4b32cf3472..ef656689eae9 100644
--- a/app-text/catdoc/Manifest
+++ b/app-text/catdoc/Manifest
@@ -1,7 +1,7 @@
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-r2.ebuild 1306 RMD160 1472923ec0e80b77d70ab8838e739e2030ecac6f SHA1 bdad19abc0f49770ee077841bd21d2f1eb700fb1 SHA256 6fd929f3b8920b6080529379fd363d5398bb5960d669a6ac3e6e652633109e3c
+EBUILD catdoc-0.94.2-r2.ebuild 1333 RMD160 e26963ba39801d2d56a964c4abc09ccb723db408 SHA1 fb73c60debecfe1f9b76cb158fdf4b7c4e237165 SHA256 c87228be1181befe0b7bcc318f973414d282496492d0bd6b26b9221ad5754ac1
EBUILD catdoc-0.94.2.ebuild 872 RMD160 599e33573e10730b77e5736510a4299ebb6a4bd6 SHA1 cea5bca47199db45015f3dedf6a0c95210ed872f SHA256 d26ea0a27ab63b11f9b1b08de2000a03ff822892a0934f905d922fd74c36ecbf
-MISC ChangeLog 3341 RMD160 28ffd0c15acb0ebe6501972e8cc64d67fc9a201d SHA1 3b2cc896de6d32be911603b7da8af12ae93bd405 SHA256 3ebeb5256c4c793e66bbf32cdf51846a2b66fcdd9d529969b03d0cb32d710c9c
+MISC ChangeLog 3549 RMD160 1c48d9fe6277b1d000ed102996bda4d4a003a55f SHA1 ca602329f443e7faa8c02f39deac9b3c1643b631 SHA256 d0ef9f7cf39b18407c846e862ef01d67fbd8f60c7719523f4a36a2fc46843c51
MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
diff --git a/app-text/catdoc/catdoc-0.94.2-r2.ebuild b/app-text/catdoc/catdoc-0.94.2-r2.ebuild
index 843b1b62d7ed..74378129fe94 100644
--- a/app-text/catdoc/catdoc-0.94.2-r2.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-r2.ebuild,v 1.1 2010/05/03 21:43:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.2-r2.ebuild,v 1.2 2010/09/15 10:26:22 grobian Exp $
EAPI=3
WANT_AUTOMAKE=none
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
IUSE="tk"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-solaris"
DEPEND="tk? ( >=dev-lang/tk-8.1 )"
@@ -33,19 +33,19 @@ src_prepare() {
src_configure() {
econf --with-install-root="${D}" \
$(use_with tk wish "${EPREFIX}"/usr/bin/wish) \
- $(use_with !tk wordview)
+ $(use_enable tk wordview)
}
src_compile() {
- emake LIB_DIR=/usr/share/catdoc || die
+ emake LIB_DIR="${EPREFIX}"/usr/share/catdoc || die
}
src_install() {
emake -j1 mandir="${EPREFIX}"/usr/share/man/man1 install || die
- if [[ -e ${D}/usr/bin/xls2csv ]]; then
+ if [[ -e ${ED}/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
+ mv -vf "${ED}"/usr/bin/xls2csv "${ED}"/usr/bin/xls2csv-${PN} || die
fi
dodoc ${DOCS}