summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2010-06-03 20:41:16 +0000
committerJeroen Roovers <jer@gentoo.org>2010-06-03 20:41:16 +0000
commit7f19382a8c6ac916ed5dd68a3907d30fd219776e (patch)
tree67be97a52f7b2555a59abe466f8e9e6e1f70d9f7 /net-proxy/tinyproxy
parentversion bump (diff)
downloadhistorical-7f19382a8c6ac916ed5dd68a3907d30fd219776e.tar.gz
historical-7f19382a8c6ac916ed5dd68a3907d30fd219776e.tar.bz2
historical-7f19382a8c6ac916ed5dd68a3907d30fd219776e.zip
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.
Package-Manager: portage-2.2_rc67/cvs/Linux i686
Diffstat (limited to 'net-proxy/tinyproxy')
-rw-r--r--net-proxy/tinyproxy/ChangeLog8
-rw-r--r--net-proxy/tinyproxy/Manifest5
-rw-r--r--net-proxy/tinyproxy/files/tinyproxy-1.8.1-minimal.patch10
-rw-r--r--net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild19
4 files changed, 33 insertions, 9 deletions
diff --git a/net-proxy/tinyproxy/ChangeLog b/net-proxy/tinyproxy/ChangeLog
index 45f32753bc17..7f000ce178c5 100644
--- a/net-proxy/tinyproxy/ChangeLog
+++ b/net-proxy/tinyproxy/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-proxy/tinyproxy
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.14 2010/05/26 18:03:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/ChangeLog,v 1.15 2010/06/03 20:41:16 jer Exp $
+
+ 03 Jun 2010; Jeroen Roovers <jer@gentoo.org> tinyproxy-1.8.1.ebuild,
+ +files/tinyproxy-1.8.1-minimal.patch:
+ 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.
*tinyproxy-1.8.1 (26 May 2010)
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index e1d80fde55ef..3962bd31fdff 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -1,4 +1,5 @@
AUX tinyproxy-1.8.1-ldflags.patch 307 RMD160 349da2d5937c1b10536d533a952a08cb671ccbcf SHA1 f23d06e2c20d4086e880957eda973a72f43fa61f SHA256 f17432cdc97520c2499f12f05e0a37f8354c0e1cdce18a4b5c2774ec5bd91fe5
+AUX tinyproxy-1.8.1-minimal.patch 109 RMD160 db0c4621e518d42dbe1bff787d9eed37515e93a7 SHA1 2a58388bc3cf46ba9b0067d97092378ea68b3898 SHA256 c2ee0a0cd073f00b7ea37eff078f84eb790bf7bb478e79fad5b1731aaec8f5dc
AUX tinyproxy-no-via.patch 980 RMD160 746a63c13176d393d756f54b649271c375bf0f74 SHA1 6bc81b0d1ebc48e67bb7a8adb6e8dad8e7506ddc SHA256 1213ea21f6967d156566e09198037db5bf0f54fa70295009f357ab3017c86397
AUX tinyproxy.initd 1068 RMD160 1a6ad426880ec112c61b85d2fc1816bebdffda9b SHA1 d4107fd238594046c3ef71839acc3a3d728f87c9 SHA256 dfcf5e4edca36408d9cc310dcc8d3fa5fe0e2bf1f9db5d6594b7b483a539f243
DIST tinyproxy-1.6.3.tar.gz 467348 RMD160 a5503d03bdfe00fd232c643b518bd6c3e034dc33 SHA1 4f101f2a24d9b917fee03a65d27bdbbfc89f85f7 SHA256 cf4f2005fcd69f10087c598398c1a156d1827b9fb11c769ab6587b7b1ea4a2dc
@@ -8,6 +9,6 @@ DIST tinyproxy-1.8.1.tar.bz2 203177 RMD160 ab7816eb15245a01d9a65827f619b86f9bc8f
EBUILD tinyproxy-1.6.3-r1.ebuild 1310 RMD160 0ad910aa3ca1a30ab2f50af20408e345533046b0 SHA1 b65ccef8dda53e1b29bdcad4d6747aa2d82fa0d0 SHA256 2da4838d042065d196a76e99dfb8f4f1b60f33672dc1fd6d8c35da3591f6f2b3
EBUILD tinyproxy-1.6.4.ebuild 1316 RMD160 386f61b41c487d5299dfee91ca4d4c2b069ac430 SHA1 d21007905aa8a9795aacf7a96ba3f7dbae2805c0 SHA256 d30e3cf0bbe9af70b92112346b2a88813709baf292292e054cfc47e52908af8b
EBUILD tinyproxy-1.6.5.ebuild 1415 RMD160 ee8f9c854161dc4d79561e883d4d8149160d71e9 SHA1 6357621902b1486441f3d3d043c4418b9c566ae5 SHA256 73bd704ab0ce30e6c7e89aed3075409d3043c0e9b4d4013399cdaa650cdcd4a7
-EBUILD tinyproxy-1.8.1.ebuild 1481 RMD160 cb91dac719382306322a355abc2ddb0dad42739c SHA1 7634973a6d4d588e4867af75c79f41bf8002083c SHA256 17ad0ccbc2e0b62feb8b944236958adb39aae06d9115e693cdce676a9a73e8b8
-MISC ChangeLog 3763 RMD160 ed1f6f7c675c9f5b653e17a8d66077c4fe9e7ce7 SHA1 6e9f48ab755c0e59bca8b690550726d6c8380426 SHA256 63b6d8fcc822541d18d6a2544951ca8eb3f1af9b57dfedf11d9a72168d16e788
+EBUILD tinyproxy-1.8.1.ebuild 1627 RMD160 ca21c1055c0bdaf2001346c392c6ad03f0afc11f SHA1 eeb409ce2e07fb50252c30c5ea1c027eea8c7907 SHA256 cad0c3916957789f966479e42b3457ed99df7c0558d8ccddc3950dd30a2c0666
+MISC ChangeLog 4078 RMD160 2b9a2c32f8888ba7b8d425d47a2b473a14f23197 SHA1 bc71dfea7bd8fb7b54508b8cb74e0d4f4376aaa1 SHA256 17323bc43b5c80df9e623e0676d35e873d6b7b3de333bddb8082cdebfe2bc9a2
MISC metadata.xml 630 RMD160 76250d5d991441a1f924f5d30ef5dd3cc067ae2c SHA1 d4ae46a69e557cecc5cc6a718c3dfbd66d83afe2 SHA256 125f298a828e96a7d8be4387304188efe17746aa78b5baf5b6c0f60fbdedf616
diff --git a/net-proxy/tinyproxy/files/tinyproxy-1.8.1-minimal.patch b/net-proxy/tinyproxy/files/tinyproxy-1.8.1-minimal.patch
new file mode 100644
index 000000000000..82793a8894d0
--- /dev/null
+++ b/net-proxy/tinyproxy/files/tinyproxy-1.8.1-minimal.patch
@@ -0,0 +1,10 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,6 @@
+ src \
+ data \
+ etc \
+- docs \
+ m4macros \
+ tests
+
diff --git a/net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild b/net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild
index 94ce198a9e35..2bcad1c93ddc 100644
--- a/net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild
+++ b/net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild,v 1.1 2010/05/26 18:03:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tinyproxy/tinyproxy-1.8.1.ebuild,v 1.2 2010/06/03 20:41:16 jer Exp $
EAPI="2"
@@ -13,17 +13,23 @@ SRC_URI="http://www.banu.com/pub/${PN}/1.8/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="debug +filter-proxy reverse-proxy transparent-proxy
+IUSE="debug +filter-proxy minimal reverse-proxy transparent-proxy
+upstream-proxy +xtinyproxy-header"
-DEPEND="app-text/asciidoc"
+DEPEND="doc? ( app-text/asciidoc )"
RDEPEND=""
src_prepare() {
epatch "${FILESDIR}"/${P}-ldflags.patch
+ use minimal && epatch "${FILESDIR}/${P}-minimal.patch"
eautoreconf
}
+
src_configure() {
+ if use minimal; then
+ ln -s /bin/true ${T}/a2x
+ export PATH="${T}:${PATH}"
+ fi
econf \
$(use_enable filter-proxy filter) \
$(use_enable reverse-proxy reverse) \
@@ -38,10 +44,11 @@ src_install() {
sed -i \
-e 's:mkdir $(datadir)/tinyproxy:mkdir -p $(DESTDIR)$(datadir)/tinyproxy:' \
Makefile
- make DESTDIR="${D}" install || die "install failed"
+ emake DESTDIR="${D}" install || die "install failed"
- dodoc AUTHORS ChangeLog NEWS README TODO
- mv "${D}/usr/share/tinyproxy" "${D}/usr/share/doc/${PF}/html"
+ if ! use minimal; then
+ dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+ fi
newinitd "${FILESDIR}/tinyproxy.initd" tinyproxy
}