| 1 |
jer 10/06/03 20:41:16 |
| 2 |
|
| 3 |
Modified: ChangeLog tinyproxy-1.8.1.ebuild |
| 4 |
Log: |
| 5 |
Introduce USE=minimal to not install documentation or man pages and to not depend on app-text/asciidoc thanks to jakie jia (bug #321753). Do not move HTML templates to docdir as they are not docs. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.15 net-proxy/tinyproxy/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/tinyproxy/ChangeLog?rev=1.15&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/tinyproxy/ChangeLog?rev=1.15&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/tinyproxy/ChangeLog?r1=1.14&r2=1.15 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v |
| 18 |
retrieving revision 1.14 |
| 19 |
retrieving revision 1.15 |
| 20 |
diff -u -r1.14 -r1.15 |
| 21 |
--- ChangeLog 26 May 2010 18:03:30 -0000 1.14 |
| 22 |
+++ ChangeLog 3 Jun 2010 20:41:16 -0000 1.15 |
| 23 |
@@ -1,6 +1,12 @@ |
| 24 |
# ChangeLog for net-proxy/tinyproxy |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.14 2010/05/26 18:03:30 jer Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.15 2010/06/03 20:41:16 jer Exp $ |
| 28 |
+ |
| 29 |
+ 03 Jun 2010; Jeroen Roovers <jer@g.o> tinyproxy-1.8.1.ebuild, |
| 30 |
+ +files/tinyproxy-1.8.1-minimal.patch: |
| 31 |
+ Introduce USE=minimal to not install documentation or man pages and to not |
| 32 |
+ depend on app-text/asciidoc thanks to jakie jia (bug #321753). Do not move |
| 33 |
+ HTML templates to docdir as they are not docs. |
| 34 |
|
| 35 |
*tinyproxy-1.8.1 (26 May 2010) |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.2 net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild?rev=1.2&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild?rev=1.2&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild?r1=1.1&r2=1.2 |
| 45 |
|
| 46 |
Index: tinyproxy-1.8.1.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild,v |
| 49 |
retrieving revision 1.1 |
| 50 |
retrieving revision 1.2 |
| 51 |
diff -u -r1.1 -r1.2 |
| 52 |
--- tinyproxy-1.8.1.ebuild 26 May 2010 18:03:30 -0000 1.1 |
| 53 |
+++ tinyproxy-1.8.1.ebuild 3 Jun 2010 20:41:16 -0000 1.2 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2010 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild,v 1.1 2010/05/26 18:03:30 jer Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild,v 1.2 2010/06/03 20:41:16 jer Exp $ |
| 59 |
|
| 60 |
EAPI="2" |
| 61 |
|
| 62 |
@@ -13,17 +13,23 @@ |
| 63 |
LICENSE="GPL-2" |
| 64 |
SLOT="0" |
| 65 |
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" |
| 66 |
-IUSE="debug +filter-proxy reverse-proxy transparent-proxy |
| 67 |
+IUSE="debug +filter-proxy minimal reverse-proxy transparent-proxy |
| 68 |
+upstream-proxy +xtinyproxy-header" |
| 69 |
|
| 70 |
-DEPEND="app-text/asciidoc" |
| 71 |
+DEPEND="doc? ( app-text/asciidoc )" |
| 72 |
RDEPEND="" |
| 73 |
|
| 74 |
src_prepare() { |
| 75 |
epatch "${FILESDIR}"/${P}-ldflags.patch |
| 76 |
+ use minimal && epatch "${FILESDIR}/${P}-minimal.patch" |
| 77 |
eautoreconf |
| 78 |
} |
| 79 |
+ |
| 80 |
src_configure() { |
| 81 |
+ if use minimal; then |
| 82 |
+ ln -s /bin/true ${T}/a2x |
| 83 |
+ export PATH="${T}:${PATH}" |
| 84 |
+ fi |
| 85 |
econf \ |
| 86 |
$(use_enable filter-proxy filter) \ |
| 87 |
$(use_enable reverse-proxy reverse) \ |
| 88 |
@@ -38,10 +44,11 @@ |
| 89 |
sed -i \ |
| 90 |
-e 's:mkdir $(datadir)/tinyproxy:mkdir -p $(DESTDIR)$(datadir)/tinyproxy:' \ |
| 91 |
Makefile |
| 92 |
- make DESTDIR="${D}" install || die "install failed" |
| 93 |
+ emake DESTDIR="${D}" install || die "install failed" |
| 94 |
|
| 95 |
- dodoc AUTHORS ChangeLog NEWS README TODO |
| 96 |
- mv "${D}/usr/share/tinyproxy" "${D}/usr/share/doc/${PF}/html" |
| 97 |
+ if ! use minimal; then |
| 98 |
+ dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed" |
| 99 |
+ fi |
| 100 |
|
| 101 |
newinitd "${FILESDIR}/tinyproxy.initd" tinyproxy |
| 102 |
} |
Archives