Version bump.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A792A613)

5 files changed, 103 insertions, 18 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/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
 }