summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-07-01 11:21:09 +0000
committerJustin Lecher <jlec@gentoo.org>2012-07-01 11:21:09 +0000
commit22e0081373d5408ddde38112c757dcb3645f93fd (patch)
tree6f8976f4a2465c2ad02cc0fbfccb7dc1263f7cb3 /app-text
parentVersion bump (diff)
downloadhistorical-22e0081373d5408ddde38112c757dcb3645f93fd.tar.gz
historical-22e0081373d5408ddde38112c757dcb3645f93fd.tar.bz2
historical-22e0081373d5408ddde38112c757dcb3645f93fd.zip
app-text/o3read: Respect LDFALGS, #336811; bumped to EAPI=4
Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64
Diffstat (limited to 'app-text')
-rw-r--r--app-text/o3read/ChangeLog8
-rw-r--r--app-text/o3read/Manifest19
-rw-r--r--app-text/o3read/metadata.xml7
-rw-r--r--app-text/o3read/o3read-0.0.4.ebuild21
4 files changed, 32 insertions, 23 deletions
diff --git a/app-text/o3read/ChangeLog b/app-text/o3read/ChangeLog
index 944ff87ca7a3..acf0ce671a13 100644
--- a/app-text/o3read/ChangeLog
+++ b/app-text/o3read/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/o3read
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/o3read/ChangeLog,v 1.17 2010/01/02 11:30:59 fauli Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/o3read/ChangeLog,v 1.18 2012/07/01 11:21:09 jlec Exp $
+
+ 01 Jul 2012; Justin Lecher <jlec@gentoo.org> o3read-0.0.4.ebuild,
+ metadata.xml:
+ Respect LDFALGS, #336811; bumped to EAPI=4
02 Jan 2010; Christian Faulhammer <fauli@gentoo.org> o3read-0.0.4.ebuild:
Transfer Prefix keywords
diff --git a/app-text/o3read/Manifest b/app-text/o3read/Manifest
index d37e1c62965d..5ca74aa364c5 100644
--- a/app-text/o3read/Manifest
+++ b/app-text/o3read/Manifest
@@ -1,16 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
DIST o3read-0.0.4.tar.gz 21075 RMD160 c011a283fdc3ee6ff4c340519a4ef7f32c258f38 SHA1 aa8bcfc82b5327f3d86a35193c0a434e33107d09 SHA256 3704b448099d3396bec4cf503c298628c815703aae12bfcddbac4444bc786430
-EBUILD o3read-0.0.4.ebuild 705 RMD160 863d4897f628aa0478ff9f3b535e2cc542bc9f40 SHA1 8fcf2d628316ca8c8ecc5ad4217e2c1467758985 SHA256 092615314a192eb5406469ee3464e63673c5a88ad51bdb557ea86b2e2ecdeafa
-MISC ChangeLog 1872 RMD160 fde7f66ed4661443136d1c7b5c2ed86b4ea3a760 SHA1 d025f8ba6d92bdce2fd355699ddef8640d66f1a5 SHA256 f3cfa8658cccc42df1469915c64c1255479d24d492b5bc5b9d4bd34a3ab11828
-MISC metadata.xml 213 RMD160 1d3424257b05a0dcfb1b2c66972031de85911079 SHA1 36203d9f7f7446e087507cff18a8b7bf60c6903c SHA256 b46ce029025fdefca9eb3187359fbe5a4d2b322d411b67bb51aa1c9feb9deb92
+EBUILD o3read-0.0.4.ebuild 740 RMD160 77eab975c02147eb2e9404c866c5cfdb56328503 SHA1 bb856df0b858c5a9afd1b4a2b26b56e2a9e80103 SHA256 201ea79234bfe36706e43612f3454eee936765c6be4e829eddbc98f3f290fc26
+MISC ChangeLog 2001 RMD160 8756e176ef93f55c947d15fe31180d2b1699bcf3 SHA1 0f9ec52381e3368dbbde893c0e8a3d9682408de6 SHA256 3cd40f076716b2504595ea3300e1661a8638c981c102738e3c3fbd9e06ec6a9c
+MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
-iJwEAQEIAAYFAk5/GK4ACgkQfXuS5UK5QB3WRgP/ckwSA2cowLU691YVqg3ttowr
-UkW9BF+4/aga0s+3gf7bJ/AtZiXuq+MigdMLZpq/jHSPPQo+mCnbo+lo8yhBCi3G
-mZhjKzw7OBbsbRFAG7AxOB7mxXbACx5AjgsnnIjMn80o0fIJL/PAZJFV53Hud9R6
-0N43OwyRI00rKDypi0w=
-=2DG1
+iEYEAREKAAYFAk/wMqoACgkQgAnW8HDreRY15QCePG/Vc4+G6nySKyzy2AJJUaWl
+ZUQAnROzAGBM3oQamBLPDOQ+fwguSSSu
+=5zpF
-----END PGP SIGNATURE-----
diff --git a/app-text/o3read/metadata.xml b/app-text/o3read/metadata.xml
index f031b496edeb..91f4e72fb544 100644
--- a/app-text/o3read/metadata.xml
+++ b/app-text/o3read/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
- <email>maintainer-needed@gentoo.org</email>
-</maintainer>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
</pkgmetadata>
-
diff --git a/app-text/o3read/o3read-0.0.4.ebuild b/app-text/o3read/o3read-0.0.4.ebuild
index 585c663044ec..59be3d98b965 100644
--- a/app-text/o3read/o3read-0.0.4.ebuild
+++ b/app-text/o3read/o3read-0.0.4.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/o3read/o3read-0.0.4.ebuild,v 1.10 2010/01/02 11:30:59 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/o3read/o3read-0.0.4.ebuild,v 1.11 2012/07/01 11:21:09 jlec Exp $
+
+EAPI=4
inherit toolchain-funcs
-DESCRIPTION="Converts OpenOffice formats to text or HTML."
+DESCRIPTION="Converts OpenOffice formats to text or HTML"
HOMEPAGE="http://siag.nu/o3read/"
SRC_URI="http://siag.nu/pub/${PN}/${P}.tar.gz"
@@ -15,11 +17,16 @@ IUSE=""
RESTRICT=test
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+src_prepare() {
+ sed \
+ -e 's:-o:$(LDFLAGS) -o:g' \
+ -e '/^CC/d' \
+ -e '/^CFLAGS/g' \
+ -i Makefile || die
+ tc-export CC
}
src_install() {
- dobin o3read o3totxt o3tohtml utf8tolatin1 || die
- doman o3read.1 o3tohtml.1 o3totxt.1 utf8tolatin1.1 || die
+ dobin o3read o3totxt o3tohtml utf8tolatin1
+ doman o3read.1 o3tohtml.1 o3totxt.1 utf8tolatin1.1
}