Enable multilib support, bug #499382.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 143 insertions, 5 deletions

diff --git a/dev-libs/libevent/ChangeLog b/dev-libs/libevent/ChangeLog
index 31e6f6e4e685..42731bfb1dbf 100644
--- a/dev-libs/libevent/ChangeLog
+++ b/dev-libs/libevent/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libevent
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/ChangeLog,v 1.266 2014/03/21 17:46:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/ChangeLog,v 1.267 2014/05/13 19:15:50 mgorny Exp $
+
+*libevent-2.1.4-r1 (13 May 2014)
+*libevent-2.0.21-r1 (13 May 2014)
+
+  13 May 2014; Michał Górny <mgorny@gentoo.org> +libevent-2.0.21-r1.ebuild,
+  +libevent-2.1.4-r1.ebuild:
+  Enable multilib support, bug #499382.
 
 *libevent-2.1.4 (21 Mar 2014)
 
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 2258fd9bc06b..21176928b65d 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -3,14 +3,28 @@ Hash: SHA256
 
 DIST libevent-2.0.21-stable.tar.gz 850772 SHA256 22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f5 SHA512 fbcdd12af9313ecc0f2988eb46ef03906b1c3aff96871a165eb8eae2cb650b1a3bb420dccf3a6bc3cdc192436d8dfc2ce67a7cc7d9e586f27be1fa52dd62dfa1 WHIRLPOOL e1d2571235770251b8a2d3f1565238909df307d7de2bb86eefeca136c76eba5f645cea951ec58fdc4f2e6bcd70b74d128ddf7df5aec4ee164fb2c6c52136989e
 DIST libevent-2.1.4-alpha.tar.gz 957745 SHA256 7e5a1f464f7c7298cbb3074481d7c620553288b73f4a6bebeea84173edc4bce5 SHA512 d75911fc968884a49bea0127f6d478b160b05032e446b8105c833b4acca6412d2eaa7b5077b1b4b902bfc5789060394433188ac36f8d4954691e00aa7ca1e0bd WHIRLPOOL 4d5b0bb7a648d658245f0d802d10da199726a8459da2dfab470f937bf61029d903d4bc688416078ba24e6627e08bd5375df0ce00f0842a7033739b79940ecd7d
+EBUILD libevent-2.0.21-r1.ebuild 1549 SHA256 836d9a26ee4ca32a846b52cc4c9a7a37aa157b050ad5bbd6a09bfcc4101a7617 SHA512 e594462a3212ef6b73c6240641f92bdab736b516152e632af2940249be47bcb0fb68b63c5409e1e6b8e4139c83d40dd364e1007eb3341863b4a0a23a7ee753f9 WHIRLPOOL 075321b7bfa8409e3feded6d2e76b21ecde955c2c9e2ae2a5238903b120079e0ccb0fdc373302683f2a5942ddf047fe22dd0c2b228068a978e99a019f2e06a23
 EBUILD libevent-2.0.21.ebuild 1382 SHA256 5ce4d1731947f3519b95fef0f5d38ff0228aa8c9c046d46a1fc5b7624b3d241b SHA512 299b4819e3c020ab4fe5d8d639592f89f15351b904bbc840725ce274d0a1934377e397667bfd3e3f364f905fa79b0acaa387316e52e84bdffab1f2e5b218ee97 WHIRLPOOL 9c18471707578491100e8530ce09c51f406f902a4a5f3b23853da95d40a770231ec5c587f29c2df901859ffb94955ff47fd5305ab1c2e9d5600d8fd4b90352c1
+EBUILD libevent-2.1.4-r1.ebuild 1275 SHA256 6f6a276de629b718db11d3cfbad51515e0d77f2c60f034f9339e7d58d95cbc9e SHA512 1c3da7774bbe6140fd9bbab162b401503fd3087c3124c758f06a2b59f4a5dc7532df4a54c2be26188b9758040ed8228042e6f64252a7217d1be63289fded08f6 WHIRLPOOL 31a49cf98ccfae4b9d977a71254724d7b5434f29d1a7e61dc9386ef4606a91fa35c3502f0b1d7ba234c17b9bbc086656da5b73bc25b67f184b2b1ae6a5a04a51
 EBUILD libevent-2.1.4.ebuild 1065 SHA256 9ead3185b2f4629d2f8166aa707673444af07ae55665cd95574bf4928101d788 SHA512 2abf8fa85735d4eecdad60c4ea6f6d4f7df5e719100f1a11c4d25c7bf19323cb4cb84f3534e8b32e6ccdb31345176e1a4ec7b490b46483f14bc5c85dcaa22950 WHIRLPOOL 08f8012e483340b783e32f95a16e5be0ca0e9d9d88356b286a5c05d108516de983f3c99e5596787ef27927a6dcd88b5e4d026ca811f0a5400013a569569b46de
-MISC ChangeLog 31309 SHA256 5c0673511bd933af218d14357cef763a6eaa0b1d735a10a840b121ecfc3a853f SHA512 25426644d84081aba20d020d342cb18d813e9d0fd9d9c420268877297e9d7dea2bc98b3c36140efc2d5ac99fe6cf8b0f76f531ddf96faf600c7197422c9e47f3 WHIRLPOOL 99247cf6172b58f98bbc43ac07923c2c5b4591c50a18e6b1d6092f130324f7da11e0c3ff6b1bcc0e72a36cf441d31c9c36dd6f7a2a56855893b05ed35c5951a7
+MISC ChangeLog 31528 SHA256 b75736e593dbedf5a1622929028e737385793f24858e5d4861c12486452c30a3 SHA512 15a240abd37fa6eb5d833415b97deb3fa9d0563b0f631b427042b50fc3155077f483807e704d0df07cad0545c3d868bf8da56016c4655bf90e420b72f99111d5 WHIRLPOOL 6651fac9d1a3e0dd3e2962928de4c1bc893c1e68b470bf6de3527591af1e42ad209416ae4a8d5e0922dc9f961695ca65a75c5640d2ea8591379e5cf06ddf4751
 MISC metadata.xml 320 SHA256 7272c89b9ce54e74fe47236d9c8aa65c71f18606a197e875185cbbc284d9e4c6 SHA512 4ec61478c7fbe4181ce995af38470b57ae5b83846a6edfef0e099bfc2dceb444e37b61861f26df75360f48fc567a212af8924f5067c4ddb5a71b6605f775e72a WHIRLPOOL 07fecddf8c350853fffdc6c134023bf573c76a59a5abd01189cbc8edd47fc3fbb580658a89b3c7d9ac0082be99bd619ab7d76b07d62cdbbc4092f704caf8aac7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMsexAACgkQVWmRsqeSphMMswCeL7l2q80pLOPxc9BBDl+0FJwS
-HxkAnj52ykmaEd/MKAANwg7bWSGrgtux
-=k4OT
+iQJ8BAEBCABmBQJTcm9oXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOkZcQAN6nK+vNOZDZcC9Pk0sL8BZQ
+3WyUnHtmzF7sv1R8GXEmkE0XJQUDU/u21EJk+JIfjsI371ywP+YJVjYpKar1rQIc
+Xj//UDqzv2TN+rKTim9+bUHRtFuAp864ykFe8oEeq8uwI3oMLb5x0BnfkMYJZ2MW
+lPlnZVspYalNEhY29Cew0MKN5WP4odeueuVegncqnM+6wcqOSwkBNl/dDxs5kWe5
+wiFoCWAjJXmBK9rAWo5IOmbwAnzvQi/A+NboJXo8b4Ljt5wroTVYh/g8eBxeKR9b
+B2fj9IqYHw0Qwb02vgM0QF8s/hxpGR9Ys/rKHsaLBLIquPOMXiMC+nrP1WuSnSmO
+MrHzvT1AJjaP2nnc9/Poc3FrxTV2myTxoXHtSi4CmoofJLOogwuVKRfkjyKHzi1f
+2c6QsVy/7KffeZB6IMxNvrNSw+aPOXVjs62lCj8VciQgY3hJHOYjTkihaF8YIQzn
+cz9GjCuGcdR1xf6LQuwUjvxvnVaBpR8CMwi6vuagfWbY8wSJ/oWSaRkLNSxBc8pL
+qJpcvASONpHwbn/0VoC/o3hIxdvgvN1bpQkZMjwzhp4FMc3SfxsAGziRiL/LvOiS
+jzlxIj5ywW7ExpOOjarDfeYS4FS1uhx095LTSLuV4l17eGERHAvSVb1urza2pHbu
+Fj37UVDYiRul7MyjL36U
+=+VKV
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libevent/libevent-2.0.21-r1.ebuild b/dev-libs/libevent/libevent-2.0.21-r1.ebuild
new file mode 100644
index 000000000000..2240822e1b9f
--- /dev/null
+++ b/dev-libs/libevent/libevent-2.0.21-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/libevent-2.0.21-r1.ebuild,v 1.1 2014/05/13 19:15:50 mgorny Exp $
+
+EAPI=5
+inherit eutils libtool multilib-minimal
+
+MY_P="${P}-stable"
+
+DESCRIPTION="A library to execute a function when a specific event occurs on a file descriptor"
+HOMEPAGE="http://libevent.org/"
+SRC_URI="mirror://github/${PN}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+ssl static-libs test"
+
+DEPEND="ssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )"
+RDEPEND="
+	${DEPEND}
+	!<=dev-libs/9libs-1.0
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/event2/event-config.h
+)
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( README ChangeLog )
+
+src_prepare() {
+	elibtoolize
+
+	# don't waste time building tests/samples
+	sed -i \
+		-e 's|^\(SUBDIRS =.*\)sample test\(.*\)$|\1\2|' \
+		Makefile.in || die "sed Makefile.in failed"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable ssl openssl)
+}
+
+src_test() {
+	# The test suite doesn't quite work (see bug #406801 for the latest
+	# installment in a riveting series of reports).
+	:
+	# emake -C test check | tee "${T}"/tests
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-libs/libevent/libevent-2.1.4-r1.ebuild b/dev-libs/libevent/libevent-2.1.4-r1.ebuild
new file mode 100644
index 000000000000..78d0daa11049
--- /dev/null
+++ b/dev-libs/libevent/libevent-2.1.4-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/libevent-2.1.4-r1.ebuild,v 1.1 2014/05/13 19:15:50 mgorny Exp $
+
+EAPI=5
+inherit eutils libtool multilib-minimal
+
+MY_P="${P}-alpha"
+
+DESCRIPTION="A library to execute a function when a specific event occurs on a file descriptor"
+HOMEPAGE="http://libevent.org/"
+SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="+ssl static-libs test"
+
+DEPEND="ssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] )"
+RDEPEND="
+	${DEPEND}
+	!<=dev-libs/9libs-1.0
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/event2/event-config.h
+)
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	elibtoolize
+	sed -i -e '/^all:/s|tests||g' Makefile.nmake || die
+}
+
+multilib_src_configure() {
+	# fix out-of-source builds
+	mkdir -p test || die
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable ssl openssl)
+}
+
+src_test() {
+	# The test suite doesn't quite work (see bug #406801 for the latest
+	# installment in a riveting series of reports).
+	:
+	# emake -C test check | tee "${T}"/tests
+}
+
+DOCS=( ChangeLog{,-1.4,-2.0} )
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}