drop 4.11; cleanup; add multilib support, thanks @iamnr3

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)

5 files changed, 56 insertions, 94 deletions

diff --git a/dev-libs/libev/ChangeLog b/dev-libs/libev/ChangeLog
index 074b1a3e527f..fa8ad6ce103d 100644
--- a/dev-libs/libev/ChangeLog
+++ b/dev-libs/libev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libev
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/ChangeLog,v 1.63 2013/12/20 19:57:20 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/ChangeLog,v 1.64 2014/03/21 21:39:03 dlan Exp $
+
+*libev-4.15-r1 (21 Mar 2014)
+
+  21 Mar 2014; Yixun Lan <dlan@gentoo.org> -libev-4.11-r1.ebuild,
+  +libev-4.15-r1.ebuild, -files/4.01-gentoo.patch,
+  -files/libev-4.11-gentoo.patch:
+  drop 4.11; cleanup; add multilib support, thanks @iamnr3
 
   20 Dec 2013; Markos Chandras <hwoarang@gentoo.org>
   +files/libev-4.15-automake-1.14.patch, libev-4.15.ebuild:
diff --git a/dev-libs/libev/files/4.01-gentoo.patch b/dev-libs/libev/files/4.01-gentoo.patch
deleted file mode 100644
index 3f7f1c7da83e..000000000000
--- a/dev-libs/libev/files/4.01-gentoo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 058c2cb..882fd23 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -9,7 +9,7 @@ EXTRA_DIST = LICENSE Changes libev.m4 autogen.sh \
- 
- man_MANS = ev.3
- 
--include_HEADERS = ev.h ev++.h event.h
-+include_HEADERS = ev.h ev++.h
- 
- lib_LTLIBRARIES = libev.la
- 
-diff --git a/configure.ac b/configure.ac
-index 20665bb..f3eb882 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3,7 +3,6 @@ AC_CONFIG_SRCDIR([ev_epoll.c])
- 
- AM_INIT_AUTOMAKE(libev,4.01) dnl also update ev.h!
- AC_CONFIG_HEADERS([config.h])
--AM_MAINTAINER_MODE
- 
- AC_PROG_INSTALL
- AC_PROG_LIBTOOL
diff --git a/dev-libs/libev/files/libev-4.11-gentoo.patch b/dev-libs/libev/files/libev-4.11-gentoo.patch
deleted file mode 100644
index d7872ab62ce2..000000000000
--- a/dev-libs/libev/files/libev-4.11-gentoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 31d0a25..60e5bda 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,6 +1,7 @@
-+AC_INIT
-+
- orig_CFLAGS="$CFLAGS"
- 
--AC_INIT
- AC_CONFIG_SRCDIR([ev_epoll.c])
- 
- AM_INIT_AUTOMAKE(libev,4.11) dnl also update ev.h!
diff --git a/dev-libs/libev/libev-4.11-r1.ebuild b/dev-libs/libev/libev-4.11-r1.ebuild
deleted file mode 100644
index bd7cb4ac7a0d..000000000000
--- a/dev-libs/libev/libev-4.11-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/libev-4.11-r1.ebuild,v 1.10 2013/03/06 10:27:57 ago Exp $
-
-EAPI=5
-
-inherit autotools eutils multilib
-
-MY_P="${P}"
-
-DESCRIPTION="A high-performance event loop/event model with lots of feature"
-HOMEPAGE="http://software.schmorp.de/pkg/libev.html"
-SRC_URI="http://dist.schmorp.de/libev/${MY_P}.tar.gz
-	http://dist.schmorp.de/libev/Attic/${MY_P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="elibc_glibc static-libs"
-
-# Bug #283558
-DEPEND="elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( Changes README )
-
-src_prepare() {
-	epatch "${FILESDIR}/4.01-gentoo.patch"
-	# bug #411847
-	epatch "${FILESDIR}/${PN}-pc.patch"
-	# bug 429526
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || prune_libtool_files
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libev.so.3.0.0
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libev.so.3.0.0
-}
diff --git a/dev-libs/libev/libev-4.15-r1.ebuild b/dev-libs/libev/libev-4.15-r1.ebuild
new file mode 100644
index 000000000000..9a0feb2ade08
--- /dev/null
+++ b/dev-libs/libev/libev-4.15-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/libev-4.15-r1.ebuild,v 1.1 2014/03/21 21:39:03 dlan Exp $
+
+EAPI=5
+
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="A high-performance event loop/event model with lots of feature"
+HOMEPAGE="http://software.schmorp.de/pkg/libev.html"
+SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz
+	http://dist.schmorp.de/libev/Attic/${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="elibc_glibc static-libs"
+
+# Bug #283558
+DEPEND="elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )"
+RDEPEND="${DEPEND}"
+
+DOCS=( Changes README )
+
+src_prepare() {
+	sed -i -e "/^include_HEADERS/s/ event.h//" Makefile.am || die
+
+	# bug #411847
+	epatch "${FILESDIR}/${PN}-pc.patch"
+	# bug #493050
+	epatch "${FILESDIR}/${P}-automake-1.14.patch"
+
+	epatch_user
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-maintainer-mode \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	use static-libs || prune_libtool_files
+	einstalldocs
+}