| 1 |
commit: 906979de3f0f9d0ecf0c7123d8f34537e58a3ed8 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 11 04:53:48 2015 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 11 04:53:48 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=906979de |
| 7 |
|
| 8 |
The stable branch deserves USE=libressl too. Add sub-SLOTS (bug #536930). |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.23 |
| 11 |
|
| 12 |
...t-2.1.5-r1.ebuild => libevent-2.0.22-r1.ebuild} | 26 ++++++++++++---------- |
| 13 |
...nt-2.1.5-r1.ebuild => libevent-2.1.5-r2.ebuild} | 5 +++-- |
| 14 |
2 files changed, 17 insertions(+), 14 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-libs/libevent/libevent-2.1.5-r1.ebuild b/dev-libs/libevent/libevent-2.0.22-r1.ebuild |
| 17 |
similarity index 67% |
| 18 |
copy from dev-libs/libevent/libevent-2.1.5-r1.ebuild |
| 19 |
copy to dev-libs/libevent/libevent-2.0.22-r1.ebuild |
| 20 |
index 9602758..de4cc28 100644 |
| 21 |
--- a/dev-libs/libevent/libevent-2.1.5-r1.ebuild |
| 22 |
+++ b/dev-libs/libevent/libevent-2.0.22-r1.ebuild |
| 23 |
@@ -5,22 +5,23 @@ |
| 24 |
EAPI=5 |
| 25 |
inherit eutils libtool multilib-minimal |
| 26 |
|
| 27 |
-MY_P="${P}-beta" |
| 28 |
+MY_P="${P}-stable" |
| 29 |
|
| 30 |
DESCRIPTION="A library to execute a function when a specific event occurs on a file descriptor" |
| 31 |
HOMEPAGE="http://libevent.org/" |
| 32 |
SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz" |
| 33 |
|
| 34 |
LICENSE="BSD" |
| 35 |
-SLOT="0" |
| 36 |
-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" |
| 37 |
+SLOT="0/5.1.9" |
| 38 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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" |
| 39 |
IUSE="debug libressl +ssl static-libs test +threads" |
| 40 |
|
| 41 |
DEPEND=" |
| 42 |
ssl? ( |
| 43 |
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) |
| 44 |
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) |
| 45 |
libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) |
| 46 |
- )" |
| 47 |
+ ) |
| 48 |
+" |
| 49 |
RDEPEND=" |
| 50 |
${DEPEND} |
| 51 |
!<=dev-libs/9libs-1.0 |
| 52 |
@@ -32,17 +33,20 @@ MULTILIB_WRAPPED_HEADERS=( |
| 53 |
|
| 54 |
S=${WORKDIR}/${MY_P} |
| 55 |
|
| 56 |
+DOCS=( README ChangeLog ) |
| 57 |
+ |
| 58 |
src_prepare() { |
| 59 |
elibtoolize |
| 60 |
- # don't waste time building tests |
| 61 |
+ |
| 62 |
+ # don't waste time building tests/samples |
| 63 |
+ # https://github.com/libevent/libevent/pull/143 |
| 64 |
# https://github.com/libevent/libevent/pull/144 |
| 65 |
- sed -i -e '/^all:/s|tests||g' Makefile.nmake || die |
| 66 |
+ sed -i \ |
| 67 |
+ -e 's|^\(SUBDIRS =.*\)sample test\(.*\)$|\1\2|' \ |
| 68 |
+ Makefile.in || die "sed Makefile.in failed" |
| 69 |
} |
| 70 |
|
| 71 |
multilib_src_configure() { |
| 72 |
- # fix out-of-source builds |
| 73 |
- mkdir -p test || die |
| 74 |
- |
| 75 |
ECONF_SOURCE="${S}" \ |
| 76 |
econf \ |
| 77 |
$(use_enable debug debug-mode) \ |
| 78 |
@@ -59,8 +63,6 @@ src_test() { |
| 79 |
# emake -C test check | tee "${T}"/tests |
| 80 |
} |
| 81 |
|
| 82 |
-DOCS=( ChangeLog{,-1.4,-2.0} ) |
| 83 |
- |
| 84 |
multilib_src_install_all() { |
| 85 |
einstalldocs |
| 86 |
prune_libtool_files |
| 87 |
|
| 88 |
diff --git a/dev-libs/libevent/libevent-2.1.5-r1.ebuild b/dev-libs/libevent/libevent-2.1.5-r2.ebuild |
| 89 |
similarity index 98% |
| 90 |
rename from dev-libs/libevent/libevent-2.1.5-r1.ebuild |
| 91 |
rename to dev-libs/libevent/libevent-2.1.5-r2.ebuild |
| 92 |
index 9602758..04a8444 100644 |
| 93 |
--- a/dev-libs/libevent/libevent-2.1.5-r1.ebuild |
| 94 |
+++ b/dev-libs/libevent/libevent-2.1.5-r2.ebuild |
| 95 |
@@ -12,7 +12,7 @@ HOMEPAGE="http://libevent.org/" |
| 96 |
SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz" |
| 97 |
|
| 98 |
LICENSE="BSD" |
| 99 |
-SLOT="0" |
| 100 |
+SLOT="0/5.0.0" |
| 101 |
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" |
| 102 |
IUSE="debug libressl +ssl static-libs test +threads" |
| 103 |
|
| 104 |
@@ -20,7 +20,8 @@ DEPEND=" |
| 105 |
ssl? ( |
| 106 |
!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) |
| 107 |
libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) |
| 108 |
- )" |
| 109 |
+ ) |
| 110 |
+" |
| 111 |
RDEPEND=" |
| 112 |
${DEPEND} |
| 113 |
!<=dev-libs/9libs-1.0 |
Archives