| 1 |
vapier 10/12/31 00:45:25 |
| 2 |
|
| 3 |
Modified: htp-1.16.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Rewrite ebuild to clean it all up. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha10/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.4 app-text/htp/htp-1.16.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/htp/htp-1.16.ebuild?rev=1.4&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/htp/htp-1.16.ebuild?rev=1.4&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/htp/htp-1.16.ebuild?r1=1.3&r2=1.4 |
| 15 |
|
| 16 |
Index: htp-1.16.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-text/htp/htp-1.16.ebuild,v |
| 19 |
retrieving revision 1.3 |
| 20 |
retrieving revision 1.4 |
| 21 |
diff -u -r1.3 -r1.4 |
| 22 |
--- htp-1.16.ebuild 23 Sep 2009 16:36:34 -0000 1.3 |
| 23 |
+++ htp-1.16.ebuild 31 Dec 2010 00:45:25 -0000 1.4 |
| 24 |
@@ -1,8 +1,10 @@ |
| 25 |
-# Copyright 1999-2009 Gentoo Foundation |
| 26 |
+# Copyright 1999-2010 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/htp/htp-1.16.ebuild,v 1.3 2009/09/23 16:36:34 patrick Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/htp/htp-1.16.ebuild,v 1.4 2010/12/31 00:45:25 vapier Exp $ |
| 30 |
|
| 31 |
-inherit distutils eutils |
| 32 |
+EAPI="2" |
| 33 |
+ |
| 34 |
+inherit eutils toolchain-funcs |
| 35 |
|
| 36 |
DESCRIPTION="An HTML preprocessor" |
| 37 |
HOMEPAGE="http://htp.sourceforge.net/" |
| 38 |
@@ -10,28 +12,39 @@ |
| 39 |
|
| 40 |
LICENSE="Clarified-Artistic" |
| 41 |
SLOT="0" |
| 42 |
-KEYWORDS="~x86 ~ppc ~sparc ~alpha" |
| 43 |
+KEYWORDS="~alpha ~ppc ~sparc ~x86" |
| 44 |
IUSE="" |
| 45 |
|
| 46 |
-DEPEND="" |
| 47 |
-RDEPEND="" |
| 48 |
- |
| 49 |
# HTP does not use autoconf, have to set options defined in Makefile.config |
| 50 |
|
| 51 |
-src_unpack() { |
| 52 |
- unpack ${A} || die |
| 53 |
- cd "${S}" |
| 54 |
- # Patch to remove meta-generator tag with "ego-gratifying Easter egg": |
| 55 |
- epatch "${FILESDIR}/easteregg.patch" |
| 56 |
- # Fix for #240110 |
| 57 |
- epatch "${FILESDIR}/strip.patch" |
| 58 |
+src_prepare() { |
| 59 |
+ epatch "${FILESDIR}"/strip.patch #240110 |
| 60 |
+ # let src_test take care of testing |
| 61 |
+ sed -i -e '/SUBDIRS /s:tests::' Makefile || die |
| 62 |
+ # don't install doc files with +x perms |
| 63 |
+ sed -i -e '$aINSTALL += -m644' homepage/ref/{*/,}Makefile || die |
| 64 |
+ # make src_test abort on failure |
| 65 |
+ sed -i -e '/DIFF.*FAILED/s/echo/exit 1; :/' tests/Makefile || die |
| 66 |
+ # the png file in this test isn't fetchable |
| 67 |
+ sed -i -e 's: width="630" height="331"::' tests/png.html.exp || die |
| 68 |
} |
| 69 |
|
| 70 |
src_compile() { |
| 71 |
- emake CCOPT="-c ${CFLAGS}" || die |
| 72 |
+ emake \ |
| 73 |
+ CCOPT="-c ${CFLAGS} ${CPPFLAGS} -DHAVE_SNPRINTF -DHAVE_VASPRINTF -DHAVE_ASPRINTF" \ |
| 74 |
+ CC="$(tc-getCC)" \ |
| 75 |
+ LINK='$(CC) $(LDFLAGS)' \ |
| 76 |
+ || die |
| 77 |
+} |
| 78 |
+ |
| 79 |
+src_test() { |
| 80 |
+ emake -C tests || die |
| 81 |
} |
| 82 |
|
| 83 |
src_install() { |
| 84 |
- make DESTDIR="${D}" prefix="${D}/usr" pkgdocdir="${D}/usr/share/doc/${PF}" \ |
| 85 |
+ emake \ |
| 86 |
+ DESTDIR="${D}" \ |
| 87 |
+ prefix='$(DESTDIR)/usr' \ |
| 88 |
+ pkgdocdir='$(DESTDIR)/usr/share/doc/${PF}/html' \ |
| 89 |
install || die |
| 90 |
} |
| 91 |
|
| 92 |
|
| 93 |
|
| 94 |
1.11 app-text/htp/ChangeLog |
| 95 |
|
| 96 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/htp/ChangeLog?rev=1.11&view=markup |
| 97 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/htp/ChangeLog?rev=1.11&content-type=text/plain |
| 98 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/htp/ChangeLog?r1=1.10&r2=1.11 |
| 99 |
|
| 100 |
Index: ChangeLog |
| 101 |
=================================================================== |
| 102 |
RCS file: /var/cvsroot/gentoo-x86/app-text/htp/ChangeLog,v |
| 103 |
retrieving revision 1.10 |
| 104 |
retrieving revision 1.11 |
| 105 |
diff -u -r1.10 -r1.11 |
| 106 |
--- ChangeLog 23 Sep 2009 16:36:34 -0000 1.10 |
| 107 |
+++ ChangeLog 31 Dec 2010 00:45:25 -0000 1.11 |
| 108 |
@@ -1,6 +1,10 @@ |
| 109 |
# ChangeLog for app-text/htp |
| 110 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 111 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/htp/ChangeLog,v 1.10 2009/09/23 16:36:34 patrick Exp $ |
| 112 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 113 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/htp/ChangeLog,v 1.11 2010/12/31 00:45:25 vapier Exp $ |
| 114 |
+ |
| 115 |
+ 31 Dec 2010; Mike Frysinger <vapier@g.o> htp-1.16.ebuild, |
| 116 |
+ files/strip.patch: |
| 117 |
+ Rewrite ebuild to clean it all up. |
| 118 |
|
| 119 |
23 Sep 2009; Patrick Lauer <patrick@g.o> htp-1.15.ebuild, |
| 120 |
htp-1.16.ebuild: |
Archives