From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7490459CAB for ; Thu, 31 Mar 2016 09:53:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A4E5F21C023; Thu, 31 Mar 2016 09:53:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 21D1721C023 for ; Thu, 31 Mar 2016 09:53:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9AA9C340D4C for ; Thu, 31 Mar 2016 09:53:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4974220E for ; Thu, 31 Mar 2016 09:53:20 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1459418157.7944c53ee75ebcd5b93546525188ce71a23450d8.blueness@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: app-misc/tmux/files/, app-misc/tmux/ X-VCS-Repository: proj/musl X-VCS-Files: app-misc/tmux/Manifest app-misc/tmux/files/tmux-2.0-flags.patch app-misc/tmux/files/tmux-2.1-cdefs.patch app-misc/tmux/files/tmux.vim app-misc/tmux/metadata.xml app-misc/tmux/tmux-2.1-r99.ebuild X-VCS-Directories: app-misc/tmux/ app-misc/tmux/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 7944c53ee75ebcd5b93546525188ce71a23450d8 X-VCS-Branch: master Date: Thu, 31 Mar 2016 09:53:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 38423d63-3d75-42e5-99c5-3efd69b6a798 X-Archives-Hash: 709c0a08c9bd2395714e5044de38588d commit: 7944c53ee75ebcd5b93546525188ce71a23450d8 Author: Masanori Ogino gmail com> AuthorDate: Thu Mar 31 02:32:40 2016 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Thu Mar 31 09:55:57 2016 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7944c53e app-misc/tmux: Fix build on musl. Signed-off-by: Masanori Ogino gmail.com> app-misc/tmux/Manifest | 6 +++ app-misc/tmux/files/tmux-2.0-flags.patch | 18 +++++++ app-misc/tmux/files/tmux-2.1-cdefs.patch | 25 +++++++++ app-misc/tmux/files/tmux.vim | 1 + app-misc/tmux/metadata.xml | 21 ++++++++ app-misc/tmux/tmux-2.1-r99.ebuild | 91 ++++++++++++++++++++++++++++++++ 6 files changed, 162 insertions(+) diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest new file mode 100644 index 0000000..808313f --- /dev/null +++ b/app-misc/tmux/Manifest @@ -0,0 +1,6 @@ +AUX tmux-2.0-flags.patch 584 SHA256 17dba9f233ca99e31d0619a47ca1cfd1f78bc429bfc9564e3fbc0174b39b61e7 SHA512 029a29182f5998c19883f24eab980d16f2e89c72f4150354e0a1101f9092491e836952fb9442e511508f47fd701c8cc8171f29c6ff097248894b6696d108f6dd WHIRLPOOL 026220084ff52382a168053b67bc5133b6d0d455059108ff85f58bb98eaab1656d1d76cd2c7814b9a7fde75e30cf79dfdf65c6c4429aa51852dfb9e6afef13e4 +AUX tmux-2.1-cdefs.patch 562 SHA256 3f8f066899976ff4ec8cba7f7426e64546c9edfdc695a64bafda7f44cc5ebd9c SHA512 94654d2567d9fcdb2788da9da692a5c7e0557dd742a865b0d22ce5b337a8a150674efe6524b9f80da6dbe4dd9519d90df60a7b25689344aceff9268fe90fab4a WHIRLPOOL ce4d40db7bfd35ba10ac3c482adf1ddf142bbe07e21526c6f6e4cbf4e84e71cad1694a6e19e91ae283ece8be594a59d18298c8133753563618478fec9a56098e +AUX tmux.vim 55 SHA256 ab10a475aa32e2aacba7b47e9ca38057ee2e447a953497a0349f1640167be6b7 SHA512 5307bf7d27209ce143d7a57856440ba0462783f5b047b00ec5a5046f1b72110e62ef8bca47b67807cb9e9ffcede06c512f6136d825260f735cc32a63706c9e5e WHIRLPOOL fa0019bcfcbe46aa9d383f8778ea4b7d8ec94f7b58f9c38b07c9b6649ea17363f2436e684d83c0c262711e30b62f90fe7f65d87e3a2c9dc5b391633f75a5d7ca +DIST tmux-2.1.tar.gz 462965 SHA256 31564e7bf4bcef2defb3cb34b9e596bd43a3937cad9e5438701a81a5a9af6176 SHA512 0faa0a60a84b777ca3cf572cf741d0e4f82a9f32d27dfeddfda41bad57830823a6d5f2323f27ba794b86e194d9f7db7028c94dc6a15bb4ac5a18508f890bdaa4 WHIRLPOOL 983024886bdb868bb69ccedc18e9fd62cc5a8f147d647ea43b6f20e297b9b3c45a061e542bcb590ab50cf5d3db43d22015c3a8f18bee33d9c76552bfe13424ed +EBUILD tmux-2.1-r99.ebuild 2349 SHA256 bde8849ede880ac0ba642e9185d60cdd92add9851d4efb49fad45f9cae5a0243 SHA512 78141bef98733e171f1df3d6c2af056eca5d2ed078d0fe509c77feb09185ba6502fa5f4ac883119751a9f1b6960c5d5afa90d2bd32f7bcbc90c6dda50016ff6c WHIRLPOOL 52ed81a4410bc350600c305f71b1b2fd58138632ad4b792e00515263b5246f013b2a87a42cd26b99fb49f11e7dbcbc31354c2808bc1647554dfe298928570e36 +MISC metadata.xml 758 SHA256 d8b1acdbe0283795479436be5437f76037fb54e0c6f32ec6cbe4142964bc1889 SHA512 560576353d246b8b63fb5287e3ead7054e8f7307c0d78e02dee378537a6ffb03edc3b444f1c54809a4807cb4ce1f22e7967ae5825692d3804b89cd1b4655e2c7 WHIRLPOOL 048f7302af5a1ed297d4664880e973304627e12565ceffd394a2564b7cf6efba94d0f6ac14d032262970d4b30b09db4ea83a7294f4ce7cdca5512510939f0d36 diff --git a/app-misc/tmux/files/tmux-2.0-flags.patch b/app-misc/tmux/files/tmux-2.0-flags.patch new file mode 100644 index 0000000..d2c40e0 --- /dev/null +++ b/app-misc/tmux/files/tmux-2.0-flags.patch @@ -0,0 +1,18 @@ + Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 63e20b1..a2fec1e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -25,9 +25,8 @@ endif + # Set flags for gcc. gcc4 whines abouts silly stuff so it needs slightly + # different flags. + if IS_GCC +-CFLAGS += -std=gnu99 -O2 ++CFLAGS += -std=gnu99 + if IS_DEBUG +-CFLAGS += -g + CFLAGS += -Wno-long-long -Wall -W -Wnested-externs -Wformat=2 + CFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations + CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare diff --git a/app-misc/tmux/files/tmux-2.1-cdefs.patch b/app-misc/tmux/files/tmux-2.1-cdefs.patch new file mode 100644 index 0000000..f26a761 --- /dev/null +++ b/app-misc/tmux/files/tmux-2.1-cdefs.patch @@ -0,0 +1,25 @@ +Remove the dependency on sys/cdefs.h. + +Note that upstream has already done similar changes so it would be unnecessary +with newer versions. + +diff -ru tmux-2.1.orig/compat/vis.h tmux-2.1/compat/vis.h +--- tmux-2.1.orig/compat/vis.h 2016-03-31 11:16:36.113228256 +0900 ++++ tmux-2.1/compat/vis.h 2016-03-31 11:17:04.263228615 +0900 +@@ -73,9 +73,6 @@ + */ + #define UNVIS_END 1 /* no more characters */ + +-#include +- +-__BEGIN_DECLS + char *vis(char *, int, int, int); + int strvis(char *, const char *, int); + int stravis(char **, const char *, int); +@@ -85,6 +82,4 @@ + int unvis(char *, char, int *, int); + ssize_t strnunvis(char *, const char *, size_t); + +-__END_DECLS +- + #endif /* !_VIS_H_ */ diff --git a/app-misc/tmux/files/tmux.vim b/app-misc/tmux/files/tmux.vim new file mode 100644 index 0000000..baac50a --- /dev/null +++ b/app-misc/tmux/files/tmux.vim @@ -0,0 +1 @@ +au BufNewFile,BufRead .tmux.conf*,tmux.conf* setf tmux diff --git a/app-misc/tmux/metadata.xml b/app-misc/tmux/metadata.xml new file mode 100644 index 0000000..c2ae9d3 --- /dev/null +++ b/app-misc/tmux/metadata.xml @@ -0,0 +1,21 @@ + + + + + wired@gentoo.org + Alex Alexander + + + shell-tools@gentoo.org + Gentoo Shell Tools Project + + + tmux is a "terminal multiplexer", it enables a number of terminals + (or windows) to be accessed and controlled from a single terminal. + tmux is intended to be a simple, modern, BSD-licensed alternative to + programs such as app-misc/screen. + + + tmux/tmux + + diff --git a/app-misc/tmux/tmux-2.1-r99.ebuild b/app-misc/tmux/tmux-2.1-r99.ebuild new file mode 100644 index 0000000..533b36f --- /dev/null +++ b/app-misc/tmux/tmux-2.1-r99.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true + +inherit autotools-utils bash-completion-r1 flag-o-matic versionator + +DESCRIPTION="Terminal multiplexer" +HOMEPAGE="http://tmux.github.io/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="debug selinux vim-syntax kernel_FreeBSD kernel_linux" + +CDEPEND=" + || ( + =dev-libs/libevent-2.0* + >=dev-libs/libevent-2.1.5-r4 + ) + kernel_linux? ( sys-libs/libutempter ) + kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) + sys-libs/ncurses:0=" +DEPEND="${CDEPEND} + virtual/pkgconfig" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-screen ) + vim-syntax? ( + || ( + app-editors/vim + app-editors/gvim + ) + )" + +DOCS=( CHANGES FAQ README TODO ) + +PATCHES=( "${FILESDIR}"/${PN}-2.0-flags.patch "${FILESDIR}"/${PN}-2.1-cdefs.patch ) + +src_prepare() { + # bug 438558 + # 1.7 segfaults when entering copy mode if compiled with -Os + replace-flags -Os -O2 + + # regenerate aclocal.m4 to support earlier automake versions + rm aclocal.m4 || die + + autotools-utils_src_prepare +} + +src_configure() { + local myeconfargs=( + --sysconfdir="${EPREFIX}"/etc + $(use_enable debug) + ) + autotools-utils_src_configure +} + +src_install() { + autotools-utils_src_install + + newbashcomp examples/bash_completion_tmux.sh ${PN} + + docinto examples + dodoc examples/*.conf + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins examples/tmux.vim + + insinto /usr/share/vim/vimfiles/ftdetect + doins "${FILESDIR}"/tmux.vim + fi +} + +pkg_postinst() { + if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then + echo + ewarn "Some configuration options changed in this release." + ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/" + ewarn + ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any" + ewarn "older, running tmux server instances. You'll have to use an existing client to" + ewarn "end your old sessions or kill the old server instances. Otherwise you'll have" + ewarn "to temporarily downgrade to access them." + echo + fi +}