remove internal copy of zlib, so the header files from the system are used. Fixes bug #178996, reported by Diego Pettenò <flameeyes@gmail.com>

Package-Manager: portage-2.1.2.7

4 files changed, 187 insertions, 9 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 99fa82440834..ea7f0cdba302 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/erlang
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.62 2007/04/20 09:19:51 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.63 2007/05/21 06:27:20 opfer Exp $
+
+*erlang-11.2.4-r1 (21 May 2007)
+
+  21 May 2007; Christian Faulhammer <opfer@gentoo.org>
+  +erlang-11.2.4-r1.ebuild:
+  remove internal copy of zlib, so the header files from the system are used.
+  Fixes bug #178996, reported by Diego Pettenò <flameeyes@gmail.com>
 
   20 Apr 2007; Christian Faulhammer <opfer@gentoo.org> erlang-11.2.4.ebuild:
   remove unneeded symlinks
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 48bc2d03f37d..86b421bdcc99 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -57,14 +57,18 @@ EBUILD erlang-11.2.3.ebuild 4805 RMD160 0406a1dd401f7ff08af37112901ac10617c17437
 MD5 bd74ef43593d2a0be30386eb618f1fec erlang-11.2.3.ebuild 4805
 RMD160 0406a1dd401f7ff08af37112901ac10617c17437 erlang-11.2.3.ebuild 4805
 SHA256 8e98d02bf69c18e6dd8029af88924f23395edd2a03ae87c0915ae34fab4a3615 erlang-11.2.3.ebuild 4805
+EBUILD erlang-11.2.4-r1.ebuild 4590 RMD160 f07dca05b0f3bd3d3992a6c900828adbe8be95c6 SHA1 fc55f5a6e49fb2fdadbb65566848421c0ec1fd33 SHA256 4fdc633e853be9bd3fd0365029f2b522a60676886c6a3103bfcb3ca4aec5fa3a
+MD5 dda7b2b50052b41e0c33d6aaaba6cd49 erlang-11.2.4-r1.ebuild 4590
+RMD160 f07dca05b0f3bd3d3992a6c900828adbe8be95c6 erlang-11.2.4-r1.ebuild 4590
+SHA256 4fdc633e853be9bd3fd0365029f2b522a60676886c6a3103bfcb3ca4aec5fa3a erlang-11.2.4-r1.ebuild 4590
 EBUILD erlang-11.2.4.ebuild 4423 RMD160 35e5bd29ea46a01d488a892009838c24d4122ce7 SHA1 30e15947de85f7b874f68a4883997c8098f89c4a SHA256 860c8575214bcd43ad265a1fe3aa065c0731165d352cd639ae7c1a530e019be0
 MD5 499891925155646dfbe695540387a7a0 erlang-11.2.4.ebuild 4423
 RMD160 35e5bd29ea46a01d488a892009838c24d4122ce7 erlang-11.2.4.ebuild 4423
 SHA256 860c8575214bcd43ad265a1fe3aa065c0731165d352cd639ae7c1a530e019be0 erlang-11.2.4.ebuild 4423
-MISC ChangeLog 11268 RMD160 abbe50244480c8c90c3d574657c1c04c9d04b45f SHA1 a9ed242adce911cbc578ddb36abba22910b7cf72 SHA256 c40dd338f1b2dabbac55059c23277bc122fbaa950c374b9d54108d854bbafa1f
-MD5 a15843963afc6ded043b66eece1049ee ChangeLog 11268
-RMD160 abbe50244480c8c90c3d574657c1c04c9d04b45f ChangeLog 11268
-SHA256 c40dd338f1b2dabbac55059c23277bc122fbaa950c374b9d54108d854bbafa1f ChangeLog 11268
+MISC ChangeLog 11533 RMD160 a9648f54fb36b92396ef0111f868c7395f00f8d2 SHA1 840ccb503718f0e0b8ba056ae98948e90917a841 SHA256 4f4360a093ed98317b40690aa8d8b81fd8b87903c67934feabc456c9a3125369
+MD5 4e6d64ab41c977cbb0338ffd17635c02 ChangeLog 11533
+RMD160 a9648f54fb36b92396ef0111f868c7395f00f8d2 ChangeLog 11533
+SHA256 4f4360a093ed98317b40690aa8d8b81fd8b87903c67934feabc456c9a3125369 ChangeLog 11533
 MISC metadata.xml 402 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 SHA1 2a45564353e8d0c2b9555294a6a269e56e0b6056 SHA256 c713a207afd5d65ef21d1c1e5fd3b867ce063dd9e46fc53db0734ad19f59ffe7
 MD5 aea374917adc11a2d42b0b9d1bba3598 metadata.xml 402
 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 metadata.xml 402
@@ -87,10 +91,13 @@ SHA256 510ba14d6371c731134f8e675778184fd98c14bd8873629c0b788517224afa47 files/di
 MD5 4f6ec05708c37021dc7c60b20a30430c files/digest-erlang-11.2.4 768
 RMD160 664ff8e5f0d7ea7263d18da37e2ebd216f429196 files/digest-erlang-11.2.4 768
 SHA256 f15898a27c4a05cc51f2427f731936b431ab3628a07af4d39836d9b3291360ec files/digest-erlang-11.2.4 768
+MD5 4f6ec05708c37021dc7c60b20a30430c files/digest-erlang-11.2.4-r1 768
+RMD160 664ff8e5f0d7ea7263d18da37e2ebd216f429196 files/digest-erlang-11.2.4-r1 768
+SHA256 f15898a27c4a05cc51f2427f731936b431ab3628a07af4d39836d9b3291360ec files/digest-erlang-11.2.4-r1 768
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGKIW+NQqtfCuFneMRAoC4AJ98jYqMKlg+XPovMfKCr30vhuD9CACgh/4Q
-0FJ6wM99GtKk8nWuNDe5sZM=
-=XyQN
+iD8DBQFGUTvVNQqtfCuFneMRAoR5AJ9W24S/zzAchEraQ0c9G8EMsM6aNgCfSmiX
+Rhoo2umGDKxedV38+UgBsTM=
+=JwQS
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-11.2.4-r1.ebuild b/dev-lang/erlang/erlang-11.2.4-r1.ebuild
new file mode 100644
index 000000000000..a2a74a930ce5
--- /dev/null
+++ b/dev-lang/erlang/erlang-11.2.4-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-11.2.4-r1.ebuild,v 1.1 2007/05/21 06:27:20 opfer Exp $
+
+inherit elisp-common eutils flag-o-matic multilib versionator
+
+# NOTE: You	 need to adjust the version number	in the last comment.  If you need symlinks for
+# binaries please tell maintainers or open up a bug to let it be created.
+
+# erlang uses a really weird versioning scheme which caused quite a few problems
+# already. Thus we do a slight modification converting all letters to digits to
+# make it more sane (see e.g. #26420)
+
+# the next line selects the right source.
+MY_PV="R$(get_major_version)B-$(get_version_component_range 3)"
+
+# ATTN!! Take care when processing the C, etc version!
+MY_P=otp_src_${MY_PV}
+
+DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries"
+HOMEPAGE="http://www.erlang.org/"
+SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz
+	doc? ( http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz
+		http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )"
+
+LICENSE="EPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc emacs hipe java kpoll odbc smp ssl tk"
+
+RDEPEND=">=dev-lang/perl-5.6.1
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	emacs? ( virtual/emacs )
+	java? ( >=virtual/jdk-1.2 )
+	odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}
+	tk? ( dev-lang/tk )"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE=50erlang-gentoo.el
+
+pkg_setup() {
+	if use hipe; then
+		ewarn
+		ewarn "You enabled High performance Erlang. Be aware that this extension"
+		ewarn "can break the compilation in many ways, especially on hardened systems."
+		ewarn "Don't cry, don't file bugs, just disable it!"
+		ewarn
+	fi
+}
+
+src_unpack() {
+	## fix compilation on hardened systems, see bug #154338
+	filter-flags "-fstack-protector"
+	filter-flags "-fstack-protector-all"
+
+	unpack ${A}
+	cd "${S}"
+
+	# needed for amd64
+	epatch "${FILESDIR}/${PN}-10.2.6-export-TARGET.patch"
+	use odbc || sed -i 's: odbc : :' lib/Makefile
+
+	# delete internal copy of zlib, so the system one is used, see bug #178996
+	rm "${S}/erts/emulator/zlib/zconf.h" "${S}/erts/emulator/zlib/zlib.h"
+}
+
+src_compile() {
+	use java || export JAVAC=false
+
+	econf \
+		--enable-threads \
+		$(use_enable hipe) \
+		$(use_with ssl) \
+		$(use_enable kpoll kernell-poll) \
+		$(use_enable smp smp-support) \
+		|| die "econf failed"
+	emake -j1 || die "emake failed"
+
+	if use emacs ; then
+		pushd lib/tools/emacs
+		elisp-compile *.el
+		popd
+	fi
+}
+
+extract_version() {
+	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
+}
+
+src_install() {
+	local ERL_LIBDIR=/usr/$(get_libdir)/erlang
+	local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN)
+	local ERL_ERTS_VER=$(extract_version erts VSN)
+
+	emake -j1 INSTALL_PREFIX="${D}" install || die "install failed"
+	dodoc AUTHORS EPLICENCE README
+
+	dosym ${ERL_LIBDIR}/bin/erl /usr/bin/erl
+	dosym ${ERL_LIBDIR}/bin/erlc /usr/bin/erlc
+	dosym ${ERL_LIBDIR}/bin/ear /usr/bin/ear
+	dosym ${ERL_LIBDIR}/bin/escript /usr/bin/escript
+	dosym \
+		${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call \
+		/usr/bin/erl_call
+	dosym ${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam /usr/bin/beam
+
+	## Remove ${D} from the following files
+	dosed ${ERL_LIBDIR}/bin/erl
+	dosed ${ERL_LIBDIR}/bin/start
+	grep -rle "${D}" "${D}"/${ERL_LIBDIR}/erts-${ERL_ERTS_VER} | xargs sed -i -e "s:${D}::g"
+
+	## Clean up the no longer needed files
+	rm "${D}"/${ERL_LIBDIR}/Install
+
+	if use doc ; then
+		for i in "${WORKDIR}"/man/man* ; do
+			dodir /usr/share/${i##${WORKDIR}}erl
+		done
+		for file in "${WORKDIR}"/man/man*/*.[1-9]; do
+			# Avoid namespace collisions
+			local newfile=${file}erl
+			cp ${file} ${newfile}
+			# Man page processing tools expect a capitalized "SEE ALSO" section
+			# header
+			sed -i -e 's,\.SH See Also,\.SH SEE ALSO,g' ${newfile}
+			# doman sucks so we can't use it
+			cp ${newfile} "${D}"/usr/share/man/man${newfile##*.}/
+		done
+		dohtml -A README,erl,hrl,c,h,kwc,info -r \
+			"${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-*
+	fi
+
+	if use emacs ; then
+		pushd "${S}"
+		elisp-install erlang lib/tools/emacs/*.{el,elc}
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+		popd
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	elog
+	elog "If you need a symlink to one of erlang's binaries,"
+	elog "please open a bug and tell the maintainers."
+	elog
+	elog "Gentoo's versioning scheme differs from the author's, so please refer to this version as R11B-4"
+	elog
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/erlang/files/digest-erlang-11.2.4-r1 b/dev-lang/erlang/files/digest-erlang-11.2.4-r1
new file mode 100644
index 000000000000..8a23b314578e
--- /dev/null
+++ b/dev-lang/erlang/files/digest-erlang-11.2.4-r1
@@ -0,0 +1,9 @@
+MD5 187cd55de8866a278ed963664819404d otp_doc_html_R11B-4.tar.gz 4902864
+RMD160 36d8ed3e0523f651f57caa8588f12f0500344f0e otp_doc_html_R11B-4.tar.gz 4902864
+SHA256 fa1f313a0d3f79239ee2930159288419c6c4348d095cf58557ff799712d3a60f otp_doc_html_R11B-4.tar.gz 4902864
+MD5 cc041ceebc4a6615073d8d7e88495610 otp_doc_man_R11B-4.tar.gz 712928
+RMD160 ba006631a99757c65ff4955650485e213d6904b9 otp_doc_man_R11B-4.tar.gz 712928
+SHA256 5852d7d9b7f09f3dda0261fe51c52025eacbdae258a984994b1a2407a065450e otp_doc_man_R11B-4.tar.gz 712928
+MD5 649e6f057e6996f92c8496161d754d8d otp_src_R11B-4.tar.gz 11720279
+RMD160 53969dd0f1637e9ac784f38d6ec9c01b7986a9cd otp_src_R11B-4.tar.gz 11720279
+SHA256 6928f44b67982aa8e00a2b053ecc78437fc70e19a2b0131c8f1ee86f02009337 otp_src_R11B-4.tar.gz 11720279