Version bump.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

6 files changed, 113 insertions, 25 deletions

diff --git a/dev-libs/libevent/ChangeLog b/dev-libs/libevent/ChangeLog
index 87f183a3fc3b..656979b0daa7 100644
--- a/dev-libs/libevent/ChangeLog
+++ b/dev-libs/libevent/ChangeLog
@@ -1,6 +1,14 @@
 # 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.281 2014/12/26 10:13:36 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/ChangeLog,v 1.282 2015/01/06 10:39:56 jer Exp $
+
+*libevent-2.1.5 (06 Jan 2015)
+*libevent-2.0.22 (06 Jan 2015)
+
+  06 Jan 2015; Jeroen Roovers <jer@gentoo.org> libevent-2.0.21-r1.ebuild,
+  libevent-2.0.21-r2.ebuild, +libevent-2.0.22.ebuild, -libevent-2.1.4.ebuild,
+  +libevent-2.1.5.ebuild:
+  Version bump.
 
 *libevent-9999 (26 Dec 2014)
 
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 0f65e5083bbb..8cd53dbf9941 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -2,18 +2,21 @@
 Hash: SHA256
 
 DIST libevent-2.0.21-stable.tar.gz 850772 SHA256 22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f5 SHA512 fbcdd12af9313ecc0f2988eb46ef03906b1c3aff96871a165eb8eae2cb650b1a3bb420dccf3a6bc3cdc192436d8dfc2ce67a7cc7d9e586f27be1fa52dd62dfa1 WHIRLPOOL e1d2571235770251b8a2d3f1565238909df307d7de2bb86eefeca136c76eba5f645cea951ec58fdc4f2e6bcd70b74d128ddf7df5aec4ee164fb2c6c52136989e
+DIST libevent-2.0.22-stable.tar.gz 854987 SHA256 71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3 SHA512 990637f12e890bfa7f86c194c8b112701436e92b60afb829194879efb85d558b986261e6508fe29bde73981feada874438e2d442cec8ea5730c889954f9bc907 WHIRLPOOL fe465e94a35dc489a86fad93fd4a82d5c314e3a66ebf1bcf8ba29014fe9bd2ebce4546b4a6a9fedee40d17010d73eb89b99596cec1dde3b7f9a4240cf6b6760d
 DIST libevent-2.1.4-alpha.tar.gz 957745 SHA256 7e5a1f464f7c7298cbb3074481d7c620553288b73f4a6bebeea84173edc4bce5 SHA512 d75911fc968884a49bea0127f6d478b160b05032e446b8105c833b4acca6412d2eaa7b5077b1b4b902bfc5789060394433188ac36f8d4954691e00aa7ca1e0bd WHIRLPOOL 4d5b0bb7a648d658245f0d802d10da199726a8459da2dfab470f937bf61029d903d4bc688416078ba24e6627e08bd5375df0ce00f0842a7033739b79940ecd7d
-EBUILD libevent-2.0.21-r1.ebuild 1603 SHA256 7f9d3754d74f580bf4fb7ea9f5925244371111d6238162a330f7eec64077a261 SHA512 c3c79c95abfd0203e078ea6588d1c6402a9adb5a6df5b1cb4e1ece7ba874220d5130d3a6d5af80a499710f50d15e11b6514b48d5bd8f0ee95ccb0f94dde98776 WHIRLPOOL e48986d1b1ab1cf1a48db9e3de08d606753524bb1b6b40a789dc7a9f8059de9a28d8b16e9530e4a64010b33cd354b40a1d8c3777c8cc609d0b8ebbccb59a66d6
-EBUILD libevent-2.0.21-r2.ebuild 1793 SHA256 fabb2f3618c2732fcd262d002284d60371be0b83c74676b6636357edd7c4e1b0 SHA512 6c140d1782fcd89bc34c2f9f9699c20c465d32226c46fdba3e4c064264005cb490f4e80c9ea83ff5539f8c5edc3928efdc3ed6ae626479d552899fed02514406 WHIRLPOOL 0efe1afbe1f14ffeb154e27781d8d34d1adb6b6e530346548a37e4f08de470df7dcb500f3512050e7788b608bc418a1d9c8c37e3f5c144fa8eb9e2c31e0452ac
+DIST libevent-2.1.5-beta.tar.gz 972344 SHA256 79e1b82236a02f1432b6d95ef94186915790eb9910211647f9c01a85149066d8 SHA512 cc38885fc9c7f884085d6adb4bfa51834935475f9c24b76e1fe301b43520dd88935aea588eb4c5795942fa625a790ff575f06b709775e8424691f3307becd216 WHIRLPOOL a040e9b63933d422a7ffa75c4dd0649ae239ebd747fb733420df9f40eb48e9d6ff4d4e6f217b87655a1cbde53cba1ef03beed107d62bf8720391c1f05e010adb
+EBUILD libevent-2.0.21-r1.ebuild 1606 SHA256 ef65da7e757308c338abda6acc6d379756650749a78c3ebfa002e1c92d5127b3 SHA512 2487536eeeaac3861b96a5452ffa06a3274e47683955afa39c997fa84bdc84a324c96a0403546f31ad7ff19e1b35f008f680b24da7b7c9edf6f46d101ad25b47 WHIRLPOOL 60b9daebaed73029d488aef1a35cc91bb73ae8bb51942ec59b78d1fea1a6d4d8d26bd663cabe6b7395cb4c68e646cc88118320edaf4330c24b9f6e9d57210667
+EBUILD libevent-2.0.21-r2.ebuild 1796 SHA256 5bfebacf6a004163cceb6b6b743ef796c45dc68f221f9ab98f2bb230206cc96e SHA512 363f8d8ded4f03880dd859345663f536c2751e3abf29d6b407d6d31629d2d9740c364630bb3995965f3fbce3014049a45eb89e30348ff4e85b742b267630e53b WHIRLPOOL da3597583625d4858e8e29f04488707b0e9056db6ccba61da4f2bbf714e4a1686a55b8fad54ae1244010dee29cfa1d89bbdf1ddbe0ffddf3bd012fe421e7e58c
+EBUILD libevent-2.0.22.ebuild 1793 SHA256 75d271c331644aca27d6d8dd8ed5412166d9f85b9ca78187d61c9591470bc165 SHA512 586d647a2b0cc09af456c08d05b2670b03091f2382efc2e00bd799fb84507a09cae87f168b7a7645edb4d08fb6a5401fdaf2062143aff1145f322b71c9001495 WHIRLPOOL 05fff5aa7337780d26ba65af5206b341a857d5d2fd47f99e9f977219f7ce222b73d55b8e20ca34e364dcdcfaceab88d882df515d4fcfd1812c6484d5e8f8169e
 EBUILD libevent-2.1.4-r1.ebuild 1505 SHA256 d411c7e35ca8353f84dbccb30bb1797984b22be9e681c8d92578ebd2e9c0812a SHA512 d97fa4369218fa3251fee6cfea9bcc0744599c649f5c72ec7d113a4e5546ea3d3effc7711fef0919a31cbff5d39c4debfe927d6ecfe43f06d5192dc8c885fd50 WHIRLPOOL e399546d9f5cf9e040fa14a0a26d7bdcfde9e6a1a782fba5a3e511c781b5f6f5b169e7dba2900f51f97d5b624abe99d0fa41bc0222531797377885a6aa056140
-EBUILD libevent-2.1.4.ebuild 1065 SHA256 9ead3185b2f4629d2f8166aa707673444af07ae55665cd95574bf4928101d788 SHA512 2abf8fa85735d4eecdad60c4ea6f6d4f7df5e719100f1a11c4d25c7bf19323cb4cb84f3534e8b32e6ccdb31345176e1a4ec7b490b46483f14bc5c85dcaa22950 WHIRLPOOL 08f8012e483340b783e32f95a16e5be0ca0e9d9d88356b286a5c05d108516de983f3c99e5596787ef27927a6dcd88b5e4d026ca811f0a5400013a569569b46de
+EBUILD libevent-2.1.5.ebuild 1498 SHA256 800d458916720f3feb626329a57106ba8cd8ece9e11a01c75af783189779c88d SHA512 fc2d94c1f7d61e0f94578c1cc4408218c482df6b097f2f4104cb15eefa13a350cb0501e16cc742c08ec9f38b11cf9278f8c02e467c468c0290c002093ae1f792 WHIRLPOOL 0c8d5105424c3f68cca6257b322bd257873c39b8017a425e1d4d4f2d5a0349860754bdb506a1767f7c914f68424061ae46bed76a8da2299b522df276e46367c7
 EBUILD libevent-9999.ebuild 1468 SHA256 fe9ff21fed3f4cc5b36e85b21f7aa279ca69d828e2c43dddf8cb8f1366c89e0d SHA512 c132d94c64e0d7978a286c1d595b564949d31fd550ea35fd5c30b5d9a1a375786902ff7177c40e527c5ef33d2adbd0345dd00a9eb08a7adea05918cfe18cbdd2 WHIRLPOOL 816c36f257fa667767c1db7e50972a442bae5605dbe65a2a471af1203671541aa772d0892beb249883d6f850ace0d531c34e045eedf133763e94f84a0e059765
-MISC ChangeLog 33286 SHA256 f50c4809ac0fe0f478724a056f8c7dfbbb39b0aa910236a37a5437ac774d435c SHA512 bee015ab86ae16461beb92be91a6112473adf605e5e93c77f11e5c3deeb5c0eb300cb7c48d04411b49ec32c08255a3dca38616a388c052690e00056a88dabeca WHIRLPOOL fbb4bcf248cb2c55a409b36d138155ca8c602ed1b88089aaa44f7debea684c2ed7b50bafd477367f351b6c2eea0c8299764c89af422b8258ed469f1341317912
+MISC ChangeLog 33543 SHA256 c832e314da272806a5d7db49e5b9c227be3bc49dde611432f5ca715f77bfc344 SHA512 c4a0fb78160c54e43504ea60f1e44d92241d48cfdf7c009b5525fff195e6b0478eddd5caf9172258f7c113d9aa36a7c00864cc05ffd7cdef681a181f55fbbc6b WHIRLPOOL a40abd0c541fb30d8321fdaffeb39b1d238e24acdf6ab33a126027a13d8c438dbd00d35039650d8ffe865659eb1e71e250b1f70848ef65de138ef02db229870d
 MISC metadata.xml 425 SHA256 edc92690cf7b79c96eb49aea0b7d3b2f779ca545f61c39bda0e6806e06cf6cb5 SHA512 71545bf5cebf22c47ecf0ce7b56dbe377d3b177a3991a5c7194da72b7c3f68394ecbbd5447823f4a509c644711ffae71be781168a6e2073383f99819f3bbd287 WHIRLPOOL b5d4c008cfb0c477c57a1faff60ca412f13703fcc7f9c8d51528b593a244e7f96db3849ea697df8dc09b5b102b364778b62f65fe639c619a97e90825cd3bf214
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSdNNEACgkQVWmRsqeSphN3MwCfWVhjuhHqDBHRNzlwhpp7OlKL
-tzYAn1H9X+88wPY9GCZnvLAS+1+rE6IV
-=L7Gq
+iEYEAREIAAYFAlSru34ACgkQVWmRsqeSphMSWwCffIHfBdFD6FE3wWIn/0a/Nx6u
+zU8An0AyN0kViGGQO/0DAYLgRqAN8inF
+=7gTN
 -----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
index 6df6bbf80649..b1330f440aac 100644
--- a/dev-libs/libevent/libevent-2.0.21-r1.ebuild
+++ b/dev-libs/libevent/libevent-2.0.21-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.12 2014/10/11 13:38:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/libevent-2.0.21-r1.ebuild,v 1.13 2015/01/06 10:39:56 jer Exp $
 
 EAPI=5
 inherit eutils libtool multilib-minimal
@@ -9,7 +9,7 @@ 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"
+SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-libs/libevent/libevent-2.0.21-r2.ebuild b/dev-libs/libevent/libevent-2.0.21-r2.ebuild
index 83aa78a53d2c..8df15e9902a9 100644
--- a/dev-libs/libevent/libevent-2.0.21-r2.ebuild
+++ b/dev-libs/libevent/libevent-2.0.21-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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-r2.ebuild,v 1.2 2014/06/18 19:13:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/libevent-2.0.21-r2.ebuild,v 1.3 2015/01/06 10:39:56 jer Exp $
 
 EAPI=5
 inherit eutils libtool multilib-minimal
@@ -9,7 +9,7 @@ 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"
+SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-libs/libevent/libevent-2.0.22.ebuild b/dev-libs/libevent/libevent-2.0.22.ebuild
new file mode 100644
index 000000000000..89bf4d4f5d70
--- /dev/null
+++ b/dev-libs/libevent/libevent-2.0.22.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/libevent-2.0.22.ebuild,v 1.1 2015/01/06 10:39:56 jer 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://sourceforge/levent/files/${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="debug +ssl static-libs test +threads"
+
+DEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${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
+	# https://github.com/libevent/libevent/pull/143
+	# https://github.com/libevent/libevent/pull/144
+	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 debug debug-mode) \
+		$(use_enable debug malloc-replacement) \
+		$(use_enable ssl openssl) \
+		$(use_enable static-libs static) \
+		$(use_enable threads thread-support)
+}
+
+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.ebuild b/dev-libs/libevent/libevent-2.1.5.ebuild
index e7e3d9bd26af..e0beba8d82ca 100644
--- a/dev-libs/libevent/libevent-2.1.4.ebuild
+++ b/dev-libs/libevent/libevent-2.1.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.ebuild,v 1.1 2014/03/21 17:46:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/libevent-2.1.5.ebuild,v 1.1 2015/01/06 10:39:56 jer Exp $
 
 EAPI=5
-inherit eutils libtool
+inherit eutils libtool multilib-minimal
 
-MY_P="${P}-alpha"
+MY_P="${P}-beta"
 
 DESCRIPTION="A library to execute a function when a specific event occurs on a file descriptor"
 HOMEPAGE="http://libevent.org/"
@@ -14,25 +14,38 @@ SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="+ssl static-libs test"
+IUSE="debug +ssl static-libs test +threads"
 
-DEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${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
+	# don't waste time building tests
+	# https://github.com/libevent/libevent/pull/144
 	sed -i -e '/^all:/s|tests||g' Makefile.nmake || die
 }
 
-src_configure() {
+multilib_src_configure() {
+	# fix out-of-source builds
+	mkdir -p test || die
+
+	ECONF_SOURCE="${S}" \
 	econf \
+		$(use_enable debug debug-mode) \
+		$(use_enable debug malloc-replacement) \
+		$(use_enable ssl openssl) \
 		$(use_enable static-libs static) \
-		$(use_enable ssl openssl)
+		$(use_enable threads thread-support)
 }
 
 src_test() {
@@ -44,7 +57,7 @@ src_test() {
 
 DOCS=( ChangeLog{,-1.4,-2.0} )
 
-src_install() {
-	default
+multilib_src_install_all() {
+	einstalldocs
 	prune_libtool_files
 }