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

Collapse All | Expand All

(-)/usr/portage/dev-libs/openssl/openssl-1.0.1g.ebuild (-16 / +30 lines)
Lines 4-10 Link Here
4
4
5
EAPI="4"
5
EAPI="4"
6
6
7
inherit eutils flag-o-matic toolchain-funcs multilib
7
inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
8
8
9
REV="1.7"
9
REV="1.7"
10
DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
10
DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
Lines 17-32 Link Here
17
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
17
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
18
IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test +tls-heartbeat vanilla zlib"
18
IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test +tls-heartbeat vanilla zlib"
19
19
20
# Have the sub-libs in RDEPEND with [static-libs] since, logically,
21
# our libssl.a depends on libz.a/etc... at runtime.
22
LIB_DEPEND="gmp? ( dev-libs/gmp[static-libs(+)] )
23
	zlib? ( sys-libs/zlib[static-libs(+)] )
24
	kerberos? ( app-crypt/mit-krb5 )"
25
# The blocks are temporary just to make sure people upgrade to a
20
# The blocks are temporary just to make sure people upgrade to a
26
# version that lack runtime version checking.  We'll drop them in
21
# version that lack runtime version checking.  We'll drop them in
27
# the future.
22
# the future.
28
RDEPEND="static-libs? ( ${LIB_DEPEND} )
23
RDEPEND="gmp? ( dev-libs/gmp[static-libs?,${MULTILIB_USEDEP}] )
29
	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
24
	zlib? ( sys-libs/zlib[static-libs?,${MULTILIB_USEDEP}] )
25
	kerberos? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
26
	abi_x86_32? (
27
		!<=app-emulation/emul-linux-x86-baselibs-20131008-r5
28
		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
29
	)
30
	!<net-misc/openssh-5.9_p1-r4
30
	!<net-misc/openssh-5.9_p1-r4
31
	!<net-libs/neon-0.29.6-r1"
31
	!<net-libs/neon-0.29.6-r1"
32
DEPEND="${RDEPEND}
32
DEPEND="${RDEPEND}
Lines 35-51 Link Here
35
	test? ( sys-devel/bc )"
35
	test? ( sys-devel/bc )"
36
PDEPEND="app-misc/ca-certificates"
36
PDEPEND="app-misc/ca-certificates"
37
37
38
src_unpack() {
38
MULTILIB_WRAPPED_HEADERS=(
39
	unpack ${P}.tar.gz
39
	usr/include/openssl/rand.h
40
	usr/include/openssl/modes.h
41
	usr/include/openssl/seed.h
42
	usr/include/openssl/opensslconf.h
43
	usr/include/openssl/kssl.h
44
	usr/include/openssl/opensslconf.h
45
	usr/include/openssl/srtp.h
46
	usr/include/openssl/ossl_typ.h
47
	usr/include/openssl/sha.h
48
)
49
50
src_prepare() {
40
	SSL_CNF_DIR="/etc/ssl"
51
	SSL_CNF_DIR="/etc/ssl"
41
	sed \
52
	sed \
42
		-e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \
53
		-e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \
43
		-e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \
54
		-e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \
44
		"${DISTDIR}"/${PN}-c_rehash.sh.${REV} \
55
		"${DISTDIR}"/${PN}-c_rehash.sh.${REV} \
45
		> "${WORKDIR}"/c_rehash || die #416717
56
		> "${WORKDIR}"/c_rehash || die #416717
46
}
47
57
48
src_prepare() {
49
	# Make sure we only ever touch Makefile.org and avoid patching a file
58
	# Make sure we only ever touch Makefile.org and avoid patching a file
50
	# that gets blown away anyways by the Configure script in src_configure
59
	# that gets blown away anyways by the Configure script in src_configure
51
	rm -f Makefile
60
	rm -f Makefile
Lines 89-97 Link Here
89
	# The config script does stupid stuff to prompt the user.  Kill it.
98
	# The config script does stupid stuff to prompt the user.  Kill it.
90
	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
99
	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
91
	./config --test-sanity || die "I AM NOT SANE"
100
	./config --test-sanity || die "I AM NOT SANE"
101
	multilib_copy_sources
92
}
102
}
93
103
94
src_configure() {
104
multilib_src_configure() {
95
	unset APPS #197996
105
	unset APPS #197996
96
	unset SCRIPTS #312551
106
	unset SCRIPTS #312551
97
	unset CROSS_COMPILE #311473
107
	unset CROSS_COMPILE #311473
Lines 125-130 Link Here
125
	einfo "Use configuration ${sslout:-(openssl knows best)}"
135
	einfo "Use configuration ${sslout:-(openssl knows best)}"
126
	local config="Configure"
136
	local config="Configure"
127
	[[ -z ${sslout} ]] && config="config"
137
	[[ -z ${sslout} ]] && config="config"
138
	
128
	echoit \
139
	echoit \
129
	./${config} \
140
	./${config} \
130
		${sslout} \
141
		${sslout} \
Lines 162-168 Link Here
162
		Makefile || die
173
		Makefile || die
163
}
174
}
164
175
165
src_compile() {
176
multilib_src_compile() {
166
	# depend is needed to use $confopts; it also doesn't matter
177
	# depend is needed to use $confopts; it also doesn't matter
167
	# that it's -j1 as the code itself serializes subdirs
178
	# that it's -j1 as the code itself serializes subdirs
168
	emake -j1 depend
179
	emake -j1 depend
Lines 172-183 Link Here
172
	emake rehash
183
	emake rehash
173
}
184
}
174
185
175
src_test() {
186
multilib_src_test() {
176
	emake -j1 test
187
	emake -j1 test
177
}
188
}
178
189
179
src_install() {
190
multilib_src_install() {
180
	emake INSTALL_PREFIX="${D}" install
191
	emake INSTALL_PREFIX="${D}" install
192
}
193
194
multilib_src_install_all() {
181
	dobin "${WORKDIR}"/c_rehash #333117
195
	dobin "${WORKDIR}"/c_rehash #333117
182
	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
196
	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
183
	dohtml -r doc/*
197
	dohtml -r doc/*

Return to bug 488418