Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 285669 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-6 / +13 lines)
Line  Link Here
0
-- net-misc/curl/curl-7.35.0.ebuild
0
++ net-misc/curl/curl-7.35.0.ebuild
Lines 4-10 Link Here
4
4
5
EAPI="5"
5
EAPI="5"
6
6
7
inherit autotools eutils prefix
7
PYTHON_COMPAT=( python2_6 python2_7 )
8
inherit autotools eutils prefix python-any-r1
8
9
9
DESCRIPTION="A Client that groks URLs"
10
DESCRIPTION="A Client that groks URLs"
10
HOMEPAGE="http://curl.haxx.se/"
11
HOMEPAGE="http://curl.haxx.se/"
Lines 15-23 Link Here
15
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
16
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
16
IUSE="adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads"
17
IUSE="adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads"
17
IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl"
18
IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl"
18
19
#lead to lots of false negatives, bug #285669
20
RESTRICT="test"
21
19
22
RDEPEND="ldap? ( net-nds/openldap )
20
RDEPEND="ldap? ( net-nds/openldap )
23
	ssl? (
21
	ssl? (
Lines 58-63 Link Here
58
DEPEND="${RDEPEND}
56
DEPEND="${RDEPEND}
59
	virtual/pkgconfig
57
	virtual/pkgconfig
60
	test? (
58
	test? (
59
		${PYTHON_DEPS}
61
		sys-apps/diffutils
60
		sys-apps/diffutils
62
		dev-lang/perl
61
		dev-lang/perl
63
	)"
62
	)"
Lines 80-91 Link Here
80
DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
79
DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
81
	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE)
80
	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE)
82
81
82
pkg_setup() {
83
	if use test ; then
84
		python-any-r1_pkg_setup
85
	fi
86
}
87
83
src_prepare() {
88
src_prepare() {
84
	epatch \
89
	epatch \
85
		"${FILESDIR}"/${PN}-7.30.0-prefix.patch \
90
		"${FILESDIR}"/${PN}-7.30.0-prefix.patch \
86
		"${FILESDIR}"/${PN}-7.30.0-configure.patch \
91
		"${FILESDIR}"/${PN}-7.30.0-configure.patch \
87
		"${FILESDIR}"/${PN}-respect-cflags-3.patch \
92
		"${FILESDIR}"/${PN}-respect-cflags-3.patch \
88
		"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
93
		"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch \
94
		"${FILESDIR}"/${PN}-7.35.0-tests.patch
95
89
	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
96
	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
90
97
91
	epatch_user
98
	epatch_user

Return to bug 285669