[gentoo-commits] gentoo-x86 commit in app-misc/tmux: ChangeLog tmux-9999.ebuild tmux-1.9a.ebuild

[Tim Harder (radhermit)]

radhermit    14/02/25 07:00:37

  Modified:             ChangeLog tmux-9999.ebuild
  Added:                tmux-1.9a.ebuild
  Log:
  Version bump (bug #502004).
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

Revision  Changes    Path
1.103                app-misc/tmux/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tmux/ChangeLog?rev=1.103&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tmux/ChangeLog?rev=1.103&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tmux/ChangeLog?r1=1.102&r2=1.103

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- ChangeLog	4 Feb 2014 08:38:54 -0000	1.102
+++ ChangeLog	25 Feb 2014 07:00:37 -0000	1.103
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/tmux
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.102 2014/02/04 08:38:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.103 2014/02/25 07:00:37 radhermit Exp $
+
+*tmux-1.9a (25 Feb 2014)
+
+  25 Feb 2014; Tim Harder <radhermit@g.o> +tmux-1.9a.ebuild,
+  tmux-9999.ebuild, +files/tmux-1.9a-flags.patch:
+  Version bump (bug #502004).
 
   04 Feb 2014; Tim Harder <radhermit@g.o> -tmux-1.6.ebuild,
   -tmux-1.7.ebuild, -tmux-1.7-r1.ebuild, -tmux-1.7-r2.ebuild,



1.11                 app-misc/tmux/tmux-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tmux/tmux-9999.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tmux/tmux-9999.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tmux/tmux-9999.ebuild?r1=1.10&r2=1.11

Index: tmux-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-9999.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tmux-9999.ebuild	28 Aug 2013 12:10:28 -0000	1.10
+++ tmux-9999.ebuild	25 Feb 2014 07:00:37 -0000	1.11
@@ -1,10 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-9999.ebuild,v 1.10 2013/08/28 12:10:28 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-9999.ebuild,v 1.11 2014/02/25 07:00:37 radhermit Exp $
 
-EAPI=4
+EAPI=5
+AUTOTOOLS_AUTORECONF=true
 
-inherit autotools git-2 bash-completion-r1
+inherit autotools-utils git-r3 bash-completion-r1 flag-o-matic
 
 EGIT_REPO_URI="git://git.code.sf.net/p/tmux/tmux-code"
 
@@ -26,23 +27,31 @@
 		app-editors/vim
 		app-editors/gvim ) )"
 
-DOCS=( CHANGES FAQ TODO )
+DOCS=( CHANGES FAQ README TODO )
 
 src_prepare() {
-	eautoreconf
-	# look for config file in the prefix
-	sed -i -e '/SYSTEM_CFG/s:"/etc:"'"${EPREFIX}"'/etc:' tmux.h || die
-	# and don't just add some includes
-	sed -i -e 's:-I/usr/local/include::' Makefile.in || die
+	# respect CFLAGS and don't add some includes
+	sed -e 's:-I/usr/local/include::' \
+		-e 's:-O2::' \
+		-i Makefile.am || die
+
+	# bug 438558
+	# 1.7 segfaults when entering copy mode if compiled with -Os
+	replace-flags -Os -O2
+
+	autotools-utils_src_prepare
 }
 
 src_configure() {
-	econf \
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc
 		$(use_enable debug)
+	)
+	autotools-utils_src_configure
 }
 
 src_install() {
-	default
+	autotools-utils_src_install
 
 	newbashcomp examples/bash_completion_tmux.sh ${PN}
 



1.1                  app-misc/tmux/tmux-1.9a.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tmux/tmux-1.9a.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tmux/tmux-1.9a.ebuild?rev=1.1&content-type=text/plain

Index: tmux-1.9a.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.9a.ebuild,v 1.1 2014/02/25 07:00:37 radhermit Exp $

EAPI=5
AUTOTOOLS_AUTORECONF=true

inherit autotools-utils bash-completion-r1 flag-o-matic

DESCRIPTION="Terminal multiplexer"
HOMEPAGE="http://tmux.sourceforge.net"
SRC_URI="mirror://sourceforge/tmux/${P}.tar.gz"

LICENSE="ISC"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~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 vim-syntax"

COMMON_DEPEND="
	>=dev-libs/libevent-2.0.10
	sys-libs/ncurses"
DEPEND="${COMMON_DEPEND}
	virtual/pkgconfig"
RDEPEND="${COMMON_DEPEND}
	vim-syntax? ( || (
		app-editors/vim
		app-editors/gvim ) )"

DOCS=( CHANGES FAQ README TODO )

PATCHES=( "${FILESDIR}"/${P}-flags.patch )

pkg_setup() {
	if has_version "<app-misc/tmux-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
}

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

	# remove generated files
	rm -r compat/.{dirstamp,deps} || 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
}