From 94d83ccf0b20bfcae985cc246fe8da184cd5f984 Mon Sep 17 00:00:00 2001 From: Jonathan Callen Date: Mon, 5 Apr 2010 21:39:00 +0000 Subject: [PATCH] Bump to EAPI=3, add prefix keywords & patch Package-Manager: portage--svn/cvs/Linux i686 --- app-text/antiword/ChangeLog | 8 ++- app-text/antiword/Manifest | 15 +++- app-text/antiword/antiword-0.37.ebuild | 29 ++++---- .../antiword/files/antiword-0.37-prefix.patch | 71 +++++++++++++++++++ 4 files changed, 106 insertions(+), 17 deletions(-) create mode 100644 app-text/antiword/files/antiword-0.37-prefix.patch diff --git a/app-text/antiword/ChangeLog b/app-text/antiword/ChangeLog index f57d658ca1d9..9a5db02e2790 100644 --- a/app-text/antiword/ChangeLog +++ b/app-text/antiword/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/antiword -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/antiword/ChangeLog,v 1.40 2009/09/06 18:43:16 idl0r Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/antiword/ChangeLog,v 1.41 2010/04/05 21:38:59 abcd Exp $ + + 05 Apr 2010; Jonathan Callen antiword-0.37.ebuild, + +files/antiword-0.37-prefix.patch: + Bump to EAPI=3, add prefix keywords & patch 06 Sep 2009; Christian Ruppert -files/antiword-0.36.1-ppc-macos.diff, antiword-0.37.ebuild, diff --git a/app-text/antiword/Manifest b/app-text/antiword/Manifest index 781268cdf31e..91538af18083 100644 --- a/app-text/antiword/Manifest +++ b/app-text/antiword/Manifest @@ -1,5 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX antiword-0.37-prefix.patch 2252 RMD160 e873aaa64d57dcdc86bf3e2914f2590c3e23e276 SHA1 0828f2ecacc4942925d5e37ecb6798b7c68158f3 SHA256 ea6ee5526d7c23e5ba5dcb75a1acd65c46fc426a6bd6f1f103b0d83b3f3896cd DIST antiword-0.37-gentoo-0.1.tar.bz2 1346 RMD160 e530ccebe9ea6a6c650e6c675a2f0cbcfe6f3119 SHA1 a4a2476ee2051f0e7f2b86c81d713a0390b4441e SHA256 98fed268769779ba096f7cce4047ad453452b0a170ef2012269f274be3f2c8f3 DIST antiword-0.37.tar.gz 317884 RMD160 506ca4a7a7fa9fd4574092798a7fffacd9a3a0a0 SHA1 4364f7f99cb2d37f7d1d5bc14a335ccc0c67292e SHA256 8e2c000fcbc6d641b0e6ff95e13c846da3ff31097801e86702124a206888f5ac -EBUILD antiword-0.37.ebuild 1077 RMD160 cf6714fc2658d9436d133cb3ddfdb7f4398c0f56 SHA1 018084ee8f9aded79bf875d2c3bcc3e17aab06e7 SHA256 1fb693bba672c3e47dce81cc2013084b05244eb7f6530eda26b1abaf75cd9c23 -MISC ChangeLog 5681 RMD160 e9ebceb81f21931f3216acc2730ab7e4c41ba1f5 SHA1 b60049e801068ebd5bba4ab20f649eaec2dfb914 SHA256 2980908c6a83f9ee3567b3f7258124e15552ab52adc642f9f6e725fc92ea58b3 +EBUILD antiword-0.37.ebuild 1286 RMD160 01efdd79024b1db939f2e8fc2a85c753d7d54e51 SHA1 e54f73874a48dbb2736bf39572ac08d7a41d7bd3 SHA256 0bf54e8e531b9444946e03602193ee6525cda1a532824eca25902a0bfcd3e108 +MISC ChangeLog 5835 RMD160 4594276ff9c2953fdf924636df14d7f565a775aa SHA1 7f97f0937114c8febed479739e1e8cb2eb777ffc SHA256 e453b9509807f977282461709846f01da0a0fe777638892301d2fe91a3f520eb MISC metadata.xml 241 RMD160 dbd39e15096a9c09432225b4dee87bcadcb33907 SHA1 1beb1a93e4526085c26b282271027ad508b29059 SHA256 950a704ea9fcebef2e688e8bd6e0f0d292c967e246d58e4778b9955b1d615ab4 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAku6WHkACgkQOypDUo0oQOqURgCfehZ79Vcj9wMS6YOB+HfgrQ6h +638AnjxZQfwVGPbevm1Qpja5SLzcjP64 +=Wo/a +-----END PGP SIGNATURE----- diff --git a/app-text/antiword/antiword-0.37.ebuild b/app-text/antiword/antiword-0.37.ebuild index 6ef901818be9..df89cfe35c47 100644 --- a/app-text/antiword/antiword-0.37.ebuild +++ b/app-text/antiword/antiword-0.37.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/antiword/antiword-0.37.ebuild,v 1.12 2009/09/06 18:43:16 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/antiword/antiword-0.37.ebuild,v 1.13 2010/04/05 21:38:59 abcd Exp $ + +EAPI="3" inherit eutils toolchain-funcs @@ -13,32 +15,33 @@ SRC_URI="http://www.winfield.demon.nl/linux/${P}.tar.gz SLOT="0" LICENSE="GPL-2" -KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86" +KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86 ~ppc-aix ~ia64-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" PATCHDIR=${WORKDIR}/gentoo-antiword/patches -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { EPATCH_SUFFIX="diff" \ epatch ${PATCHDIR} + + epatch "${FILESDIR}"/${P}-prefix.patch } +src_configure() { :; } + src_compile() { - emake OPT="${CFLAGS}" CC="$(tc-getCC)" LD="$(tc-getCC)" \ + emake PREFIX="${EPREFIX}" OPT="${CFLAGS}" CC="$(tc-getCC)" LD="$(tc-getCC)" \ LDFLAGS="${LDFLAGS}" || die "emake failed" } src_install() { - make DESTDIR="${D}" global_install || die + emake -j1 PREFIX="${EPREFIX}" DESTDIR="${D}" global_install || die - use kde || rm -f "${D}"/usr/bin/kantiword + use kde || rm -f "${ED}"/usr/bin/kantiword insinto /usr/share/${PN}/examples - doins Docs/testdoc.doc Docs/antiword.php + doins Docs/testdoc.doc Docs/antiword.php || die cd Docs - doman antiword.1 - dodoc ChangeLog Exmh Emacs FAQ History Netscape \ - QandA ReadMe Mozilla Mutt + doman antiword.1 || die + dodoc ChangeLog Exmh Emacs FAQ History Netscape QandA ReadMe Mozilla Mutt || die } diff --git a/app-text/antiword/files/antiword-0.37-prefix.patch b/app-text/antiword/files/antiword-0.37-prefix.patch new file mode 100644 index 000000000000..40053696f52e --- /dev/null +++ b/app-text/antiword/files/antiword-0.37-prefix.patch @@ -0,0 +1,71 @@ +--- antiword.h ++++ antiword.h +@@ -191,43 +191,11 @@ + #define FONT_SANS_SERIF_ITALIC "Helvetica-Oblique" + #define FONT_SANS_SERIF_BOLDITALIC "Helvetica-BoldOblique" + /* The name of the antiword directories and the font information file */ +-#if defined(__dos) +-#define GLOBAL_ANTIWORD_DIR "C:\\antiword" +-#define ANTIWORD_DIR "antiword" +-#define FONTNAMES_FILE "fontname.txt" +-#elif defined(__amigaos) +-#define GLOBAL_ANTIWORD_DIR "SYS:.antiword" +-#define ANTIWORD_DIR ".antiword" +-#define FONTNAMES_FILE "fontnames" +-#elif defined(N_PLAT_NLM) +-#define GLOBAL_ANTIWORD_DIR "SYS:/antiword" +-#define ANTIWORD_DIR "antiword" +-#define FONTNAMES_FILE "fontname.txt" +-#elif defined(__vms) +-#define GLOBAL_ANTIWORD_DIR "/usr/share/antiword" +-#define ANTIWORD_DIR "antiword" +-#define FONTNAMES_FILE "fontnames" +-#elif defined(__BEOS__) +-#define GLOBAL_ANTIWORD_DIR "/boot/home/config/apps/antiword" +-#define ANTIWORD_DIR "antiword" +-#define FONTNAMES_FILE "fontnames" +-#elif defined(__CYGMING__) +-#define GLOBAL_ANTIWORD_DIR "C:\\antiword" +-#define ANTIWORD_DIR "antiword" +-#define FONTNAMES_FILE "fontnames" +-#elif defined(__Plan9__) +-#define GLOBAL_ANTIWORD_DIR "/sys/lib/antiword" +-#define ANTIWORD_DIR "lib/antiword" +-#define FONTNAMES_FILE "fontnames" +-#elif defined(__sun__) +-#define GLOBAL_ANTIWORD_DIR "/usr/local/share/antiword" ++#ifndef GLOBAL_ANTIWORD_DIR ++#error "GLOBAL_ANTIWORD_DIR is unset!" ++#endif + #define ANTIWORD_DIR ".antiword" + #define FONTNAMES_FILE "fontnames" +-#else /* All others */ +-#define GLOBAL_ANTIWORD_DIR "/usr/share/antiword" +-#define ANTIWORD_DIR ".antiword" +-#define FONTNAMES_FILE "fontnames" +-#endif /* __dos */ + /* The names of grouped mapping files */ + /* ASCII */ + #define MAPPING_FILE_CP437 "cp437.txt" +--- Makefile ++++ Makefile +@@ -36,8 +36,8 @@ + LOCAL_INSTALL_DIR = $(HOME)/bin + LOCAL_RESOURCES_DIR = $(HOME)/.antiword + +-GLOBAL_INSTALL_DIR = /usr/bin +-GLOBAL_RESOURCES_DIR = /usr/share/antiword ++GLOBAL_INSTALL_DIR = $(PREFIX)/usr/bin ++GLOBAL_RESOURCES_DIR = $(PREFIX)/usr/share/antiword + + all: $(PROGS) + +@@ -83,7 +83,7 @@ + @chmod 750 $@ + + .c.o: +- $(CC) $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) '-DGLOBAL_ANTIWORD_DIR="$(GLOBAL_RESOURCES_DIR)"' -c $< + + main_u.o: version.h + postscript.o: version.h -- 2.26.2