diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-03-31 11:59:35 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-03-31 11:59:35 +0000 |
| commit | 21e894067564c5b87a37b8897d46e2b6a70913ec (patch) | |
| tree | 7e9a1d725028c49c3936fdf063a996592e0729c2 | |
| parent | alpha/ia64/sparc/x86 stable wrt #402765 (diff) | |
| download | historical-21e894067564c5b87a37b8897d46e2b6a70913ec.tar.gz historical-21e894067564c5b87a37b8897d46e2b6a70913ec.tar.bz2 historical-21e894067564c5b87a37b8897d46e2b6a70913ec.zip | |
Add blocker on app-office/unoconv which is different approach for the solution provided here. Wrt bug#410057.
Package-Manager: portage-2.2.0_alpha96/cvs/Linux x86_64
| -rw-r--r-- | app-text/odt2txt/ChangeLog | 8 | ||||
| -rw-r--r-- | app-text/odt2txt/Manifest | 26 | ||||
| -rw-r--r-- | app-text/odt2txt/odt2txt-0.4-r1.ebuild | 22 |
3 files changed, 36 insertions, 20 deletions
diff --git a/app-text/odt2txt/ChangeLog b/app-text/odt2txt/ChangeLog index 8ea10e8b84e5..2df7647e56bb 100644 --- a/app-text/odt2txt/ChangeLog +++ b/app-text/odt2txt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/odt2txt -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/odt2txt/ChangeLog,v 1.7 2011/02/02 15:57:28 halcy0n Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/odt2txt/ChangeLog,v 1.8 2012/03/31 11:59:35 scarabeus Exp $ + + 31 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> odt2txt-0.4-r1.ebuild: + Add blocker on app-office/unoconv which is different approach for the solution + provided here. Wrt bug#410057. 02 Feb 2011; Mark Loeser <halcy0n@gentoo.org> odt2txt-0.4-r1.ebuild: Mark ~ppc64; bug #296794 diff --git a/app-text/odt2txt/Manifest b/app-text/odt2txt/Manifest index e449cc49a897..b20276e27c40 100644 --- a/app-text/odt2txt/Manifest +++ b/app-text/odt2txt/Manifest @@ -1,17 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX odt2txt-0.4-darwin_iconv.patch 366 RMD160 1572f05d3287471118c930f3b7fd9400f05daa48 SHA1 85966e0cab843e683fbae59e698f7f09bc9574f8 SHA256 2ce5183a5f5d64ebb265cfe527b60819e2a06fac17707ccc83f2aece9dccd0e8 DIST odt2txt-0.4.tar.gz 23997 RMD160 bb6ef1a58a6b18f40855be4124e32b1d514e8bca SHA1 331eef1c64cec809a5c7b7cfb972279cc4f9c914 SHA256 a5f4bdf81cdc2afb60fa74ed5da34235eafdc78263f5aaa325193c2bf8d166f8 -EBUILD odt2txt-0.4-r1.ebuild 829 RMD160 089e561241554d80f764d636203ecb3559c39f2b SHA1 db82561630c939c25b4ec622e5842bf680edfff3 SHA256 577072e77dc4f723147351c39bebc220836264b117bb1b2d0f9bd7be18c8be6f -MISC ChangeLog 1184 RMD160 b94df6247fc252ef6701607dd1209f8003112b38 SHA1 ebd04aae482411ee066fbea9bf49abe1e695bbc4 SHA256 cb7242f1d76d23e57ee784c1e9ff75001632da10bdcf37111e1d1b82208a1c6b +EBUILD odt2txt-0.4-r1.ebuild 842 RMD160 95c05cc96a2be9d35eb6448178f6cf476a979215 SHA1 22869892c45c1d4ab2229e86dd5b287fb5eb5ae1 SHA256 fc84a9f0f8e209b158fb75b49c4f6d89ee4a5ec39e0172c56074c4fcec5202cd +MISC ChangeLog 1379 RMD160 2961f75b0d792dffcb533f6e11de65d552c5f6f9 SHA1 f0fa1df6d9527c7965358f83fd9feb3be6426882 SHA256 010fd7f1314fc88db6ec5bf00b77258094315be79f6565da66c0449ea9fef11a MISC metadata.xml 504 RMD160 192983433233357a5f8b0ea09289ecdada8f18f2 SHA1 8c4e670821607ecd523c756d6f1fe6f302f4ffbc SHA256 85b7d3294638ac0c4db56860559b85b6f2eb6dba424a31e78cdb1fb3543c9326 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iJwEAQEIAAYFAk5/GKkACgkQfXuS5UK5QB0ecAQAmFByJ/NqOeSf9W4sa8/DalAa -VXB/jJeaJ/y+rBQ1ve5NmuZImn52w/C67HWsP/CKCzgY9g6LYI2MgFnZIgODRKO5 -GFPrdYjJfgUsY8P9hCxHkQnorwyEbmyhkg1vb5Dl3vmsAHcw1zU2MupOACkOJ5Lk -QVmoHXOa+7JUrGmKijI= -=Gch4 +iQIcBAEBAgAGBQJPdvGtAAoJEOSiRoyO7jvo9HEQAI+0EPpV7fglv11vNucSEpA5 +81J6KVv5abL5ClvbF38zBh+qus8Yj6WhLqtzh7lTgkwwNBiz1Blg3R6ZsqaFAaaJ +e9+Cr2wIrc/ZazL/IBr1Lchkbzw+jqiGskc75bD5MxpCqkVstUfTftAEzDgJyNlG +SDzC635qXE7xpBH/eiZwo46KVLS46LdtsO3040jjYMkWpMrF++ir1CwUl6Nr4cqB +dE5zfdnbq/mYHK2S2NIpCfB1m3NroZJLdGPP/5ChX2XEEy2XvVsPf3eRjun6xBsF +QwnBED23CruJJNWmLSPIkD7yxSi7EX7Egq64l1E43xIeurPk3Lhwt5t9B3mMCu/t +PLUtdqrkja0SmemZkG9db/2DjAeYR/74s5mijAVoJmBBczM0AyOijL2JL5AXPIv+ +NIBLL7sMhzNKwXqqi5bYkGBICtUAQd3A8/LbVMd19HGmmLwAoKdLji7qcqwcwqX7 +GIbQ54AMPRMzFyzv8+D3+OJ5734zQnNiawlyRgtRgJncnCXxckGWMDd6x3YEFU9U +k7sBC75jFc+J9ygaEFgRLCH3/xhQGYzJGK+rCLk49SGtipB0kecsgpny3HvDigps +lFoK+/Ep9+ccLaywpnKP1Et7531Rc4sllcgIm0mNdHafTaoapuiWp7q4C5Jvx4zg +OxeTwCtVXUfeanw69x7z +=GBZM -----END PGP SIGNATURE----- diff --git a/app-text/odt2txt/odt2txt-0.4-r1.ebuild b/app-text/odt2txt/odt2txt-0.4-r1.ebuild index fefdd79b77dc..a6743d4847e1 100644 --- a/app-text/odt2txt/odt2txt-0.4-r1.ebuild +++ b/app-text/odt2txt/odt2txt-0.4-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 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/odt2txt/odt2txt-0.4-r1.ebuild,v 1.5 2011/02/02 15:57:28 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/odt2txt/odt2txt-0.4-r1.ebuild,v 1.6 2012/03/31 11:59:35 scarabeus Exp $ -EAPI=2 +EAPI=4 inherit eutils toolchain-funcs @@ -15,10 +15,14 @@ SLOT="0" KEYWORDS="alpha amd64 ia64 ~ppc64 sparc x86 ~x86-macos" IUSE="" -RDEPEND="sys-libs/zlib - virtual/libiconv" -DEPEND="sys-apps/groff - ${RDEPEND}" +RDEPEND=" + !app-office/unoconv + sys-libs/zlib + virtual/libiconv +" +DEPEND="${RDEPEND} + sys-apps/groff +" src_prepare() { epatch "${FILESDIR}"/${P}-darwin_iconv.patch @@ -29,6 +33,6 @@ src_compile() { } src_install() { - emake install DESTDIR="${D}" PREFIX=/usr || die - doman odt2txt.1 || die + emake install DESTDIR="${D}" PREFIX=/usr + doman odt2txt.1 } |